diff --git a/README.md b/README.md index 8402923f2..c640b1347 100644 --- a/README.md +++ b/README.md @@ -228,7 +228,7 @@ let us know and we'll be happy to include it here! - **Mongo to D2**: [https://github.com/novuhq/mongo-to-D2](https://github.com/novuhq/mongo-to-D2) - **Pandoc filter**: [https://github.com/ram02z/d2-filter](https://github.com/ram02z/d2-filter) - **Logseq-D2**: [https://github.com/b-yp/logseq-d2](https://github.com/b-yp/logseq-d2) -- **ent2d2**: [https://github.com/tmc/ent2d2](https://github.com/b-yp/logseq-d2) +- **ent2d2**: [https://github.com/tmc/ent2d2](https://github.com/tmc/ent2d2) ### Misc diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 5ebefa915..14878ca73 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,5 +1,7 @@ #### Features 🚀 +- Configure timeout value with D2_TIMEOUT env var. [#1392](https://github.com/terrastruct/d2/pull/1392) + #### Improvements 🧹 - Use shape specific sizing for grid containers [#1294](https://github.com/terrastruct/d2/pull/1294) @@ -8,15 +10,12 @@ - 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) +- Display version on CLI help invocation [#1400](https://github.com/terrastruct/d2/pull/1400) +- Improved readability of connection labels when they overlap another connection. [#447](https://github.com/terrastruct/d2/pull/447) +- Error message when `shape` is given a composite [#1415](https://github.com/terrastruct/d2/pull/1415) - The autoformatter moves board declarations to the bottom of its scope. [#1424](https://github.com/terrastruct/d2/pull/1424) #### Bugfixes ⛑️ -- Shadow is cut off when `--pad` is 0. Thank you @LeonardsonCC ! [#1326](https://github.com/terrastruct/d2/pull/1326) -- Fixes grid layout overwriting label placements for nested objects. [#1345](https://github.com/terrastruct/d2/pull/1345) -- Fixes fonts not rendering correctly on certain platforms. Thanks @mikeday for identifying the solution. [#1356](https://github.com/terrastruct/d2/pull/1356) -- Fixes folders not rendering in animations (`--animate-interval`) [#1357](https://github.com/terrastruct/d2/pull/1357) -- Fixes panic using reserved keywords as containers [#1358](https://github.com/terrastruct/d2/pull/1358) -- When multiple classes are applied changing different attributes of arrowheads, they are - all applied instead of only the last one [#1362](https://github.com/terrastruct/d2/pull/1362) -- Prevent empty block strings [#1364](https://github.com/terrastruct/d2/pull/1364) +- Fixes edge case in compiler using dots in quotes [#1401](https://github.com/terrastruct/d2/pull/1401) +- Fixes grid label font size for TALA [#1412](https://github.com/terrastruct/d2/pull/1412) diff --git a/ci/release/changelogs/v0.5.0.md b/ci/release/changelogs/v0.5.0.md new file mode 100644 index 000000000..e67ce0d0d --- /dev/null +++ b/ci/release/changelogs/v0.5.0.md @@ -0,0 +1,46 @@ +There are three important features that were in the initial design of D2 that have not been done and hold it back from 1.0: globs, imports, and vars. This release brings imports. + +Imports open up a world of possibilities and works beautifully to modularize diagrams. See the new docs to try it out today. + +As usual, many improvements and bug fixes accompany this release. D2 0.5 produces more legible diagrams by masking obstructions (e.g. arrow going through a label), has better error messages to guide you, is faster at certain tasks, and addresses many issues brought by community bug reports. + +#### Features 🚀 + +- D2 files have the ability to import from other D2 files. See [docs](https://d2lang.com/tour/imports). [#1371](https://github.com/terrastruct/d2/pull/1371) +- `sql_table` alternatively takes an array of constraints instead of being limited to a single one. Thanks @satoqz ! [#1245](https://github.com/terrastruct/d2/pull/1245) + +#### Improvements 🧹 + +- Use shape-specific sizing for grid containers [#1294](https://github.com/terrastruct/d2/pull/1294) +- Grid diagrams support nested shapes or grid diagrams [#1309](https://github.com/terrastruct/d2/pull/1309) +- `grid-gap`, `vertical-gap`, and `horizontal-gap` apply to padding on grid diagrams [#1309](https://github.com/terrastruct/d2/pull/1309) +- Watch mode browser uses an error favicon to easily indicate compiler errors. Thanks @sinyo-matu ! [#1240](https://github.com/terrastruct/d2/pull/1240) +- Grid layout performance improved when there are many similarly sized shapes [#1315](https://github.com/terrastruct/d2/pull/1315) +- Connections and labels are adjusted for shapes with `3d` or `multiple` [#1340](https://github.com/terrastruct/d2/pull/1340) +- Constraints in `sql_table` render even if they have no matching abbreviation [#1372](https://github.com/terrastruct/d2/pull/1372) +- Constraints in `sql_table` sheds their excessive letter-spacing and is padded from the end consistently [#1372](https://github.com/terrastruct/d2/pull/1372) +- Duplicate image URLs in icons are only fetched once [#1373](https://github.com/terrastruct/d2/pull/1373) +- In watch mode, images are cached by default across compiles. Can be disabled with flag `--img-cache=0`. [#1373](https://github.com/terrastruct/d2/pull/1373) +- Common invalid array separator `,` usage in class arrays returns a helpful error message [#1376](https://github.com/terrastruct/d2/pull/1376) +- Invalid `constraint` usage is met with an error message, preventing a common mistake of omitting `shape: sql_table` [#1379](https://github.com/terrastruct/d2/pull/1379) +- Connections no longer obscure outside labels [#1381](https://github.com/terrastruct/d2/pull/1381) +- Container connections in `dagre` are more balanced [#1384](https://github.com/terrastruct/d2/pull/1384) +- Connections that go through shape labels are now masked translucently [#1383](https://github.com/terrastruct/d2/pull/1383) + +#### Bugfixes ⛑️ + +- Shadow is no longer cut off when `--pad` is 0. Thank you @LeonardsonCC ! [#1326](https://github.com/terrastruct/d2/pull/1326) +- Fixes grid layout overwriting label placements for nested objects [#1345](https://github.com/terrastruct/d2/pull/1345) +- Fixes fonts not rendering correctly on certain platforms. Thanks @mikeday for identifying the solution. [#1356](https://github.com/terrastruct/d2/pull/1356) +- Fixes folders not rendering in animations (`--animate-interval`) [#1357](https://github.com/terrastruct/d2/pull/1357) +- Fixes panic using reserved keywords as containers [#1358](https://github.com/terrastruct/d2/pull/1358) +- When multiple classes are change different attributes of arrowheads, they are + all applied instead of only the last one [#1362](https://github.com/terrastruct/d2/pull/1362) +- Prevent empty block strings [#1364](https://github.com/terrastruct/d2/pull/1364) +- Fixes `dagre` mis-aligning a nested shape's connection [#1370](https://github.com/terrastruct/d2/pull/1370) +- Fixes a bug in grids sometimes putting a shape on the next row/column [#1380](https://github.com/terrastruct/d2/pull/1380) + +#### Breaking changes + +- `@xyz` is now reserved as a pattern for imports. If you previously had a key that started like that, it must either be renamed or quoted like `"@xyz"`. +- Likewise with `...@xyz` (spread operator import) diff --git a/ci/release/changelogs/v0.5.1.md b/ci/release/changelogs/v0.5.1.md new file mode 100644 index 000000000..782907b97 --- /dev/null +++ b/ci/release/changelogs/v0.5.1.md @@ -0,0 +1,5 @@ +This is a hotfix to 0.5.0, imports weren't working on Windows. + +#### Improvements 🧹 + +- Improves compiler's tooltip URL check. [#1390](https://github.com/terrastruct/d2/pull/1390) diff --git a/ci/release/template/man/d2.1 b/ci/release/template/man/d2.1 index 81bc4e895..81e1557cb 100644 --- a/ci/release/template/man/d2.1 +++ b/ci/release/template/man/d2.1 @@ -103,27 +103,41 @@ Set the diagram layout engine to the passed string. For a list of available opti .Ar layout .Ns . .It Fl b , -bundle Ar true -Bundle all assets and layers into the output svg. +Bundle all assets and layers into the output svg +.Ns . .It Fl -force-appendix Ar false An appendix for tooltips and links is added to PNG exports since they are not interactive. Setting this to true adds an appendix to SVG exports as well .Ns . .It Fl d , -debug -Print debug logs. +Print debug logs +.Ns . +.It Fl -img-cache Ar true +In watch mode, images used in icons are cached for subsequent compilations. This should be disabled if images might change +.Ns . +.It Fl -timeout Ar 120 +The maximum number of seconds that D2 runs for before timing out and exiting. When rendering a large diagram, it is recommended to increase this value +.Ns . .It Fl h , -help -Print usage information and exit. +Print usage information and exit +.Ns . .It Fl v , -version -Print version information and exit. +Print version information and exit +.Ns . .El .Sh SUBCOMMANDS .Bl -tag -width Fl .It Ar layout -Lists available layout engine options with short help. +Lists available layout engine options with short help +.Ns . .It Ar layout Op Ar name -Display long help for a particular layout engine, including its configuration options. +Display long help for a particular layout engine, including its configuration options +.Ns . .It Ar themes -Lists available themes. +Lists available themes +.Ns . .It Ar fmt Ar file.d2 ... -Format all passed files. +Format all passed files +.Ns . .El .Sh SEE ALSO .Xr d2plugin-tala 1 diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index c0b5eedf7..3398bda54 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -28,6 +28,7 @@ import ( "errors" "fmt" "math/big" + "path" "strconv" "strings" "unicode" @@ -63,6 +64,7 @@ var _ Node = &DoubleQuotedString{} var _ Node = &SingleQuotedString{} var _ Node = &BlockString{} var _ Node = &Substitution{} +var _ Node = &Import{} var _ Node = &Array{} var _ Node = &Map{} @@ -179,6 +181,10 @@ func (p Position) String() string { return fmt.Sprintf("%d:%d", p.Line+1, p.Column+1) } +func (p Position) Debug() string { + return fmt.Sprintf("%d:%d:%d", p.Line, p.Column, p.Byte) +} + // See docs on Range. func (p Position) MarshalText() ([]byte, error) { return []byte(fmt.Sprintf("%d:%d:%d", p.Line, p.Column, p.Byte)), nil @@ -256,6 +262,13 @@ func (p Position) Subtract(r rune, byUTF16 bool) Position { return p } +func (p Position) AdvanceString(s string, byUTF16 bool) Position { + for _, r := range s { + p = p.Advance(r, byUTF16) + } + return p +} + func (p Position) SubtractString(s string, byUTF16 bool) Position { for _, r := range s { p = p.Subtract(r, byUTF16) @@ -277,6 +290,7 @@ var _ MapNode = &Comment{} var _ MapNode = &BlockComment{} var _ MapNode = &Key{} var _ MapNode = &Substitution{} +var _ MapNode = &Import{} // ArrayNode is implemented by nodes that may be children of Arrays. type ArrayNode interface { @@ -288,6 +302,7 @@ type ArrayNode interface { var _ ArrayNode = &Comment{} var _ ArrayNode = &BlockComment{} var _ ArrayNode = &Substitution{} +var _ ArrayNode = &Import{} // Value is implemented by nodes that may be values of a key. type Value interface { @@ -334,6 +349,7 @@ func (s *DoubleQuotedString) node() {} func (s *SingleQuotedString) node() {} func (s *BlockString) node() {} func (s *Substitution) node() {} +func (i *Import) node() {} func (a *Array) node() {} func (m *Map) node() {} func (k *Key) node() {} @@ -351,6 +367,7 @@ func (s *DoubleQuotedString) Type() string { return "double quoted string" } func (s *SingleQuotedString) Type() string { return "single quoted string" } func (s *BlockString) Type() string { return s.Tag + " block string" } func (s *Substitution) Type() string { return "substitution" } +func (i *Import) Type() string { return "import" } func (a *Array) Type() string { return "array" } func (m *Map) Type() string { return "map" } func (k *Key) Type() string { return "map key" } @@ -368,6 +385,7 @@ func (s *DoubleQuotedString) GetRange() Range { return s.Range } func (s *SingleQuotedString) GetRange() Range { return s.Range } func (s *BlockString) GetRange() Range { return s.Range } func (s *Substitution) GetRange() Range { return s.Range } +func (i *Import) GetRange() Range { return i.Range } func (a *Array) GetRange() Range { return a.Range } func (m *Map) GetRange() Range { return m.Range } func (k *Key) GetRange() Range { return k.Range } @@ -379,6 +397,7 @@ func (c *Comment) mapNode() {} func (c *BlockComment) mapNode() {} func (k *Key) mapNode() {} func (s *Substitution) mapNode() {} +func (i *Import) mapNode() {} func (c *Comment) arrayNode() {} func (c *BlockComment) arrayNode() {} @@ -390,6 +409,7 @@ func (s *DoubleQuotedString) arrayNode() {} func (s *SingleQuotedString) arrayNode() {} func (s *BlockString) arrayNode() {} func (s *Substitution) arrayNode() {} +func (i *Import) arrayNode() {} func (a *Array) arrayNode() {} func (m *Map) arrayNode() {} @@ -402,6 +422,7 @@ func (s *SingleQuotedString) value() {} func (s *BlockString) value() {} func (a *Array) value() {} func (m *Map) value() {} +func (i *Import) value() {} func (n *Null) scalar() {} func (b *Boolean) scalar() {} @@ -722,11 +743,20 @@ type Substitution struct { Path []*StringBox `json:"path"` } +type Import struct { + Range Range `json:"range"` + + Spread bool `json:"spread"` + Pre string `json:"pre"` + Path []*StringBox `json:"path"` +} + // MapNodeBox is used to box MapNode for JSON persistence. type MapNodeBox struct { Comment *Comment `json:"comment,omitempty"` BlockComment *BlockComment `json:"block_comment,omitempty"` Substitution *Substitution `json:"substitution,omitempty"` + Import *Import `json:"import,omitempty"` MapKey *Key `json:"map_key,omitempty"` } @@ -739,6 +769,8 @@ func MakeMapNodeBox(n MapNode) MapNodeBox { box.BlockComment = n case *Substitution: box.Substitution = n + case *Import: + box.Import = n case *Key: box.MapKey = n } @@ -753,6 +785,8 @@ func (mb MapNodeBox) Unbox() MapNode { return mb.BlockComment case mb.Substitution != nil: return mb.Substitution + case mb.Import != nil: + return mb.Import case mb.MapKey != nil: return mb.MapKey default: @@ -777,6 +811,7 @@ type ArrayNodeBox struct { Comment *Comment `json:"comment,omitempty"` BlockComment *BlockComment `json:"block_comment,omitempty"` Substitution *Substitution `json:"substitution,omitempty"` + Import *Import `json:"import,omitempty"` Null *Null `json:"null,omitempty"` Boolean *Boolean `json:"boolean,omitempty"` Number *Number `json:"number,omitempty"` @@ -797,6 +832,8 @@ func MakeArrayNodeBox(an ArrayNode) ArrayNodeBox { ab.BlockComment = an case *Substitution: ab.Substitution = an + case *Import: + ab.Import = an case *Null: ab.Null = an case *Boolean: @@ -827,6 +864,8 @@ func (ab ArrayNodeBox) Unbox() ArrayNode { return ab.BlockComment case ab.Substitution != nil: return ab.Substitution + case ab.Import != nil: + return ab.Import case ab.Null != nil: return ab.Null case ab.Boolean != nil: @@ -861,6 +900,7 @@ type ValueBox struct { BlockString *BlockString `json:"block_string,omitempty"` Array *Array `json:"array,omitempty"` Map *Map `json:"map,omitempty"` + Import *Import `json:"import,omitempty"` } func (vb ValueBox) Unbox() Value { @@ -883,6 +923,8 @@ func (vb ValueBox) Unbox() Value { return vb.Array case vb.Map != nil: return vb.Map + case vb.Import != nil: + return vb.Import default: return nil } @@ -909,6 +951,8 @@ func MakeValueBox(v Value) ValueBox { vb.Array = v case *Map: vb.Map = v + case *Import: + vb.Import = v } return vb } @@ -1002,8 +1046,8 @@ type InterpolationBox struct { // & is only special if it begins a key. // - is only special if followed by another - in a key. // ' " and | are only special if they begin an unquoted key or value. -var UnquotedKeySpecials = string([]rune{'#', ';', '\n', '\\', '{', '}', '[', ']', '\'', '"', '|', ':', '.', '-', '<', '>', '*', '&', '(', ')'}) -var UnquotedValueSpecials = string([]rune{'#', ';', '\n', '\\', '{', '}', '[', ']', '\'', '"', '|', '$'}) +var UnquotedKeySpecials = string([]rune{'#', ';', '\n', '\\', '{', '}', '[', ']', '\'', '"', '|', ':', '.', '-', '<', '>', '*', '&', '(', ')', '@'}) +var UnquotedValueSpecials = string([]rune{'#', ';', '\n', '\\', '{', '}', '[', ']', '\'', '"', '|', '$', '@'}) // RawString returns s in a AST String node that can format s in the most aesthetically // pleasing way. @@ -1052,8 +1096,33 @@ func RawString(s string, inKey bool) String { return FlatUnquotedString(s) } +func RawStringBox(s string, inKey bool) *StringBox { + return MakeValueBox(RawString(s, inKey)).StringBox() +} + func hasSurroundingWhitespace(s string) bool { r, _ := utf8.DecodeRuneInString(s) r2, _ := utf8.DecodeLastRuneInString(s) return unicode.IsSpace(r) || unicode.IsSpace(r2) } + +func (s *Substitution) IDA() (ida []string) { + for _, el := range s.Path { + ida = append(ida, el.Unbox().ScalarString()) + } + return ida +} + +func (i *Import) IDA() (ida []string) { + for _, el := range i.Path[1:] { + ida = append(ida, el.Unbox().ScalarString()) + } + return ida +} + +func (i *Import) PathWithPre() string { + if len(i.Path) == 0 { + return "" + } + return path.Join(i.Pre, i.Path[0].Unbox().ScalarString()) +} diff --git a/d2cli/help.go b/d2cli/help.go index 1a451b2ca..a786cd7b4 100644 --- a/d2cli/help.go +++ b/d2cli/help.go @@ -13,10 +13,12 @@ import ( "oss.terrastruct.com/d2/d2plugin" "oss.terrastruct.com/d2/d2themes/d2themescatalog" + "oss.terrastruct.com/d2/lib/version" ) func help(ms *xmain.State) { - fmt.Fprintf(ms.Stdout, `Usage: + fmt.Fprintf(ms.Stdout, `%[1]s %[2]s +Usage: %[1]s [--watch=false] [--theme=0] file.d2 [file.svg | file.png] %[1]s layout [name] %[1]s fmt file.d2 ... @@ -29,7 +31,7 @@ Use - to have d2 read from stdin or write to stdout. See man d2 for more detailed docs. Flags: -%s +%[3]s Subcommands: %[1]s layout - Lists available layout engine options with short help @@ -40,7 +42,7 @@ Subcommands: See more docs and the source code at https://oss.terrastruct.com/d2. Hosted icons at https://icons.terrastruct.com. Playground runner at https://play.d2lang.com. -`, filepath.Base(ms.Name), ms.Opts.Defaults()) +`, filepath.Base(ms.Name), version.Version, ms.Opts.Defaults()) } func layoutCmd(ctx context.Context, ms *xmain.State, ps []d2plugin.Plugin) error { diff --git a/d2cli/main.go b/d2cli/main.go index 0db873bc6..5fcf94c5d 100644 --- a/d2cli/main.go +++ b/d2cli/main.go @@ -37,6 +37,7 @@ import ( "oss.terrastruct.com/d2/lib/png" "oss.terrastruct.com/d2/lib/pptx" "oss.terrastruct.com/d2/lib/textmeasure" + timelib "oss.terrastruct.com/d2/lib/time" "oss.terrastruct.com/d2/lib/version" "oss.terrastruct.com/d2/lib/xgif" @@ -67,6 +68,10 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if err != nil { return err } + imgCacheFlag, err := ms.Opts.Bool("IMG_CACHE", "img-cache", "", true, "in watch mode, images used in icons are cached for subsequent compilations. This should be disabled if images might change.") + if err != nil { + return err + } layoutFlag := ms.Opts.String("D2_LAYOUT", "layout", "l", "dagre", `the layout engine used`) themeFlag, err := ms.Opts.Int64("D2_THEME", "theme", "t", 0, "the diagram theme ID") if err != nil { @@ -84,6 +89,11 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if err != nil { return err } + timeoutFlag, err := ms.Opts.Int64("D2_TIMEOUT", "timeout", "", 120, "the maximum number of seconds that D2 runs for before timing out and exiting. When rendering a large diagram, it is recommended to increase this value") + if err != nil { + return err + } + versionFlag, err := ms.Opts.Bool("", "version", "v", false, "get the version") if err != nil { return err @@ -150,9 +160,15 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if *debugFlag { ms.Env.Setenv("DEBUG", "1") } + if *imgCacheFlag { + ms.Env.Setenv("IMG_CACHE", "1") + } if *browserFlag != "" { ms.Env.Setenv("BROWSER", *browserFlag) } + if timeoutFlag != nil { + os.Setenv("D2_TIMEOUT", fmt.Sprintf("%d", *timeoutFlag)) + } var inputPath string var outputPath string @@ -291,7 +307,7 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { return w.run() } - ctx, cancel := context.WithTimeout(ctx, time.Minute*2) + ctx, cancel := timelib.WithTimeout(ctx, time.Minute*2) defer cancel() _, written, err := compile(ctx, ms, plugin, renderOpts, fontFamily, *animateIntervalFlag, inputPath, outputPath, *bundleFlag, *forceAppendixFlag, pw.Page) @@ -322,6 +338,7 @@ func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, rende Ruler: ruler, ThemeID: renderOpts.ThemeID, FontFamily: fontFamily, + InputPath: inputPath, } if renderOpts.Sketch { opts.FontFamily = go2.Pointer(d2fonts.HandDrawn) diff --git a/d2cli/watch.go b/d2cli/watch.go index 6b1c5412c..047e415d5 100644 --- a/d2cli/watch.go +++ b/d2cli/watch.go @@ -403,7 +403,7 @@ func (w *watcher) goServe() error { // TODO: Add standard debug/profiling routes m.HandleFunc("/", w.handleRoot) m.Handle("/static/", http.StripPrefix("/static", w.staticFileServer)) - m.Handle("/watch", xhttp.HandlerFuncAdapter{w.ms.Log, w.handleWatch}) + m.Handle("/watch", xhttp.HandlerFuncAdapter{Log: w.ms.Log, Func: w.handleWatch}) s := xhttp.NewServer(w.ms.Log.Warn, xhttp.Log(w.ms.Log, m)) w.goFunc(func(ctx context.Context) error { diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 2e85a27be..b8579ffe3 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -4,6 +4,7 @@ import ( "encoding/xml" "fmt" "io" + "io/fs" "net/url" "strconv" "strings" @@ -21,21 +22,27 @@ import ( type CompileOptions struct { UTF16 bool + // FS is the file system used for resolving imports in the d2 text. + // It should correspond to the root path. + FS fs.FS } -func Compile(path string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph, error) { +func Compile(p string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph, error) { if opts == nil { opts = &CompileOptions{} } - ast, err := d2parser.Parse(path, r, &d2parser.ParseOptions{ + ast, err := d2parser.Parse(p, r, &d2parser.ParseOptions{ UTF16: opts.UTF16, }) if err != nil { return nil, err } - ir, err := d2ir.Compile(ast) + ir, err := d2ir.Compile(ast, &d2ir.CompileOptions{ + UTF16: opts.UTF16, + FS: opts.FS, + }) if err != nil { return nil, err } @@ -50,7 +57,9 @@ func Compile(path string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph } func compileIR(ast *d2ast.Map, m *d2ir.Map) (*d2graph.Graph, error) { - c := &compiler{} + c := &compiler{ + err: &d2parser.ParseError{}, + } g := d2graph.NewGraph() g.AST = ast @@ -101,7 +110,7 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName } g2 := d2graph.NewGraph() g2.Parent = g - g2.AST = g.AST + g2.AST = f.Map().AST().(*d2ast.Map) c.compileBoard(g2, f.Map()) g2.Name = f.Name switch fieldName { @@ -116,7 +125,7 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName } type compiler struct { - err d2parser.ParseError + err *d2parser.ParseError } func (c *compiler) errorf(n d2ast.Node, f string, v ...interface{}) { @@ -147,12 +156,31 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) { classMap := m.GetClassMap(className) if classMap != nil { c.compileMap(obj, classMap) + } else { + if strings.Contains(className, ",") { + split := strings.Split(className, ",") + allFound := true + for _, maybeClassName := range split { + maybeClassName = strings.TrimSpace(maybeClassName) + if m.GetClassMap(maybeClassName) == nil { + allFound = false + break + } + } + if allFound { + c.errorf(class.LastRef().AST(), `class "%s" not found. Did you mean to use ";" to separate array items?`, className) + } + } } } } shape := m.GetField("shape") if shape != nil { - c.compileField(obj, shape) + if shape.Composite != nil { + c.errorf(shape.LastPrimaryKey(), "reserved field shape does not accept composite") + } else { + c.compileField(obj, shape) + } } for _, f := range m.Fields { if f.Name == "shape" { @@ -249,17 +277,19 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { obj.Map = fr.Context.Key.Value.Map } } - scopeObjIDA := d2ir.BoardIDA(fr.Context.ScopeMap) - scopeObj := obj.Graph.Root.EnsureChildIDVal(scopeObjIDA) - obj.References = append(obj.References, d2graph.Reference{ + r := d2graph.Reference{ Key: fr.KeyPath, KeyPathIndex: fr.KeyPathIndex(), MapKey: fr.Context.Key, MapKeyEdgeIndex: fr.Context.EdgeIndex(), Scope: fr.Context.Scope, - ScopeObj: scopeObj, - }) + } + if fr.Context.ScopeMap != nil { + scopeObjIDA := d2graphIDA(d2ir.BoardIDA(fr.Context.ScopeMap)) + r.ScopeObj = obj.Graph.Root.EnsureChild(scopeObjIDA) + } + obj.References = append(obj.References, r) } } @@ -310,8 +340,27 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) { func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { if f.Primary() == nil { - if f.Composite != nil && !strings.EqualFold(f.Name, "class") { - c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name) + if f.Composite != nil { + switch f.Name { + case "class": + if arr, ok := f.Composite.(*d2ir.Array); ok { + for _, class := range arr.Values { + if scalar, ok := class.(*d2ir.Scalar); ok { + attrs.Classes = append(attrs.Classes, scalar.Value.ScalarString()) + } + } + } + case "constraint": + if arr, ok := f.Composite.(*d2ir.Array); ok { + for _, constraint := range arr.Values { + if scalar, ok := constraint.(*d2ir.Scalar); ok { + attrs.Constraint = append(attrs.Constraint, scalar.Value.ScalarString()) + } + } + } + default: + c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name) + } } return } @@ -412,8 +461,7 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { c.errorf(f.LastPrimaryKey(), "constraint value must be a string") return } - attrs.Constraint.Value = scalar.ScalarString() - attrs.Constraint.MapKey = f.LastPrimaryKey() + attrs.Constraint = append(attrs.Constraint, scalar.ScalarString()) case "grid-rows": v, err := strconv.Atoi(scalar.ScalarString()) if err != nil { @@ -480,23 +528,13 @@ 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": } if attrs.Link != nil && attrs.Tooltip != nil { - _, err := url.ParseRequestURI(attrs.Tooltip.Value) - if err == nil { + u, err := url.ParseRequestURI(attrs.Tooltip.Value) + if err == nil && u.Host != "" { c.errorf(scalar, "Tooltip cannot be set to URL when link is also set (for security)") } } @@ -594,15 +632,17 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) { edge.Label.MapKey = e.LastPrimaryKey() for _, er := range e.References { - scopeObjIDA := d2ir.BoardIDA(er.Context.ScopeMap) - scopeObj := edge.Src.Graph.Root.EnsureChildIDVal(scopeObjIDA) - edge.References = append(edge.References, d2graph.EdgeReference{ + r := d2graph.EdgeReference{ Edge: er.Context.Edge, MapKey: er.Context.Key, MapKeyEdgeIndex: er.Context.EdgeIndex(), Scope: er.Context.Scope, - ScopeObj: scopeObj, - }) + } + if er.Context.ScopeMap != nil { + scopeObjIDA := d2graphIDA(d2ir.BoardIDA(er.Context.ScopeMap)) + r.ScopeObj = edge.Src.Graph.Root.EnsureChild(scopeObjIDA) + } + edge.References = append(edge.References, r) } } @@ -784,11 +824,9 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { typ = "" } d2Col := d2target.SQLColumn{ - Name: d2target.Text{Label: col.IDVal}, - Type: d2target.Text{Label: typ}, - } - if col.Constraint.Value != "" { - d2Col.Constraint = col.Constraint.Value + Name: d2target.Text{Label: col.IDVal}, + Type: d2target.Text{Label: typ}, + Constraint: col.Constraint, } obj.SQLTable.Columns = append(obj.SQLTable.Columns, d2Col) } @@ -848,6 +886,10 @@ func (c *compiler) validateKey(obj *d2graph.Object, f *d2ir.Field) { if !in && arrowheadIn { c.errorf(f.LastPrimaryKey(), fmt.Sprintf(`invalid shape, can only set "%s" for arrowheads`, obj.Shape.Value)) } + case "constraint": + if obj.Shape.Value != d2target.ShapeSQLTable { + c.errorf(f.LastPrimaryKey(), `"constraint" keyword can only be used in "sql_table" shapes`) + } } return } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 3a73a9b08..efa7ec146 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -315,6 +315,20 @@ containers: { `, expErr: `d2/testdata/d2compiler/TestCompile/image_children_Steps.d2:4:3: steps is only allowed at a board root`, }, + { + name: "name-with-dot-underscore", + text: `A: { + _.C +} + +"D.E": { + _.C +} +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.Equal(t, 3, len(g.Objects)) + }, + }, { name: "stroke-width", @@ -1505,6 +1519,11 @@ x -> y: { text: `x: {link: https://not-google.com; tooltip: https://google.com}`, expErr: `d2/testdata/d2compiler/TestCompile/no_url_link_and_url_tooltip_concurrently.d2:1:44: Tooltip cannot be set to URL when link is also set (for security)`, }, + { + name: "url_link_non_url_tooltip_ok", + text: `x: {link: https://not-google.com; tooltip: note: url.ParseRequestURI might see this as a URL}`, + expErr: ``, + }, { name: "url_link_and_not_url_tooltip_concurrently", text: `x: {link: https://google.com; tooltip: hello world}`, @@ -2117,9 +2136,7 @@ ok: { label: bar constraint: BIZ }`, - assertions: func(t *testing.T, g *d2graph.Graph) { - assert.String(t, "bar", g.Objects[0].Label.Value) - }, + expErr: `d2/testdata/d2compiler/TestCompile/constraint_label.d2:3:3: "constraint" keyword can only be used in "sql_table" shapes`, }, { name: "invalid_direction", @@ -2170,13 +2187,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", @@ -2478,6 +2499,23 @@ nostar -> 1star: { class: [path; path2] } tassert.Equal(t, "2", g.Edges[0].Style.StrokeWidth.Value) }, }, + { + name: "comma-array-class", + + text: `classes: { + dragon_ball: { + label: "" + shape: circle + style.fill: orange + } + path: { + label: "then" + style.stroke-width: 4 + } +} +nostar: { class: [dragon_ball, path] }`, + expErr: `d2/testdata/d2compiler/TestCompile/comma-array-class.d2:12:11: class "dragon_ball, path" not found. Did you mean to use ";" to separate array items?`, + }, { name: "reordered-classes", text: `classes: { @@ -2576,6 +2614,15 @@ object: { `, expErr: `d2/testdata/d2compiler/TestCompile/classes-internal-edge.d2:8:3: classes cannot contain an edge`, }, + { + name: "reserved-composite", + text: `shape: sequence_diagram { + alice -> bob: What does it mean\nto be well-adjusted? + bob -> alice: The ability to play bridge or\ngolf as if they were games. +} +`, + expErr: `d2/testdata/d2compiler/TestCompile/reserved-composite.d2:1:1: reserved field shape does not accept composite`, + }, } for _, tc := range testCases { diff --git a/d2format/format.go b/d2format/format.go index 3f86dad4d..5d5b71271 100644 --- a/d2format/format.go +++ b/d2format/format.go @@ -1,6 +1,7 @@ package d2format import ( + "path" "strconv" "strings" @@ -62,6 +63,8 @@ func (p *printer) node(n d2ast.Node) { p.blockString(n) case *d2ast.Substitution: p.substitution(n) + case *d2ast.Import: + p._import(n) case *d2ast.Array: p.array(n) case *d2ast.Map: @@ -203,6 +206,25 @@ func (p *printer) substitution(s *d2ast.Substitution) { p.sb.WriteByte('}') } +func (p *printer) _import(i *d2ast.Import) { + if i.Spread { + p.sb.WriteString("...") + } + p.sb.WriteString("@") + pre := path.Clean(i.Pre) + if pre != "." { + p.sb.WriteString(pre) + p.sb.WriteRune('/') + } + if len(i.Path) > 0 { + i2 := *i + i2.Path = append([]*d2ast.StringBox{}, i.Path...) + i2.Path[0] = d2ast.RawStringBox(path.Clean(i.Path[0].Unbox().ScalarString()), true) + i = &i2 + } + p.path(i.Path) +} + func (p *printer) array(a *d2ast.Array) { p.sb.WriteByte('[') if !a.Range.OneLine() { diff --git a/d2format/format_test.go b/d2format/format_test.go index 6f0616db0..7e034c7cb 100644 --- a/d2format/format_test.go +++ b/d2format/format_test.go @@ -617,6 +617,46 @@ y x <= y `, exp: `x <- = y +`, + }, + { + name: "import/1", + in: ` +x: @file.d2 +`, + exp: `x: @file +`, + }, + { + name: "import/2", + in: ` +x: @file."d2" +`, + exp: `x: @file."d2" +`, + }, + { + name: "import/3", + in: ` +x: @./file +`, + exp: `x: @file +`, + }, + { + name: "import/4", + in: ` +x: @../file +`, + exp: `x: @../file +`, + }, + { + name: "import/4", + in: ` +x: @"x/../file" +`, + exp: `x: @file `, }, { diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 57f135d57..409e59cf0 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"` @@ -584,7 +584,8 @@ func (obj *Object) Text() *d2target.MText { } if obj.OuterSequenceDiagram() == nil { - if obj.IsContainer() && obj.Shape.Value != "text" { + // Note: during grid layout when children are temporarily removed `IsContainer` is false + if (obj.IsContainer() || obj.IsGridDiagram()) && obj.Shape.Value != "text" { fontSize = obj.Level().LabelSize() } } else { @@ -671,38 +672,6 @@ func (obj *Object) HasChild(ids []string) (*Object, bool) { return child, true } -// Keep in sync with EnsureChild. -func (obj *Object) EnsureChildIDVal(ids []string) *Object { - if len(ids) == 0 { - return obj - } - if len(ids) == 1 && ids[0] != "style" { - _, ok := ReservedKeywords[ids[0]] - if ok { - return obj - } - } - - id := ids[0] - ids = ids[1:] - - var child *Object - for _, ch2 := range obj.ChildrenArray { - if ch2.IDVal == id { - child = ch2 - break - } - } - if child == nil { - child = obj.newObject(id) - } - - if len(ids) >= 1 { - return child.EnsureChildIDVal(ids) - } - return child -} - func (obj *Object) HasEdge(mk *d2ast.Key) (*Edge, bool) { ea, ok := obj.FindEdges(mk) if !ok { @@ -1005,7 +974,7 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R case d2target.ShapeSQLTable: maxNameWidth := 0 maxTypeWidth := 0 - constraintWidth := 0 + maxConstraintWidth := 0 colFontSize := d2fonts.FONT_SIZE_L if obj.Style.FontSize != nil { @@ -1032,21 +1001,24 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } c.Type.LabelWidth = typeDims.Width c.Type.LabelHeight = typeDims.Height - if maxTypeWidth < typeDims.Width { - maxTypeWidth = typeDims.Width - } maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) - if c.Constraint != "" { - // covers UNQ constraint with padding - constraintWidth = 60 + if l := len(c.Constraint); l > 0 { + constraintDims := GetTextDimensions(mtexts, ruler, ctexts[2], fontFamily) + if constraintDims == nil { + return nil, fmt.Errorf("dimensions for sql_table constraint %#v not found", ctexts[2].Text) + } + maxConstraintWidth = go2.Max(maxConstraintWidth, constraintDims.Width) } } // The rows get padded a little due to header font being larger than row font dims.Height = go2.Max(12, labelDims.Height*(len(obj.SQLTable.Columns)+1)) headerWidth := d2target.HeaderPadding + labelDims.Width + d2target.HeaderPadding - rowsWidth := d2target.NamePadding + maxNameWidth + d2target.TypePadding + maxTypeWidth + d2target.TypePadding + constraintWidth + rowsWidth := d2target.NamePadding + maxNameWidth + d2target.TypePadding + maxTypeWidth + d2target.TypePadding + maxConstraintWidth + if maxConstraintWidth != 0 { + rowsWidth += d2target.ConstraintPadding + } dims.Width = go2.Max(12, go2.Max(headerWidth, rowsWidth)) } @@ -1608,6 +1580,24 @@ func (g *Graph) Texts() []*d2target.MText { } } + for _, board := range g.Layers { + for _, t := range board.Texts() { + texts = appendTextDedup(texts, t) + } + } + + for _, board := range g.Scenarios { + for _, t := range board.Texts() { + texts = appendTextDedup(texts, t) + } + } + + for _, board := range g.Steps { + for _, t := range board.Texts() { + texts = appendTextDedup(texts, t) + } + } + return texts } diff --git a/d2graph/layout.go b/d2graph/layout.go index 43342daa1..60f3bdcca 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -9,6 +9,8 @@ import ( "oss.terrastruct.com/d2/lib/shape" ) +const MIN_SEGMENT_LEN = 10 + func (obj *Object) MoveWithDescendants(dx, dy float64) { obj.TopLeft.X += dx obj.TopLeft.Y += dy @@ -127,11 +129,23 @@ func (obj *Object) ShiftDescendants(dx, dy float64) { p.Y += dy } } else if isSrc { - e.Route[0].X += dx - e.Route[0].Y += dy + if dx == 0 { + e.ShiftStart(dy, false) + } else if dy == 0 { + e.ShiftStart(dx, true) + } else { + e.Route[0].X += dx + e.Route[0].Y += dy + } } else if isDst { - e.Route[len(e.Route)-1].X += dx - e.Route[len(e.Route)-1].Y += dy + if dx == 0 { + e.ShiftEnd(dy, false) + } else if dy == 0 { + e.ShiftEnd(dx, true) + } else { + e.Route[len(e.Route)-1].X += dx + e.Route[len(e.Route)-1].Y += dy + } } if isSrc || isDst { @@ -141,6 +155,118 @@ func (obj *Object) ShiftDescendants(dx, dy float64) { }) } +// ShiftStart moves the starting point of the route by delta either horizontally or vertically +// if subsequent points are in line with the movement, they will be removed (unless it is the last point) +// start end +// . ├────┼────┼───┼────┼───┤ before +// . ├──dx──► +// . ├──┼───┼────┼───┤ after +func (edge *Edge) ShiftStart(delta float64, isHorizontal bool) { + position := func(p *geo.Point) float64 { + if isHorizontal { + return p.X + } + return p.Y + } + + start := edge.Route[0] + next := edge.Route[1] + isIncreasing := position(start) < position(next) + if isHorizontal { + start.X += delta + } else { + start.Y += delta + } + + if isIncreasing == (delta < 0) { + // nothing more to do when moving away from the next point + return + } + + isAligned := func(p *geo.Point) bool { + if isHorizontal { + return p.Y == start.Y + } + return p.X == start.X + } + isPastStart := func(p *geo.Point) bool { + if delta > 0 { + return position(p) < position(start) + } else { + return position(p) > position(start) + } + } + + needsRemoval := false + toRemove := make([]bool, len(edge.Route)) + for i := 1; i < len(edge.Route)-1; i++ { + if !isAligned(edge.Route[i]) { + break + } + if isPastStart(edge.Route[i]) { + toRemove[i] = true + needsRemoval = true + } + } + if needsRemoval { + edge.Route = geo.RemovePoints(edge.Route, toRemove) + } +} + +// ShiftEnd moves the ending point of the route by delta either horizontally or vertically +// if prior points are in line with the movement, they will be removed (unless it is the first point) +func (edge *Edge) ShiftEnd(delta float64, isHorizontal bool) { + position := func(p *geo.Point) float64 { + if isHorizontal { + return p.X + } + return p.Y + } + + end := edge.Route[len(edge.Route)-1] + prev := edge.Route[len(edge.Route)-2] + isIncreasing := position(prev) < position(end) + if isHorizontal { + end.X += delta + } else { + end.Y += delta + } + + if isIncreasing == (delta > 0) { + // nothing more to do when moving away from the next point + return + } + + isAligned := func(p *geo.Point) bool { + if isHorizontal { + return p.Y == end.Y + } + return p.X == end.X + } + isPastEnd := func(p *geo.Point) bool { + if delta > 0 { + return position(p) < position(end) + } else { + return position(p) > position(end) + } + } + + needsRemoval := false + toRemove := make([]bool, len(edge.Route)) + for i := len(edge.Route) - 2; i > 0; i-- { + if !isAligned(edge.Route[i]) { + break + } + if isPastEnd(edge.Route[i]) { + toRemove[i] = true + needsRemoval = true + } + } + if needsRemoval { + edge.Route = geo.RemovePoints(edge.Route, toRemove) + } +} + // GetModifierElementAdjustments returns width/height adjustments to account for shapes with 3d or multiple func (obj *Object) GetModifierElementAdjustments() (dx, dy float64) { if obj.Is3D() { @@ -189,3 +315,72 @@ func (obj *Object) GetLabelTopLeft() *geo.Point { ) return labelTL } + +func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (newStart, newEnd int) { + srcShape := edge.Src.ToShape() + dstShape := edge.Dst.ToShape() + + // if an edge runs into an outside label, stop the edge at the label instead + overlapsOutsideLabel := false + if edge.Src.HasLabel() { + // assumes LabelPosition, LabelWidth, LabelHeight are all set if there is a label + labelPosition := label.Position(*edge.Src.LabelPosition) + if labelPosition.IsOutside() { + labelWidth := float64(edge.Src.LabelDimensions.Width) + labelHeight := float64(edge.Src.LabelDimensions.Height) + labelTL := labelPosition.GetPointOnBox(edge.Src.Box, label.PADDING, labelWidth, labelHeight) + + startingSegment := geo.Segment{Start: points[startIndex+1], End: points[startIndex]} + labelBox := geo.NewBox(labelTL, labelWidth, labelHeight) + // add left/right padding to box + labelBox.TopLeft.X -= label.PADDING + labelBox.Width += 2 * label.PADDING + if intersections := labelBox.Intersections(startingSegment); len(intersections) > 0 { + overlapsOutsideLabel = true + // move starting segment to label intersection point + points[startIndex] = intersections[0] + startingSegment.End = intersections[0] + // if the segment becomes too short, just merge it with the next segment + if startIndex < len(points) && startingSegment.Length() < MIN_SEGMENT_LEN { + points[startIndex+1] = points[startIndex] + startIndex++ + } + } + } + } + if !overlapsOutsideLabel { + // trace the edge to the specific shape's border + points[startIndex] = shape.TraceToShapeBorder(srcShape, points[startIndex], points[startIndex+1]) + } + overlapsOutsideLabel = false + if edge.Dst.HasLabel() { + // assumes LabelPosition, LabelWidth, LabelHeight are all set if there is a label + labelPosition := label.Position(*edge.Dst.LabelPosition) + if labelPosition.IsOutside() { + labelWidth := float64(edge.Dst.LabelDimensions.Width) + labelHeight := float64(edge.Dst.LabelDimensions.Height) + labelTL := labelPosition.GetPointOnBox(edge.Dst.Box, label.PADDING, labelWidth, labelHeight) + + endingSegment := geo.Segment{Start: points[endIndex-1], End: points[endIndex]} + labelBox := geo.NewBox(labelTL, labelWidth, labelHeight) + // add left/right padding to box + labelBox.TopLeft.X -= label.PADDING + labelBox.Width += 2 * label.PADDING + if intersections := labelBox.Intersections(endingSegment); len(intersections) > 0 { + overlapsOutsideLabel = true + // move ending segment to label intersection point + points[endIndex] = intersections[0] + endingSegment.End = intersections[0] + // if the segment becomes too short, just merge it with the previous segment + if endIndex-1 > 0 && endingSegment.Length() < MIN_SEGMENT_LEN { + points[endIndex-1] = points[endIndex] + endIndex-- + } + } + } + } + if !overlapsOutsideLabel { + points[endIndex] = shape.TraceToShapeBorder(dstShape, points[endIndex], points[endIndex-1]) + } + return startIndex, endIndex +} diff --git a/d2ir/compile.go b/d2ir/compile.go index a1723464b..2c4022edc 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -1,6 +1,7 @@ package d2ir import ( + "io/fs" "strings" "oss.terrastruct.com/d2/d2ast" @@ -9,18 +10,46 @@ import ( ) type compiler struct { - err d2parser.ParseError + err *d2parser.ParseError + + fs fs.FS + // importStack is used to detect cyclic imports. + importStack []string + // importCache enables reuse of files imported multiple times. + importCache map[string]*Map + utf16 bool +} + +type CompileOptions struct { + UTF16 bool + // Pass nil to disable imports. + FS fs.FS } func (c *compiler) errorf(n d2ast.Node, f string, v ...interface{}) { c.err.Errors = append(c.err.Errors, d2parser.Errorf(n, f, v...).(d2ast.Error)) } -func Compile(ast *d2ast.Map) (*Map, error) { - c := &compiler{} +func Compile(ast *d2ast.Map, opts *CompileOptions) (*Map, error) { + if opts == nil { + opts = &CompileOptions{} + } + c := &compiler{ + err: &d2parser.ParseError{}, + fs: opts.FS, + + importCache: make(map[string]*Map), + utf16: opts.UTF16, + } m := &Map{} m.initRoot() m.parent.(*Field).References[0].Context.Scope = ast + + c.pushImportStack(&d2ast.Import{ + Path: []*d2ast.StringBox{d2ast.RawStringBox(ast.GetRange().Path, true)}, + }) + defer c.popImportStack() + c.compileMap(m, ast) c.compileClasses(m) if !c.err.Empty() { @@ -85,6 +114,25 @@ func (c *compiler) compileMap(dst *Map, ast *d2ast.Map) { Scope: ast, ScopeMap: dst, }) + case n.Import != nil: + impn, ok := c._import(n.Import) + if !ok { + continue + } + if impn.Map() == nil { + c.errorf(n.Import, "cannot spread import non map into map") + continue + } + OverlayMap(dst, impn.Map()) + + if impnf, ok := impn.(*Field); ok { + if impnf.Primary_ != nil { + dstf := ParentField(dst) + if dstf != nil { + dstf.Primary_ = impnf.Primary_ + } + } + } case n.Substitution != nil: panic("TODO") } @@ -145,6 +193,46 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) case BoardScenario, BoardStep: c.compileClasses(f.Map()) } + } else if refctx.Key.Value.Import != nil { + n, ok := c._import(refctx.Key.Value.Import) + if !ok { + return + } + switch n := n.(type) { + case *Field: + if n.Primary_ != nil { + f.Primary_ = n.Primary_.Copy(f).(*Scalar) + } + if n.Composite != nil { + f.Composite = n.Composite.Copy(f).(Composite) + } + case *Map: + f.Composite = &Map{ + parent: f, + } + switch NodeBoardKind(f) { + case BoardScenario: + c.overlay(ParentBoard(f).Map(), f) + case BoardStep: + stepsMap := ParentMap(f) + for i := range stepsMap.Fields { + if stepsMap.Fields[i] == f { + if i == 0 { + c.overlay(ParentBoard(f).Map(), f) + } else { + c.overlay(stepsMap.Fields[i-1].Map(), f) + } + break + } + } + } + OverlayMap(f.Map(), n) + c.updateLinks(f.Map()) + switch NodeBoardKind(f) { + case BoardScenario, BoardStep: + c.compileClasses(f.Map()) + } + } } else if refctx.Key.Value.ScalarBox().Unbox() != nil { // If the link is a board, we need to transform it into an absolute path. if f.Name == "link" { @@ -157,6 +245,24 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } } +func (c *compiler) updateLinks(m *Map) { + for _, f := range m.Fields { + if f.Name == "link" { + bida := BoardIDA(f) + aida := IDA(f) + if len(bida) != len(aida) { + prependIDA := aida[:len(aida)-len(bida)] + kp := d2ast.MakeKeyPath(prependIDA) + s := d2format.Format(kp) + strings.TrimPrefix(f.Primary_.Value.ScalarString(), "root") + f.Primary_.Value = d2ast.MakeValueBox(d2ast.FlatUnquotedString(s)).ScalarBox().Unbox() + } + } + if f.Map() != nil { + c.updateLinks(f.Map()) + } + } +} + func (c *compiler) compileLink(refctx *RefContext) { val := refctx.Key.Value.ScalarBox().Unbox().ScalarString() link, err := d2parser.ParseKey(val) @@ -216,7 +322,7 @@ func (c *compiler) compileLink(refctx *RefContext) { // Create the absolute path by appending scope path with value specified scopeIDA = append(scopeIDA, linkIDA...) kp := d2ast.MakeKeyPath(scopeIDA) - refctx.Key.Value = d2ast.MakeValueBox(d2ast.RawString(d2format.Format(kp), true)) + refctx.Key.Value = d2ast.MakeValueBox(d2ast.FlatUnquotedString(d2format.Format(kp))) } func (c *compiler) compileEdges(refctx *RefContext) { @@ -330,6 +436,34 @@ func (c *compiler) compileArray(dst *Array, a *d2ast.Array) { parent: dst, Value: v, } + case *d2ast.Import: + n, ok := c._import(v) + if !ok { + continue + } + switch n := n.(type) { + case *Field: + if v.Spread { + a, ok := n.Composite.(*Array) + if !ok { + c.errorf(v, "can only spread import array into array") + continue + } + dst.Values = append(dst.Values, a.Values...) + continue + } + if n.Composite != nil { + irv = n.Composite + } else { + irv = n.Primary_ + } + case *Map: + if v.Spread { + c.errorf(v, "can only spread import array into array") + continue + } + irv = n + } case *d2ast.Substitution: // panic("TODO") } diff --git a/d2ir/compile_test.go b/d2ir/compile_test.go index b9fc2250d..516c42be4 100644 --- a/d2ir/compile_test.go +++ b/d2ir/compile_test.go @@ -9,6 +9,7 @@ import ( "oss.terrastruct.com/util-go/assert" "oss.terrastruct.com/util-go/diff" + "oss.terrastruct.com/util-go/mapfs" "oss.terrastruct.com/d2/d2ast" "oss.terrastruct.com/d2/d2ir" @@ -24,6 +25,7 @@ func TestCompile(t *testing.T) { t.Run("layers", testCompileLayers) t.Run("scenarios", testCompileScenarios) t.Run("steps", testCompileSteps) + t.Run("imports", testCompileImports) } type testCase struct { @@ -45,10 +47,26 @@ func compile(t testing.TB, text string) (*d2ir.Map, error) { t.Helper() d2Path := fmt.Sprintf("%v.d2", t.Name()) - ast, err := d2parser.Parse(d2Path, strings.NewReader(text), nil) - assert.Success(t, err) + return compileFS(t, d2Path, map[string]string{d2Path: text}) +} - m, err := d2ir.Compile(ast) +func compileFS(t testing.TB, path string, mfs map[string]string) (*d2ir.Map, error) { + t.Helper() + + ast, err := d2parser.Parse(path, strings.NewReader(mfs[path]), nil) + if err != nil { + return nil, err + } + + fs, err := mapfs.New(mfs) + assert.Success(t, err) + t.Cleanup(func() { + err = fs.Close() + assert.Success(t, err) + }) + m, err := d2ir.Compile(ast, &d2ir.CompileOptions{ + FS: fs, + }) if err != nil { return nil, err } diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index bf4b6cdd9..47651fdc6 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -25,7 +25,7 @@ type Node interface { Map() *Map Equal(n2 Node) bool - ast() d2ast.Node + AST() d2ast.Node fmt.Stringer LastRef() Reference @@ -100,11 +100,11 @@ func (n *Map) value() {} func (n *Array) composite() {} func (n *Map) composite() {} -func (n *Scalar) String() string { return d2format.Format(n.ast()) } -func (n *Field) String() string { return d2format.Format(n.ast()) } -func (n *Edge) String() string { return d2format.Format(n.ast()) } -func (n *Array) String() string { return d2format.Format(n.ast()) } -func (n *Map) String() string { return d2format.Format(n.ast()) } +func (n *Scalar) String() string { return d2format.Format(n.AST()) } +func (n *Field) String() string { return d2format.Format(n.AST()) } +func (n *Edge) String() string { return d2format.Format(n.AST()) } +func (n *Array) String() string { return d2format.Format(n.AST()) } +func (n *Map) String() string { return d2format.Format(n.AST()) } func (n *Scalar) LastRef() Reference { return parentRef(n) } func (n *Map) LastRef() Reference { return parentRef(n) } @@ -855,11 +855,11 @@ func (m *Map) CreateEdge(eid *EdgeID, refctx *RefContext) (*Edge, error) { return e, nil } -func (s *Scalar) ast() d2ast.Node { +func (s *Scalar) AST() d2ast.Node { return s.Value } -func (f *Field) ast() d2ast.Node { +func (f *Field) AST() d2ast.Node { k := &d2ast.Key{ Key: &d2ast.KeyPath{ Path: []*d2ast.StringBox{ @@ -869,16 +869,16 @@ func (f *Field) ast() d2ast.Node { } if f.Primary_ != nil { - k.Primary = d2ast.MakeValueBox(f.Primary_.ast().(d2ast.Value)).ScalarBox() + k.Primary = d2ast.MakeValueBox(f.Primary_.AST().(d2ast.Value)).ScalarBox() } if f.Composite != nil { - k.Value = d2ast.MakeValueBox(f.Composite.ast().(d2ast.Value)) + k.Value = d2ast.MakeValueBox(f.Composite.AST().(d2ast.Value)) } return k } -func (e *Edge) ast() d2ast.Node { +func (e *Edge) AST() d2ast.Node { astEdge := &d2ast.Edge{} astEdge.Src = d2ast.MakeKeyPath(e.ID.SrcPath) @@ -895,27 +895,27 @@ func (e *Edge) ast() d2ast.Node { } if e.Primary_ != nil { - k.Primary = d2ast.MakeValueBox(e.Primary_.ast().(d2ast.Value)).ScalarBox() + k.Primary = d2ast.MakeValueBox(e.Primary_.AST().(d2ast.Value)).ScalarBox() } if e.Map_ != nil { - k.Value = d2ast.MakeValueBox(e.Map_.ast().(*d2ast.Map)) + k.Value = d2ast.MakeValueBox(e.Map_.AST().(*d2ast.Map)) } return k } -func (a *Array) ast() d2ast.Node { +func (a *Array) AST() d2ast.Node { if a == nil { return nil } astArray := &d2ast.Array{} for _, av := range a.Values { - astArray.Nodes = append(astArray.Nodes, d2ast.MakeArrayNodeBox(av.ast().(d2ast.ArrayNode))) + astArray.Nodes = append(astArray.Nodes, d2ast.MakeArrayNodeBox(av.AST().(d2ast.ArrayNode))) } return astArray } -func (m *Map) ast() d2ast.Node { +func (m *Map) AST() d2ast.Node { if m == nil { return nil } @@ -926,10 +926,10 @@ func (m *Map) ast() d2ast.Node { astMap.Range = d2ast.MakeRange(",1:0:0-2:0:0") } for _, f := range m.Fields { - astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(f.ast().(d2ast.MapNode))) + astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(f.AST().(d2ast.MapNode))) } for _, e := range m.Edges { - astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(e.ast().(d2ast.MapNode))) + astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(e.AST().(d2ast.MapNode))) } return astMap } diff --git a/d2ir/import.go b/d2ir/import.go new file mode 100644 index 000000000..aaad0d035 --- /dev/null +++ b/d2ir/import.go @@ -0,0 +1,145 @@ +package d2ir + +import ( + "bufio" + "io/fs" + "os" + "path" + "strings" + + "oss.terrastruct.com/d2/d2ast" + "oss.terrastruct.com/d2/d2parser" +) + +func (c *compiler) pushImportStack(imp *d2ast.Import) (string, bool) { + impPath := imp.PathWithPre() + if impPath == "" && imp.Range.Path != "" { + c.errorf(imp, "imports must specify a path to import") + return "", false + } + if len(c.importStack) > 0 { + if path.IsAbs(impPath) { + c.errorf(imp, "import paths must be relative") + return "", false + } + + if path.Ext(impPath) != ".d2" { + impPath += ".d2" + } + + // Imports are always relative to the importing file. + impPath = path.Join(path.Dir(c.importStack[len(c.importStack)-1]), impPath) + } + + for i, p := range c.importStack { + if impPath == p { + c.errorf(imp, "detected cyclic import chain: %s", formatCyclicChain(c.importStack[i:])) + return "", false + } + } + + c.importStack = append(c.importStack, impPath) + return impPath, true +} + +func (c *compiler) popImportStack() { + c.importStack = c.importStack[:len(c.importStack)-1] +} + +func formatCyclicChain(cyclicChain []string) string { + var b strings.Builder + for _, p := range cyclicChain { + b.WriteString(p) + b.WriteString(" -> ") + } + b.WriteString(cyclicChain[0]) + return b.String() +} + +// Returns either *Map or *Field. +func (c *compiler) _import(imp *d2ast.Import) (Node, bool) { + ir, ok := c.__import(imp) + if !ok { + return nil, false + } + nilScopeMap(ir) + if len(imp.IDA()) > 0 { + f := ir.GetField(imp.IDA()...) + if f == nil { + c.errorf(imp, "import key %q doesn't exist inside import", imp.IDA()) + return nil, false + } + return f, true + } + return ir, true +} + +func (c *compiler) __import(imp *d2ast.Import) (*Map, bool) { + impPath, ok := c.pushImportStack(imp) + if !ok { + return nil, false + } + defer c.popImportStack() + + ir, ok := c.importCache[impPath] + if ok { + return ir, true + } + + var f fs.File + var err error + if c.fs == nil { + f, err = os.Open(impPath) + } else { + f, err = c.fs.Open(impPath) + } + if err != nil { + c.errorf(imp, "failed to import %q: %v", impPath, err) + return nil, false + } + defer f.Close() + + ast, err := d2parser.Parse(impPath, bufio.NewReader(f), &d2parser.ParseOptions{ + UTF16: c.utf16, + ParseError: c.err, + }) + if err != nil { + return nil, false + } + + ir = &Map{} + ir.initRoot() + ir.parent.(*Field).References[0].Context.Scope = ast + + c.compileMap(ir, ast) + + c.importCache[impPath] = ir + + return ir, true +} + +func nilScopeMap(n Node) { + switch n := n.(type) { + case *Map: + for _, f := range n.Fields { + nilScopeMap(f) + } + for _, e := range n.Edges { + nilScopeMap(e) + } + case *Edge: + for _, r := range n.References { + r.Context.ScopeMap = nil + } + if n.Map() != nil { + nilScopeMap(n.Map()) + } + case *Field: + for _, r := range n.References { + r.Context.ScopeMap = nil + } + if n.Map() != nil { + nilScopeMap(n.Map()) + } + } +} diff --git a/d2ir/import_test.go b/d2ir/import_test.go new file mode 100644 index 000000000..38b3a3a2c --- /dev/null +++ b/d2ir/import_test.go @@ -0,0 +1,214 @@ +package d2ir_test + +import ( + "testing" + + "oss.terrastruct.com/util-go/assert" + + "oss.terrastruct.com/d2/d2ir" +) + +func testCompileImports(t *testing.T) { + t.Parallel() + + tca := []testCase{ + { + name: "value", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "x: @x.d2", + "x.d2": `shape: circle +label: meow`, + }) + assert.Success(t, err) + assertQuery(t, m, 3, 0, nil, "") + assertQuery(t, m, 2, 0, nil, "x") + assertQuery(t, m, 0, 0, "circle", "x.shape") + assertQuery(t, m, 0, 0, "meow", "x.label") + }, + }, + { + name: "nested/map", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "x: @x.y", + "x.d2": `y: { + shape: circle + label: meow +}`, + }) + assert.Success(t, err) + assertQuery(t, m, 3, 0, nil, "") + assertQuery(t, m, 2, 0, nil, "x") + assertQuery(t, m, 0, 0, "circle", "x.shape") + assertQuery(t, m, 0, 0, "meow", "x.label") + }, + }, + { + name: "nested/array", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "x: @x.y", + "x.d2": `y: [1, 2]`, + }) + assert.Success(t, err) + assertQuery(t, m, 1, 0, nil, "") + x := assertQuery(t, m, 0, 0, nil, "x") + xf, ok := x.(*d2ir.Field) + assert.True(t, ok) + assert.Equal(t, `[1, 2]`, xf.Composite.String()) + }, + }, + { + name: "nested/scalar", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "x: @x.y", + "x.d2": `y: meow`, + }) + assert.Success(t, err) + assertQuery(t, m, 1, 0, nil, "") + assertQuery(t, m, 0, 0, "meow", "x") + }, + }, + { + name: "boards", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": `x.link: layers.x; layers: { x: @x }`, + "x.d2": `y.link: layers.y; layers: { y: @y }`, + "y.d2": `meow`, + }) + assert.Success(t, err) + assertQuery(t, m, 0, 0, "root.layers.x", "x.link") + assertQuery(t, m, 0, 0, "root.layers.x.layers.y", "layers.x.y.link") + }, + }, + { + name: "steps-inheritence", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": `z; steps: { 1: @x; 2: @y }; scenarios: { x: @x; y: @y }`, + "x.d2": `a`, + "y.d2": `b`, + }) + assert.Success(t, err) + assertQuery(t, m, 2, 0, nil, "scenarios.x") + assertQuery(t, m, 2, 0, nil, "scenarios.y") + assertQuery(t, m, 2, 0, nil, "steps.1") + assertQuery(t, m, 3, 0, nil, "steps.2") + }, + }, + { + name: "spread", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "...@x.d2", + "x.d2": "x: wowa", + }) + assert.Success(t, err) + assertQuery(t, m, 1, 0, nil, "") + assertQuery(t, m, 0, 0, "wowa", "x") + }, + }, + { + name: "nested/spread", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "...@x.y", + "x.d2": "y: { jon; jan }", + }) + assert.Success(t, err) + assertQuery(t, m, 2, 0, nil, "") + assertQuery(t, m, 0, 0, nil, "jan") + assertQuery(t, m, 0, 0, nil, "jon") + }, + }, + { + name: "nested/spread_primary", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "q: { ...@x.y }", + "x.d2": "y: meow { jon; jan }", + }) + assert.Success(t, err) + assertQuery(t, m, 3, 0, nil, "") + assertQuery(t, m, 2, 0, "meow", "q") + assertQuery(t, m, 0, 0, nil, "q.jan") + assertQuery(t, m, 0, 0, nil, "q.jon") + }, + }, + } + + runa(t, tca) + + t.Run("errors", func(t *testing.T) { + tca := []testCase{ + { + name: "not_exist", + run: func(t testing.TB) { + _, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "...@x.d2", + }) + assert.ErrorString(t, err, `index.d2:1:1: failed to import "x.d2": open x.d2: no such file or directory`) + }, + }, + { + name: "escape", + run: func(t testing.TB) { + _, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "...@'./../x.d2'", + }) + assert.ErrorString(t, err, `index.d2:1:1: failed to import "../x.d2": stat ../x.d2: invalid argument`) + }, + }, + { + name: "absolute", + run: func(t testing.TB) { + _, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "...@/x.d2", + }) + assert.ErrorString(t, err, `index.d2:1:1: import paths must be relative`) + }, + }, + { + name: "parse", + run: func(t testing.TB) { + _, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "...@x.d2", + "x.d2": "x<><><<>q", + }) + assert.ErrorString(t, err, `x.d2:1:1: connection missing destination +x.d2:1:4: connection missing source +x.d2:1:4: connection missing destination +x.d2:1:6: connection missing source +x.d2:1:6: connection missing destination +x.d2:1:7: connection missing source`) + }, + }, + { + name: "cyclic", + run: func(t testing.TB) { + _, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "...@x", + "x.d2": "...@y", + "y.d2": "...@q", + "q.d2": "...@x", + }) + assert.ErrorString(t, err, `q.d2:1:1: detected cyclic import chain: x.d2 -> y.d2 -> q.d2 -> x.d2`) + }, + }, + { + name: "spread_non_map", + run: func(t testing.TB) { + _, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "...@x.y", + "x.d2": "y: meow", + }) + assert.ErrorString(t, err, `index.d2:1:1: cannot spread import non map into map`) + }, + }, + } + runa(t, tca) + }) +} diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index e033c61e7..da29d818a 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -21,7 +21,6 @@ import ( "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/label" "oss.terrastruct.com/d2/lib/log" - "oss.terrastruct.com/d2/lib/shape" ) //go:embed setup.js @@ -31,9 +30,8 @@ var setupJS string var dagreJS string const ( - MIN_SEGMENT_LEN = 10 - MIN_RANK_SEP = 60 - EDGE_LABEL_GAP = 20 + MIN_RANK_SEP = 60 + EDGE_LABEL_GAP = 20 ) type ConfigurableOpts struct { @@ -384,7 +382,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err if isHorizontal && e.Src.Parent != g.Root && e.Dst.Parent != g.Root { moveWholeEdge = true } else { - e.Route[0].Y += stepSize + e.ShiftStart(stepSize, false) } } } @@ -393,7 +391,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err if isHorizontal && e.Dst.Parent != g.Root && e.Src.Parent != g.Root { moveWholeEdge = true } else { - e.Route[len(e.Route)-1].Y += stepSize + e.ShiftEnd(stepSize, false) } } } @@ -433,7 +431,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err // to fix this, we try extending the previous segment into the shape instead of having a very short segment if !start.Equals(points[0]) && startIndex+2 < len(points) { newStartingSegment := *geo.NewSegment(start, points[startIndex+1]) - if newStartingSegment.Length() < MIN_SEGMENT_LEN { + if newStartingSegment.Length() < d2graph.MIN_SEGMENT_LEN { // we don't want a very short segment right next to the source because it will mess up the arrowhead // instead we want to extend the next segment into the shape border if possible nextStart := points[startIndex+1] @@ -442,30 +440,32 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err // Note: in other direction to extend towards source nextSegment := *geo.NewSegment(nextStart, nextEnd) v := nextSegment.ToVector() - extendedStart := nextEnd.ToVector().Add(v.AddLength(MIN_SEGMENT_LEN)).ToPoint() + extendedStart := nextEnd.ToVector().Add(v.AddLength(d2graph.MIN_SEGMENT_LEN)).ToPoint() extended := *geo.NewSegment(nextEnd, extendedStart) if intersections := edge.Src.Box.Intersections(extended); len(intersections) > 0 { - start = intersections[0] - startIndex += 1 + startIndex++ + points[startIndex] = intersections[0] + start = points[startIndex] } } } if !end.Equals(points[len(points)-1]) && endIndex-2 >= 0 { newEndingSegment := *geo.NewSegment(end, points[endIndex-1]) - if newEndingSegment.Length() < MIN_SEGMENT_LEN { + if newEndingSegment.Length() < d2graph.MIN_SEGMENT_LEN { // extend the prev segment into the shape border if possible prevStart := points[endIndex-2] prevEnd := points[endIndex-1] prevSegment := *geo.NewSegment(prevStart, prevEnd) v := prevSegment.ToVector() - extendedEnd := prevStart.ToVector().Add(v.AddLength(MIN_SEGMENT_LEN)).ToPoint() + extendedEnd := prevStart.ToVector().Add(v.AddLength(d2graph.MIN_SEGMENT_LEN)).ToPoint() extended := *geo.NewSegment(prevStart, extendedEnd) if intersections := edge.Dst.Box.Intersections(extended); len(intersections) > 0 { - end = intersections[0] - endIndex -= 1 + endIndex-- + points[endIndex] = intersections[0] + end = points[endIndex] } } } @@ -489,41 +489,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - srcShape := edge.Src.ToShape() - dstShape := edge.Dst.ToShape() - - // trace the edge to the specific shape's border - points[startIndex] = shape.TraceToShapeBorder(srcShape, start, points[startIndex+1]) - - // if an edge to a container runs into its label, stop the edge at the label instead - overlapsContainerLabel := false - if edge.Dst.IsContainer() && edge.Dst.Label.Value != "" && !dstShape.Is(shape.TEXT_TYPE) { - // assumes LabelPosition, LabelWidth, LabelHeight are all set if there is a label - labelWidth := float64(edge.Dst.LabelDimensions.Width) - labelHeight := float64(edge.Dst.LabelDimensions.Height) - labelTL := label.Position(*edge.Dst.LabelPosition). - GetPointOnBox(edge.Dst.Box, label.PADDING, labelWidth, labelHeight) - - endingSegment := geo.Segment{Start: points[endIndex-1], End: points[endIndex]} - labelBox := geo.NewBox(labelTL, labelWidth, labelHeight) - // add left/right padding to box - labelBox.TopLeft.X -= label.PADDING - labelBox.Width += 2 * label.PADDING - if intersections := labelBox.Intersections(endingSegment); len(intersections) > 0 { - overlapsContainerLabel = true - // move ending segment to label intersection point - points[endIndex] = intersections[0] - endingSegment.End = intersections[0] - // if the segment becomes too short, just merge it with the previous segment - if endIndex-1 > 0 && endingSegment.Length() < MIN_SEGMENT_LEN { - points[endIndex-1] = points[endIndex] - endIndex-- - } - } - } - if !overlapsContainerLabel { - points[endIndex] = shape.TraceToShapeBorder(dstShape, end, points[endIndex-1]) - } + startIndex, endIndex = edge.TraceToShape(points, startIndex, endIndex) points = points[startIndex : endIndex+1] // build a curved path from the dagre route @@ -578,22 +544,7 @@ func getEdgeEndpoints(g *d2graph.Graph, edge *d2graph.Edge) (*d2graph.Object, *d } dst := edge.Dst for len(dst.Children) > 0 && dst.Class == nil && dst.SQLTable == nil { - dst = dst.ChildrenArray[0] - - // We want to get the top node of destinations - for _, child := range dst.ChildrenArray { - isHead := true - for _, e := range g.Edges { - if inContainer(e.Src, child) != nil && inContainer(e.Dst, dst) != nil { - isHead = false - break - } - } - if isHead { - dst = child - break - } - } + dst = getLongestEdgeChainHead(g, dst) } if edge.SrcArrow && !edge.DstArrow { // for `b <- a`, edge.Edge is `a -> b` and we expect this routing result @@ -641,8 +592,73 @@ func generateAddEdgeLine(fromID, toID, edgeID string, width, height int) string return fmt.Sprintf("g.setEdge({v:`%s`, w:`%s`, name:`%s`}, { width:%d, height:%d, labelpos: `c` });\n", escapeID(fromID), escapeID(toID), escapeID(edgeID), width, height) } +// getLongestEdgeChainHead finds the longest chain in a container and gets its head +// If there are multiple chains of the same length, get the head closest to the center +func getLongestEdgeChainHead(g *d2graph.Graph, container *d2graph.Object) *d2graph.Object { + rank := make(map[*d2graph.Object]int) + chainLength := make(map[*d2graph.Object]int) + + for _, obj := range container.ChildrenArray { + isHead := true + for _, e := range g.Edges { + if inContainer(e.Src, container) != nil && inContainer(e.Dst, obj) != nil { + isHead = false + break + } + } + if !isHead { + continue + } + rank[obj] = 1 + chainLength[obj] = 1 + // BFS + queue := []*d2graph.Object{obj} + visited := make(map[*d2graph.Object]struct{}) + for len(queue) > 0 { + curr := queue[0] + queue = queue[1:] + if _, ok := visited[curr]; ok { + continue + } + visited[curr] = struct{}{} + for _, e := range g.Edges { + child := inContainer(e.Dst, container) + if child == curr { + continue + } + if child != nil && inContainer(e.Src, curr) != nil { + if rank[curr]+1 > rank[child] { + rank[child] = rank[curr] + 1 + chainLength[obj] = go2.Max(chainLength[obj], rank[child]) + } + queue = append(queue, child) + } + } + } + } + max := int(math.MinInt32) + for _, obj := range container.ChildrenArray { + if chainLength[obj] > max { + max = chainLength[obj] + } + } + + var heads []*d2graph.Object + for i, obj := range container.ChildrenArray { + if rank[obj] == 1 && chainLength[obj] == max { + heads = append(heads, container.ChildrenArray[i]) + } + } + + if len(heads) > 0 { + return heads[int(math.Floor(float64(len(heads))/2.0))] + } + return container.ChildrenArray[0] +} + // getLongestEdgeChainTail gets the node at the end of the longest edge chain, because that will be the end of the container -// and is what external connections should connect with +// and is what external connections should connect with. +// If there are multiple of same length, get the one closest to the middle func getLongestEdgeChainTail(g *d2graph.Graph, container *d2graph.Object) *d2graph.Object { rank := make(map[*d2graph.Object]int) @@ -681,14 +697,20 @@ func getLongestEdgeChainTail(g *d2graph.Graph, container *d2graph.Object) *d2gra } } max := int(math.MinInt32) - var tail *d2graph.Object for _, obj := range container.ChildrenArray { - if rank[obj] >= max { + if rank[obj] > max { max = rank[obj] - tail = obj } } - return tail + + var tails []*d2graph.Object + for i, obj := range container.ChildrenArray { + if rank[obj] == max { + tails = append(tails, container.ChildrenArray[i]) + } + } + + return tails[int(math.Floor(float64(len(tails))/2.0))] } func inContainer(obj, container *d2graph.Object) *d2graph.Object { diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 2fb5e160d..e93085547 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -501,12 +501,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - srcShape := edge.Src.ToShape() - dstShape := edge.Dst.ToShape() - - // trace the edge to the specific shape's border - points[startIndex] = shape.TraceToShapeBorder(srcShape, points[startIndex], points[startIndex+1]) - points[endIndex] = shape.TraceToShapeBorder(dstShape, points[endIndex], points[endIndex-1]) + startIndex, endIndex = edge.TraceToShape(points, startIndex, endIndex) + points = points[startIndex : endIndex+1] if edge.Label.Value != "" { edge.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index 390470583..3e5e1d104 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -590,7 +590,7 @@ func (gd *gridDiagram) getBestLayout(targetSize float64, columns bool) [][]*d2gr nCuts = gd.rows - 1 } if nCuts == 0 { - return genLayout(gd.objects, nil) + return GenLayout(gd.objects, nil) } var bestLayout [][]*d2graph.Object @@ -692,7 +692,7 @@ func (gd *gridDiagram) getBestLayout(targetSize float64, columns bool) [][]*d2gr // . A │ B │ C D E └────────────┘ // of these divisions, find the layout with rows closest to the targetSize tryDivision := func(division []int) bool { - layout := genLayout(gd.objects, division) + layout := GenLayout(gd.objects, division) dist := getDistToTarget(layout, targetSize, float64(gd.horizontalGap), float64(gd.verticalGap), columns) if dist < bestDist { bestLayout = layout @@ -786,8 +786,10 @@ func (gd *gridDiagram) fastLayout(targetSize float64, nCuts int, columns bool) ( size = o.Width } if rowSize == 0 { + // if a single object meets the target size, end the row here if size > targetSize-debt { - fastDivision = append(fastDivision, i-1) + // cut row with just this object + fastDivision = append(fastDivision, i) // we build up a debt of distance past the target size across rows newDebt := size - targetSize debt += newDebt @@ -797,7 +799,11 @@ func (gd *gridDiagram) fastLayout(targetSize float64, nCuts int, columns bool) ( continue } // debt is paid by decreasing threshold to start new row and ending below targetSize - if rowSize+(gap+size)/2. > targetSize-debt { + if rowSize+gap+(size)/2. > targetSize-debt { + // start a new row before this object since it is mostly past the target size + // . size + // ├...row─┼gap┼───┼───┤ + // ├──targetSize──┤ (debt=0) fastDivision = append(fastDivision, i-1) newDebt := rowSize - targetSize debt += newDebt @@ -807,7 +813,7 @@ func (gd *gridDiagram) fastLayout(targetSize float64, nCuts int, columns bool) ( } } if len(fastDivision) == nCuts { - layout = genLayout(gd.objects, fastDivision) + layout = GenLayout(gd.objects, fastDivision) } return layout @@ -885,7 +891,9 @@ func iterDivisions(objects []*d2graph.Object, nCuts int, f iterDivision, check c } // generate a grid of objects from the given cut indices -func genLayout(objects []*d2graph.Object, cutIndices []int) [][]*d2graph.Object { +// each cut index applies after the object at that index +// e.g. [0 1 2 3 4 5 6 7] with cutIndices [0, 2, 6] => [[0], [1, 2], [3,4,5,6], [7]] +func GenLayout(objects []*d2graph.Object, cutIndices []int) [][]*d2graph.Object { layout := make([][]*d2graph.Object, len(cutIndices)+1) objIndex := 0 for i := 0; i <= len(cutIndices); i++ { @@ -916,6 +924,13 @@ func getDistToTarget(layout [][]*d2graph.Object, targetSize float64, horizontalG rowSize += o.Width + horizontalGap } } + if len(row) > 0 { + if columns { + rowSize -= verticalGap + } else { + rowSize -= horizontalGap + } + } totalDelta += math.Abs(rowSize - targetSize) } return totalDelta diff --git a/d2layouts/d2grid/layout_test.go b/d2layouts/d2grid/layout_test.go new file mode 100644 index 000000000..f874cb0e5 --- /dev/null +++ b/d2layouts/d2grid/layout_test.go @@ -0,0 +1,72 @@ +package d2grid_test + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" + + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/d2layouts/d2grid" +) + +func TestGenLayout(t *testing.T) { + objects := []*d2graph.Object{ + {ID: "1"}, + {ID: "2"}, + {ID: "3"}, + {ID: "4"}, + {ID: "5"}, + {ID: "6"}, + {ID: "7"}, + {ID: "8"}, + } + var cutIndices []int + var layout [][]*d2graph.Object + cutIndices = []int{0} + layout = d2grid.GenLayout(objects, cutIndices) + fmt.Printf("layout %v\n", len(layout)) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 2 rows from 1 cut") + assert.Equalf(t, 1, len(layout[0]), "expected first row to be 1 object") + assert.Equalf(t, 7, len(layout[1]), "expected second row to be 7 objects") + assert.Equalf(t, objects[0].ID, layout[0][0].ID, "expected first object to be 1") + + cutIndices = []int{6} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 2 rows from 1 cut") + assert.Equalf(t, 7, len(layout[0]), "expected first row to be 7 objects") + assert.Equalf(t, 1, len(layout[1]), "expected second row to be 1 object") + + cutIndices = []int{0, 6} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 3 rows from 2 cuts") + assert.Equalf(t, 1, len(layout[0]), "expected first row to be 1 objects") + assert.Equalf(t, 6, len(layout[1]), "expected second row to be 6 objects") + assert.Equalf(t, 1, len(layout[2]), "expected second row to be 1 object") + + cutIndices = []int{1, 5} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 3 rows from 2 cuts") + assert.Equalf(t, 2, len(layout[0]), "expected first row to be 2 objects") + assert.Equalf(t, 4, len(layout[1]), "expected second row to be 6 objects") + assert.Equalf(t, 2, len(layout[2]), "expected second row to be 2 object") + + cutIndices = []int{5} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 2 rows from 1 cut") + assert.Equalf(t, 6, len(layout[0]), "expected first row to be 6 objects") + assert.Equalf(t, 2, len(layout[1]), "expected second row to be 2 object") + + cutIndices = []int{1} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 2 rows from 1 cut") + assert.Equalf(t, 2, len(layout[0]), "expected first row to be 2 object") + assert.Equalf(t, 6, len(layout[1]), "expected second row to be 6 objects") + + cutIndices = []int{0, 1, 2, 3, 4, 5, 6} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 3 rows from 2 cuts") + for i := range layout { + assert.Equalf(t, 1, len(layout[i]), "expected row %d to be 1 object", i) + } +} diff --git a/d2lib/d2.go b/d2lib/d2.go index 10fbb02e7..d12423332 100644 --- a/d2lib/d2.go +++ b/d2lib/d2.go @@ -3,6 +3,7 @@ package d2lib import ( "context" "errors" + "io/fs" "os" "strings" @@ -20,6 +21,7 @@ import ( type CompileOptions struct { UTF16 bool + FS fs.FS MeasuredTexts []*d2target.MText Ruler *textmeasure.Ruler Layout func(context.Context, *d2graph.Graph) error @@ -31,6 +33,8 @@ type CompileOptions struct { // - pre-measured (web setting) // TODO maybe some will want to configure code font too, but that's much lower priority FontFamily *d2fonts.FontFamily + + InputPath string } func Compile(ctx context.Context, input string, opts *CompileOptions) (*d2target.Diagram, *d2graph.Graph, error) { @@ -38,8 +42,9 @@ func Compile(ctx context.Context, input string, opts *CompileOptions) (*d2target opts = &CompileOptions{} } - g, err := d2compiler.Compile("", strings.NewReader(input), &d2compiler.CompileOptions{ + g, err := d2compiler.Compile(opts.InputPath, strings.NewReader(input), &d2compiler.CompileOptions{ UTF16: opts.UTF16, + FS: opts.FS, }) if err != nil { return nil, nil, err diff --git a/d2oracle/edit.go b/d2oracle/edit.go index 566a0a573..165d6886c 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -347,7 +347,7 @@ func _set(g *d2graph.Graph, key string, tag, value *string) error { } } - ir, err := d2ir.Compile(g.AST) + ir, err := d2ir.Compile(g.AST, nil) if err != nil { return err } diff --git a/d2parser/parse.go b/d2parser/parse.go index 162caf5af..fa64531a3 100644 --- a/d2parser/parse.go +++ b/d2parser/parse.go @@ -15,7 +15,8 @@ import ( ) type ParseOptions struct { - UTF16 bool + UTF16 bool + ParseError *ParseError } // Parse parses a .d2 Map in r. @@ -42,6 +43,10 @@ func Parse(path string, r io.RuneReader, opts *ParseOptions) (*d2ast.Map, error) reader: r, utf16: opts.UTF16, + err: opts.ParseError, + } + if p.err == nil { + p.err = &ParseError{} } m := p.parseMap(true) @@ -54,6 +59,7 @@ func Parse(path string, r io.RuneReader, opts *ParseOptions) (*d2ast.Map, error) func ParseKey(key string) (*d2ast.KeyPath, error) { p := &parser{ reader: strings.NewReader(key), + err: &ParseError{}, } k := p.parseKey() @@ -69,6 +75,7 @@ func ParseKey(key string) (*d2ast.KeyPath, error) { func ParseMapKey(mapKey string) (*d2ast.Key, error) { p := &parser{ reader: strings.NewReader(mapKey), + err: &ParseError{}, } mk := p.parseMapKey() @@ -84,6 +91,7 @@ func ParseMapKey(mapKey string) (*d2ast.Key, error) { func ParseValue(value string) (d2ast.Value, error) { p := &parser{ reader: strings.NewReader(value), + err: &ParseError{}, } v := p.parseValue() @@ -117,18 +125,16 @@ type parser struct { lookaheadPos d2ast.Position ioerr bool - err ParseError + err *ParseError inEdgeGroup bool depth int } -// TODO: remove ioerr, just sort (with Append) should be fine but filter non ast errors in API // TODO: rename to Error and make existing Error a private type errorWithRange type ParseError struct { - IOError *d2ast.Error `json:"ioerr"` - Errors []d2ast.Error `json:"errs"` + Errors []d2ast.Error `json:"errs"` } func Errorf(n d2ast.Node, f string, v ...interface{}) error { @@ -140,17 +146,17 @@ func Errorf(n d2ast.Node, f string, v ...interface{}) error { } } -func (pe ParseError) Empty() bool { - return pe.IOError == nil && len(pe.Errors) == 0 +func (pe *ParseError) Empty() bool { + if pe == nil { + return true + } + return len(pe.Errors) == 0 } -func (pe ParseError) Error() string { +func (pe *ParseError) Error() string { var sb strings.Builder - if pe.IOError != nil { - sb.WriteString(pe.IOError.Error()) - } for i, err := range pe.Errors { - if pe.IOError != nil || i > 0 { + if i > 0 { sb.WriteByte('\n') } sb.WriteString(err.Error()) @@ -191,14 +197,14 @@ func (p *parser) _readRune() (r rune, eof bool) { if err != nil { p.ioerr = true if err != io.EOF { - p.err.IOError = &d2ast.Error{ + p.err.Errors = append(p.err.Errors, d2ast.Error{ Range: d2ast.Range{ Path: p.path, Start: p.readerPos, End: p.readerPos, }, Message: fmt.Sprintf("io error: %v", err), - } + }) } p.rewind() return 0, true @@ -355,7 +361,7 @@ func (p *parser) parseMap(isFileMap bool) *d2ast.Map { Start: p.pos, }, } - defer m.Range.End.From(&p.readerPos) + defer m.Range.End.From(&p.pos) if !isFileMap { m.Range.Start = m.Range.Start.Subtract('{', p.utf16) @@ -448,17 +454,30 @@ func (p *parser) parseMapNode(r rune) d2ast.MapNodeBox { box.BlockComment = p.parseBlockComment() return box case '.': - s, eof := p.peekn(3) + s, eof := p.peekn(2) if eof { break } - if s != "..$" { + if s != ".." { p.rewind() break } - p.commit() - box.Substitution = p.parseSubstitution(true) - return box + r, eof := p.peek() + if eof { + break + } + if r == '$' { + p.commit() + box.Substitution = p.parseSubstitution(true) + return box + } + if r == '@' { + p.commit() + box.Import = p.parseImport(true) + return box + } + p.rewind() + break } p.replay(r) @@ -614,7 +633,7 @@ func (p *parser) parseMapKey() (mk *d2ast.Key) { } }() - // Check for ampersand. + // Check for ampersand/@. r, eof := p.peek() if eof { return mk @@ -948,6 +967,9 @@ func (p *parser) parseKey() (k *d2ast.KeyPath) { if s == nil { return k } + if sb.UnquotedString != nil && strings.HasPrefix(s.ScalarString(), "@") { + p.errorf(s.GetRange().Start, s.GetRange().End, "%s is not a valid import, did you mean ...%[2]s?", s.ScalarString()) + } if len(k.Path) == 0 { k.Range.Start = s.GetRange().Start @@ -1024,6 +1046,14 @@ func (p *parser) parseUnquotedString(inKey bool) (s *d2ast.UnquotedString) { s.Value = append(s.Value, d2ast.InterpolationBox{String: &sv, StringRaw: &rawv}) }() + _s, eof := p.peekn(4) + p.rewind() + if !eof { + if _s == "...@" { + p.errorf(p.pos, p.pos.AdvanceString("...@", p.utf16), "unquoted strings cannot begin with ...@ as that's import spread syntax") + } + } + for { r, eof := p.peek() if eof { @@ -1502,17 +1532,30 @@ func (p *parser) parseArrayNode(r rune) d2ast.ArrayNodeBox { box.BlockComment = p.parseBlockComment() return box case '.': - s, eof := p.peekn(3) + s, eof := p.peekn(2) if eof { break } - if s != "..$" { + if s != ".." { p.rewind() break } - p.commit() - box.Substitution = p.parseSubstitution(true) - return box + r, eof := p.peek() + if eof { + break + } + if r == '$' { + p.commit() + box.Substitution = p.parseSubstitution(true) + return box + } + if r == '@' { + p.commit() + box.Import = p.parseImport(true) + return box + } + p.rewind() + break } p.replay(r) @@ -1529,6 +1572,7 @@ func (p *parser) parseArrayNode(r rune) d2ast.ArrayNodeBox { box.BlockString = vbox.BlockString box.Array = vbox.Array box.Map = vbox.Map + box.Import = vbox.Import return box } @@ -1549,6 +1593,9 @@ func (p *parser) parseValue() d2ast.ValueBox { case '{': box.Map = p.parseMap(false) return box + case '@': + box.Import = p.parseImport(false) + return box } p.replay(r) @@ -1659,6 +1706,46 @@ func (p *parser) parseSubstitution(spread bool) *d2ast.Substitution { return subst } +func (p *parser) parseImport(spread bool) *d2ast.Import { + imp := &d2ast.Import{ + Range: d2ast.Range{ + Path: p.path, + Start: p.pos.SubtractString("$", p.utf16), + }, + Spread: spread, + } + defer imp.Range.End.From(&p.pos) + + if imp.Spread { + imp.Range.Start = imp.Range.Start.SubtractString("...", p.utf16) + } + + var pre strings.Builder + for { + r, eof := p.peek() + if eof { + break + } + if r != '.' && r != '/' { + p.rewind() + break + } + pre.WriteRune(r) + p.commit() + } + imp.Pre = pre.String() + + k := p.parseKey() + if k == nil { + return imp + } + if k.Path[0].UnquotedString != nil && len(k.Path) > 1 && k.Path[1].UnquotedString != nil && k.Path[1].Unbox().ScalarString() == "d2" { + k.Path = append(k.Path[:1], k.Path[2:]...) + } + imp.Path = k.Path + return imp +} + // func marshalKey(k *d2ast.Key) string { // var sb strings.Builder // for i, s := range k.Path { diff --git a/d2parser/parse_test.go b/d2parser/parse_test.go index b1c8dfb3d..2dc195d02 100644 --- a/d2parser/parse_test.go +++ b/d2parser/parse_test.go @@ -13,20 +13,19 @@ import ( "oss.terrastruct.com/d2/d2parser" ) +type testCase struct { + name string + text string + assert func(t testing.TB, ast *d2ast.Map, err error) +} + // TODO: next step for parser is writing as many tests and grouping them nicely // TODO: add assertions // to layout *all* expected behavior. func TestParse(t *testing.T) { t.Parallel() - testCases := []struct { - name string - text string - assert func(t testing.TB, ast *d2ast.Map, err error) - - // exp is in testdata/d2parser/TestParse/${name}.json - }{ - + var testCases = []testCase{ { name: "empty", text: ``, @@ -394,7 +393,99 @@ c- }, } - for _, tc := range testCases { + t.Run("import", testImport) + + runa(t, testCases) +} + +func testImport(t *testing.T) { + t.Parallel() + + tca := []testCase{ + { + text: "x: @file", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.Success(t, err) + assert.Equal(t, "file", ast.Nodes[0].MapKey.Value.Import.Path[0].Unbox().ScalarString()) + }, + }, + { + text: "x: @file.d2", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.Success(t, err) + assert.Equal(t, "file", ast.Nodes[0].MapKey.Value.Import.Path[0].Unbox().ScalarString()) + }, + }, + { + text: "...@file.d2", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.Success(t, err) + assert.True(t, ast.Nodes[0].Import.Spread) + assert.Equal(t, "file", ast.Nodes[0].Import.Path[0].Unbox().ScalarString()) + }, + }, + { + text: "x: [...@file.d2]", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.Success(t, err) + imp := ast.Nodes[0].MapKey.Value.Array.Nodes[0].Import + assert.True(t, imp.Spread) + assert.Equal(t, "file", imp.Path[0].Unbox().ScalarString()) + }, + }, + { + text: "...@\"file\".d2", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.Success(t, err) + assert.True(t, ast.Nodes[0].Import.Spread) + assert.Equal(t, "file", ast.Nodes[0].Import.Path[0].Unbox().ScalarString()) + assert.Equal(t, "d2", ast.Nodes[0].Import.Path[1].Unbox().ScalarString()) + }, + }, + { + text: "...@file.\"d2\"", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.Success(t, err) + assert.True(t, ast.Nodes[0].Import.Spread) + assert.Equal(t, "file", ast.Nodes[0].Import.Path[0].Unbox().ScalarString()) + assert.Equal(t, "d2", ast.Nodes[0].Import.Path[1].Unbox().ScalarString()) + }, + }, + { + text: "...@../file", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.Success(t, err) + assert.True(t, ast.Nodes[0].Import.Spread) + assert.Equal(t, "../file", ast.Nodes[0].Import.PathWithPre()) + }, + }, + { + text: "@file", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.ErrorString(t, err, "d2/testdata/d2parser/TestParse/import/#07.d2:1:1: @file is not a valid import, did you mean ...@file?") + }, + }, + { + text: "...@./../.././file", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.Success(t, err) + assert.True(t, ast.Nodes[0].Import.Spread) + assert.Equal(t, "../../file", ast.Nodes[0].Import.PathWithPre()) + }, + }, + { + text: "meow: ...@file", + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.ErrorString(t, err, "d2/testdata/d2parser/TestParse/import/#09.d2:1:7: unquoted strings cannot begin with ...@ as that's import spread syntax") + }, + }, + } + + runa(t, tca) +} + +func runa(t *testing.T, tca []testCase) { + for _, tc := range tca { tc := tc t.Run(tc.name, func(t *testing.T) { t.Parallel() diff --git a/d2plugin/exec.go b/d2plugin/exec.go index 4a5836f35..4631ef036 100644 --- a/d2plugin/exec.go +++ b/d2plugin/exec.go @@ -15,6 +15,7 @@ import ( "oss.terrastruct.com/util-go/xmain" "oss.terrastruct.com/d2/d2graph" + timelib "oss.terrastruct.com/d2/lib/time" ) // execPlugin uses the binary at pathname with the plugin protocol to implement @@ -147,7 +148,7 @@ func (p *execPlugin) Info(ctx context.Context) (_ *PluginInfo, err error) { } func (p *execPlugin) Layout(ctx context.Context, g *d2graph.Graph) error { - ctx, cancel := context.WithTimeout(ctx, time.Minute) + ctx, cancel := timelib.WithTimeout(ctx, time.Minute*2) defer cancel() graphBytes, err := d2graph.SerializeGraph(g) diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index 052e94abc..9d890f6ad 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-2607227077 .fill-N1{fill:#0A0F25;} + .d2-2607227077 .fill-N2{fill:#676C7E;} + .d2-2607227077 .fill-N3{fill:#9499AB;} + .d2-2607227077 .fill-N4{fill:#CFD2DD;} + .d2-2607227077 .fill-N5{fill:#DEE1EB;} + .d2-2607227077 .fill-N6{fill:#EEF1F8;} + .d2-2607227077 .fill-N7{fill:#FFFFFF;} + .d2-2607227077 .fill-B1{fill:#0D32B2;} + .d2-2607227077 .fill-B2{fill:#0D32B2;} + .d2-2607227077 .fill-B3{fill:#E3E9FD;} + .d2-2607227077 .fill-B4{fill:#E3E9FD;} + .d2-2607227077 .fill-B5{fill:#EDF0FD;} + .d2-2607227077 .fill-B6{fill:#F7F8FE;} + .d2-2607227077 .fill-AA2{fill:#4A6FF3;} + .d2-2607227077 .fill-AA4{fill:#EDF0FD;} + .d2-2607227077 .fill-AA5{fill:#F7F8FE;} + .d2-2607227077 .fill-AB4{fill:#EDF0FD;} + .d2-2607227077 .fill-AB5{fill:#F7F8FE;} + .d2-2607227077 .stroke-N1{stroke:#0A0F25;} + .d2-2607227077 .stroke-N2{stroke:#676C7E;} + .d2-2607227077 .stroke-N3{stroke:#9499AB;} + .d2-2607227077 .stroke-N4{stroke:#CFD2DD;} + .d2-2607227077 .stroke-N5{stroke:#DEE1EB;} + .d2-2607227077 .stroke-N6{stroke:#EEF1F8;} + .d2-2607227077 .stroke-N7{stroke:#FFFFFF;} + .d2-2607227077 .stroke-B1{stroke:#0D32B2;} + .d2-2607227077 .stroke-B2{stroke:#0D32B2;} + .d2-2607227077 .stroke-B3{stroke:#E3E9FD;} + .d2-2607227077 .stroke-B4{stroke:#E3E9FD;} + .d2-2607227077 .stroke-B5{stroke:#EDF0FD;} + .d2-2607227077 .stroke-B6{stroke:#F7F8FE;} + .d2-2607227077 .stroke-AA2{stroke:#4A6FF3;} + .d2-2607227077 .stroke-AA4{stroke:#EDF0FD;} + .d2-2607227077 .stroke-AA5{stroke:#F7F8FE;} + .d2-2607227077 .stroke-AB4{stroke:#EDF0FD;} + .d2-2607227077 .stroke-AB5{stroke:#F7F8FE;} + .d2-2607227077 .background-color-N1{background-color:#0A0F25;} + .d2-2607227077 .background-color-N2{background-color:#676C7E;} + .d2-2607227077 .background-color-N3{background-color:#9499AB;} + .d2-2607227077 .background-color-N4{background-color:#CFD2DD;} + .d2-2607227077 .background-color-N5{background-color:#DEE1EB;} + .d2-2607227077 .background-color-N6{background-color:#EEF1F8;} + .d2-2607227077 .background-color-N7{background-color:#FFFFFF;} + .d2-2607227077 .background-color-B1{background-color:#0D32B2;} + .d2-2607227077 .background-color-B2{background-color:#0D32B2;} + .d2-2607227077 .background-color-B3{background-color:#E3E9FD;} + .d2-2607227077 .background-color-B4{background-color:#E3E9FD;} + .d2-2607227077 .background-color-B5{background-color:#EDF0FD;} + .d2-2607227077 .background-color-B6{background-color:#F7F8FE;} + .d2-2607227077 .background-color-AA2{background-color:#4A6FF3;} + .d2-2607227077 .background-color-AA4{background-color:#EDF0FD;} + .d2-2607227077 .background-color-AA5{background-color:#F7F8FE;} + .d2-2607227077 .background-color-AB4{background-color:#EDF0FD;} + .d2-2607227077 .background-color-AB5{background-color:#F7F8FE;} + .d2-2607227077 .color-N1{color:#0A0F25;} + .d2-2607227077 .color-N2{color:#676C7E;} + .d2-2607227077 .color-N3{color:#9499AB;} + .d2-2607227077 .color-N4{color:#CFD2DD;} + .d2-2607227077 .color-N5{color:#DEE1EB;} + .d2-2607227077 .color-N6{color:#EEF1F8;} + .d2-2607227077 .color-N7{color:#FFFFFF;} + .d2-2607227077 .color-B1{color:#0D32B2;} + .d2-2607227077 .color-B2{color:#0D32B2;} + .d2-2607227077 .color-B3{color:#E3E9FD;} + .d2-2607227077 .color-B4{color:#E3E9FD;} + .d2-2607227077 .color-B5{color:#EDF0FD;} + .d2-2607227077 .color-B6{color:#F7F8FE;} + .d2-2607227077 .color-AA2{color:#4A6FF3;} + .d2-2607227077 .color-AA4{color:#EDF0FD;} + .d2-2607227077 .color-AA5{color:#F7F8FE;} + .d2-2607227077 .color-AB4{color:#EDF0FD;} + .d2-2607227077 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -112,7 +112,7 @@ -aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd - +aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg index b78e4a5f0..8d0c11df1 100644 --- a/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg @@ -1,4 +1,4 @@ - @@ -852,7 +852,10 @@ 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..2b5809b8e 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,10 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg b/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg index b08faacee..8d0db48bf 100644 --- a/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-4027692135 .fill-N1{fill:#0A0F25;} + .d2-4027692135 .fill-N2{fill:#676C7E;} + .d2-4027692135 .fill-N3{fill:#9499AB;} + .d2-4027692135 .fill-N4{fill:#CFD2DD;} + .d2-4027692135 .fill-N5{fill:#DEE1EB;} + .d2-4027692135 .fill-N6{fill:#EEF1F8;} + .d2-4027692135 .fill-N7{fill:#FFFFFF;} + .d2-4027692135 .fill-B1{fill:#0D32B2;} + .d2-4027692135 .fill-B2{fill:#0D32B2;} + .d2-4027692135 .fill-B3{fill:#E3E9FD;} + .d2-4027692135 .fill-B4{fill:#E3E9FD;} + .d2-4027692135 .fill-B5{fill:#EDF0FD;} + .d2-4027692135 .fill-B6{fill:#F7F8FE;} + .d2-4027692135 .fill-AA2{fill:#4A6FF3;} + .d2-4027692135 .fill-AA4{fill:#EDF0FD;} + .d2-4027692135 .fill-AA5{fill:#F7F8FE;} + .d2-4027692135 .fill-AB4{fill:#EDF0FD;} + .d2-4027692135 .fill-AB5{fill:#F7F8FE;} + .d2-4027692135 .stroke-N1{stroke:#0A0F25;} + .d2-4027692135 .stroke-N2{stroke:#676C7E;} + .d2-4027692135 .stroke-N3{stroke:#9499AB;} + .d2-4027692135 .stroke-N4{stroke:#CFD2DD;} + .d2-4027692135 .stroke-N5{stroke:#DEE1EB;} + .d2-4027692135 .stroke-N6{stroke:#EEF1F8;} + .d2-4027692135 .stroke-N7{stroke:#FFFFFF;} + .d2-4027692135 .stroke-B1{stroke:#0D32B2;} + .d2-4027692135 .stroke-B2{stroke:#0D32B2;} + .d2-4027692135 .stroke-B3{stroke:#E3E9FD;} + .d2-4027692135 .stroke-B4{stroke:#E3E9FD;} + .d2-4027692135 .stroke-B5{stroke:#EDF0FD;} + .d2-4027692135 .stroke-B6{stroke:#F7F8FE;} + .d2-4027692135 .stroke-AA2{stroke:#4A6FF3;} + .d2-4027692135 .stroke-AA4{stroke:#EDF0FD;} + .d2-4027692135 .stroke-AA5{stroke:#F7F8FE;} + .d2-4027692135 .stroke-AB4{stroke:#EDF0FD;} + .d2-4027692135 .stroke-AB5{stroke:#F7F8FE;} + .d2-4027692135 .background-color-N1{background-color:#0A0F25;} + .d2-4027692135 .background-color-N2{background-color:#676C7E;} + .d2-4027692135 .background-color-N3{background-color:#9499AB;} + .d2-4027692135 .background-color-N4{background-color:#CFD2DD;} + .d2-4027692135 .background-color-N5{background-color:#DEE1EB;} + .d2-4027692135 .background-color-N6{background-color:#EEF1F8;} + .d2-4027692135 .background-color-N7{background-color:#FFFFFF;} + .d2-4027692135 .background-color-B1{background-color:#0D32B2;} + .d2-4027692135 .background-color-B2{background-color:#0D32B2;} + .d2-4027692135 .background-color-B3{background-color:#E3E9FD;} + .d2-4027692135 .background-color-B4{background-color:#E3E9FD;} + .d2-4027692135 .background-color-B5{background-color:#EDF0FD;} + .d2-4027692135 .background-color-B6{background-color:#F7F8FE;} + .d2-4027692135 .background-color-AA2{background-color:#4A6FF3;} + .d2-4027692135 .background-color-AA4{background-color:#EDF0FD;} + .d2-4027692135 .background-color-AA5{background-color:#F7F8FE;} + .d2-4027692135 .background-color-AB4{background-color:#EDF0FD;} + .d2-4027692135 .background-color-AB5{background-color:#F7F8FE;} + .d2-4027692135 .color-N1{color:#0A0F25;} + .d2-4027692135 .color-N2{color:#676C7E;} + .d2-4027692135 .color-N3{color:#9499AB;} + .d2-4027692135 .color-N4{color:#CFD2DD;} + .d2-4027692135 .color-N5{color:#DEE1EB;} + .d2-4027692135 .color-N6{color:#EEF1F8;} + .d2-4027692135 .color-N7{color:#FFFFFF;} + .d2-4027692135 .color-B1{color:#0D32B2;} + .d2-4027692135 .color-B2{color:#0D32B2;} + .d2-4027692135 .color-B3{color:#E3E9FD;} + .d2-4027692135 .color-B4{color:#E3E9FD;} + .d2-4027692135 .color-B5{color:#EDF0FD;} + .d2-4027692135 .color-B6{color:#F7F8FE;} + .d2-4027692135 .color-AA2{color:#4A6FF3;} + .d2-4027692135 .color-AA4{color:#EDF0FD;} + .d2-4027692135 .color-AA5{color:#F7F8FE;} + .d2-4027692135 .color-AB4{color:#EDF0FD;} + .d2-4027692135 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -97,7 +97,7 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring - +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg index 641f51c9e..41a78c7d9 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-4027692135 .fill-N1{fill:#CDD6F4;} + .d2-4027692135 .fill-N2{fill:#BAC2DE;} + .d2-4027692135 .fill-N3{fill:#A6ADC8;} + .d2-4027692135 .fill-N4{fill:#585B70;} + .d2-4027692135 .fill-N5{fill:#45475A;} + .d2-4027692135 .fill-N6{fill:#313244;} + .d2-4027692135 .fill-N7{fill:#1E1E2E;} + .d2-4027692135 .fill-B1{fill:#CBA6f7;} + .d2-4027692135 .fill-B2{fill:#CBA6f7;} + .d2-4027692135 .fill-B3{fill:#6C7086;} + .d2-4027692135 .fill-B4{fill:#585B70;} + .d2-4027692135 .fill-B5{fill:#45475A;} + .d2-4027692135 .fill-B6{fill:#313244;} + .d2-4027692135 .fill-AA2{fill:#f38BA8;} + .d2-4027692135 .fill-AA4{fill:#45475A;} + .d2-4027692135 .fill-AA5{fill:#313244;} + .d2-4027692135 .fill-AB4{fill:#45475A;} + .d2-4027692135 .fill-AB5{fill:#313244;} + .d2-4027692135 .stroke-N1{stroke:#CDD6F4;} + .d2-4027692135 .stroke-N2{stroke:#BAC2DE;} + .d2-4027692135 .stroke-N3{stroke:#A6ADC8;} + .d2-4027692135 .stroke-N4{stroke:#585B70;} + .d2-4027692135 .stroke-N5{stroke:#45475A;} + .d2-4027692135 .stroke-N6{stroke:#313244;} + .d2-4027692135 .stroke-N7{stroke:#1E1E2E;} + .d2-4027692135 .stroke-B1{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B2{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B3{stroke:#6C7086;} + .d2-4027692135 .stroke-B4{stroke:#585B70;} + .d2-4027692135 .stroke-B5{stroke:#45475A;} + .d2-4027692135 .stroke-B6{stroke:#313244;} + .d2-4027692135 .stroke-AA2{stroke:#f38BA8;} + .d2-4027692135 .stroke-AA4{stroke:#45475A;} + .d2-4027692135 .stroke-AA5{stroke:#313244;} + .d2-4027692135 .stroke-AB4{stroke:#45475A;} + .d2-4027692135 .stroke-AB5{stroke:#313244;} + .d2-4027692135 .background-color-N1{background-color:#CDD6F4;} + .d2-4027692135 .background-color-N2{background-color:#BAC2DE;} + .d2-4027692135 .background-color-N3{background-color:#A6ADC8;} + .d2-4027692135 .background-color-N4{background-color:#585B70;} + .d2-4027692135 .background-color-N5{background-color:#45475A;} + .d2-4027692135 .background-color-N6{background-color:#313244;} + .d2-4027692135 .background-color-N7{background-color:#1E1E2E;} + .d2-4027692135 .background-color-B1{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B2{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B3{background-color:#6C7086;} + .d2-4027692135 .background-color-B4{background-color:#585B70;} + .d2-4027692135 .background-color-B5{background-color:#45475A;} + .d2-4027692135 .background-color-B6{background-color:#313244;} + .d2-4027692135 .background-color-AA2{background-color:#f38BA8;} + .d2-4027692135 .background-color-AA4{background-color:#45475A;} + .d2-4027692135 .background-color-AA5{background-color:#313244;} + .d2-4027692135 .background-color-AB4{background-color:#45475A;} + .d2-4027692135 .background-color-AB5{background-color:#313244;} + .d2-4027692135 .color-N1{color:#CDD6F4;} + .d2-4027692135 .color-N2{color:#BAC2DE;} + .d2-4027692135 .color-N3{color:#A6ADC8;} + .d2-4027692135 .color-N4{color:#585B70;} + .d2-4027692135 .color-N5{color:#45475A;} + .d2-4027692135 .color-N6{color:#313244;} + .d2-4027692135 .color-N7{color:#1E1E2E;} + .d2-4027692135 .color-B1{color:#CBA6f7;} + .d2-4027692135 .color-B2{color:#CBA6f7;} + .d2-4027692135 .color-B3{color:#6C7086;} + .d2-4027692135 .color-B4{color:#585B70;} + .d2-4027692135 .color-B5{color:#45475A;} + .d2-4027692135 .color-B6{color:#313244;} + .d2-4027692135 .color-AA2{color:#f38BA8;} + .d2-4027692135 .color-AA4{color:#45475A;} + .d2-4027692135 .color-AA5{color:#313244;} + .d2-4027692135 .color-AB4{color:#45475A;} + .d2-4027692135 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring - +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg index 371d60fe2..3e5b79366 100644 --- a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg @@ -1,4 +1,4 @@ -customerissuerstore1Like starbucks or somethingacquirer2I'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occur + + + + + + + @@ -115,6 +122,7 @@ + 1Like starbucks or something 2I'm not sure what this is x1 - + 1root > x x1y2Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!3 - + + 1https://d2lang.com 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! 3https://terrastruct.com diff --git a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg index 9e0a83ac5..f26b43641 100644 --- a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg @@ -1,4 +1,4 @@ -x1y2Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!3 - + + 1https://d2lang.com 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! 3https://fosny.eu diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg index 9ec2d7733..63a7b868b 100644 --- a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg @@ -1,4 +1,4 @@ -x1Total abstinence is easier than perfect moderationy2Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! - + + 1Total abstinence is easier than perfect moderation 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! x1Total abstinence is easier than perfect moderationy2Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! - + + 1Total abstinence is easier than perfect moderation 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg index e6f863efd..da23bdb8b 100644 --- a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg @@ -1,4 +1,4 @@ -wintersummertreessnowsun - + + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg index 7fdd127c7..ab4e4fc68 100644 --- a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg @@ -1,4 +1,4 @@ -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + + + + + + + + + + + + + + + + + + diff --git a/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg index 0eee3b115..ebb118dfb 100644 --- a/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg @@ -1,4 +1,4 @@ -ab - + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg index 44eac9d0b..6332d2f50 100644 --- a/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg @@ -1,4 +1,4 @@ -wintersummersnowsun - + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg index 77531acfd..891dafbd5 100644 --- a/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg @@ -1,4 +1,4 @@ -ab hello + + \ 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..88c7c4182 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/overlay/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg index c5d95bd43..47def9f3e 100644 --- a/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg @@ -1,4 +1,4 @@ -brightnormaldarkdarker - + + + + \ 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..2767f25ae 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-4027692135 .fill-N1{fill:#CDD6F4;} + .d2-4027692135 .fill-N2{fill:#BAC2DE;} + .d2-4027692135 .fill-N3{fill:#A6ADC8;} + .d2-4027692135 .fill-N4{fill:#585B70;} + .d2-4027692135 .fill-N5{fill:#45475A;} + .d2-4027692135 .fill-N6{fill:#313244;} + .d2-4027692135 .fill-N7{fill:#1E1E2E;} + .d2-4027692135 .fill-B1{fill:#CBA6f7;} + .d2-4027692135 .fill-B2{fill:#CBA6f7;} + .d2-4027692135 .fill-B3{fill:#6C7086;} + .d2-4027692135 .fill-B4{fill:#585B70;} + .d2-4027692135 .fill-B5{fill:#45475A;} + .d2-4027692135 .fill-B6{fill:#313244;} + .d2-4027692135 .fill-AA2{fill:#f38BA8;} + .d2-4027692135 .fill-AA4{fill:#45475A;} + .d2-4027692135 .fill-AA5{fill:#313244;} + .d2-4027692135 .fill-AB4{fill:#45475A;} + .d2-4027692135 .fill-AB5{fill:#313244;} + .d2-4027692135 .stroke-N1{stroke:#CDD6F4;} + .d2-4027692135 .stroke-N2{stroke:#BAC2DE;} + .d2-4027692135 .stroke-N3{stroke:#A6ADC8;} + .d2-4027692135 .stroke-N4{stroke:#585B70;} + .d2-4027692135 .stroke-N5{stroke:#45475A;} + .d2-4027692135 .stroke-N6{stroke:#313244;} + .d2-4027692135 .stroke-N7{stroke:#1E1E2E;} + .d2-4027692135 .stroke-B1{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B2{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B3{stroke:#6C7086;} + .d2-4027692135 .stroke-B4{stroke:#585B70;} + .d2-4027692135 .stroke-B5{stroke:#45475A;} + .d2-4027692135 .stroke-B6{stroke:#313244;} + .d2-4027692135 .stroke-AA2{stroke:#f38BA8;} + .d2-4027692135 .stroke-AA4{stroke:#45475A;} + .d2-4027692135 .stroke-AA5{stroke:#313244;} + .d2-4027692135 .stroke-AB4{stroke:#45475A;} + .d2-4027692135 .stroke-AB5{stroke:#313244;} + .d2-4027692135 .background-color-N1{background-color:#CDD6F4;} + .d2-4027692135 .background-color-N2{background-color:#BAC2DE;} + .d2-4027692135 .background-color-N3{background-color:#A6ADC8;} + .d2-4027692135 .background-color-N4{background-color:#585B70;} + .d2-4027692135 .background-color-N5{background-color:#45475A;} + .d2-4027692135 .background-color-N6{background-color:#313244;} + .d2-4027692135 .background-color-N7{background-color:#1E1E2E;} + .d2-4027692135 .background-color-B1{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B2{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B3{background-color:#6C7086;} + .d2-4027692135 .background-color-B4{background-color:#585B70;} + .d2-4027692135 .background-color-B5{background-color:#45475A;} + .d2-4027692135 .background-color-B6{background-color:#313244;} + .d2-4027692135 .background-color-AA2{background-color:#f38BA8;} + .d2-4027692135 .background-color-AA4{background-color:#45475A;} + .d2-4027692135 .background-color-AA5{background-color:#313244;} + .d2-4027692135 .background-color-AB4{background-color:#45475A;} + .d2-4027692135 .background-color-AB5{background-color:#313244;} + .d2-4027692135 .color-N1{color:#CDD6F4;} + .d2-4027692135 .color-N2{color:#BAC2DE;} + .d2-4027692135 .color-N3{color:#A6ADC8;} + .d2-4027692135 .color-N4{color:#585B70;} + .d2-4027692135 .color-N5{color:#45475A;} + .d2-4027692135 .color-N6{color:#313244;} + .d2-4027692135 .color-N7{color:#1E1E2E;} + .d2-4027692135 .color-B1{color:#CBA6f7;} + .d2-4027692135 .color-B2{color:#CBA6f7;} + .d2-4027692135 .color-B3{color:#6C7086;} + .d2-4027692135 .color-B4{color:#585B70;} + .d2-4027692135 .color-B5{color:#45475A;} + .d2-4027692135 .color-B6{color:#313244;} + .d2-4027692135 .color-AA2{color:#f38BA8;} + .d2-4027692135 .color-AA4{color:#45475A;} + .d2-4027692135 .color-AA5{color:#313244;} + .d2-4027692135 .color-AB4{color:#45475A;} + .d2-4027692135 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg index 80466cf48..ebd373a65 100644 --- a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg @@ -1,4 +1,4 @@ -xy - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg index a254dee08..81d43d92a 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg @@ -1,4 +1,4 @@ -Chicken's plan - + Approach roadChicken's plan - + + Approach roadCross roadChicken's plan - + + + Approach roadCross roadMake you wonder whyChicken's plan - + + + + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg new file mode 100644 index 000000000..101f09133 --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg @@ -0,0 +1,95 @@ +meow + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg new file mode 100644 index 000000000..bea8e3772 --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg @@ -0,0 +1,110 @@ +y + + + + + + + + + + + + + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg new file mode 100644 index 000000000..ed14482e7 --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg @@ -0,0 +1,110 @@ +x + + + + + + + + + + + + + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg index 9e719dde7..5bb8b29ff 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg @@ -1,4 +1,4 @@ -xy - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg new file mode 100644 index 000000000..101f09133 --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg @@ -0,0 +1,95 @@ +meow + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg index 2d74f466f..2f6518d78 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg @@ -1,4 +1,4 @@ -ab - + + abdc - + + + + abdce - + + + + + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/empty-layer/x.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/empty-layer/x.exp.svg index 7df85074f..a94bf5b69 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/empty-layer/x.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/empty-layer/x.exp.svg @@ -1,4 +1,4 @@ -xy + + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg new file mode 100644 index 000000000..8093d4d7e --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg @@ -0,0 +1,96 @@ +jonjan + + + + 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..87b6e616e 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-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg index fc5ff4aa1..da9ffaff9 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg @@ -1,4 +1,4 @@ -xy - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg index 3dced60d4..8796f5570 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg @@ -1,4 +1,4 @@ -mortgagerealtor - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg index 8cab94806..1e6718dfa 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg @@ -1,4 +1,4 @@ -belieffooddiet - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg index ced4f2f93..f735f5d14 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg @@ -1,4 +1,4 @@ -TSXNYSENASDAQ - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg index 7d74b667e..62f45f0f8 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg @@ -1,4 +1,4 @@ -xy - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg index fc5ff4aa1..da9ffaff9 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg @@ -1,4 +1,4 @@ -xy - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg index 3dced60d4..8796f5570 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg @@ -1,4 +1,4 @@ -mortgagerealtor - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg index 8cab94806..1e6718dfa 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg @@ -1,4 +1,4 @@ -belieffooddiet - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg index ced4f2f93..f735f5d14 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg @@ -1,4 +1,4 @@ -TSXNYSENASDAQ - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg index 7d74b667e..62f45f0f8 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg @@ -1,4 +1,4 @@ -xy - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg index 219a86910..b572b06c2 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg @@ -1,4 +1,4 @@ -xy - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg index 4a345975b..6f99c984e 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg @@ -1,4 +1,4 @@ -Why do computers get sick often?Because their Windows are always open! italic font + + diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index be778d758..e542d469e 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -934,6 +934,7 @@ cf many required: { loadFromFile(t, "slow_grid"), loadFromFile(t, "grid_oom"), loadFromFile(t, "cylinder_grid_label"), + loadFromFile(t, "grid_with_latex"), } runa(t, tcs) diff --git a/e2etests/report/main.go b/e2etests/report/main.go index a2ef1896a..481cc9fd1 100644 --- a/e2etests/report/main.go +++ b/e2etests/report/main.go @@ -16,6 +16,7 @@ import ( "time" "oss.terrastruct.com/d2/lib/log" + timelib "oss.terrastruct.com/d2/lib/time" ) //go:embed template.html @@ -69,8 +70,10 @@ func main() { if !*skipTests { ctx := log.Stderr(context.Background()) - ctx, cancel := context.WithTimeout(ctx, 2*time.Minute) + + ctx, cancel := timelib.WithTimeout(ctx, 2*time.Minute) defer cancel() + // don't want to pass empty args to CommandContext args := []string{"test", testDir, testMatchString} if cpuProfileStr != "" { diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index ff25dfd6d..809e791d5 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2316,6 +2316,23 @@ Listen <-> Talk: { target-arrowhead.shape: diamond label: hear } +`, + }, + { + name: "dagre-container", + script: `a: { + a + b + c +} + +b: { + a + b + c +} + +a -> b `, }, { @@ -2385,6 +2402,40 @@ 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]} +} +e: { + shape: sql_table + x: INT {constraint: [no_abbrev; foreign_key; hello]} + y: string + z: STRING {constraint: yo} +} +f: { + shape: sql_table + x: INT +} `, }, { @@ -2726,6 +2777,8 @@ scenarios: { loadFromFile(t, "grid_icon"), loadFromFile(t, "multiple_offset"), loadFromFile(t, "multiple_offset_left"), + loadFromFile(t, "multiple_box_selection"), + loadFromFile(t, "outside_bottom_labels"), } runa(t, tcs) diff --git a/e2etests/testdata/files/grid_with_latex.d2 b/e2etests/testdata/files/grid_with_latex.d2 new file mode 100644 index 000000000..9cb7245ed --- /dev/null +++ b/e2etests/testdata/files/grid_with_latex.d2 @@ -0,0 +1,27 @@ +x: { + grid-columns: 2 + + a.width: 50 + a.height: 72 + b.width: 50 + b.height: 30 +} + +y: { + grid-columns: 2 + + a.width: 50 + a.height: 73 + b.width: 50 + b.height: 30 +} + +z: { + grid-columns: 2 + lim: |latex + \\lim_{h \\rightarrow 0 } \\frac{f(x+h)-f(x)}{h} + | + add: |latex + 1 + 1 + | +} diff --git a/e2etests/testdata/files/multiple_box_selection.d2 b/e2etests/testdata/files/multiple_box_selection.d2 new file mode 100644 index 000000000..a4301aa80 --- /dev/null +++ b/e2etests/testdata/files/multiple_box_selection.d2 @@ -0,0 +1,11 @@ +outer: { + vg: volume group { + vd: volume definition { + style.multiple: true + + volume.style.multiple: true + volume.style.stroke-dash: 3 + } + } +} +start -> outer.vg.vd.volume -> end diff --git a/e2etests/testdata/files/outside_bottom_labels.d2 b/e2etests/testdata/files/outside_bottom_labels.d2 new file mode 100644 index 000000000..620a4d6f7 --- /dev/null +++ b/e2etests/testdata/files/outside_bottom_labels.d2 @@ -0,0 +1,15 @@ +p1: Daphne Snickerdoodle { + shape: person +} +p2: Prudence McSnortle { + shape: person +} +p3: Polly Pizzazzle { + shape: person +} +p1 -> p3 +p2 -> p3 +p1 -> p3 +p2 -> p3 +p3 -> p2 +p3 -> p1 diff --git a/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg index b24ba53b5..35c3bf9de 100644 --- a/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg +++ b/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg index 905c5127a..50dec30ab 100644 --- a/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg index d6e96d49c..20116a72b 100644 --- a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -xyz syncsync + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg b/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg index 185612b81..cf8db8c9b 100644 --- a/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -xyz syncsync + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg b/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg index 2fc18dfa6..3a388bcbf 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -container title is hiddenfirstsecond - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg b/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg index 2e39e4ace..bbe171e8e 100644 --- a/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -container title is hiddenfirstsecond - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg index 6f36b02bb..4bb381897 100644 --- a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -askuhykfnsomsczrgtigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg index 4d7b3feab..b57b2f821 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -askuhykfnsomsczrgtigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg index 96cefb7bc..dd3533724 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abc12d line 1line 2line 3line 4 + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg index 5bd745f62..e6b63d66d 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abc12d line 1line 2line 3line 4 + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg index 63de15456..702eadc48 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas + + + + + + diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg index 0c97b085e..e57e12963 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas + + + + + + diff --git a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg index cfc9df9e4..aefc7f638 100644 --- a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ninetynineeighty eightseventy sevena\yodetherea\"odea\node - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg index 44181a9ea..a9821796d 100644 --- a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ninetynineeighty eightseventy sevena\yodetherea\"odea\node - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg index 2e95c3f18..8db5f0b7e 100644 --- a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest + + + + + + + + + + + + + + diff --git a/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg index e309e539c..1e77a082f 100644 --- a/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest + + + + + + + + + + + + + + diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg index d4b852428..c55600cfe 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -xab - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg index a540f005f..a0f7e4271 100644 --- a/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -xab - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg index f26773ff3..2c8ea9f7a 100644 --- a/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -hellogoodbye - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg index 231fa72a5..6c305f6b8 100644 --- a/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -hellogoodbye - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_in_constant_near/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_in_constant_near/dagre/sketch.exp.svg index d96ff9d57..4905480ba 100644 --- a/e2etests/testdata/regression/grid_in_constant_near/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_in_constant_near/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcxyz - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_in_constant_near/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_in_constant_near/elk/sketch.exp.svg index 6b9090dc6..fdb8d54c2 100644 --- a/e2etests/testdata/regression/grid_in_constant_near/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_in_constant_near/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcxyz - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_oom/dagre/board.exp.json b/e2etests/testdata/regression/grid_oom/dagre/board.exp.json index 9aa86b393..c522ffa6c 100644 --- a/e2etests/testdata/regression/grid_oom/dagre/board.exp.json +++ b/e2etests/testdata/regression/grid_oom/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 0 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,10 +73,10 @@ "type": "class", "pos": { "x": 0, - "y": 377 + "y": 381 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -128,10 +128,10 @@ "type": "class", "pos": { "x": 0, - "y": 704 + "y": 713 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -193,10 +193,10 @@ "type": "class", "pos": { "x": 0, - "y": 1082 + "y": 1094 }, "width": 626, - "height": 261, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -243,10 +243,10 @@ "type": "class", "pos": { "x": 0, - "y": 1383 + "y": 1403 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -308,10 +308,10 @@ "type": "class", "pos": { "x": 0, - "y": 1761 + "y": 1784 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -373,10 +373,10 @@ "type": "class", "pos": { "x": 0, - "y": 2139 + "y": 2165 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -438,7 +438,7 @@ "type": "class", "pos": { "x": 0, - "y": 2516 + "y": 2546 }, "width": 626, "height": 414, @@ -518,10 +518,10 @@ "type": "class", "pos": { "x": 0, - "y": 2970 + "y": 3000 }, "width": 626, - "height": 261, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -568,10 +568,10 @@ "type": "class", "pos": { "x": 0, - "y": 3272 + "y": 3308 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -716,7 +716,7 @@ "y": 454 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -763,10 +763,10 @@ "type": "class", "pos": { "x": 666, - "y": 662 + "y": 665 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,10 +828,10 @@ "type": "class", "pos": { "x": 666, - "y": 993 + "y": 998 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -883,10 +883,10 @@ "type": "class", "pos": { "x": 666, - "y": 1242 + "y": 1250 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -938,10 +938,10 @@ "type": "class", "pos": { "x": 666, - "y": 1491 + "y": 1502 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -988,10 +988,10 @@ "type": "class", "pos": { "x": 666, - "y": 1699 + "y": 1714 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1038,10 +1038,10 @@ "type": "class", "pos": { "x": 666, - "y": 1907 + "y": 1925 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1088,10 +1088,10 @@ "type": "class", "pos": { "x": 666, - "y": 2115 + "y": 2137 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1138,10 +1138,10 @@ "type": "class", "pos": { "x": 666, - "y": 2323 + "y": 2349 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1203,10 +1203,10 @@ "type": "class", "pos": { "x": 666, - "y": 2654 + "y": 2681 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1268,10 +1268,10 @@ "type": "class", "pos": { "x": 666, - "y": 2985 + "y": 3014 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1323,10 +1323,10 @@ "type": "class", "pos": { "x": 666, - "y": 3234 + "y": 3266 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1373,10 +1373,10 @@ "type": "class", "pos": { "x": 666, - "y": 3442 + "y": 3478 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1426,7 +1426,7 @@ "y": 0 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1478,10 +1478,10 @@ "type": "class", "pos": { "x": 1392, - "y": 274 + "y": 278 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1528,7 +1528,7 @@ "type": "class", "pos": { "x": 1392, - "y": 527 + "y": 537 }, "width": 650, "height": 276, @@ -1593,10 +1593,10 @@ "type": "class", "pos": { "x": 1392, - "y": 843 + "y": 853 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1643,10 +1643,10 @@ "type": "class", "pos": { "x": 1392, - "y": 1097 + "y": 1112 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1703,7 +1703,7 @@ "type": "class", "pos": { "x": 1392, - "y": 1392 + "y": 1409 }, "width": 650, "height": 276, @@ -1768,7 +1768,7 @@ "type": "class", "pos": { "x": 1392, - "y": 1708 + "y": 1725 }, "width": 650, "height": 276, @@ -1833,10 +1833,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2024 + "y": 2041 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1888,10 +1888,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2299 + "y": 2319 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1943,10 +1943,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2573 + "y": 2597 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1993,10 +1993,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2826 + "y": 2856 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2043,7 +2043,7 @@ "type": "class", "pos": { "x": 1392, - "y": 3080 + "y": 3115 }, "width": 650, "height": 276, @@ -2108,10 +2108,10 @@ "type": "class", "pos": { "x": 1392, - "y": 3396 + "y": 3431 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2161,7 +2161,7 @@ "y": 0 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2208,10 +2208,10 @@ "type": "class", "pos": { "x": 2082, - "y": 242 + "y": 247 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2258,10 +2258,10 @@ "type": "class", "pos": { "x": 2082, - "y": 484 + "y": 494 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2308,10 +2308,10 @@ "type": "class", "pos": { "x": 2082, - "y": 727 + "y": 741 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2358,10 +2358,10 @@ "type": "class", "pos": { "x": 2082, - "y": 969 + "y": 988 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2423,10 +2423,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1318 + "y": 1339 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2488,10 +2488,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1666 + "y": 1689 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2538,10 +2538,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1908 + "y": 1937 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2603,10 +2603,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2257 + "y": 2287 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2653,10 +2653,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2499 + "y": 2534 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2718,10 +2718,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2847 + "y": 2885 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2783,7 +2783,7 @@ "type": "class", "pos": { "x": 2082, - "y": 3196 + "y": 3235 }, "width": 927, "height": 414, @@ -2866,7 +2866,7 @@ "y": 0 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2918,7 +2918,7 @@ "type": "class", "pos": { "x": 3049, - "y": 269 + "y": 272 }, "width": 686, "height": 414, @@ -2998,10 +2998,10 @@ "type": "class", "pos": { "x": 3049, - "y": 723 + "y": 726 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3053,10 +3053,10 @@ "type": "class", "pos": { "x": 3049, - "y": 992 + "y": 999 }, "width": 686, - "height": 303, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3118,10 +3118,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1336 + "y": 1344 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3168,10 +3168,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1568 + "y": 1581 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3223,10 +3223,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1837 + "y": 1853 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3273,10 +3273,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2070 + "y": 2090 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3323,10 +3323,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2302 + "y": 2326 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3378,10 +3378,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2572 + "y": 2599 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3428,10 +3428,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2804 + "y": 2835 }, "width": 686, - "height": 303, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3493,10 +3493,10 @@ "type": "class", "pos": { "x": 3049, - "y": 3148 + "y": 3180 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3548,10 +3548,10 @@ "type": "class", "pos": { "x": 3049, - "y": 3417 + "y": 3453 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3601,7 +3601,7 @@ "y": 0 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3663,7 +3663,7 @@ "type": "class", "pos": { "x": 3775, - "y": 354 + "y": 358 }, "width": 927, "height": 460, @@ -3748,10 +3748,10 @@ "type": "class", "pos": { "x": 3775, - "y": 854 + "y": 858 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3813,10 +3813,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1208 + "y": 1216 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3883,10 +3883,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1598 + "y": 1610 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3948,10 +3948,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1952 + "y": 1968 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4018,10 +4018,10 @@ "type": "class", "pos": { "x": 3775, - "y": 2343 + "y": 2362 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4088,10 +4088,10 @@ "type": "class", "pos": { "x": 3775, - "y": 2733 + "y": 2756 }, "width": 927, - "height": 241, + "height": 247, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4143,10 +4143,10 @@ "type": "class", "pos": { "x": 3775, - "y": 3014 + "y": 3044 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4208,10 +4208,10 @@ "type": "class", "pos": { "x": 3775, - "y": 3368 + "y": 3402 }, "width": 927, - "height": 241, + "height": 247, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4266,7 +4266,7 @@ "y": 0 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4328,10 +4328,10 @@ "type": "class", "pos": { "x": 4742, - "y": 414 + "y": 420 }, "width": 627, - "height": 306, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4383,10 +4383,10 @@ "type": "class", "pos": { "x": 4742, - "y": 760 + "y": 774 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4448,10 +4448,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1174 + "y": 1194 }, "width": 627, - "height": 340, + "height": 347, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4508,10 +4508,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1555 + "y": 1581 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4573,10 +4573,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1969 + "y": 2001 }, "width": 627, - "height": 610, + "height": 611, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4673,7 +4673,7 @@ "type": "class", "pos": { "x": 4742, - "y": 2619 + "y": 2652 }, "width": 627, "height": 644, @@ -4778,10 +4778,10 @@ "type": "class", "pos": { "x": 4742, - "y": 3303 + "y": 3336 }, "width": 627, - "height": 306, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4836,7 +4836,7 @@ "y": 0 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4898,10 +4898,10 @@ "type": "class", "pos": { "x": 5409, - "y": 353 + "y": 357 }, "width": 578, - "height": 274, + "height": 280, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4958,10 +4958,10 @@ "type": "class", "pos": { "x": 5409, - "y": 668 + "y": 677 }, "width": 578, - "height": 236, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5013,10 +5013,10 @@ "type": "class", "pos": { "x": 5409, - "y": 944 + "y": 960 }, "width": 578, - "height": 390, + "height": 393, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5088,10 +5088,10 @@ "type": "class", "pos": { "x": 5409, - "y": 1375 + "y": 1393 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5153,10 +5153,10 @@ "type": "class", "pos": { "x": 5409, - "y": 1728 + "y": 1750 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5218,10 +5218,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2082 + "y": 2108 }, "width": 578, - "height": 197, + "height": 204, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5268,10 +5268,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2320 + "y": 2353 }, "width": 578, - "height": 467, + "height": 468, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5353,10 +5353,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2827 + "y": 2861 }, "width": 578, - "height": 236, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5408,7 +5408,7 @@ "type": "class", "pos": { "x": 5409, - "y": 3104 + "y": 3144 }, "width": 578, "height": 506, @@ -5501,7 +5501,7 @@ "y": 0 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5553,10 +5553,10 @@ "type": "class", "pos": { "x": 6027, - "y": 306 + "y": 312 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5608,10 +5608,10 @@ "type": "class", "pos": { "x": 6027, - "y": 613 + "y": 624 }, "width": 626, - "height": 403, + "height": 405, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5683,10 +5683,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1057 + "y": 1070 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5748,10 +5748,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1432 + "y": 1449 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5813,10 +5813,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1807 + "y": 1828 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5878,10 +5878,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2183 + "y": 2207 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5933,10 +5933,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2490 + "y": 2519 }, "width": 626, - "height": 232, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5983,10 +5983,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2762 + "y": 2798 }, "width": 626, - "height": 301, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6043,7 +6043,7 @@ "type": "class", "pos": { "x": 6027, - "y": 3104 + "y": 3144 }, "width": 626, "height": 506, @@ -6136,7 +6136,7 @@ "y": 0 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6188,7 +6188,7 @@ "type": "class", "pos": { "x": 6693, - "y": 274 + "y": 278 }, "width": 650, "height": 276, @@ -6253,10 +6253,10 @@ "type": "class", "pos": { "x": 6693, - "y": 590 + "y": 594 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6313,10 +6313,10 @@ "type": "class", "pos": { "x": 6693, - "y": 885 + "y": 891 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6368,10 +6368,10 @@ "type": "class", "pos": { "x": 6693, - "y": 1159 + "y": 1169 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6418,10 +6418,10 @@ "type": "class", "pos": { "x": 6693, - "y": 1413 + "y": 1428 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6473,7 +6473,7 @@ "type": "class", "pos": { "x": 6693, - "y": 1687 + "y": 1706 }, "width": 650, "height": 276, @@ -6538,10 +6538,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2003 + "y": 2022 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6588,10 +6588,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2257 + "y": 2281 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6648,7 +6648,7 @@ "type": "class", "pos": { "x": 6693, - "y": 2552 + "y": 2578 }, "width": 650, "height": 276, @@ -6713,10 +6713,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2868 + "y": 2894 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6768,10 +6768,10 @@ "type": "class", "pos": { "x": 6693, - "y": 3142 + "y": 3172 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6818,10 +6818,10 @@ "type": "class", "pos": { "x": 6693, - "y": 3396 + "y": 3431 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6871,7 +6871,7 @@ "y": 0 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6918,10 +6918,10 @@ "type": "class", "pos": { "x": 7383, - "y": 230 + "y": 268 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6983,10 +6983,10 @@ "type": "class", "pos": { "x": 7383, - "y": 559 + "y": 607 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7033,10 +7033,10 @@ "type": "class", "pos": { "x": 7383, - "y": 789 + "y": 875 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7083,7 +7083,7 @@ "type": "class", "pos": { "x": 7383, - "y": 1019 + "y": 1144 }, "width": 578, "height": 322, @@ -7153,10 +7153,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1381 + "y": 1506 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7203,10 +7203,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1611 + "y": 1774 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7268,10 +7268,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1940 + "y": 2113 }, "width": 578, - "height": 256, + "height": 275, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7328,10 +7328,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2236 + "y": 2428 }, "width": 578, - "height": 256, + "height": 275, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7388,10 +7388,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2532 + "y": 2744 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7438,10 +7438,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2762 + "y": 3012 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7503,10 +7503,10 @@ "type": "class", "pos": { "x": 7383, - "y": 3091 + "y": 3351 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7567,11 +7567,11 @@ "id": "127", "type": "class", "pos": { - "x": 7383, - "y": 3420 + "x": 8001, + "y": 0 }, "width": 578, - "height": 190, + "height": 138, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7618,10 +7618,10 @@ "type": "class", "pos": { "x": 8001, - "y": 0 + "y": 178 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7683,10 +7683,10 @@ "type": "class", "pos": { "x": 8001, - "y": 350 + "y": 494 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7748,10 +7748,10 @@ "type": "class", "pos": { "x": 8001, - "y": 700 + "y": 810 }, "width": 578, - "height": 219, + "height": 184, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7803,10 +7803,10 @@ "type": "class", "pos": { "x": 8001, - "y": 959 + "y": 1034 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7868,7 +7868,7 @@ "type": "class", "pos": { "x": 8001, - "y": 1310 + "y": 1350 }, "width": 578, "height": 2300, @@ -8156,7 +8156,7 @@ "y": 0 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8223,10 +8223,10 @@ "type": "class", "pos": { "x": 8619, - "y": 405 + "y": 410 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8278,10 +8278,10 @@ "type": "class", "pos": { "x": 8619, - "y": 811 + "y": 820 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8343,10 +8343,10 @@ "type": "class", "pos": { "x": 8619, - "y": 1216 + "y": 1230 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8408,10 +8408,10 @@ "type": "class", "pos": { "x": 8619, - "y": 1622 + "y": 1640 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8473,10 +8473,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2027 + "y": 2050 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8538,10 +8538,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2433 + "y": 2460 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8598,10 +8598,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2838 + "y": 2870 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8663,10 +8663,10 @@ "type": "class", "pos": { "x": 8619, - "y": 3244 + "y": 3280 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8721,7 +8721,7 @@ "y": 0 }, "width": 650, - "height": 138, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8768,10 +8768,10 @@ "type": "class", "pos": { "x": 9249, - "y": 178 + "y": 188 }, "width": 650, - "height": 276, + "height": 286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8833,10 +8833,10 @@ "type": "class", "pos": { "x": 9249, - "y": 494 + "y": 514 }, "width": 650, - "height": 276, + "height": 286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8898,10 +8898,10 @@ "type": "class", "pos": { "x": 9249, - "y": 810 + "y": 840 }, "width": 650, - "height": 460, + "height": 469, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8983,7 +8983,7 @@ "type": "class", "pos": { "x": 9249, - "y": 1310 + "y": 1350 }, "width": 650, "height": 2300, @@ -9271,7 +9271,7 @@ "y": 0 }, "width": 626, - "height": 329, + "height": 333, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9328,10 +9328,10 @@ "type": "class", "pos": { "x": 9939, - "y": 369 + "y": 373 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9393,10 +9393,10 @@ "type": "class", "pos": { "x": 9939, - "y": 759 + "y": 766 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9458,10 +9458,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1150 + "y": 1159 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9523,10 +9523,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1540 + "y": 1552 }, "width": 626, - "height": 308, + "height": 312, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9578,10 +9578,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1888 + "y": 1905 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9628,10 +9628,10 @@ "type": "class", "pos": { "x": 9939, - "y": 2215 + "y": 2238 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9678,7 +9678,7 @@ "type": "class", "pos": { "x": 9939, - "y": 2542 + "y": 2570 }, "width": 626, "height": 414, @@ -9758,10 +9758,10 @@ "type": "class", "pos": { "x": 9939, - "y": 2996 + "y": 3024 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9808,10 +9808,10 @@ "type": "class", "pos": { "x": 9939, - "y": 3323 + "y": 3357 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg index a4d7f9d35..b499ca5f4 100644 --- a/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- - + .d2-110778175 .fill-N1{fill:#0A0F25;} + .d2-110778175 .fill-N2{fill:#676C7E;} + .d2-110778175 .fill-N3{fill:#9499AB;} + .d2-110778175 .fill-N4{fill:#CFD2DD;} + .d2-110778175 .fill-N5{fill:#DEE1EB;} + .d2-110778175 .fill-N6{fill:#EEF1F8;} + .d2-110778175 .fill-N7{fill:#FFFFFF;} + .d2-110778175 .fill-B1{fill:#0D32B2;} + .d2-110778175 .fill-B2{fill:#0D32B2;} + .d2-110778175 .fill-B3{fill:#E3E9FD;} + .d2-110778175 .fill-B4{fill:#E3E9FD;} + .d2-110778175 .fill-B5{fill:#EDF0FD;} + .d2-110778175 .fill-B6{fill:#F7F8FE;} + .d2-110778175 .fill-AA2{fill:#4A6FF3;} + .d2-110778175 .fill-AA4{fill:#EDF0FD;} + .d2-110778175 .fill-AA5{fill:#F7F8FE;} + .d2-110778175 .fill-AB4{fill:#EDF0FD;} + .d2-110778175 .fill-AB5{fill:#F7F8FE;} + .d2-110778175 .stroke-N1{stroke:#0A0F25;} + .d2-110778175 .stroke-N2{stroke:#676C7E;} + .d2-110778175 .stroke-N3{stroke:#9499AB;} + .d2-110778175 .stroke-N4{stroke:#CFD2DD;} + .d2-110778175 .stroke-N5{stroke:#DEE1EB;} + .d2-110778175 .stroke-N6{stroke:#EEF1F8;} + .d2-110778175 .stroke-N7{stroke:#FFFFFF;} + .d2-110778175 .stroke-B1{stroke:#0D32B2;} + .d2-110778175 .stroke-B2{stroke:#0D32B2;} + .d2-110778175 .stroke-B3{stroke:#E3E9FD;} + .d2-110778175 .stroke-B4{stroke:#E3E9FD;} + .d2-110778175 .stroke-B5{stroke:#EDF0FD;} + .d2-110778175 .stroke-B6{stroke:#F7F8FE;} + .d2-110778175 .stroke-AA2{stroke:#4A6FF3;} + .d2-110778175 .stroke-AA4{stroke:#EDF0FD;} + .d2-110778175 .stroke-AA5{stroke:#F7F8FE;} + .d2-110778175 .stroke-AB4{stroke:#EDF0FD;} + .d2-110778175 .stroke-AB5{stroke:#F7F8FE;} + .d2-110778175 .background-color-N1{background-color:#0A0F25;} + .d2-110778175 .background-color-N2{background-color:#676C7E;} + .d2-110778175 .background-color-N3{background-color:#9499AB;} + .d2-110778175 .background-color-N4{background-color:#CFD2DD;} + .d2-110778175 .background-color-N5{background-color:#DEE1EB;} + .d2-110778175 .background-color-N6{background-color:#EEF1F8;} + .d2-110778175 .background-color-N7{background-color:#FFFFFF;} + .d2-110778175 .background-color-B1{background-color:#0D32B2;} + .d2-110778175 .background-color-B2{background-color:#0D32B2;} + .d2-110778175 .background-color-B3{background-color:#E3E9FD;} + .d2-110778175 .background-color-B4{background-color:#E3E9FD;} + .d2-110778175 .background-color-B5{background-color:#EDF0FD;} + .d2-110778175 .background-color-B6{background-color:#F7F8FE;} + .d2-110778175 .background-color-AA2{background-color:#4A6FF3;} + .d2-110778175 .background-color-AA4{background-color:#EDF0FD;} + .d2-110778175 .background-color-AA5{background-color:#F7F8FE;} + .d2-110778175 .background-color-AB4{background-color:#EDF0FD;} + .d2-110778175 .background-color-AB5{background-color:#F7F8FE;} + .d2-110778175 .color-N1{color:#0A0F25;} + .d2-110778175 .color-N2{color:#676C7E;} + .d2-110778175 .color-N3{color:#9499AB;} + .d2-110778175 .color-N4{color:#CFD2DD;} + .d2-110778175 .color-N5{color:#DEE1EB;} + .d2-110778175 .color-N6{color:#EEF1F8;} + .d2-110778175 .color-N7{color:#FFFFFF;} + .d2-110778175 .color-B1{color:#0D32B2;} + .d2-110778175 .color-B2{color:#0D32B2;} + .d2-110778175 .color-B3{color:#E3E9FD;} + .d2-110778175 .color-B4{color:#E3E9FD;} + .d2-110778175 .color-B5{color:#EDF0FD;} + .d2-110778175 .color-B6{color:#F7F8FE;} + .d2-110778175 .color-AA2{color:#4A6FF3;} + .d2-110778175 .color-AA4{color:#EDF0FD;} + .d2-110778175 .color-AA5{color:#F7F8FE;} + .d2-110778175 .color-AB4{color:#EDF0FD;} + .d2-110778175 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_oom/elk/board.exp.json b/e2etests/testdata/regression/grid_oom/elk/board.exp.json index 9aa86b393..c522ffa6c 100644 --- a/e2etests/testdata/regression/grid_oom/elk/board.exp.json +++ b/e2etests/testdata/regression/grid_oom/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 0 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,10 +73,10 @@ "type": "class", "pos": { "x": 0, - "y": 377 + "y": 381 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -128,10 +128,10 @@ "type": "class", "pos": { "x": 0, - "y": 704 + "y": 713 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -193,10 +193,10 @@ "type": "class", "pos": { "x": 0, - "y": 1082 + "y": 1094 }, "width": 626, - "height": 261, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -243,10 +243,10 @@ "type": "class", "pos": { "x": 0, - "y": 1383 + "y": 1403 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -308,10 +308,10 @@ "type": "class", "pos": { "x": 0, - "y": 1761 + "y": 1784 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -373,10 +373,10 @@ "type": "class", "pos": { "x": 0, - "y": 2139 + "y": 2165 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -438,7 +438,7 @@ "type": "class", "pos": { "x": 0, - "y": 2516 + "y": 2546 }, "width": 626, "height": 414, @@ -518,10 +518,10 @@ "type": "class", "pos": { "x": 0, - "y": 2970 + "y": 3000 }, "width": 626, - "height": 261, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -568,10 +568,10 @@ "type": "class", "pos": { "x": 0, - "y": 3272 + "y": 3308 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -716,7 +716,7 @@ "y": 454 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -763,10 +763,10 @@ "type": "class", "pos": { "x": 666, - "y": 662 + "y": 665 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,10 +828,10 @@ "type": "class", "pos": { "x": 666, - "y": 993 + "y": 998 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -883,10 +883,10 @@ "type": "class", "pos": { "x": 666, - "y": 1242 + "y": 1250 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -938,10 +938,10 @@ "type": "class", "pos": { "x": 666, - "y": 1491 + "y": 1502 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -988,10 +988,10 @@ "type": "class", "pos": { "x": 666, - "y": 1699 + "y": 1714 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1038,10 +1038,10 @@ "type": "class", "pos": { "x": 666, - "y": 1907 + "y": 1925 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1088,10 +1088,10 @@ "type": "class", "pos": { "x": 666, - "y": 2115 + "y": 2137 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1138,10 +1138,10 @@ "type": "class", "pos": { "x": 666, - "y": 2323 + "y": 2349 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1203,10 +1203,10 @@ "type": "class", "pos": { "x": 666, - "y": 2654 + "y": 2681 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1268,10 +1268,10 @@ "type": "class", "pos": { "x": 666, - "y": 2985 + "y": 3014 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1323,10 +1323,10 @@ "type": "class", "pos": { "x": 666, - "y": 3234 + "y": 3266 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1373,10 +1373,10 @@ "type": "class", "pos": { "x": 666, - "y": 3442 + "y": 3478 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1426,7 +1426,7 @@ "y": 0 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1478,10 +1478,10 @@ "type": "class", "pos": { "x": 1392, - "y": 274 + "y": 278 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1528,7 +1528,7 @@ "type": "class", "pos": { "x": 1392, - "y": 527 + "y": 537 }, "width": 650, "height": 276, @@ -1593,10 +1593,10 @@ "type": "class", "pos": { "x": 1392, - "y": 843 + "y": 853 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1643,10 +1643,10 @@ "type": "class", "pos": { "x": 1392, - "y": 1097 + "y": 1112 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1703,7 +1703,7 @@ "type": "class", "pos": { "x": 1392, - "y": 1392 + "y": 1409 }, "width": 650, "height": 276, @@ -1768,7 +1768,7 @@ "type": "class", "pos": { "x": 1392, - "y": 1708 + "y": 1725 }, "width": 650, "height": 276, @@ -1833,10 +1833,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2024 + "y": 2041 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1888,10 +1888,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2299 + "y": 2319 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1943,10 +1943,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2573 + "y": 2597 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1993,10 +1993,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2826 + "y": 2856 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2043,7 +2043,7 @@ "type": "class", "pos": { "x": 1392, - "y": 3080 + "y": 3115 }, "width": 650, "height": 276, @@ -2108,10 +2108,10 @@ "type": "class", "pos": { "x": 1392, - "y": 3396 + "y": 3431 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2161,7 +2161,7 @@ "y": 0 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2208,10 +2208,10 @@ "type": "class", "pos": { "x": 2082, - "y": 242 + "y": 247 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2258,10 +2258,10 @@ "type": "class", "pos": { "x": 2082, - "y": 484 + "y": 494 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2308,10 +2308,10 @@ "type": "class", "pos": { "x": 2082, - "y": 727 + "y": 741 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2358,10 +2358,10 @@ "type": "class", "pos": { "x": 2082, - "y": 969 + "y": 988 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2423,10 +2423,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1318 + "y": 1339 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2488,10 +2488,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1666 + "y": 1689 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2538,10 +2538,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1908 + "y": 1937 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2603,10 +2603,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2257 + "y": 2287 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2653,10 +2653,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2499 + "y": 2534 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2718,10 +2718,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2847 + "y": 2885 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2783,7 +2783,7 @@ "type": "class", "pos": { "x": 2082, - "y": 3196 + "y": 3235 }, "width": 927, "height": 414, @@ -2866,7 +2866,7 @@ "y": 0 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2918,7 +2918,7 @@ "type": "class", "pos": { "x": 3049, - "y": 269 + "y": 272 }, "width": 686, "height": 414, @@ -2998,10 +2998,10 @@ "type": "class", "pos": { "x": 3049, - "y": 723 + "y": 726 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3053,10 +3053,10 @@ "type": "class", "pos": { "x": 3049, - "y": 992 + "y": 999 }, "width": 686, - "height": 303, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3118,10 +3118,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1336 + "y": 1344 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3168,10 +3168,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1568 + "y": 1581 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3223,10 +3223,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1837 + "y": 1853 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3273,10 +3273,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2070 + "y": 2090 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3323,10 +3323,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2302 + "y": 2326 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3378,10 +3378,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2572 + "y": 2599 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3428,10 +3428,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2804 + "y": 2835 }, "width": 686, - "height": 303, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3493,10 +3493,10 @@ "type": "class", "pos": { "x": 3049, - "y": 3148 + "y": 3180 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3548,10 +3548,10 @@ "type": "class", "pos": { "x": 3049, - "y": 3417 + "y": 3453 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3601,7 +3601,7 @@ "y": 0 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3663,7 +3663,7 @@ "type": "class", "pos": { "x": 3775, - "y": 354 + "y": 358 }, "width": 927, "height": 460, @@ -3748,10 +3748,10 @@ "type": "class", "pos": { "x": 3775, - "y": 854 + "y": 858 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3813,10 +3813,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1208 + "y": 1216 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3883,10 +3883,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1598 + "y": 1610 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3948,10 +3948,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1952 + "y": 1968 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4018,10 +4018,10 @@ "type": "class", "pos": { "x": 3775, - "y": 2343 + "y": 2362 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4088,10 +4088,10 @@ "type": "class", "pos": { "x": 3775, - "y": 2733 + "y": 2756 }, "width": 927, - "height": 241, + "height": 247, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4143,10 +4143,10 @@ "type": "class", "pos": { "x": 3775, - "y": 3014 + "y": 3044 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4208,10 +4208,10 @@ "type": "class", "pos": { "x": 3775, - "y": 3368 + "y": 3402 }, "width": 927, - "height": 241, + "height": 247, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4266,7 +4266,7 @@ "y": 0 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4328,10 +4328,10 @@ "type": "class", "pos": { "x": 4742, - "y": 414 + "y": 420 }, "width": 627, - "height": 306, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4383,10 +4383,10 @@ "type": "class", "pos": { "x": 4742, - "y": 760 + "y": 774 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4448,10 +4448,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1174 + "y": 1194 }, "width": 627, - "height": 340, + "height": 347, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4508,10 +4508,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1555 + "y": 1581 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4573,10 +4573,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1969 + "y": 2001 }, "width": 627, - "height": 610, + "height": 611, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4673,7 +4673,7 @@ "type": "class", "pos": { "x": 4742, - "y": 2619 + "y": 2652 }, "width": 627, "height": 644, @@ -4778,10 +4778,10 @@ "type": "class", "pos": { "x": 4742, - "y": 3303 + "y": 3336 }, "width": 627, - "height": 306, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4836,7 +4836,7 @@ "y": 0 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4898,10 +4898,10 @@ "type": "class", "pos": { "x": 5409, - "y": 353 + "y": 357 }, "width": 578, - "height": 274, + "height": 280, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4958,10 +4958,10 @@ "type": "class", "pos": { "x": 5409, - "y": 668 + "y": 677 }, "width": 578, - "height": 236, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5013,10 +5013,10 @@ "type": "class", "pos": { "x": 5409, - "y": 944 + "y": 960 }, "width": 578, - "height": 390, + "height": 393, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5088,10 +5088,10 @@ "type": "class", "pos": { "x": 5409, - "y": 1375 + "y": 1393 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5153,10 +5153,10 @@ "type": "class", "pos": { "x": 5409, - "y": 1728 + "y": 1750 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5218,10 +5218,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2082 + "y": 2108 }, "width": 578, - "height": 197, + "height": 204, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5268,10 +5268,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2320 + "y": 2353 }, "width": 578, - "height": 467, + "height": 468, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5353,10 +5353,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2827 + "y": 2861 }, "width": 578, - "height": 236, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5408,7 +5408,7 @@ "type": "class", "pos": { "x": 5409, - "y": 3104 + "y": 3144 }, "width": 578, "height": 506, @@ -5501,7 +5501,7 @@ "y": 0 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5553,10 +5553,10 @@ "type": "class", "pos": { "x": 6027, - "y": 306 + "y": 312 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5608,10 +5608,10 @@ "type": "class", "pos": { "x": 6027, - "y": 613 + "y": 624 }, "width": 626, - "height": 403, + "height": 405, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5683,10 +5683,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1057 + "y": 1070 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5748,10 +5748,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1432 + "y": 1449 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5813,10 +5813,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1807 + "y": 1828 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5878,10 +5878,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2183 + "y": 2207 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5933,10 +5933,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2490 + "y": 2519 }, "width": 626, - "height": 232, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5983,10 +5983,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2762 + "y": 2798 }, "width": 626, - "height": 301, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6043,7 +6043,7 @@ "type": "class", "pos": { "x": 6027, - "y": 3104 + "y": 3144 }, "width": 626, "height": 506, @@ -6136,7 +6136,7 @@ "y": 0 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6188,7 +6188,7 @@ "type": "class", "pos": { "x": 6693, - "y": 274 + "y": 278 }, "width": 650, "height": 276, @@ -6253,10 +6253,10 @@ "type": "class", "pos": { "x": 6693, - "y": 590 + "y": 594 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6313,10 +6313,10 @@ "type": "class", "pos": { "x": 6693, - "y": 885 + "y": 891 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6368,10 +6368,10 @@ "type": "class", "pos": { "x": 6693, - "y": 1159 + "y": 1169 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6418,10 +6418,10 @@ "type": "class", "pos": { "x": 6693, - "y": 1413 + "y": 1428 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6473,7 +6473,7 @@ "type": "class", "pos": { "x": 6693, - "y": 1687 + "y": 1706 }, "width": 650, "height": 276, @@ -6538,10 +6538,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2003 + "y": 2022 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6588,10 +6588,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2257 + "y": 2281 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6648,7 +6648,7 @@ "type": "class", "pos": { "x": 6693, - "y": 2552 + "y": 2578 }, "width": 650, "height": 276, @@ -6713,10 +6713,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2868 + "y": 2894 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6768,10 +6768,10 @@ "type": "class", "pos": { "x": 6693, - "y": 3142 + "y": 3172 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6818,10 +6818,10 @@ "type": "class", "pos": { "x": 6693, - "y": 3396 + "y": 3431 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6871,7 +6871,7 @@ "y": 0 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6918,10 +6918,10 @@ "type": "class", "pos": { "x": 7383, - "y": 230 + "y": 268 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6983,10 +6983,10 @@ "type": "class", "pos": { "x": 7383, - "y": 559 + "y": 607 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7033,10 +7033,10 @@ "type": "class", "pos": { "x": 7383, - "y": 789 + "y": 875 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7083,7 +7083,7 @@ "type": "class", "pos": { "x": 7383, - "y": 1019 + "y": 1144 }, "width": 578, "height": 322, @@ -7153,10 +7153,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1381 + "y": 1506 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7203,10 +7203,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1611 + "y": 1774 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7268,10 +7268,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1940 + "y": 2113 }, "width": 578, - "height": 256, + "height": 275, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7328,10 +7328,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2236 + "y": 2428 }, "width": 578, - "height": 256, + "height": 275, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7388,10 +7388,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2532 + "y": 2744 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7438,10 +7438,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2762 + "y": 3012 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7503,10 +7503,10 @@ "type": "class", "pos": { "x": 7383, - "y": 3091 + "y": 3351 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7567,11 +7567,11 @@ "id": "127", "type": "class", "pos": { - "x": 7383, - "y": 3420 + "x": 8001, + "y": 0 }, "width": 578, - "height": 190, + "height": 138, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7618,10 +7618,10 @@ "type": "class", "pos": { "x": 8001, - "y": 0 + "y": 178 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7683,10 +7683,10 @@ "type": "class", "pos": { "x": 8001, - "y": 350 + "y": 494 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7748,10 +7748,10 @@ "type": "class", "pos": { "x": 8001, - "y": 700 + "y": 810 }, "width": 578, - "height": 219, + "height": 184, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7803,10 +7803,10 @@ "type": "class", "pos": { "x": 8001, - "y": 959 + "y": 1034 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7868,7 +7868,7 @@ "type": "class", "pos": { "x": 8001, - "y": 1310 + "y": 1350 }, "width": 578, "height": 2300, @@ -8156,7 +8156,7 @@ "y": 0 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8223,10 +8223,10 @@ "type": "class", "pos": { "x": 8619, - "y": 405 + "y": 410 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8278,10 +8278,10 @@ "type": "class", "pos": { "x": 8619, - "y": 811 + "y": 820 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8343,10 +8343,10 @@ "type": "class", "pos": { "x": 8619, - "y": 1216 + "y": 1230 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8408,10 +8408,10 @@ "type": "class", "pos": { "x": 8619, - "y": 1622 + "y": 1640 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8473,10 +8473,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2027 + "y": 2050 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8538,10 +8538,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2433 + "y": 2460 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8598,10 +8598,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2838 + "y": 2870 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8663,10 +8663,10 @@ "type": "class", "pos": { "x": 8619, - "y": 3244 + "y": 3280 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8721,7 +8721,7 @@ "y": 0 }, "width": 650, - "height": 138, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8768,10 +8768,10 @@ "type": "class", "pos": { "x": 9249, - "y": 178 + "y": 188 }, "width": 650, - "height": 276, + "height": 286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8833,10 +8833,10 @@ "type": "class", "pos": { "x": 9249, - "y": 494 + "y": 514 }, "width": 650, - "height": 276, + "height": 286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8898,10 +8898,10 @@ "type": "class", "pos": { "x": 9249, - "y": 810 + "y": 840 }, "width": 650, - "height": 460, + "height": 469, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8983,7 +8983,7 @@ "type": "class", "pos": { "x": 9249, - "y": 1310 + "y": 1350 }, "width": 650, "height": 2300, @@ -9271,7 +9271,7 @@ "y": 0 }, "width": 626, - "height": 329, + "height": 333, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9328,10 +9328,10 @@ "type": "class", "pos": { "x": 9939, - "y": 369 + "y": 373 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9393,10 +9393,10 @@ "type": "class", "pos": { "x": 9939, - "y": 759 + "y": 766 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9458,10 +9458,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1150 + "y": 1159 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9523,10 +9523,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1540 + "y": 1552 }, "width": 626, - "height": 308, + "height": 312, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9578,10 +9578,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1888 + "y": 1905 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9628,10 +9628,10 @@ "type": "class", "pos": { "x": 9939, - "y": 2215 + "y": 2238 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9678,7 +9678,7 @@ "type": "class", "pos": { "x": 9939, - "y": 2542 + "y": 2570 }, "width": 626, "height": 414, @@ -9758,10 +9758,10 @@ "type": "class", "pos": { "x": 9939, - "y": 2996 + "y": 3024 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9808,10 +9808,10 @@ "type": "class", "pos": { "x": 9939, - "y": 3323 + "y": 3357 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg index a4d7f9d35..b499ca5f4 100644 --- a/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- - + .d2-110778175 .fill-N1{fill:#0A0F25;} + .d2-110778175 .fill-N2{fill:#676C7E;} + .d2-110778175 .fill-N3{fill:#9499AB;} + .d2-110778175 .fill-N4{fill:#CFD2DD;} + .d2-110778175 .fill-N5{fill:#DEE1EB;} + .d2-110778175 .fill-N6{fill:#EEF1F8;} + .d2-110778175 .fill-N7{fill:#FFFFFF;} + .d2-110778175 .fill-B1{fill:#0D32B2;} + .d2-110778175 .fill-B2{fill:#0D32B2;} + .d2-110778175 .fill-B3{fill:#E3E9FD;} + .d2-110778175 .fill-B4{fill:#E3E9FD;} + .d2-110778175 .fill-B5{fill:#EDF0FD;} + .d2-110778175 .fill-B6{fill:#F7F8FE;} + .d2-110778175 .fill-AA2{fill:#4A6FF3;} + .d2-110778175 .fill-AA4{fill:#EDF0FD;} + .d2-110778175 .fill-AA5{fill:#F7F8FE;} + .d2-110778175 .fill-AB4{fill:#EDF0FD;} + .d2-110778175 .fill-AB5{fill:#F7F8FE;} + .d2-110778175 .stroke-N1{stroke:#0A0F25;} + .d2-110778175 .stroke-N2{stroke:#676C7E;} + .d2-110778175 .stroke-N3{stroke:#9499AB;} + .d2-110778175 .stroke-N4{stroke:#CFD2DD;} + .d2-110778175 .stroke-N5{stroke:#DEE1EB;} + .d2-110778175 .stroke-N6{stroke:#EEF1F8;} + .d2-110778175 .stroke-N7{stroke:#FFFFFF;} + .d2-110778175 .stroke-B1{stroke:#0D32B2;} + .d2-110778175 .stroke-B2{stroke:#0D32B2;} + .d2-110778175 .stroke-B3{stroke:#E3E9FD;} + .d2-110778175 .stroke-B4{stroke:#E3E9FD;} + .d2-110778175 .stroke-B5{stroke:#EDF0FD;} + .d2-110778175 .stroke-B6{stroke:#F7F8FE;} + .d2-110778175 .stroke-AA2{stroke:#4A6FF3;} + .d2-110778175 .stroke-AA4{stroke:#EDF0FD;} + .d2-110778175 .stroke-AA5{stroke:#F7F8FE;} + .d2-110778175 .stroke-AB4{stroke:#EDF0FD;} + .d2-110778175 .stroke-AB5{stroke:#F7F8FE;} + .d2-110778175 .background-color-N1{background-color:#0A0F25;} + .d2-110778175 .background-color-N2{background-color:#676C7E;} + .d2-110778175 .background-color-N3{background-color:#9499AB;} + .d2-110778175 .background-color-N4{background-color:#CFD2DD;} + .d2-110778175 .background-color-N5{background-color:#DEE1EB;} + .d2-110778175 .background-color-N6{background-color:#EEF1F8;} + .d2-110778175 .background-color-N7{background-color:#FFFFFF;} + .d2-110778175 .background-color-B1{background-color:#0D32B2;} + .d2-110778175 .background-color-B2{background-color:#0D32B2;} + .d2-110778175 .background-color-B3{background-color:#E3E9FD;} + .d2-110778175 .background-color-B4{background-color:#E3E9FD;} + .d2-110778175 .background-color-B5{background-color:#EDF0FD;} + .d2-110778175 .background-color-B6{background-color:#F7F8FE;} + .d2-110778175 .background-color-AA2{background-color:#4A6FF3;} + .d2-110778175 .background-color-AA4{background-color:#EDF0FD;} + .d2-110778175 .background-color-AA5{background-color:#F7F8FE;} + .d2-110778175 .background-color-AB4{background-color:#EDF0FD;} + .d2-110778175 .background-color-AB5{background-color:#F7F8FE;} + .d2-110778175 .color-N1{color:#0A0F25;} + .d2-110778175 .color-N2{color:#676C7E;} + .d2-110778175 .color-N3{color:#9499AB;} + .d2-110778175 .color-N4{color:#CFD2DD;} + .d2-110778175 .color-N5{color:#DEE1EB;} + .d2-110778175 .color-N6{color:#EEF1F8;} + .d2-110778175 .color-N7{color:#FFFFFF;} + .d2-110778175 .color-B1{color:#0D32B2;} + .d2-110778175 .color-B2{color:#0D32B2;} + .d2-110778175 .color-B3{color:#E3E9FD;} + .d2-110778175 .color-B4{color:#E3E9FD;} + .d2-110778175 .color-B5{color:#EDF0FD;} + .d2-110778175 .color-B6{color:#F7F8FE;} + .d2-110778175 .color-AA2{color:#4A6FF3;} + .d2-110778175 .color-AA4{color:#EDF0FD;} + .d2-110778175 .color-AA5{color:#F7F8FE;} + .d2-110778175 .color-AB4{color:#EDF0FD;} + .d2-110778175 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg index b75fe94ae..6ae5935a9 100644 --- a/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg index 4881bb913..a7631c80c 100644 --- a/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json b/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json new file mode 100644 index 000000000..9e2bb39a3 --- /dev/null +++ b/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json @@ -0,0 +1,417 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 0, + "y": 1 + }, + "width": 260, + "height": 192, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "x.a", + "type": "rectangle", + "pos": { + "x": 60, + "y": 61 + }, + "width": 50, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "x.b", + "type": "rectangle", + "pos": { + "x": 150, + "y": 61 + }, + "width": 50, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 320, + "y": 0 + }, + "width": 260, + "height": 193, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.a", + "type": "rectangle", + "pos": { + "x": 380, + "y": 60 + }, + "width": 50, + "height": 73, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "y.b", + "type": "rectangle", + "pos": { + "x": 470, + "y": 60 + }, + "width": 50, + "height": 73, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "z", + "type": "rectangle", + "pos": { + "x": 640, + "y": 16 + }, + "width": 363, + "height": 161, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "z", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "z.lim", + "type": "text", + "pos": { + "x": 700, + "y": 76 + }, + "width": 162, + "height": 41, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\\\\lim_{h \\\\rightarrow 0 } \\\\frac{f(x+h)-f(x)}{h}", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 162, + "labelHeight": 41, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "z.add", + "type": "text", + "pos": { + "x": 902, + "y": 76 + }, + "width": 41, + "height": 41, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1 + 1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 41, + "labelHeight": 14, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg new file mode 100644 index 000000000..e5e9cbafc --- /dev/null +++ b/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg @@ -0,0 +1,846 @@ +xyzabab + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json b/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json new file mode 100644 index 000000000..b0873cb79 --- /dev/null +++ b/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json @@ -0,0 +1,417 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 260, + "height": 192, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "x.a", + "type": "rectangle", + "pos": { + "x": 72, + "y": 72 + }, + "width": 50, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "x.b", + "type": "rectangle", + "pos": { + "x": 162, + "y": 72 + }, + "width": 50, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 292, + "y": 12 + }, + "width": 260, + "height": 193, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.a", + "type": "rectangle", + "pos": { + "x": 352, + "y": 72 + }, + "width": 50, + "height": 73, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "y.b", + "type": "rectangle", + "pos": { + "x": 442, + "y": 72 + }, + "width": 50, + "height": 73, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "z", + "type": "rectangle", + "pos": { + "x": 572, + "y": 28 + }, + "width": 363, + "height": 161, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "z", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "z.lim", + "type": "text", + "pos": { + "x": 632, + "y": 88 + }, + "width": 162, + "height": 41, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\\\\lim_{h \\\\rightarrow 0 } \\\\frac{f(x+h)-f(x)}{h}", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 162, + "labelHeight": 41, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "z.add", + "type": "text", + "pos": { + "x": 834, + "y": 88 + }, + "width": 41, + "height": 41, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1 + 1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 41, + "labelHeight": 14, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg new file mode 100644 index 000000000..37b86d119 --- /dev/null +++ b/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg @@ -0,0 +1,846 @@ +xyzabab + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg b/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg index dc48f4f9b..30e0e551b 100644 --- a/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -x - + \ No newline at end of file diff --git a/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg b/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg index f95d01361..da33f5421 100644 --- a/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -x - + \ No newline at end of file diff --git a/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg b/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg index 887ad47d2..415f5121e 100644 --- a/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -teamwork: having someone to blame - + \ No newline at end of file diff --git a/e2etests/testdata/regression/just-width/elk/sketch.exp.svg b/e2etests/testdata/regression/just-width/elk/sketch.exp.svg index d85754e2d..f568e2964 100644 --- a/e2etests/testdata/regression/just-width/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/just-width/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -teamwork: having someone to blame - + \ No newline at end of file diff --git a/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg b/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg index f14c7af03..3d96ebfbb 100644 --- a/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ab a to b with unexpectedly long target arrowhead label - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg b/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg index 7913a68d0..324f0edbf 100644 --- a/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ab a to b with unexpectedly long target arrowhead label - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg b/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg index 33b72e9d4..082ca371d 100644 --- a/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -acdab - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg index 9642663fc..586ed6529 100644 --- a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -acdab - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg b/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg index 797e0a74f..7fcf9f363 100644 --- a/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -x -> yx -> y - + \ No newline at end of file diff --git a/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg b/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg index feae46753..cd9c9f9f8 100644 --- a/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -x -> yx -> y - + \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json b/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json index 63751930a..1421415d8 100644 --- a/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json +++ b/e2etests/testdata/regression/only_header_class_table/dagre/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/dagre/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg index c593f9f87..8cabf72ec 100644 --- a/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -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..9bd6fadd7 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/opacity-on-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg index 296359aff..3fd901ccb 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault - - - - - + .d2-3149817923 .fill-N1{fill:#0A0F25;} + .d2-3149817923 .fill-N2{fill:#676C7E;} + .d2-3149817923 .fill-N3{fill:#9499AB;} + .d2-3149817923 .fill-N4{fill:#CFD2DD;} + .d2-3149817923 .fill-N5{fill:#DEE1EB;} + .d2-3149817923 .fill-N6{fill:#EEF1F8;} + .d2-3149817923 .fill-N7{fill:#FFFFFF;} + .d2-3149817923 .fill-B1{fill:#0D32B2;} + .d2-3149817923 .fill-B2{fill:#0D32B2;} + .d2-3149817923 .fill-B3{fill:#E3E9FD;} + .d2-3149817923 .fill-B4{fill:#E3E9FD;} + .d2-3149817923 .fill-B5{fill:#EDF0FD;} + .d2-3149817923 .fill-B6{fill:#F7F8FE;} + .d2-3149817923 .fill-AA2{fill:#4A6FF3;} + .d2-3149817923 .fill-AA4{fill:#EDF0FD;} + .d2-3149817923 .fill-AA5{fill:#F7F8FE;} + .d2-3149817923 .fill-AB4{fill:#EDF0FD;} + .d2-3149817923 .fill-AB5{fill:#F7F8FE;} + .d2-3149817923 .stroke-N1{stroke:#0A0F25;} + .d2-3149817923 .stroke-N2{stroke:#676C7E;} + .d2-3149817923 .stroke-N3{stroke:#9499AB;} + .d2-3149817923 .stroke-N4{stroke:#CFD2DD;} + .d2-3149817923 .stroke-N5{stroke:#DEE1EB;} + .d2-3149817923 .stroke-N6{stroke:#EEF1F8;} + .d2-3149817923 .stroke-N7{stroke:#FFFFFF;} + .d2-3149817923 .stroke-B1{stroke:#0D32B2;} + .d2-3149817923 .stroke-B2{stroke:#0D32B2;} + .d2-3149817923 .stroke-B3{stroke:#E3E9FD;} + .d2-3149817923 .stroke-B4{stroke:#E3E9FD;} + .d2-3149817923 .stroke-B5{stroke:#EDF0FD;} + .d2-3149817923 .stroke-B6{stroke:#F7F8FE;} + .d2-3149817923 .stroke-AA2{stroke:#4A6FF3;} + .d2-3149817923 .stroke-AA4{stroke:#EDF0FD;} + .d2-3149817923 .stroke-AA5{stroke:#F7F8FE;} + .d2-3149817923 .stroke-AB4{stroke:#EDF0FD;} + .d2-3149817923 .stroke-AB5{stroke:#F7F8FE;} + .d2-3149817923 .background-color-N1{background-color:#0A0F25;} + .d2-3149817923 .background-color-N2{background-color:#676C7E;} + .d2-3149817923 .background-color-N3{background-color:#9499AB;} + .d2-3149817923 .background-color-N4{background-color:#CFD2DD;} + .d2-3149817923 .background-color-N5{background-color:#DEE1EB;} + .d2-3149817923 .background-color-N6{background-color:#EEF1F8;} + .d2-3149817923 .background-color-N7{background-color:#FFFFFF;} + .d2-3149817923 .background-color-B1{background-color:#0D32B2;} + .d2-3149817923 .background-color-B2{background-color:#0D32B2;} + .d2-3149817923 .background-color-B3{background-color:#E3E9FD;} + .d2-3149817923 .background-color-B4{background-color:#E3E9FD;} + .d2-3149817923 .background-color-B5{background-color:#EDF0FD;} + .d2-3149817923 .background-color-B6{background-color:#F7F8FE;} + .d2-3149817923 .background-color-AA2{background-color:#4A6FF3;} + .d2-3149817923 .background-color-AA4{background-color:#EDF0FD;} + .d2-3149817923 .background-color-AA5{background-color:#F7F8FE;} + .d2-3149817923 .background-color-AB4{background-color:#EDF0FD;} + .d2-3149817923 .background-color-AB5{background-color:#F7F8FE;} + .d2-3149817923 .color-N1{color:#0A0F25;} + .d2-3149817923 .color-N2{color:#676C7E;} + .d2-3149817923 .color-N3{color:#9499AB;} + .d2-3149817923 .color-N4{color:#CFD2DD;} + .d2-3149817923 .color-N5{color:#DEE1EB;} + .d2-3149817923 .color-N6{color:#EEF1F8;} + .d2-3149817923 .color-N7{color:#FFFFFF;} + .d2-3149817923 .color-B1{color:#0D32B2;} + .d2-3149817923 .color-B2{color:#0D32B2;} + .d2-3149817923 .color-B3{color:#E3E9FD;} + .d2-3149817923 .color-B4{color:#E3E9FD;} + .d2-3149817923 .color-B5{color:#EDF0FD;} + .d2-3149817923 .color-B6{color:#F7F8FE;} + .d2-3149817923 .color-AA2{color:#4A6FF3;} + .d2-3149817923 .color-AA4{color:#EDF0FD;} + .d2-3149817923 .color-AA5{color:#F7F8FE;} + .d2-3149817923 .color-AB4{color:#EDF0FD;} + .d2-3149817923 .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}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg index ac1f5a7fb..ffb9ded61 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault + + + + + + + + + + diff --git a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg index e0184e4f9..5e0006e71 100644 --- a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -my network - + \ No newline at end of file diff --git a/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg b/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg index f1233f4cb..549b44c3d 100644 --- a/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -my network - + \ No newline at end of file diff --git a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg index 89dba0b46..c7e01b108 100644 --- a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -mainrootxyzxyz - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/root-container/elk/sketch.exp.svg b/e2etests/testdata/regression/root-container/elk/sketch.exp.svg index 6ccd70f53..c3e7d378d 100644 --- a/e2etests/testdata/regression/root-container/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -mainrootxyzxyz - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg index 56d81f143..273cad7ae 100644 --- a/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ab04:20,11:20loop through each table start_time = datetime.datetime.now + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg index 56d81f143..273cad7ae 100644 --- a/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ab04:20,11:20loop through each table start_time = datetime.datetime.now + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg index 6518876ba..2903b1d4a 100644 --- a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -foofoobarabcd - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg index 2d36ed64b..eb7174f7d 100644 --- a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -foofoobarabcd - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg index 343235679..6ef98f4c2 100644 --- a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -AB - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg index 343235679..6ef98f4c2 100644 --- a/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -AB - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg index f3e9d487b..5d50dbbb7 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + + + diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg index f3e9d487b..5d50dbbb7 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + + + diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg index a73f6801b..ebe9e215e 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -b - + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg index a73f6801b..ebe9e215e 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -b - + \ No newline at end of file diff --git a/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg b/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg index 73817ce1e..1cb8c69be 100644 --- a/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK - + .d2-1684363094 .fill-N1{fill:#0A0F25;} + .d2-1684363094 .fill-N2{fill:#676C7E;} + .d2-1684363094 .fill-N3{fill:#9499AB;} + .d2-1684363094 .fill-N4{fill:#CFD2DD;} + .d2-1684363094 .fill-N5{fill:#DEE1EB;} + .d2-1684363094 .fill-N6{fill:#EEF1F8;} + .d2-1684363094 .fill-N7{fill:#FFFFFF;} + .d2-1684363094 .fill-B1{fill:#0D32B2;} + .d2-1684363094 .fill-B2{fill:#0D32B2;} + .d2-1684363094 .fill-B3{fill:#E3E9FD;} + .d2-1684363094 .fill-B4{fill:#E3E9FD;} + .d2-1684363094 .fill-B5{fill:#EDF0FD;} + .d2-1684363094 .fill-B6{fill:#F7F8FE;} + .d2-1684363094 .fill-AA2{fill:#4A6FF3;} + .d2-1684363094 .fill-AA4{fill:#EDF0FD;} + .d2-1684363094 .fill-AA5{fill:#F7F8FE;} + .d2-1684363094 .fill-AB4{fill:#EDF0FD;} + .d2-1684363094 .fill-AB5{fill:#F7F8FE;} + .d2-1684363094 .stroke-N1{stroke:#0A0F25;} + .d2-1684363094 .stroke-N2{stroke:#676C7E;} + .d2-1684363094 .stroke-N3{stroke:#9499AB;} + .d2-1684363094 .stroke-N4{stroke:#CFD2DD;} + .d2-1684363094 .stroke-N5{stroke:#DEE1EB;} + .d2-1684363094 .stroke-N6{stroke:#EEF1F8;} + .d2-1684363094 .stroke-N7{stroke:#FFFFFF;} + .d2-1684363094 .stroke-B1{stroke:#0D32B2;} + .d2-1684363094 .stroke-B2{stroke:#0D32B2;} + .d2-1684363094 .stroke-B3{stroke:#E3E9FD;} + .d2-1684363094 .stroke-B4{stroke:#E3E9FD;} + .d2-1684363094 .stroke-B5{stroke:#EDF0FD;} + .d2-1684363094 .stroke-B6{stroke:#F7F8FE;} + .d2-1684363094 .stroke-AA2{stroke:#4A6FF3;} + .d2-1684363094 .stroke-AA4{stroke:#EDF0FD;} + .d2-1684363094 .stroke-AA5{stroke:#F7F8FE;} + .d2-1684363094 .stroke-AB4{stroke:#EDF0FD;} + .d2-1684363094 .stroke-AB5{stroke:#F7F8FE;} + .d2-1684363094 .background-color-N1{background-color:#0A0F25;} + .d2-1684363094 .background-color-N2{background-color:#676C7E;} + .d2-1684363094 .background-color-N3{background-color:#9499AB;} + .d2-1684363094 .background-color-N4{background-color:#CFD2DD;} + .d2-1684363094 .background-color-N5{background-color:#DEE1EB;} + .d2-1684363094 .background-color-N6{background-color:#EEF1F8;} + .d2-1684363094 .background-color-N7{background-color:#FFFFFF;} + .d2-1684363094 .background-color-B1{background-color:#0D32B2;} + .d2-1684363094 .background-color-B2{background-color:#0D32B2;} + .d2-1684363094 .background-color-B3{background-color:#E3E9FD;} + .d2-1684363094 .background-color-B4{background-color:#E3E9FD;} + .d2-1684363094 .background-color-B5{background-color:#EDF0FD;} + .d2-1684363094 .background-color-B6{background-color:#F7F8FE;} + .d2-1684363094 .background-color-AA2{background-color:#4A6FF3;} + .d2-1684363094 .background-color-AA4{background-color:#EDF0FD;} + .d2-1684363094 .background-color-AA5{background-color:#F7F8FE;} + .d2-1684363094 .background-color-AB4{background-color:#EDF0FD;} + .d2-1684363094 .background-color-AB5{background-color:#F7F8FE;} + .d2-1684363094 .color-N1{color:#0A0F25;} + .d2-1684363094 .color-N2{color:#676C7E;} + .d2-1684363094 .color-N3{color:#9499AB;} + .d2-1684363094 .color-N4{color:#CFD2DD;} + .d2-1684363094 .color-N5{color:#DEE1EB;} + .d2-1684363094 .color-N6{color:#EEF1F8;} + .d2-1684363094 .color-N7{color:#FFFFFF;} + .d2-1684363094 .color-B1{color:#0D32B2;} + .d2-1684363094 .color-B2{color:#0D32B2;} + .d2-1684363094 .color-B3{color:#E3E9FD;} + .d2-1684363094 .color-B4{color:#E3E9FD;} + .d2-1684363094 .color-B5{color:#EDF0FD;} + .d2-1684363094 .color-B6{color:#F7F8FE;} + .d2-1684363094 .color-AA2{color:#4A6FF3;} + .d2-1684363094 .color-AA4{color:#EDF0FD;} + .d2-1684363094 .color-AA5{color:#F7F8FE;} + .d2-1684363094 .color-AB4{color:#EDF0FD;} + .d2-1684363094 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json index b68be23ec..3c6ee9d9e 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -110,7 +110,7 @@ "x": 566, "y": 12 }, - "width": 594, + "width": 592, "height": 108, "opacity": 1, "strokeDash": 0, @@ -155,7 +155,9 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -183,7 +185,9 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg index e0461bb9b..f2874e57f 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-1261803308 .fill-N1{fill:#0A0F25;} + .d2-1261803308 .fill-N2{fill:#676C7E;} + .d2-1261803308 .fill-N3{fill:#9499AB;} + .d2-1261803308 .fill-N4{fill:#CFD2DD;} + .d2-1261803308 .fill-N5{fill:#DEE1EB;} + .d2-1261803308 .fill-N6{fill:#EEF1F8;} + .d2-1261803308 .fill-N7{fill:#FFFFFF;} + .d2-1261803308 .fill-B1{fill:#0D32B2;} + .d2-1261803308 .fill-B2{fill:#0D32B2;} + .d2-1261803308 .fill-B3{fill:#E3E9FD;} + .d2-1261803308 .fill-B4{fill:#E3E9FD;} + .d2-1261803308 .fill-B5{fill:#EDF0FD;} + .d2-1261803308 .fill-B6{fill:#F7F8FE;} + .d2-1261803308 .fill-AA2{fill:#4A6FF3;} + .d2-1261803308 .fill-AA4{fill:#EDF0FD;} + .d2-1261803308 .fill-AA5{fill:#F7F8FE;} + .d2-1261803308 .fill-AB4{fill:#EDF0FD;} + .d2-1261803308 .fill-AB5{fill:#F7F8FE;} + .d2-1261803308 .stroke-N1{stroke:#0A0F25;} + .d2-1261803308 .stroke-N2{stroke:#676C7E;} + .d2-1261803308 .stroke-N3{stroke:#9499AB;} + .d2-1261803308 .stroke-N4{stroke:#CFD2DD;} + .d2-1261803308 .stroke-N5{stroke:#DEE1EB;} + .d2-1261803308 .stroke-N6{stroke:#EEF1F8;} + .d2-1261803308 .stroke-N7{stroke:#FFFFFF;} + .d2-1261803308 .stroke-B1{stroke:#0D32B2;} + .d2-1261803308 .stroke-B2{stroke:#0D32B2;} + .d2-1261803308 .stroke-B3{stroke:#E3E9FD;} + .d2-1261803308 .stroke-B4{stroke:#E3E9FD;} + .d2-1261803308 .stroke-B5{stroke:#EDF0FD;} + .d2-1261803308 .stroke-B6{stroke:#F7F8FE;} + .d2-1261803308 .stroke-AA2{stroke:#4A6FF3;} + .d2-1261803308 .stroke-AA4{stroke:#EDF0FD;} + .d2-1261803308 .stroke-AA5{stroke:#F7F8FE;} + .d2-1261803308 .stroke-AB4{stroke:#EDF0FD;} + .d2-1261803308 .stroke-AB5{stroke:#F7F8FE;} + .d2-1261803308 .background-color-N1{background-color:#0A0F25;} + .d2-1261803308 .background-color-N2{background-color:#676C7E;} + .d2-1261803308 .background-color-N3{background-color:#9499AB;} + .d2-1261803308 .background-color-N4{background-color:#CFD2DD;} + .d2-1261803308 .background-color-N5{background-color:#DEE1EB;} + .d2-1261803308 .background-color-N6{background-color:#EEF1F8;} + .d2-1261803308 .background-color-N7{background-color:#FFFFFF;} + .d2-1261803308 .background-color-B1{background-color:#0D32B2;} + .d2-1261803308 .background-color-B2{background-color:#0D32B2;} + .d2-1261803308 .background-color-B3{background-color:#E3E9FD;} + .d2-1261803308 .background-color-B4{background-color:#E3E9FD;} + .d2-1261803308 .background-color-B5{background-color:#EDF0FD;} + .d2-1261803308 .background-color-B6{background-color:#F7F8FE;} + .d2-1261803308 .background-color-AA2{background-color:#4A6FF3;} + .d2-1261803308 .background-color-AA4{background-color:#EDF0FD;} + .d2-1261803308 .background-color-AA5{background-color:#F7F8FE;} + .d2-1261803308 .background-color-AB4{background-color:#EDF0FD;} + .d2-1261803308 .background-color-AB5{background-color:#F7F8FE;} + .d2-1261803308 .color-N1{color:#0A0F25;} + .d2-1261803308 .color-N2{color:#676C7E;} + .d2-1261803308 .color-N3{color:#9499AB;} + .d2-1261803308 .color-N4{color:#CFD2DD;} + .d2-1261803308 .color-N5{color:#DEE1EB;} + .d2-1261803308 .color-N6{color:#EEF1F8;} + .d2-1261803308 .color-N7{color:#FFFFFF;} + .d2-1261803308 .color-B1{color:#0D32B2;} + .d2-1261803308 .color-B2{color:#0D32B2;} + .d2-1261803308 .color-B3{color:#E3E9FD;} + .d2-1261803308 .color-B4{color:#E3E9FD;} + .d2-1261803308 .color-B5{color:#EDF0FD;} + .d2-1261803308 .color-B6{color:#F7F8FE;} + .d2-1261803308 .color-AA2{color:#4A6FF3;} + .d2-1261803308 .color-AA4{color:#EDF0FD;} + .d2-1261803308 .color-AA5{color:#F7F8FE;} + .d2-1261803308 .color-AB4{color:#EDF0FD;} + .d2-1261803308 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg index c9ae0eb6e..44d3daa25 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg index 29e2dce86..87a8bf13c 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index 324862fbd..7d9070e88 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ --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..3207efd8a 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/root/border-radius/dagre/sketch.exp.svg b/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg index d4d66512b..418187501 100644 --- a/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/border-radius/elk/sketch.exp.svg b/e2etests/testdata/root/border-radius/elk/sketch.exp.svg index 1339ca388..ddf345162 100644 --- a/e2etests/testdata/root/border-radius/elk/sketch.exp.svg +++ b/e2etests/testdata/root/border-radius/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/double-border/dagre/sketch.exp.svg b/e2etests/testdata/root/double-border/dagre/sketch.exp.svg index 0447d8320..c57e50cde 100644 --- a/e2etests/testdata/root/double-border/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/double-border/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/double-border/elk/sketch.exp.svg b/e2etests/testdata/root/double-border/elk/sketch.exp.svg index 1770bd71f..7a8e514ac 100644 --- a/e2etests/testdata/root/double-border/elk/sketch.exp.svg +++ b/e2etests/testdata/root/double-border/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg b/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg index 48ae9bb17..b25e30fa3 100644 --- a/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg b/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg index bb7c83633..2faa3d02d 100644 --- a/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg +++ b/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/fill/dagre/sketch.exp.svg b/e2etests/testdata/root/fill/dagre/sketch.exp.svg index 7d518c004..ac6c638bc 100644 --- a/e2etests/testdata/root/fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/fill/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/fill/elk/sketch.exp.svg b/e2etests/testdata/root/fill/elk/sketch.exp.svg index 50e49412f..a17b61d77 100644 --- a/e2etests/testdata/root/fill/elk/sketch.exp.svg +++ b/e2etests/testdata/root/fill/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg b/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg index d9b76177a..a1b14248d 100644 --- a/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg b/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg index e74a3219d..f5602732e 100644 --- a/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg b/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg index a131b9d7e..637af0d1c 100644 --- a/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg b/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg index 8ffa19d97..d183c87b5 100644 --- a/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg b/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg index 39902ac4e..e509a66b0 100644 --- a/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg b/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg index 4f37c7026..de8263bc0 100644 --- a/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -we all livein a LightSteelBluesubmarine - + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg index 6ce717945..e7171621a 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abc - + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg index 73e9130d7..9c25bb055 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abc - + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg b/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg index ad436fdfa..3b8148501 100644 --- a/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ab - + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/basic/elk/sketch.exp.svg b/e2etests/testdata/sanity/basic/elk/sketch.exp.svg index f773277ac..dac7e2756 100644 --- a/e2etests/testdata/sanity/basic/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/basic/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ab - + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg index 6778cb3fb..00eb18985 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -acbd - + + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg b/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg index a446f5108..1101e2e53 100644 --- a/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -acbd - + + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg index 872c6dad5..04e56647d 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ab hello + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg index 807fbe480..0f8295888 100644 --- a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ab hello + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg index fd3586e45..cae6cbc98 100644 --- a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg index 14664c71e..1934530d5 100644 --- a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg index 5ccdf4033..429e5b9bb 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg index 47596f89f..76989c9dd 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg index baa7b522d..4904853c2 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/animated/elk/sketch.exp.svg b/e2etests/testdata/stable/animated/elk/sketch.exp.svg index 900d01992..79b379bba 100644 --- a/e2etests/testdata/stable/animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/animated/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear + + + + + + + + + + + + + \ 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..28da2492e 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..f05e35fb7 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/arrowhead_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg index 50dffb9f1..df21aee3c 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abc * - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg index 7c54fb238..698f0aa39 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abc * - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg index b0217a8eb..73478444e 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ab To err is human, to moo bovine1* + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg index b3fedcf52..1ff063e32 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ab To err is human, to moo bovine1* + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg index 7e4cf6264..0adedcfd4 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg index c9c007d71..9508754c9 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg index fcbd8ec11..94fa5f5f4 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghijklmno - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg index 162e3b4f9..03e1f25ce 100644 --- a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghijklmno - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg index d425008a1..5e0f09e53 100644 --- a/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index 219d1b16a..f5ac51868 100644 --- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcd circle filled-circle + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg index 038e6b9a9..065ee383b 100644 --- a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcd circle filled-circle + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg index 90119db80..bea32ac65 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abc - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg index 3bef396a1..2bf96323b 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abc - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/class/dagre/sketch.exp.svg b/e2etests/testdata/stable/class/dagre/sketch.exp.svg index ce82a5450..39f265fc0 100644 --- a/e2etests/testdata/stable/class/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d - + .d2-2645559164 .fill-N1{fill:#0A0F25;} + .d2-2645559164 .fill-N2{fill:#676C7E;} + .d2-2645559164 .fill-N3{fill:#9499AB;} + .d2-2645559164 .fill-N4{fill:#CFD2DD;} + .d2-2645559164 .fill-N5{fill:#DEE1EB;} + .d2-2645559164 .fill-N6{fill:#EEF1F8;} + .d2-2645559164 .fill-N7{fill:#FFFFFF;} + .d2-2645559164 .fill-B1{fill:#0D32B2;} + .d2-2645559164 .fill-B2{fill:#0D32B2;} + .d2-2645559164 .fill-B3{fill:#E3E9FD;} + .d2-2645559164 .fill-B4{fill:#E3E9FD;} + .d2-2645559164 .fill-B5{fill:#EDF0FD;} + .d2-2645559164 .fill-B6{fill:#F7F8FE;} + .d2-2645559164 .fill-AA2{fill:#4A6FF3;} + .d2-2645559164 .fill-AA4{fill:#EDF0FD;} + .d2-2645559164 .fill-AA5{fill:#F7F8FE;} + .d2-2645559164 .fill-AB4{fill:#EDF0FD;} + .d2-2645559164 .fill-AB5{fill:#F7F8FE;} + .d2-2645559164 .stroke-N1{stroke:#0A0F25;} + .d2-2645559164 .stroke-N2{stroke:#676C7E;} + .d2-2645559164 .stroke-N3{stroke:#9499AB;} + .d2-2645559164 .stroke-N4{stroke:#CFD2DD;} + .d2-2645559164 .stroke-N5{stroke:#DEE1EB;} + .d2-2645559164 .stroke-N6{stroke:#EEF1F8;} + .d2-2645559164 .stroke-N7{stroke:#FFFFFF;} + .d2-2645559164 .stroke-B1{stroke:#0D32B2;} + .d2-2645559164 .stroke-B2{stroke:#0D32B2;} + .d2-2645559164 .stroke-B3{stroke:#E3E9FD;} + .d2-2645559164 .stroke-B4{stroke:#E3E9FD;} + .d2-2645559164 .stroke-B5{stroke:#EDF0FD;} + .d2-2645559164 .stroke-B6{stroke:#F7F8FE;} + .d2-2645559164 .stroke-AA2{stroke:#4A6FF3;} + .d2-2645559164 .stroke-AA4{stroke:#EDF0FD;} + .d2-2645559164 .stroke-AA5{stroke:#F7F8FE;} + .d2-2645559164 .stroke-AB4{stroke:#EDF0FD;} + .d2-2645559164 .stroke-AB5{stroke:#F7F8FE;} + .d2-2645559164 .background-color-N1{background-color:#0A0F25;} + .d2-2645559164 .background-color-N2{background-color:#676C7E;} + .d2-2645559164 .background-color-N3{background-color:#9499AB;} + .d2-2645559164 .background-color-N4{background-color:#CFD2DD;} + .d2-2645559164 .background-color-N5{background-color:#DEE1EB;} + .d2-2645559164 .background-color-N6{background-color:#EEF1F8;} + .d2-2645559164 .background-color-N7{background-color:#FFFFFF;} + .d2-2645559164 .background-color-B1{background-color:#0D32B2;} + .d2-2645559164 .background-color-B2{background-color:#0D32B2;} + .d2-2645559164 .background-color-B3{background-color:#E3E9FD;} + .d2-2645559164 .background-color-B4{background-color:#E3E9FD;} + .d2-2645559164 .background-color-B5{background-color:#EDF0FD;} + .d2-2645559164 .background-color-B6{background-color:#F7F8FE;} + .d2-2645559164 .background-color-AA2{background-color:#4A6FF3;} + .d2-2645559164 .background-color-AA4{background-color:#EDF0FD;} + .d2-2645559164 .background-color-AA5{background-color:#F7F8FE;} + .d2-2645559164 .background-color-AB4{background-color:#EDF0FD;} + .d2-2645559164 .background-color-AB5{background-color:#F7F8FE;} + .d2-2645559164 .color-N1{color:#0A0F25;} + .d2-2645559164 .color-N2{color:#676C7E;} + .d2-2645559164 .color-N3{color:#9499AB;} + .d2-2645559164 .color-N4{color:#CFD2DD;} + .d2-2645559164 .color-N5{color:#DEE1EB;} + .d2-2645559164 .color-N6{color:#EEF1F8;} + .d2-2645559164 .color-N7{color:#FFFFFF;} + .d2-2645559164 .color-B1{color:#0D32B2;} + .d2-2645559164 .color-B2{color:#0D32B2;} + .d2-2645559164 .color-B3{color:#E3E9FD;} + .d2-2645559164 .color-B4{color:#E3E9FD;} + .d2-2645559164 .color-B5{color:#EDF0FD;} + .d2-2645559164 .color-B6{color:#F7F8FE;} + .d2-2645559164 .color-AA2{color:#4A6FF3;} + .d2-2645559164 .color-AA4{color:#EDF0FD;} + .d2-2645559164 .color-AA5{color:#F7F8FE;} + .d2-2645559164 .color-AB4{color:#EDF0FD;} + .d2-2645559164 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json index 557561b09..9e58c1d09 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 14 }, - "width": 439, + "width": 437, "height": 180, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -139,7 +145,7 @@ "labelWidth": 219, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -163,7 +169,7 @@ "id": "b", "type": "class", "pos": { - "x": 471, + "x": 469, "y": 12 }, "width": 407, @@ -218,7 +224,7 @@ "id": "c", "type": "class", "pos": { - "x": 898, + "x": 896, "y": 58 }, "width": 117, @@ -261,7 +267,7 @@ "id": "d", "type": "sql_table", "pos": { - "x": 1035, + "x": 1033, "y": 86 }, "width": 50, diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg index f8af9686a..00db2bd81 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-466630064 .fill-N1{fill:#0A0F25;} + .d2-466630064 .fill-N2{fill:#676C7E;} + .d2-466630064 .fill-N3{fill:#9499AB;} + .d2-466630064 .fill-N4{fill:#CFD2DD;} + .d2-466630064 .fill-N5{fill:#DEE1EB;} + .d2-466630064 .fill-N6{fill:#EEF1F8;} + .d2-466630064 .fill-N7{fill:#FFFFFF;} + .d2-466630064 .fill-B1{fill:#0D32B2;} + .d2-466630064 .fill-B2{fill:#0D32B2;} + .d2-466630064 .fill-B3{fill:#E3E9FD;} + .d2-466630064 .fill-B4{fill:#E3E9FD;} + .d2-466630064 .fill-B5{fill:#EDF0FD;} + .d2-466630064 .fill-B6{fill:#F7F8FE;} + .d2-466630064 .fill-AA2{fill:#4A6FF3;} + .d2-466630064 .fill-AA4{fill:#EDF0FD;} + .d2-466630064 .fill-AA5{fill:#F7F8FE;} + .d2-466630064 .fill-AB4{fill:#EDF0FD;} + .d2-466630064 .fill-AB5{fill:#F7F8FE;} + .d2-466630064 .stroke-N1{stroke:#0A0F25;} + .d2-466630064 .stroke-N2{stroke:#676C7E;} + .d2-466630064 .stroke-N3{stroke:#9499AB;} + .d2-466630064 .stroke-N4{stroke:#CFD2DD;} + .d2-466630064 .stroke-N5{stroke:#DEE1EB;} + .d2-466630064 .stroke-N6{stroke:#EEF1F8;} + .d2-466630064 .stroke-N7{stroke:#FFFFFF;} + .d2-466630064 .stroke-B1{stroke:#0D32B2;} + .d2-466630064 .stroke-B2{stroke:#0D32B2;} + .d2-466630064 .stroke-B3{stroke:#E3E9FD;} + .d2-466630064 .stroke-B4{stroke:#E3E9FD;} + .d2-466630064 .stroke-B5{stroke:#EDF0FD;} + .d2-466630064 .stroke-B6{stroke:#F7F8FE;} + .d2-466630064 .stroke-AA2{stroke:#4A6FF3;} + .d2-466630064 .stroke-AA4{stroke:#EDF0FD;} + .d2-466630064 .stroke-AA5{stroke:#F7F8FE;} + .d2-466630064 .stroke-AB4{stroke:#EDF0FD;} + .d2-466630064 .stroke-AB5{stroke:#F7F8FE;} + .d2-466630064 .background-color-N1{background-color:#0A0F25;} + .d2-466630064 .background-color-N2{background-color:#676C7E;} + .d2-466630064 .background-color-N3{background-color:#9499AB;} + .d2-466630064 .background-color-N4{background-color:#CFD2DD;} + .d2-466630064 .background-color-N5{background-color:#DEE1EB;} + .d2-466630064 .background-color-N6{background-color:#EEF1F8;} + .d2-466630064 .background-color-N7{background-color:#FFFFFF;} + .d2-466630064 .background-color-B1{background-color:#0D32B2;} + .d2-466630064 .background-color-B2{background-color:#0D32B2;} + .d2-466630064 .background-color-B3{background-color:#E3E9FD;} + .d2-466630064 .background-color-B4{background-color:#E3E9FD;} + .d2-466630064 .background-color-B5{background-color:#EDF0FD;} + .d2-466630064 .background-color-B6{background-color:#F7F8FE;} + .d2-466630064 .background-color-AA2{background-color:#4A6FF3;} + .d2-466630064 .background-color-AA4{background-color:#EDF0FD;} + .d2-466630064 .background-color-AA5{background-color:#F7F8FE;} + .d2-466630064 .background-color-AB4{background-color:#EDF0FD;} + .d2-466630064 .background-color-AB5{background-color:#F7F8FE;} + .d2-466630064 .color-N1{color:#0A0F25;} + .d2-466630064 .color-N2{color:#676C7E;} + .d2-466630064 .color-N3{color:#9499AB;} + .d2-466630064 .color-N4{color:#CFD2DD;} + .d2-466630064 .color-N5{color:#DEE1EB;} + .d2-466630064 .color-N6{color:#EEF1F8;} + .d2-466630064 .color-N7{color:#FFFFFF;} + .d2-466630064 .color-B1{color:#0D32B2;} + .d2-466630064 .color-B2{color:#0D32B2;} + .d2-466630064 .color-B3{color:#E3E9FD;} + .d2-466630064 .color-B4{color:#E3E9FD;} + .d2-466630064 .color-B5{color:#EDF0FD;} + .d2-466630064 .color-B6{color:#F7F8FE;} + .d2-466630064 .color-AA2{color:#4A6FF3;} + .d2-466630064 .color-AA4{color:#EDF0FD;} + .d2-466630064 .color-AA5{color:#F7F8FE;} + .d2-466630064 .color-AB4{color:#EDF0FD;} + .d2-466630064 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + \ No newline at end of file diff --git a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg index c1d5e0e8e..e8388a3da 100644 --- a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -*** thenthen + + \ No newline at end of file diff --git a/e2etests/testdata/stable/classes/elk/sketch.exp.svg b/e2etests/testdata/stable/classes/elk/sketch.exp.svg index fc9be5172..dfeb45004 100644 --- a/e2etests/testdata/stable/classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -*** thenthen + + \ No newline at end of file diff --git a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg index b83d47dc7..769193474 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -windowroofgarage - + + + blindsglass - + + shinglesstarlinkutility hookup - + + + toolsvehicles - + + find contractorscraigslistfacebook - + + + find contractorssolicit quotescraigslistfacebook - + + + + find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook - + + + + + + find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook - + + + + + + + windowroofgaragewaterrainthunder - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg index 1763abe67..2df6ed2a5 100644 --- a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -windowroofgarage - + + + blindsglass - + + shinglesstarlinkutility hookup - + + + toolsvehicles - + + find contractorscraigslistfacebook - + + + find contractorssolicit quotescraigslistfacebook - + + + + find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook - + + + + + + find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook - + + + + + + + windowroofgaragewaterrainthunder - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg index 3d0883a17..179dd14c5 100644 --- a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -acfbdhg - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg b/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg index 628ac8564..d72caaf5c 100644 --- a/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -acfbdhg - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg b/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg index af104d4a4..c441d40e2 100644 --- a/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -agdfbhec - - + .d2-1919566525 .fill-N1{fill:#0A0F25;} + .d2-1919566525 .fill-N2{fill:#676C7E;} + .d2-1919566525 .fill-N3{fill:#9499AB;} + .d2-1919566525 .fill-N4{fill:#CFD2DD;} + .d2-1919566525 .fill-N5{fill:#DEE1EB;} + .d2-1919566525 .fill-N6{fill:#EEF1F8;} + .d2-1919566525 .fill-N7{fill:#FFFFFF;} + .d2-1919566525 .fill-B1{fill:#0D32B2;} + .d2-1919566525 .fill-B2{fill:#0D32B2;} + .d2-1919566525 .fill-B3{fill:#E3E9FD;} + .d2-1919566525 .fill-B4{fill:#E3E9FD;} + .d2-1919566525 .fill-B5{fill:#EDF0FD;} + .d2-1919566525 .fill-B6{fill:#F7F8FE;} + .d2-1919566525 .fill-AA2{fill:#4A6FF3;} + .d2-1919566525 .fill-AA4{fill:#EDF0FD;} + .d2-1919566525 .fill-AA5{fill:#F7F8FE;} + .d2-1919566525 .fill-AB4{fill:#EDF0FD;} + .d2-1919566525 .fill-AB5{fill:#F7F8FE;} + .d2-1919566525 .stroke-N1{stroke:#0A0F25;} + .d2-1919566525 .stroke-N2{stroke:#676C7E;} + .d2-1919566525 .stroke-N3{stroke:#9499AB;} + .d2-1919566525 .stroke-N4{stroke:#CFD2DD;} + .d2-1919566525 .stroke-N5{stroke:#DEE1EB;} + .d2-1919566525 .stroke-N6{stroke:#EEF1F8;} + .d2-1919566525 .stroke-N7{stroke:#FFFFFF;} + .d2-1919566525 .stroke-B1{stroke:#0D32B2;} + .d2-1919566525 .stroke-B2{stroke:#0D32B2;} + .d2-1919566525 .stroke-B3{stroke:#E3E9FD;} + .d2-1919566525 .stroke-B4{stroke:#E3E9FD;} + .d2-1919566525 .stroke-B5{stroke:#EDF0FD;} + .d2-1919566525 .stroke-B6{stroke:#F7F8FE;} + .d2-1919566525 .stroke-AA2{stroke:#4A6FF3;} + .d2-1919566525 .stroke-AA4{stroke:#EDF0FD;} + .d2-1919566525 .stroke-AA5{stroke:#F7F8FE;} + .d2-1919566525 .stroke-AB4{stroke:#EDF0FD;} + .d2-1919566525 .stroke-AB5{stroke:#F7F8FE;} + .d2-1919566525 .background-color-N1{background-color:#0A0F25;} + .d2-1919566525 .background-color-N2{background-color:#676C7E;} + .d2-1919566525 .background-color-N3{background-color:#9499AB;} + .d2-1919566525 .background-color-N4{background-color:#CFD2DD;} + .d2-1919566525 .background-color-N5{background-color:#DEE1EB;} + .d2-1919566525 .background-color-N6{background-color:#EEF1F8;} + .d2-1919566525 .background-color-N7{background-color:#FFFFFF;} + .d2-1919566525 .background-color-B1{background-color:#0D32B2;} + .d2-1919566525 .background-color-B2{background-color:#0D32B2;} + .d2-1919566525 .background-color-B3{background-color:#E3E9FD;} + .d2-1919566525 .background-color-B4{background-color:#E3E9FD;} + .d2-1919566525 .background-color-B5{background-color:#EDF0FD;} + .d2-1919566525 .background-color-B6{background-color:#F7F8FE;} + .d2-1919566525 .background-color-AA2{background-color:#4A6FF3;} + .d2-1919566525 .background-color-AA4{background-color:#EDF0FD;} + .d2-1919566525 .background-color-AA5{background-color:#F7F8FE;} + .d2-1919566525 .background-color-AB4{background-color:#EDF0FD;} + .d2-1919566525 .background-color-AB5{background-color:#F7F8FE;} + .d2-1919566525 .color-N1{color:#0A0F25;} + .d2-1919566525 .color-N2{color:#676C7E;} + .d2-1919566525 .color-N3{color:#9499AB;} + .d2-1919566525 .color-N4{color:#CFD2DD;} + .d2-1919566525 .color-N5{color:#DEE1EB;} + .d2-1919566525 .color-N6{color:#EEF1F8;} + .d2-1919566525 .color-N7{color:#FFFFFF;} + .d2-1919566525 .color-B1{color:#0D32B2;} + .d2-1919566525 .color-B2{color:#0D32B2;} + .d2-1919566525 .color-B3{color:#E3E9FD;} + .d2-1919566525 .color-B4{color:#E3E9FD;} + .d2-1919566525 .color-B5{color:#EDF0FD;} + .d2-1919566525 .color-B6{color:#F7F8FE;} + .d2-1919566525 .color-AA2{color:#4A6FF3;} + .d2-1919566525 .color-AA4{color:#EDF0FD;} + .d2-1919566525 .color-AA5{color:#F7F8FE;} + .d2-1919566525 .color-AB4{color:#EDF0FD;} + .d2-1919566525 .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}]]>agdfbhec + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg index 4a9a8169c..e17bc75a3 100644 --- a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -agdfbhec - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg index 30dcadf89..885fa8bca 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg index 2337a1e4c..a483f9cbe 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg index 0af9d6839..78deb234b 100644 --- a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg index e008163ee..b7c95be02 100644 --- a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg index 26db287a2..1e1c40b21 100644 --- a/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg index 26db287a2..1e1c40b21 100644 --- a/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre-container/dagre/board.exp.json b/e2etests/testdata/stable/dagre-container/dagre/board.exp.json new file mode 100644 index 000000000..ff93ed8e0 --- /dev/null +++ b/e2etests/testdata/stable/dagre-container/dagre/board.exp.json @@ -0,0 +1,424 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 41 + }, + "width": 359, + "height": 125, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.a", + "type": "rectangle", + "pos": { + "x": 40, + "y": 70 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.b", + "type": "rectangle", + "pos": { + "x": 153, + "y": 70 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.c", + "type": "rectangle", + "pos": { + "x": 266, + "y": 70 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 0, + "y": 307 + }, + "width": 359, + "height": 125, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b.a", + "type": "rectangle", + "pos": { + "x": 40, + "y": 336 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b.b", + "type": "rectangle", + "pos": { + "x": 153, + "y": 336 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b.c", + "type": "rectangle", + "pos": { + "x": 266, + "y": 336 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 179.5, + "y": 166 + }, + { + "x": 179.5, + "y": 206 + }, + { + "x": 179.5, + "y": 226 + }, + { + "x": 179.5, + "y": 266 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg new file mode 100644 index 000000000..116abf33f --- /dev/null +++ b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg @@ -0,0 +1,109 @@ +ababcabc + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre-container/elk/board.exp.json b/e2etests/testdata/stable/dagre-container/elk/board.exp.json new file mode 100644 index 000000000..09e17e037 --- /dev/null +++ b/e2etests/testdata/stable/dagre-container/elk/board.exp.json @@ -0,0 +1,415 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 299, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.a", + "type": "rectangle", + "pos": { + "x": 62, + "y": 62 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.b", + "type": "rectangle", + "pos": { + "x": 135, + "y": 62 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.c", + "type": "rectangle", + "pos": { + "x": 208, + "y": 62 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 12, + "y": 248 + }, + "width": 299, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b.a", + "type": "rectangle", + "pos": { + "x": 62, + "y": 298 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b.b", + "type": "rectangle", + "pos": { + "x": 135, + "y": 298 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b.c", + "type": "rectangle", + "pos": { + "x": 208, + "y": 298 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 161.5, + "y": 178 + }, + { + "x": 161.5, + "y": 248 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg new file mode 100644 index 000000000..d7d1c79bd --- /dev/null +++ b/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg @@ -0,0 +1,109 @@ +ababcabc + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg index 1093a08f5..6aedcc551 100644 --- a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghijklmnopq - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dense/elk/sketch.exp.svg b/e2etests/testdata/stable/dense/elk/sketch.exp.svg index 9d90113b2..e3d92c538 100644 --- a/e2etests/testdata/stable/dense/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghijklmnopq - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg index 9e6e5b22c..c555a97a2 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg index c2e274e9a..7e967cd64 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg index 6e1c676a0..40417f25e 100644 --- a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcde12345abcde - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/direction/elk/sketch.exp.svg b/e2etests/testdata/stable/direction/elk/sketch.exp.svg index 5b0e9531e..35730f487 100644 --- a/e2etests/testdata/stable/direction/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcde12345abcde - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg index bc67b8a3d..ec8c7d7b3 100644 --- a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal + + + diff --git a/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg b/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg index c2e0d82a8..7a8c0e914 100644 --- a/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal + + + diff --git a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg index b0427e98e..d203f3c31 100644 --- a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcefg - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg index 023f9df17..e9f202658 100644 --- a/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcefg - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg index fd49cfe9f..63f9fc52e 100644 --- a/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -i can not see the titlex - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg index 5a53c6cf1..c97859b14 100644 --- a/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -i can not see the titlex - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg index 05e393987..74064c23d 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + + + + + + + + + + + diff --git a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg index 56e015809..513aa1d7d 100644 --- a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + + + + + + + + + + + diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json index ec32a6e81..24467c27a 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json @@ -7,10 +7,10 @@ "id": "User", "type": "sql_table", "pos": { - "x": 553, + "x": 519, "y": 0 }, - "width": 218, + "width": 201, "height": 144, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -138,7 +144,7 @@ "x": 0, "y": 283 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -235,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 271, + "x": 254, "y": 283 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -335,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 542, + "x": 508, "y": 265 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -463,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 841, + "x": 790, "y": 283 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -563,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 1064, + "x": 996, "y": 283 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -686,56 +708,56 @@ "labelPercentage": 0, "route": [ { - "x": 770.5, - "y": 22.433000564575195 + "x": 719.5, + "y": 23.70599937438965 }, { - "x": 809.9660034179688, - "y": 4.486000061035156 + "x": 758.9660034179688, + "y": 4.741000175476074 }, { - "x": 822.2999877929688, + "x": 771.2999877929688, "y": 0 }, { - "x": 826, + "x": 775, "y": 0 }, { - "x": 829.698974609375, + "x": 778.698974609375, "y": 0 }, { - "x": 834.6329956054688, + "x": 783.6329956054688, "y": 14.399999618530273 }, { - "x": 838.3330078125, + "x": 787.3330078125, "y": 36 }, { - "x": 842.0330200195312, + "x": 791.0330200195312, "y": 57.599998474121094 }, { - "x": 842.0330200195312, + "x": 791.0330200195312, "y": 86.4000015258789 }, { - "x": 838.3330078125, + "x": 787.3330078125, "y": 108 }, { - "x": 834.6329956054688, + "x": 783.6329956054688, "y": 129.60000610351562 }, { - "x": 809.9660034179688, - "y": 139.51300048828125 + "x": 758.9660034179688, + "y": 139.25799560546875 }, { - "x": 770.5, - "y": 121.56600189208984 + "x": 719.5, + "y": 120.29299926757812 } ], "isCurve": true, @@ -769,56 +791,56 @@ "labelPercentage": 0, "route": [ { - "x": 770.5, - "y": 41.42300033569336 + "x": 719.5, + "y": 42.84199905395508 }, { - "x": 888.6329956054688, - "y": 8.284000396728516 + "x": 837.6329956054688, + "y": 8.567999839782715 }, { - "x": 925.5499877929688, + "x": 874.5499877929688, "y": 0 }, { - "x": 936.625, + "x": 885.625, "y": 0 }, { - "x": 947.7000122070312, + "x": 896.7000122070312, "y": 0 }, { - "x": 962.4660034179688, + "x": 911.4660034179688, "y": 14.399999618530273 }, { - "x": 973.541015625, + "x": 922.541015625, "y": 36 }, { - "x": 984.6160278320312, + "x": 933.6160278320312, "y": 57.599998474121094 }, { - "x": 984.6160278320312, + "x": 933.6160278320312, "y": 86.4000015258789 }, { - "x": 973.541015625, + "x": 922.541015625, "y": 108 }, { - "x": 962.4660034179688, + "x": 911.4660034179688, "y": 129.60000610351562 }, { - "x": 888.6329956054688, - "y": 135.71499633789062 + "x": 837.6329956054688, + "y": 135.43099975585938 }, { - "x": 770.5, - "y": 102.57599639892578 + "x": 719.5, + "y": 101.15699768066406 } ], "isCurve": true, @@ -852,19 +874,19 @@ "labelPercentage": 0, "route": [ { - "x": 552.5, - "y": 97.9749984741211 + "x": 518.5, + "y": 97.51000213623047 }, { - "x": 194.8990020751953, - "y": 183.19500732421875 + "x": 181.2989959716797, + "y": 183.1020050048828 }, { - "x": 105.5, + "x": 97, "y": 220.3000030517578 }, { - "x": 105.5, + "x": 97, "y": 283.5 } ], @@ -899,19 +921,19 @@ "labelPercentage": 0, "route": [ { - "x": 552.5, - "y": 122.67500305175781 + "x": 518.5, + "y": 121.68699645996094 }, { - "x": 411.70001220703125, - "y": 188.13499450683594 + "x": 384.5, + "y": 187.93699645996094 }, { - "x": 376.5, + "x": 351, "y": 220.3000030517578 }, { - "x": 376.5, + "x": 351, "y": 283.5 } ], @@ -946,19 +968,19 @@ "labelPercentage": 0, "route": [ { - "x": 661.5, + "x": 619, "y": 144 }, { - "x": 661.5, + "x": 619, "y": 192.39999389648438 }, { - "x": 661.5, + "x": 619, "y": 216.6999969482422 }, { - "x": 661.5, + "x": 619, "y": 265.5 } ], @@ -993,19 +1015,19 @@ "labelPercentage": 0, "route": [ { - "x": 771.5, - "y": 127.33499908447266 + "x": 720.5, + "y": 126.5739974975586 }, { - "x": 892.2999877929688, - "y": 189.06700134277344 + "x": 834.5, + "y": 188.91400146484375 }, { - "x": 922.5, + "x": 863, "y": 220.3000030517578 }, { - "x": 922.5, + "x": 863, "y": 283.5 } ], @@ -1040,19 +1062,19 @@ "labelPercentage": 0, "route": [ { - "x": 771.5, - "y": 97.56099700927734 + "x": 720.5, + "y": 97.0770034790039 }, { - "x": 1135.5, - "y": 183.11199951171875 + "x": 1064.0999755859375, + "y": 183.01499938964844 }, { - "x": 1226.5, + "x": 1150, "y": 220.3000030517578 }, { - "x": 1226.5, + "x": 1150, "y": 283.5 } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 5dcea3c9b..80984ab8e 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-2324764429 .fill-N1{fill:#0A0F25;} + .d2-2324764429 .fill-N2{fill:#676C7E;} + .d2-2324764429 .fill-N3{fill:#9499AB;} + .d2-2324764429 .fill-N4{fill:#CFD2DD;} + .d2-2324764429 .fill-N5{fill:#DEE1EB;} + .d2-2324764429 .fill-N6{fill:#EEF1F8;} + .d2-2324764429 .fill-N7{fill:#FFFFFF;} + .d2-2324764429 .fill-B1{fill:#0D32B2;} + .d2-2324764429 .fill-B2{fill:#0D32B2;} + .d2-2324764429 .fill-B3{fill:#E3E9FD;} + .d2-2324764429 .fill-B4{fill:#E3E9FD;} + .d2-2324764429 .fill-B5{fill:#EDF0FD;} + .d2-2324764429 .fill-B6{fill:#F7F8FE;} + .d2-2324764429 .fill-AA2{fill:#4A6FF3;} + .d2-2324764429 .fill-AA4{fill:#EDF0FD;} + .d2-2324764429 .fill-AA5{fill:#F7F8FE;} + .d2-2324764429 .fill-AB4{fill:#EDF0FD;} + .d2-2324764429 .fill-AB5{fill:#F7F8FE;} + .d2-2324764429 .stroke-N1{stroke:#0A0F25;} + .d2-2324764429 .stroke-N2{stroke:#676C7E;} + .d2-2324764429 .stroke-N3{stroke:#9499AB;} + .d2-2324764429 .stroke-N4{stroke:#CFD2DD;} + .d2-2324764429 .stroke-N5{stroke:#DEE1EB;} + .d2-2324764429 .stroke-N6{stroke:#EEF1F8;} + .d2-2324764429 .stroke-N7{stroke:#FFFFFF;} + .d2-2324764429 .stroke-B1{stroke:#0D32B2;} + .d2-2324764429 .stroke-B2{stroke:#0D32B2;} + .d2-2324764429 .stroke-B3{stroke:#E3E9FD;} + .d2-2324764429 .stroke-B4{stroke:#E3E9FD;} + .d2-2324764429 .stroke-B5{stroke:#EDF0FD;} + .d2-2324764429 .stroke-B6{stroke:#F7F8FE;} + .d2-2324764429 .stroke-AA2{stroke:#4A6FF3;} + .d2-2324764429 .stroke-AA4{stroke:#EDF0FD;} + .d2-2324764429 .stroke-AA5{stroke:#F7F8FE;} + .d2-2324764429 .stroke-AB4{stroke:#EDF0FD;} + .d2-2324764429 .stroke-AB5{stroke:#F7F8FE;} + .d2-2324764429 .background-color-N1{background-color:#0A0F25;} + .d2-2324764429 .background-color-N2{background-color:#676C7E;} + .d2-2324764429 .background-color-N3{background-color:#9499AB;} + .d2-2324764429 .background-color-N4{background-color:#CFD2DD;} + .d2-2324764429 .background-color-N5{background-color:#DEE1EB;} + .d2-2324764429 .background-color-N6{background-color:#EEF1F8;} + .d2-2324764429 .background-color-N7{background-color:#FFFFFF;} + .d2-2324764429 .background-color-B1{background-color:#0D32B2;} + .d2-2324764429 .background-color-B2{background-color:#0D32B2;} + .d2-2324764429 .background-color-B3{background-color:#E3E9FD;} + .d2-2324764429 .background-color-B4{background-color:#E3E9FD;} + .d2-2324764429 .background-color-B5{background-color:#EDF0FD;} + .d2-2324764429 .background-color-B6{background-color:#F7F8FE;} + .d2-2324764429 .background-color-AA2{background-color:#4A6FF3;} + .d2-2324764429 .background-color-AA4{background-color:#EDF0FD;} + .d2-2324764429 .background-color-AA5{background-color:#F7F8FE;} + .d2-2324764429 .background-color-AB4{background-color:#EDF0FD;} + .d2-2324764429 .background-color-AB5{background-color:#F7F8FE;} + .d2-2324764429 .color-N1{color:#0A0F25;} + .d2-2324764429 .color-N2{color:#676C7E;} + .d2-2324764429 .color-N3{color:#9499AB;} + .d2-2324764429 .color-N4{color:#CFD2DD;} + .d2-2324764429 .color-N5{color:#DEE1EB;} + .d2-2324764429 .color-N6{color:#EEF1F8;} + .d2-2324764429 .color-N7{color:#FFFFFF;} + .d2-2324764429 .color-B1{color:#0D32B2;} + .d2-2324764429 .color-B2{color:#0D32B2;} + .d2-2324764429 .color-B3{color:#E3E9FD;} + .d2-2324764429 .color-B4{color:#E3E9FD;} + .d2-2324764429 .color-B5{color:#EDF0FD;} + .d2-2324764429 .color-B6{color:#F7F8FE;} + .d2-2324764429 .color-AA2{color:#4A6FF3;} + .d2-2324764429 .color-AA4{color:#EDF0FD;} + .d2-2324764429 .color-AA5{color:#F7F8FE;} + .d2-2324764429 .color-AB4{color:#EDF0FD;} + .d2-2324764429 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json index 17bfd3cda..9fd0bdcae 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "User", "type": "sql_table", "pos": { - "x": 453, + "x": 411, "y": 12 }, "width": 280, @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -138,7 +144,7 @@ "x": 12, "y": 377 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -235,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 243, + "x": 226, "y": 377 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -335,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 474, + "x": 440, "y": 377 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -463,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 733, + "x": 682, "y": 377 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -563,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 916, + "x": 848, "y": 377 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -686,19 +708,19 @@ "labelPercentage": 0, "route": [ { - "x": 453.5, + "x": 411, "y": 60 }, { - "x": 365.5, + "x": 323, "y": 60 }, { - "x": 365.5, + "x": 323, "y": 108 }, { - "x": 453.5, + "x": 411, "y": 108 } ], @@ -732,19 +754,19 @@ "labelPercentage": 0, "route": [ { - "x": 733.5, + "x": 691, "y": 108 }, { - "x": 821.5, + "x": 779, "y": 108 }, { - "x": 821.5, + "x": 779, "y": 60 }, { - "x": 733.5, + "x": 691, "y": 60 } ], @@ -778,19 +800,19 @@ "labelPercentage": 0, "route": [ { - "x": 500.1659851074219, + "x": 457.6659851074219, "y": 156 }, { - "x": 500.1659851074219, + "x": 457.6659851074219, "y": 196 }, { - "x": 117.5, + "x": 109, "y": 196 }, { - "x": 117.5, + "x": 109, "y": 377 } ], @@ -824,19 +846,19 @@ "labelPercentage": 0, "route": [ { - "x": 546.8330078125, + "x": 504.3330078125, "y": 156 }, { - "x": 546.8330078125, + "x": 504.3330078125, "y": 246 }, { - "x": 348.5, + "x": 323, "y": 246 }, { - "x": 348.5, + "x": 323, "y": 377 } ], @@ -870,11 +892,11 @@ "labelPercentage": 0, "route": [ { - "x": 593.5, + "x": 551, "y": 156 }, { - "x": 593.5, + "x": 551, "y": 377 } ], @@ -908,19 +930,19 @@ "labelPercentage": 0, "route": [ { - "x": 640.166015625, + "x": 597.666015625, "y": 156 }, { - "x": 640.166015625, + "x": 597.666015625, "y": 246 }, { - "x": 814.5, + "x": 755, "y": 246 }, { - "x": 814.5, + "x": 755, "y": 377 } ], @@ -954,19 +976,19 @@ "labelPercentage": 0, "route": [ { - "x": 686.8330078125, + "x": 644.3330078125, "y": 156 }, { - "x": 686.8330078125, + "x": 644.3330078125, "y": 196 }, { - "x": 1078.5, + "x": 1002, "y": 196 }, { - "x": 1078.5, + "x": 1002, "y": 377 } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index 205bb2374..ce3e87a67 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-251747913 .fill-N1{fill:#0A0F25;} + .d2-251747913 .fill-N2{fill:#676C7E;} + .d2-251747913 .fill-N3{fill:#9499AB;} + .d2-251747913 .fill-N4{fill:#CFD2DD;} + .d2-251747913 .fill-N5{fill:#DEE1EB;} + .d2-251747913 .fill-N6{fill:#EEF1F8;} + .d2-251747913 .fill-N7{fill:#FFFFFF;} + .d2-251747913 .fill-B1{fill:#0D32B2;} + .d2-251747913 .fill-B2{fill:#0D32B2;} + .d2-251747913 .fill-B3{fill:#E3E9FD;} + .d2-251747913 .fill-B4{fill:#E3E9FD;} + .d2-251747913 .fill-B5{fill:#EDF0FD;} + .d2-251747913 .fill-B6{fill:#F7F8FE;} + .d2-251747913 .fill-AA2{fill:#4A6FF3;} + .d2-251747913 .fill-AA4{fill:#EDF0FD;} + .d2-251747913 .fill-AA5{fill:#F7F8FE;} + .d2-251747913 .fill-AB4{fill:#EDF0FD;} + .d2-251747913 .fill-AB5{fill:#F7F8FE;} + .d2-251747913 .stroke-N1{stroke:#0A0F25;} + .d2-251747913 .stroke-N2{stroke:#676C7E;} + .d2-251747913 .stroke-N3{stroke:#9499AB;} + .d2-251747913 .stroke-N4{stroke:#CFD2DD;} + .d2-251747913 .stroke-N5{stroke:#DEE1EB;} + .d2-251747913 .stroke-N6{stroke:#EEF1F8;} + .d2-251747913 .stroke-N7{stroke:#FFFFFF;} + .d2-251747913 .stroke-B1{stroke:#0D32B2;} + .d2-251747913 .stroke-B2{stroke:#0D32B2;} + .d2-251747913 .stroke-B3{stroke:#E3E9FD;} + .d2-251747913 .stroke-B4{stroke:#E3E9FD;} + .d2-251747913 .stroke-B5{stroke:#EDF0FD;} + .d2-251747913 .stroke-B6{stroke:#F7F8FE;} + .d2-251747913 .stroke-AA2{stroke:#4A6FF3;} + .d2-251747913 .stroke-AA4{stroke:#EDF0FD;} + .d2-251747913 .stroke-AA5{stroke:#F7F8FE;} + .d2-251747913 .stroke-AB4{stroke:#EDF0FD;} + .d2-251747913 .stroke-AB5{stroke:#F7F8FE;} + .d2-251747913 .background-color-N1{background-color:#0A0F25;} + .d2-251747913 .background-color-N2{background-color:#676C7E;} + .d2-251747913 .background-color-N3{background-color:#9499AB;} + .d2-251747913 .background-color-N4{background-color:#CFD2DD;} + .d2-251747913 .background-color-N5{background-color:#DEE1EB;} + .d2-251747913 .background-color-N6{background-color:#EEF1F8;} + .d2-251747913 .background-color-N7{background-color:#FFFFFF;} + .d2-251747913 .background-color-B1{background-color:#0D32B2;} + .d2-251747913 .background-color-B2{background-color:#0D32B2;} + .d2-251747913 .background-color-B3{background-color:#E3E9FD;} + .d2-251747913 .background-color-B4{background-color:#E3E9FD;} + .d2-251747913 .background-color-B5{background-color:#EDF0FD;} + .d2-251747913 .background-color-B6{background-color:#F7F8FE;} + .d2-251747913 .background-color-AA2{background-color:#4A6FF3;} + .d2-251747913 .background-color-AA4{background-color:#EDF0FD;} + .d2-251747913 .background-color-AA5{background-color:#F7F8FE;} + .d2-251747913 .background-color-AB4{background-color:#EDF0FD;} + .d2-251747913 .background-color-AB5{background-color:#F7F8FE;} + .d2-251747913 .color-N1{color:#0A0F25;} + .d2-251747913 .color-N2{color:#676C7E;} + .d2-251747913 .color-N3{color:#9499AB;} + .d2-251747913 .color-N4{color:#CFD2DD;} + .d2-251747913 .color-N5{color:#DEE1EB;} + .d2-251747913 .color-N6{color:#EEF1F8;} + .d2-251747913 .color-N7{color:#FFFFFF;} + .d2-251747913 .color-B1{color:#0D32B2;} + .d2-251747913 .color-B2{color:#0D32B2;} + .d2-251747913 .color-B3{color:#E3E9FD;} + .d2-251747913 .color-B4{color:#E3E9FD;} + .d2-251747913 .color-B5{color:#EDF0FD;} + .d2-251747913 .color-B6{color:#F7F8FE;} + .d2-251747913 .color-AA2{color:#4A6FF3;} + .d2-251747913 .color-AA4{color:#EDF0FD;} + .d2-251747913 .color-AA5{color:#F7F8FE;} + .d2-251747913 .color-AB4{color:#EDF0FD;} + .d2-251747913 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index 0ce03b06d..298ceb0cf 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 0, "y": 231 }, - "width": 218, + "width": 201, "height": 144, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -135,10 +141,10 @@ "id": "Pet", "type": "sql_table", "pos": { - "x": 517, + "x": 500, "y": 0 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -235,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 517, + "x": 500, "y": 146 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -335,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 503, + "x": 486, "y": 274 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -463,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 541, + "x": 524, "y": 438 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -563,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 460, + "x": 443, "y": 584 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -686,11 +708,11 @@ "labelPercentage": 0, "route": [ { - "x": 52.67399978637695, + "x": 48.566001892089844, "y": 374.5 }, { - "x": 10.534000396728516, + "x": 9.713000297546387, "y": 428.3659973144531 }, { @@ -706,35 +728,35 @@ "y": 455.29998779296875 }, { - "x": 21.799999237060547, + "x": 20.100000381469727, "y": 462.0329895019531 }, { - "x": 54.5, + "x": 50.25, "y": 467.0830078125 }, { - "x": 87.19999694824219, + "x": 80.4000015258789, "y": 472.13299560546875 }, { - "x": 130.8000030517578, + "x": 120.5999984741211, "y": 472.13299560546875 }, { - "x": 163.5, + "x": 150.75, "y": 467.0830078125 }, { - "x": 196.1999969482422, + "x": 180.89999389648438, "y": 462.0329895019531 }, { - "x": 207.46499633789062, + "x": 191.28599548339844, "y": 428.3659973144531 }, { - "x": 165.3249969482422, + "x": 152.43299865722656, "y": 374.5 } ], @@ -769,11 +791,11 @@ "labelPercentage": 0, "route": [ { - "x": 80.63300323486328, + "x": 74.34500122070312, "y": 374.5 }, { - "x": 16.125999450683594, + "x": 14.869000434875488, "y": 538.2329711914062 }, { @@ -789,35 +811,35 @@ "y": 620.0999755859375 }, { - "x": 21.799999237060547, + "x": 20.100000381469727, "y": 640.5659790039062 }, { - "x": 54.5, + "x": 50.25, "y": 655.916015625 }, { - "x": 87.19999694824219, + "x": 80.4000015258789, "y": 671.2659912109375 }, { - "x": 130.8000030517578, + "x": 120.5999984741211, "y": 671.2659912109375 }, { - "x": 163.5, + "x": 150.75, "y": 655.916015625 }, { - "x": 196.1999969482422, + "x": 180.89999389648438, "y": 640.5659790039062 }, { - "x": 201.8730010986328, + "x": 186.1300048828125, "y": 538.2329711914062 }, { - "x": 137.36599731445312, + "x": 126.65399932861328, "y": 374.5 } ], @@ -852,19 +874,19 @@ "labelPercentage": 0, "route": [ { - "x": 175.63900756835938, + "x": 164.677001953125, "y": 230.5 }, { - "x": 306.3269958496094, + "x": 290.5350036621094, "y": 89.29900360107422 }, { - "x": 374.6000061035156, + "x": 357.6000061035156, "y": 54 }, { - "x": 517, + "x": 500, "y": 54 } ], @@ -899,19 +921,19 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 253.92300415039062 + "x": 201, + "y": 255.9929962158203 }, { - "x": 314.79998779296875, - "y": 210.78399658203125 + "x": 297.79998779296875, + "y": 211.197998046875 }, { - "x": 374.6000061035156, + "x": 357.6000061035156, "y": 200 }, { - "x": 517, + "x": 500, "y": 200 } ], @@ -946,19 +968,19 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 323.114990234375 + "x": 201, + "y": 322.23699951171875 }, { - "x": 314.79998779296875, - "y": 341.4230041503906 + "x": 297.79998779296875, + "y": 341.24700927734375 }, { - "x": 371.79998779296875, + "x": 354.79998779296875, "y": 346 }, { - "x": 503, + "x": 486, "y": 346 } ], @@ -993,19 +1015,19 @@ "labelPercentage": 0, "route": [ { - "x": 197.38699340820312, + "x": 185.6580047607422, "y": 375.5 }, { - "x": 310.677001953125, + "x": 294.7309875488281, "y": 468.70001220703125 }, { - "x": 379.3999938964844, + "x": 362.3999938964844, "y": 492 }, { - "x": 541, + "x": 524, "y": 492 } ], @@ -1040,19 +1062,19 @@ "labelPercentage": 0, "route": [ { - "x": 158.35899353027344, + "x": 148.03500366210938, "y": 375.5 }, { - "x": 302.8710021972656, + "x": 287.2070007324219, "y": 585.5 }, { - "x": 363.20001220703125, + "x": 346.20001220703125, "y": 638 }, { - "x": 460, + "x": 443, "y": 638 } ], diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index b593b9671..177d8bb00 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-1563072179 .fill-N1{fill:#0A0F25;} + .d2-1563072179 .fill-N2{fill:#676C7E;} + .d2-1563072179 .fill-N3{fill:#9499AB;} + .d2-1563072179 .fill-N4{fill:#CFD2DD;} + .d2-1563072179 .fill-N5{fill:#DEE1EB;} + .d2-1563072179 .fill-N6{fill:#EEF1F8;} + .d2-1563072179 .fill-N7{fill:#FFFFFF;} + .d2-1563072179 .fill-B1{fill:#0D32B2;} + .d2-1563072179 .fill-B2{fill:#0D32B2;} + .d2-1563072179 .fill-B3{fill:#E3E9FD;} + .d2-1563072179 .fill-B4{fill:#E3E9FD;} + .d2-1563072179 .fill-B5{fill:#EDF0FD;} + .d2-1563072179 .fill-B6{fill:#F7F8FE;} + .d2-1563072179 .fill-AA2{fill:#4A6FF3;} + .d2-1563072179 .fill-AA4{fill:#EDF0FD;} + .d2-1563072179 .fill-AA5{fill:#F7F8FE;} + .d2-1563072179 .fill-AB4{fill:#EDF0FD;} + .d2-1563072179 .fill-AB5{fill:#F7F8FE;} + .d2-1563072179 .stroke-N1{stroke:#0A0F25;} + .d2-1563072179 .stroke-N2{stroke:#676C7E;} + .d2-1563072179 .stroke-N3{stroke:#9499AB;} + .d2-1563072179 .stroke-N4{stroke:#CFD2DD;} + .d2-1563072179 .stroke-N5{stroke:#DEE1EB;} + .d2-1563072179 .stroke-N6{stroke:#EEF1F8;} + .d2-1563072179 .stroke-N7{stroke:#FFFFFF;} + .d2-1563072179 .stroke-B1{stroke:#0D32B2;} + .d2-1563072179 .stroke-B2{stroke:#0D32B2;} + .d2-1563072179 .stroke-B3{stroke:#E3E9FD;} + .d2-1563072179 .stroke-B4{stroke:#E3E9FD;} + .d2-1563072179 .stroke-B5{stroke:#EDF0FD;} + .d2-1563072179 .stroke-B6{stroke:#F7F8FE;} + .d2-1563072179 .stroke-AA2{stroke:#4A6FF3;} + .d2-1563072179 .stroke-AA4{stroke:#EDF0FD;} + .d2-1563072179 .stroke-AA5{stroke:#F7F8FE;} + .d2-1563072179 .stroke-AB4{stroke:#EDF0FD;} + .d2-1563072179 .stroke-AB5{stroke:#F7F8FE;} + .d2-1563072179 .background-color-N1{background-color:#0A0F25;} + .d2-1563072179 .background-color-N2{background-color:#676C7E;} + .d2-1563072179 .background-color-N3{background-color:#9499AB;} + .d2-1563072179 .background-color-N4{background-color:#CFD2DD;} + .d2-1563072179 .background-color-N5{background-color:#DEE1EB;} + .d2-1563072179 .background-color-N6{background-color:#EEF1F8;} + .d2-1563072179 .background-color-N7{background-color:#FFFFFF;} + .d2-1563072179 .background-color-B1{background-color:#0D32B2;} + .d2-1563072179 .background-color-B2{background-color:#0D32B2;} + .d2-1563072179 .background-color-B3{background-color:#E3E9FD;} + .d2-1563072179 .background-color-B4{background-color:#E3E9FD;} + .d2-1563072179 .background-color-B5{background-color:#EDF0FD;} + .d2-1563072179 .background-color-B6{background-color:#F7F8FE;} + .d2-1563072179 .background-color-AA2{background-color:#4A6FF3;} + .d2-1563072179 .background-color-AA4{background-color:#EDF0FD;} + .d2-1563072179 .background-color-AA5{background-color:#F7F8FE;} + .d2-1563072179 .background-color-AB4{background-color:#EDF0FD;} + .d2-1563072179 .background-color-AB5{background-color:#F7F8FE;} + .d2-1563072179 .color-N1{color:#0A0F25;} + .d2-1563072179 .color-N2{color:#676C7E;} + .d2-1563072179 .color-N3{color:#9499AB;} + .d2-1563072179 .color-N4{color:#CFD2DD;} + .d2-1563072179 .color-N5{color:#DEE1EB;} + .d2-1563072179 .color-N6{color:#EEF1F8;} + .d2-1563072179 .color-N7{color:#FFFFFF;} + .d2-1563072179 .color-B1{color:#0D32B2;} + .d2-1563072179 .color-B2{color:#0D32B2;} + .d2-1563072179 .color-B3{color:#E3E9FD;} + .d2-1563072179 .color-B4{color:#E3E9FD;} + .d2-1563072179 .color-B5{color:#EDF0FD;} + .d2-1563072179 .color-B6{color:#F7F8FE;} + .d2-1563072179 .color-AA2{color:#4A6FF3;} + .d2-1563072179 .color-AA4{color:#EDF0FD;} + .d2-1563072179 .color-AA5{color:#F7F8FE;} + .d2-1563072179 .color-AB4{color:#EDF0FD;} + .d2-1563072179 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json index c3f32eced..31085175a 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 200 }, - "width": 218, + "width": 201, "height": 280, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -135,10 +141,10 @@ "id": "Pet", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 12 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -235,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 140 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -335,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 268 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -463,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 432 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -563,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 560 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -686,19 +708,19 @@ "labelPercentage": 0, "route": [ { - "x": 84.66600036621094, + "x": 79, "y": 200 }, { - "x": 84.66600036621094, + "x": 79, "y": 150 }, { - "x": 157.33299255371094, + "x": 146, "y": 150 }, { - "x": 157.33299255371094, + "x": 146, "y": 200 } ], @@ -732,19 +754,19 @@ "labelPercentage": 0, "route": [ { - "x": 157.33299255371094, + "x": 146, "y": 480 }, { - "x": 157.33299255371094, + "x": 146, "y": 530 }, { - "x": 84.66600036621094, + "x": 79, "y": 530 }, { - "x": 84.66600036621094, + "x": 79, "y": 480 } ], @@ -778,19 +800,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 246.66600036621094 }, { - "x": 270, + "x": 253, "y": 246.66600036621094 }, { - "x": 270, + "x": 253, "y": 66 }, { - "x": 531, + "x": 514, "y": 66 } ], @@ -824,19 +846,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 293.3330078125 }, { - "x": 320, + "x": 303, "y": 293.3330078125 }, { - "x": 320, + "x": 303, "y": 194 }, { - "x": 531, + "x": 514, "y": 194 } ], @@ -870,11 +892,11 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 340 }, { - "x": 531, + "x": 514, "y": 340 } ], @@ -908,19 +930,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 386.6659851074219 }, { - "x": 320, + "x": 303, "y": 386.6659851074219 }, { - "x": 320, + "x": 303, "y": 486 }, { - "x": 531, + "x": 514, "y": 486 } ], @@ -954,19 +976,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 433.3330078125 }, { - "x": 270, + "x": 253, "y": 433.3330078125 }, { - "x": 270, + "x": 253, "y": 614 }, { - "x": 531, + "x": 514, "y": 614 } ], diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index 8a77d825b..c9c708ed6 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-3400051897 .fill-N1{fill:#0A0F25;} + .d2-3400051897 .fill-N2{fill:#676C7E;} + .d2-3400051897 .fill-N3{fill:#9499AB;} + .d2-3400051897 .fill-N4{fill:#CFD2DD;} + .d2-3400051897 .fill-N5{fill:#DEE1EB;} + .d2-3400051897 .fill-N6{fill:#EEF1F8;} + .d2-3400051897 .fill-N7{fill:#FFFFFF;} + .d2-3400051897 .fill-B1{fill:#0D32B2;} + .d2-3400051897 .fill-B2{fill:#0D32B2;} + .d2-3400051897 .fill-B3{fill:#E3E9FD;} + .d2-3400051897 .fill-B4{fill:#E3E9FD;} + .d2-3400051897 .fill-B5{fill:#EDF0FD;} + .d2-3400051897 .fill-B6{fill:#F7F8FE;} + .d2-3400051897 .fill-AA2{fill:#4A6FF3;} + .d2-3400051897 .fill-AA4{fill:#EDF0FD;} + .d2-3400051897 .fill-AA5{fill:#F7F8FE;} + .d2-3400051897 .fill-AB4{fill:#EDF0FD;} + .d2-3400051897 .fill-AB5{fill:#F7F8FE;} + .d2-3400051897 .stroke-N1{stroke:#0A0F25;} + .d2-3400051897 .stroke-N2{stroke:#676C7E;} + .d2-3400051897 .stroke-N3{stroke:#9499AB;} + .d2-3400051897 .stroke-N4{stroke:#CFD2DD;} + .d2-3400051897 .stroke-N5{stroke:#DEE1EB;} + .d2-3400051897 .stroke-N6{stroke:#EEF1F8;} + .d2-3400051897 .stroke-N7{stroke:#FFFFFF;} + .d2-3400051897 .stroke-B1{stroke:#0D32B2;} + .d2-3400051897 .stroke-B2{stroke:#0D32B2;} + .d2-3400051897 .stroke-B3{stroke:#E3E9FD;} + .d2-3400051897 .stroke-B4{stroke:#E3E9FD;} + .d2-3400051897 .stroke-B5{stroke:#EDF0FD;} + .d2-3400051897 .stroke-B6{stroke:#F7F8FE;} + .d2-3400051897 .stroke-AA2{stroke:#4A6FF3;} + .d2-3400051897 .stroke-AA4{stroke:#EDF0FD;} + .d2-3400051897 .stroke-AA5{stroke:#F7F8FE;} + .d2-3400051897 .stroke-AB4{stroke:#EDF0FD;} + .d2-3400051897 .stroke-AB5{stroke:#F7F8FE;} + .d2-3400051897 .background-color-N1{background-color:#0A0F25;} + .d2-3400051897 .background-color-N2{background-color:#676C7E;} + .d2-3400051897 .background-color-N3{background-color:#9499AB;} + .d2-3400051897 .background-color-N4{background-color:#CFD2DD;} + .d2-3400051897 .background-color-N5{background-color:#DEE1EB;} + .d2-3400051897 .background-color-N6{background-color:#EEF1F8;} + .d2-3400051897 .background-color-N7{background-color:#FFFFFF;} + .d2-3400051897 .background-color-B1{background-color:#0D32B2;} + .d2-3400051897 .background-color-B2{background-color:#0D32B2;} + .d2-3400051897 .background-color-B3{background-color:#E3E9FD;} + .d2-3400051897 .background-color-B4{background-color:#E3E9FD;} + .d2-3400051897 .background-color-B5{background-color:#EDF0FD;} + .d2-3400051897 .background-color-B6{background-color:#F7F8FE;} + .d2-3400051897 .background-color-AA2{background-color:#4A6FF3;} + .d2-3400051897 .background-color-AA4{background-color:#EDF0FD;} + .d2-3400051897 .background-color-AA5{background-color:#F7F8FE;} + .d2-3400051897 .background-color-AB4{background-color:#EDF0FD;} + .d2-3400051897 .background-color-AB5{background-color:#F7F8FE;} + .d2-3400051897 .color-N1{color:#0A0F25;} + .d2-3400051897 .color-N2{color:#676C7E;} + .d2-3400051897 .color-N3{color:#9499AB;} + .d2-3400051897 .color-N4{color:#CFD2DD;} + .d2-3400051897 .color-N5{color:#DEE1EB;} + .d2-3400051897 .color-N6{color:#EEF1F8;} + .d2-3400051897 .color-N7{color:#FFFFFF;} + .d2-3400051897 .color-B1{color:#0D32B2;} + .d2-3400051897 .color-B2{color:#0D32B2;} + .d2-3400051897 .color-B3{color:#E3E9FD;} + .d2-3400051897 .color-B4{color:#E3E9FD;} + .d2-3400051897 .color-B5{color:#EDF0FD;} + .d2-3400051897 .color-B6{color:#F7F8FE;} + .d2-3400051897 .color-AA2{color:#4A6FF3;} + .d2-3400051897 .color-AA4{color:#EDF0FD;} + .d2-3400051897 .color-AA5{color:#F7F8FE;} + .d2-3400051897 .color-AB4{color:#EDF0FD;} + .d2-3400051897 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg index fb494bef5..29d7ed413 100644 --- a/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg index fb494bef5..29d7ed413 100644 --- a/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg index 80a790d95..1cc9e0b00 100644 --- a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -alphabeta gamma + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg b/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg index 1f41b9fda..d37ad580c 100644 --- a/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -alphabeta gamma + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg index caf89128a..89f36dd83 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg index c9d47a098..99d72001e 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg index 7784749ee..f0e77a7ad 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ninety ninesixty fourthirty twosixteeneight - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg index 46f2fb367..312852604 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ninety ninesixty fourthirty twosixteeneight - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg index e2e6f8af2..aab74ad41 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ninety ninesixty fourthirty twosixteeneight - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg index 46f2fb367..312852604 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ninety ninesixty fourthirty twosixteeneight - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg index fe9241674..8fd342297 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -rows 2 columns 3 (<cap)a - + + rows 2 columns 3 (<cap)ab - + + + rows 2 columns 3 (<cap)abc - + + + + rows 2 columns 3 (<cap)abcd - + + + + + rows 2 columns 3 (<cap)abcde - + + + + + + rows 2 columns 3 (=cap)abcdef - + + + + + + + rows 2 columns 3 (=cap)abcdef - + + + + + + + rows 2 columns 3 (=cap)abcdef - + + + + + + + rows 2 columns 3 (>cap)abcdefg - + + + + + + + + rows 2 columns 3 (>cap)abcdefgh - + + + + + + + + + rows 2 columns 3 (>cap)abcdefghi - + + + + + + + + + + rows 2 columns 3 (>cap)abcdefghij - + + + + + + + + + + + rows 2 columns 3 (>cap)abcdefghijk - + + + + + + + + + + + + rows 2 columns 3 (>cap)abcdefghijkl - + + + + + + + + + + + + + rows 2 columns 3 (>cap)abcdefghijkl - + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg index 22abc2786..910506bd1 100644 --- a/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -rows 2 columns 3 (<cap)a - + + rows 2 columns 3 (<cap)ab - + + + rows 2 columns 3 (<cap)abc - + + + + rows 2 columns 3 (<cap)abcd - + + + + + rows 2 columns 3 (<cap)abcde - + + + + + + rows 2 columns 3 (=cap)abcdef - + + + + + + + rows 2 columns 3 (=cap)abcdef - + + + + + + + rows 2 columns 3 (=cap)abcdef - + + + + + + + rows 2 columns 3 (>cap)abcdefg - + + + + + + + + rows 2 columns 3 (>cap)abcdefgh - + + + + + + + + + rows 2 columns 3 (>cap)abcdefghi - + + + + + + + + + + rows 2 columns 3 (>cap)abcdefghij - + + + + + + + + + + + rows 2 columns 3 (>cap)abcdefghijk - + + + + + + + + + + + + rows 2 columns 3 (>cap)abcdefghijkl - + + + + + + + + + + + + + rows 2 columns 3 (>cap)abcdefghijkl - + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg index e3e4f7ac8..fdd03c2ab 100644 --- a/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg index 6253e21c0..c0a207b8e 100644 --- a/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg index 46003ee00..0990001c1 100644 --- a/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg index bd207982b..4ba26a75e 100644 --- a/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg index bb9f8f402..b99a5e2d2 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg index 96c6fa725..2dcc7c1d9 100644 --- a/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_large_checkered/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_large_checkered/dagre/sketch.exp.svg index 902008e3f..efbb000b8 100644 --- a/e2etests/testdata/stable/grid_large_checkered/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_large_checkered/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -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..fc5207f74 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/grid_nested_gap0/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg index 4d9c96d6a..424af7695 100644 --- a/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg index 9e40971c5..6f5c3ddad 100644 --- a/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_tests/dagre/board.exp.json b/e2etests/testdata/stable/grid_tests/dagre/board.exp.json index 15c3df149..7b3ccd502 100644 --- a/e2etests/testdata/stable/grid_tests/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_tests/dagre/board.exp.json @@ -2634,7 +2634,7 @@ "x": 3548, "y": 212 }, - "width": 359, + "width": 358, "height": 398, "opacity": 1, "strokeDash": 0, @@ -2675,7 +2675,7 @@ "x": 3608, "y": 272 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2713,10 +2713,10 @@ "id": "rows 3.b", "type": "rectangle", "pos": { - "x": 3701, + "x": 3747, "y": 272 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2754,10 +2754,10 @@ "id": "rows 3.c", "type": "rectangle", "pos": { - "x": 3794, - "y": 272 + "x": 3608, + "y": 378 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2795,7 +2795,7 @@ "id": "rows 3.d", "type": "rectangle", "pos": { - "x": 3608, + "x": 3747, "y": 378 }, "width": 99, @@ -2836,10 +2836,10 @@ "id": "rows 3.e", "type": "rectangle", "pos": { - "x": 3747, - "y": 378 + "x": 3608, + "y": 484 }, - "width": 99, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2877,10 +2877,10 @@ "id": "rows 3.f", "type": "rectangle", "pos": { - "x": 3608, + "x": 3701, "y": 484 }, - "width": 99, + "width": 51, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2918,10 +2918,10 @@ "id": "rows 3.g", "type": "rectangle", "pos": { - "x": 3747, + "x": 3792, "y": 484 }, - "width": 99, + "width": 54, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2959,7 +2959,7 @@ "id": "columns 3", "type": "rectangle", "pos": { - "x": 3967, + "x": 3966, "y": 212 }, "width": 361, @@ -3000,7 +3000,7 @@ "id": "columns 3.a", "type": "rectangle", "pos": { - "x": 4027, + "x": 4026, "y": 272 }, "width": 53, @@ -3041,7 +3041,7 @@ "id": "columns 3.b", "type": "rectangle", "pos": { - "x": 4027, + "x": 4026, "y": 378 }, "width": 53, @@ -3082,7 +3082,7 @@ "id": "columns 3.c", "type": "rectangle", "pos": { - "x": 4027, + "x": 4026, "y": 484 }, "width": 53, @@ -3123,7 +3123,7 @@ "id": "columns 3.d", "type": "rectangle", "pos": { - "x": 4120, + "x": 4119, "y": 272 }, "width": 54, @@ -3164,7 +3164,7 @@ "id": "columns 3.e", "type": "rectangle", "pos": { - "x": 4120, + "x": 4119, "y": 431 }, "width": 54, @@ -3205,7 +3205,7 @@ "id": "columns 3.f", "type": "rectangle", "pos": { - "x": 4214, + "x": 4213, "y": 272 }, "width": 54, @@ -3246,7 +3246,7 @@ "id": "columns 3.g", "type": "rectangle", "pos": { - "x": 4214, + "x": 4213, "y": 431 }, "width": 54, @@ -3287,7 +3287,7 @@ "id": "widths heights", "type": "rectangle", "pos": { - "x": 4388, + "x": 4387, "y": 28 }, "width": 886, @@ -3328,7 +3328,7 @@ "id": "widths heights.a w200", "type": "rectangle", "pos": { - "x": 4448, + "x": 4447, "y": 88 }, "width": 200, @@ -3369,7 +3369,7 @@ "id": "widths heights.b h300", "type": "rectangle", "pos": { - "x": 4688, + "x": 4687, "y": 88 }, "width": 86, @@ -3410,7 +3410,7 @@ "id": "widths heights.c", "type": "rectangle", "pos": { - "x": 4814, + "x": 4813, "y": 88 }, "width": 400, @@ -3451,7 +3451,7 @@ "id": "widths heights.d h200", "type": "rectangle", "pos": { - "x": 4448, + "x": 4447, "y": 428 }, "width": 200, @@ -3492,7 +3492,7 @@ "id": "widths heights.e", "type": "rectangle", "pos": { - "x": 4688, + "x": 4687, "y": 428 }, "width": 86, @@ -3533,7 +3533,7 @@ "id": "widths heights.f w400", "type": "rectangle", "pos": { - "x": 4814, + "x": 4813, "y": 428 }, "width": 400, @@ -3574,7 +3574,7 @@ "id": "widths heights.g", "type": "rectangle", "pos": { - "x": 4448, + "x": 4447, "y": 668 }, "width": 200, @@ -3615,7 +3615,7 @@ "id": "widths heights.h", "type": "rectangle", "pos": { - "x": 4688, + "x": 4687, "y": 668 }, "width": 86, @@ -3656,7 +3656,7 @@ "id": "widths heights.i", "type": "rectangle", "pos": { - "x": 4814, + "x": 4813, "y": 668 }, "width": 400, diff --git a/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg index f19b8aca8..27bf6c7b7 100644 --- a/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi - - + .d2-2040055327 .fill-N1{fill:#0A0F25;} + .d2-2040055327 .fill-N2{fill:#676C7E;} + .d2-2040055327 .fill-N3{fill:#9499AB;} + .d2-2040055327 .fill-N4{fill:#CFD2DD;} + .d2-2040055327 .fill-N5{fill:#DEE1EB;} + .d2-2040055327 .fill-N6{fill:#EEF1F8;} + .d2-2040055327 .fill-N7{fill:#FFFFFF;} + .d2-2040055327 .fill-B1{fill:#0D32B2;} + .d2-2040055327 .fill-B2{fill:#0D32B2;} + .d2-2040055327 .fill-B3{fill:#E3E9FD;} + .d2-2040055327 .fill-B4{fill:#E3E9FD;} + .d2-2040055327 .fill-B5{fill:#EDF0FD;} + .d2-2040055327 .fill-B6{fill:#F7F8FE;} + .d2-2040055327 .fill-AA2{fill:#4A6FF3;} + .d2-2040055327 .fill-AA4{fill:#EDF0FD;} + .d2-2040055327 .fill-AA5{fill:#F7F8FE;} + .d2-2040055327 .fill-AB4{fill:#EDF0FD;} + .d2-2040055327 .fill-AB5{fill:#F7F8FE;} + .d2-2040055327 .stroke-N1{stroke:#0A0F25;} + .d2-2040055327 .stroke-N2{stroke:#676C7E;} + .d2-2040055327 .stroke-N3{stroke:#9499AB;} + .d2-2040055327 .stroke-N4{stroke:#CFD2DD;} + .d2-2040055327 .stroke-N5{stroke:#DEE1EB;} + .d2-2040055327 .stroke-N6{stroke:#EEF1F8;} + .d2-2040055327 .stroke-N7{stroke:#FFFFFF;} + .d2-2040055327 .stroke-B1{stroke:#0D32B2;} + .d2-2040055327 .stroke-B2{stroke:#0D32B2;} + .d2-2040055327 .stroke-B3{stroke:#E3E9FD;} + .d2-2040055327 .stroke-B4{stroke:#E3E9FD;} + .d2-2040055327 .stroke-B5{stroke:#EDF0FD;} + .d2-2040055327 .stroke-B6{stroke:#F7F8FE;} + .d2-2040055327 .stroke-AA2{stroke:#4A6FF3;} + .d2-2040055327 .stroke-AA4{stroke:#EDF0FD;} + .d2-2040055327 .stroke-AA5{stroke:#F7F8FE;} + .d2-2040055327 .stroke-AB4{stroke:#EDF0FD;} + .d2-2040055327 .stroke-AB5{stroke:#F7F8FE;} + .d2-2040055327 .background-color-N1{background-color:#0A0F25;} + .d2-2040055327 .background-color-N2{background-color:#676C7E;} + .d2-2040055327 .background-color-N3{background-color:#9499AB;} + .d2-2040055327 .background-color-N4{background-color:#CFD2DD;} + .d2-2040055327 .background-color-N5{background-color:#DEE1EB;} + .d2-2040055327 .background-color-N6{background-color:#EEF1F8;} + .d2-2040055327 .background-color-N7{background-color:#FFFFFF;} + .d2-2040055327 .background-color-B1{background-color:#0D32B2;} + .d2-2040055327 .background-color-B2{background-color:#0D32B2;} + .d2-2040055327 .background-color-B3{background-color:#E3E9FD;} + .d2-2040055327 .background-color-B4{background-color:#E3E9FD;} + .d2-2040055327 .background-color-B5{background-color:#EDF0FD;} + .d2-2040055327 .background-color-B6{background-color:#F7F8FE;} + .d2-2040055327 .background-color-AA2{background-color:#4A6FF3;} + .d2-2040055327 .background-color-AA4{background-color:#EDF0FD;} + .d2-2040055327 .background-color-AA5{background-color:#F7F8FE;} + .d2-2040055327 .background-color-AB4{background-color:#EDF0FD;} + .d2-2040055327 .background-color-AB5{background-color:#F7F8FE;} + .d2-2040055327 .color-N1{color:#0A0F25;} + .d2-2040055327 .color-N2{color:#676C7E;} + .d2-2040055327 .color-N3{color:#9499AB;} + .d2-2040055327 .color-N4{color:#CFD2DD;} + .d2-2040055327 .color-N5{color:#DEE1EB;} + .d2-2040055327 .color-N6{color:#EEF1F8;} + .d2-2040055327 .color-N7{color:#FFFFFF;} + .d2-2040055327 .color-B1{color:#0D32B2;} + .d2-2040055327 .color-B2{color:#0D32B2;} + .d2-2040055327 .color-B3{color:#E3E9FD;} + .d2-2040055327 .color-B4{color:#E3E9FD;} + .d2-2040055327 .color-B5{color:#EDF0FD;} + .d2-2040055327 .color-B6{color:#F7F8FE;} + .d2-2040055327 .color-AA2{color:#4A6FF3;} + .d2-2040055327 .color-AA4{color:#EDF0FD;} + .d2-2040055327 .color-AA5{color:#F7F8FE;} + .d2-2040055327 .color-AB4{color:#EDF0FD;} + .d2-2040055327 .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}]]>rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_tests/elk/board.exp.json b/e2etests/testdata/stable/grid_tests/elk/board.exp.json index 95b4c1c12..a0054417b 100644 --- a/e2etests/testdata/stable/grid_tests/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_tests/elk/board.exp.json @@ -2634,7 +2634,7 @@ "x": 3240, "y": 224 }, - "width": 359, + "width": 358, "height": 398, "opacity": 1, "strokeDash": 0, @@ -2675,7 +2675,7 @@ "x": 3300, "y": 284 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2713,10 +2713,10 @@ "id": "rows 3.b", "type": "rectangle", "pos": { - "x": 3393, + "x": 3439, "y": 284 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2754,10 +2754,10 @@ "id": "rows 3.c", "type": "rectangle", "pos": { - "x": 3486, - "y": 284 + "x": 3300, + "y": 390 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2795,7 +2795,7 @@ "id": "rows 3.d", "type": "rectangle", "pos": { - "x": 3300, + "x": 3439, "y": 390 }, "width": 99, @@ -2836,10 +2836,10 @@ "id": "rows 3.e", "type": "rectangle", "pos": { - "x": 3439, - "y": 390 + "x": 3300, + "y": 496 }, - "width": 99, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2877,10 +2877,10 @@ "id": "rows 3.f", "type": "rectangle", "pos": { - "x": 3300, + "x": 3393, "y": 496 }, - "width": 99, + "width": 51, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2918,10 +2918,10 @@ "id": "rows 3.g", "type": "rectangle", "pos": { - "x": 3439, + "x": 3484, "y": 496 }, - "width": 99, + "width": 54, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2959,7 +2959,7 @@ "id": "columns 3", "type": "rectangle", "pos": { - "x": 3619, + "x": 3618, "y": 224 }, "width": 361, @@ -3000,7 +3000,7 @@ "id": "columns 3.a", "type": "rectangle", "pos": { - "x": 3679, + "x": 3678, "y": 284 }, "width": 53, @@ -3041,7 +3041,7 @@ "id": "columns 3.b", "type": "rectangle", "pos": { - "x": 3679, + "x": 3678, "y": 390 }, "width": 53, @@ -3082,7 +3082,7 @@ "id": "columns 3.c", "type": "rectangle", "pos": { - "x": 3679, + "x": 3678, "y": 496 }, "width": 53, @@ -3123,7 +3123,7 @@ "id": "columns 3.d", "type": "rectangle", "pos": { - "x": 3772, + "x": 3771, "y": 284 }, "width": 54, @@ -3164,7 +3164,7 @@ "id": "columns 3.e", "type": "rectangle", "pos": { - "x": 3772, + "x": 3771, "y": 443 }, "width": 54, @@ -3205,7 +3205,7 @@ "id": "columns 3.f", "type": "rectangle", "pos": { - "x": 3866, + "x": 3865, "y": 284 }, "width": 54, @@ -3246,7 +3246,7 @@ "id": "columns 3.g", "type": "rectangle", "pos": { - "x": 3866, + "x": 3865, "y": 443 }, "width": 54, @@ -3287,7 +3287,7 @@ "id": "widths heights", "type": "rectangle", "pos": { - "x": 4000, + "x": 3999, "y": 40 }, "width": 886, @@ -3328,7 +3328,7 @@ "id": "widths heights.a w200", "type": "rectangle", "pos": { - "x": 4060, + "x": 4059, "y": 100 }, "width": 200, @@ -3369,7 +3369,7 @@ "id": "widths heights.b h300", "type": "rectangle", "pos": { - "x": 4300, + "x": 4299, "y": 100 }, "width": 86, @@ -3410,7 +3410,7 @@ "id": "widths heights.c", "type": "rectangle", "pos": { - "x": 4426, + "x": 4425, "y": 100 }, "width": 400, @@ -3451,7 +3451,7 @@ "id": "widths heights.d h200", "type": "rectangle", "pos": { - "x": 4060, + "x": 4059, "y": 440 }, "width": 200, @@ -3492,7 +3492,7 @@ "id": "widths heights.e", "type": "rectangle", "pos": { - "x": 4300, + "x": 4299, "y": 440 }, "width": 86, @@ -3533,7 +3533,7 @@ "id": "widths heights.f w400", "type": "rectangle", "pos": { - "x": 4426, + "x": 4425, "y": 440 }, "width": 400, @@ -3574,7 +3574,7 @@ "id": "widths heights.g", "type": "rectangle", "pos": { - "x": 4060, + "x": 4059, "y": 680 }, "width": 200, @@ -3615,7 +3615,7 @@ "id": "widths heights.h", "type": "rectangle", "pos": { - "x": 4300, + "x": 4299, "y": 680 }, "width": 86, @@ -3656,7 +3656,7 @@ "id": "widths heights.i", "type": "rectangle", "pos": { - "x": 4426, + "x": 4425, "y": 680 }, "width": 400, diff --git a/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg index 8fa5cd3a4..cc06af60e 100644 --- a/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi - - + .d2-1810002325 .fill-N1{fill:#0A0F25;} + .d2-1810002325 .fill-N2{fill:#676C7E;} + .d2-1810002325 .fill-N3{fill:#9499AB;} + .d2-1810002325 .fill-N4{fill:#CFD2DD;} + .d2-1810002325 .fill-N5{fill:#DEE1EB;} + .d2-1810002325 .fill-N6{fill:#EEF1F8;} + .d2-1810002325 .fill-N7{fill:#FFFFFF;} + .d2-1810002325 .fill-B1{fill:#0D32B2;} + .d2-1810002325 .fill-B2{fill:#0D32B2;} + .d2-1810002325 .fill-B3{fill:#E3E9FD;} + .d2-1810002325 .fill-B4{fill:#E3E9FD;} + .d2-1810002325 .fill-B5{fill:#EDF0FD;} + .d2-1810002325 .fill-B6{fill:#F7F8FE;} + .d2-1810002325 .fill-AA2{fill:#4A6FF3;} + .d2-1810002325 .fill-AA4{fill:#EDF0FD;} + .d2-1810002325 .fill-AA5{fill:#F7F8FE;} + .d2-1810002325 .fill-AB4{fill:#EDF0FD;} + .d2-1810002325 .fill-AB5{fill:#F7F8FE;} + .d2-1810002325 .stroke-N1{stroke:#0A0F25;} + .d2-1810002325 .stroke-N2{stroke:#676C7E;} + .d2-1810002325 .stroke-N3{stroke:#9499AB;} + .d2-1810002325 .stroke-N4{stroke:#CFD2DD;} + .d2-1810002325 .stroke-N5{stroke:#DEE1EB;} + .d2-1810002325 .stroke-N6{stroke:#EEF1F8;} + .d2-1810002325 .stroke-N7{stroke:#FFFFFF;} + .d2-1810002325 .stroke-B1{stroke:#0D32B2;} + .d2-1810002325 .stroke-B2{stroke:#0D32B2;} + .d2-1810002325 .stroke-B3{stroke:#E3E9FD;} + .d2-1810002325 .stroke-B4{stroke:#E3E9FD;} + .d2-1810002325 .stroke-B5{stroke:#EDF0FD;} + .d2-1810002325 .stroke-B6{stroke:#F7F8FE;} + .d2-1810002325 .stroke-AA2{stroke:#4A6FF3;} + .d2-1810002325 .stroke-AA4{stroke:#EDF0FD;} + .d2-1810002325 .stroke-AA5{stroke:#F7F8FE;} + .d2-1810002325 .stroke-AB4{stroke:#EDF0FD;} + .d2-1810002325 .stroke-AB5{stroke:#F7F8FE;} + .d2-1810002325 .background-color-N1{background-color:#0A0F25;} + .d2-1810002325 .background-color-N2{background-color:#676C7E;} + .d2-1810002325 .background-color-N3{background-color:#9499AB;} + .d2-1810002325 .background-color-N4{background-color:#CFD2DD;} + .d2-1810002325 .background-color-N5{background-color:#DEE1EB;} + .d2-1810002325 .background-color-N6{background-color:#EEF1F8;} + .d2-1810002325 .background-color-N7{background-color:#FFFFFF;} + .d2-1810002325 .background-color-B1{background-color:#0D32B2;} + .d2-1810002325 .background-color-B2{background-color:#0D32B2;} + .d2-1810002325 .background-color-B3{background-color:#E3E9FD;} + .d2-1810002325 .background-color-B4{background-color:#E3E9FD;} + .d2-1810002325 .background-color-B5{background-color:#EDF0FD;} + .d2-1810002325 .background-color-B6{background-color:#F7F8FE;} + .d2-1810002325 .background-color-AA2{background-color:#4A6FF3;} + .d2-1810002325 .background-color-AA4{background-color:#EDF0FD;} + .d2-1810002325 .background-color-AA5{background-color:#F7F8FE;} + .d2-1810002325 .background-color-AB4{background-color:#EDF0FD;} + .d2-1810002325 .background-color-AB5{background-color:#F7F8FE;} + .d2-1810002325 .color-N1{color:#0A0F25;} + .d2-1810002325 .color-N2{color:#676C7E;} + .d2-1810002325 .color-N3{color:#9499AB;} + .d2-1810002325 .color-N4{color:#CFD2DD;} + .d2-1810002325 .color-N5{color:#DEE1EB;} + .d2-1810002325 .color-N6{color:#EEF1F8;} + .d2-1810002325 .color-N7{color:#FFFFFF;} + .d2-1810002325 .color-B1{color:#0D32B2;} + .d2-1810002325 .color-B2{color:#0D32B2;} + .d2-1810002325 .color-B3{color:#E3E9FD;} + .d2-1810002325 .color-B4{color:#E3E9FD;} + .d2-1810002325 .color-B5{color:#EDF0FD;} + .d2-1810002325 .color-B6{color:#F7F8FE;} + .d2-1810002325 .color-AA2{color:#4A6FF3;} + .d2-1810002325 .color-AA4{color:#EDF0FD;} + .d2-1810002325 .color-AA5{color:#F7F8FE;} + .d2-1810002325 .color-AB4{color:#EDF0FD;} + .d2-1810002325 .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}]]>rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg index 461bd7903..f51ab8728 100644 --- a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg b/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg index 70da6ddf7..e2784c09a 100644 --- a/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg index 636d31245..31b45f743 100644 --- a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -hello - + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg b/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg index 903014244..68037ef7b 100644 --- a/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -hello - + \ No newline at end of file diff --git a/e2etests/testdata/stable/images/dagre/sketch.exp.svg b/e2etests/testdata/stable/images/dagre/sketch.exp.svg index 99923bc60..6893f5c9d 100644 --- a/e2etests/testdata/stable/images/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/images/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ab - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/images/elk/sketch.exp.svg b/e2etests/testdata/stable/images/elk/sketch.exp.svg index bac662e72..6a3528443 100644 --- a/e2etests/testdata/stable/images/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/images/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ab - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg index 20d4cb74d..2dc194b2f 100644 --- a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index 4ffc78759..c9c316a89 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index 0b4035169..e323340fd 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index 96a8d92de..11a3bd0bd 100644 --- a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg index dc1a3d0dc..89f411bf3 100644 --- a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -xy hi + + \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg index 9e1231aff..d5dcc6ece 100644 --- a/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -xy hi + + \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg index d042e00de..588fe473d 100644 --- a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -SATELLITESTRANSMITTER SENDSENDSEND + + diff --git a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg index 48ae29040..6db3a94cd 100644 --- a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -SATELLITESTRANSMITTER SENDSENDSEND + + diff --git a/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg index f0c651bab..2157c5617 100644 --- a/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -thisgoesmultiple lines - + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg b/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg index 006da36b3..57928f4fd 100644 --- a/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -thisgoesmultiple lines - + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json new file mode 100644 index 000000000..defb282e2 --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json @@ -0,0 +1,425 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "outer", + "type": "rectangle", + "pos": { + "x": 0, + "y": 207 + }, + "width": 268, + "height": 335, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "outer", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 63, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "outer.vg", + "type": "rectangle", + "pos": { + "x": 20, + "y": 272 + }, + "width": 228, + "height": 240, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume group", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 140, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "outer.vg.vd", + "type": "rectangle", + "pos": { + "x": 40, + "y": 345 + }, + "width": 188, + "height": 145, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume definition", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 147, + "labelHeight": 26, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "outer.vg.vd.volume", + "type": "rectangle", + "pos": { + "x": 80, + "y": 390 + }, + "width": 98, + "height": 66, + "opacity": 1, + "strokeDash": 3, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 4 + }, + { + "id": "start", + "type": "rectangle", + "pos": { + "x": 94, + "y": 0 + }, + "width": 80, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "start", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 35, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "end", + "type": "rectangle", + "pos": { + "x": 98, + "y": 642 + }, + "width": 72, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "end", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 27, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(start -> outer.vg.vd.volume)[0]", + "src": "start", + "srcArrow": "none", + "dst": "outer.vg.vd.volume", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 134, + "y": 66 + }, + { + "x": 134, + "y": 106 + }, + { + "x": 134, + "y": 126 + }, + { + "x": 134, + "y": 141 + }, + { + "x": 134, + "y": 156 + }, + { + "x": 134, + "y": 176 + }, + { + "x": 134, + "y": 191 + }, + { + "x": 134, + "y": 206 + }, + { + "x": 134, + "y": 288.79998779296875 + }, + { + "x": 134, + "y": 380 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(outer.vg.vd.volume -> end)[0]", + "src": "outer.vg.vd.volume", + "srcArrow": "none", + "dst": "end", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 134, + "y": 456 + }, + { + "x": 134, + "y": 484.79998779296875 + }, + { + "x": 134, + "y": 502 + }, + { + "x": 134, + "y": 517 + }, + { + "x": 134, + "y": 532 + }, + { + "x": 134, + "y": 602 + }, + { + "x": 134, + "y": 642 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg new file mode 100644 index 000000000..39caa9bc5 --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg @@ -0,0 +1,107 @@ +outerstartendvolume groupvolume definitionvolume + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json new file mode 100644 index 000000000..f9f1eb196 --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json @@ -0,0 +1,371 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "outer", + "type": "rectangle", + "pos": { + "x": 12, + "y": 153 + }, + "width": 408, + "height": 396, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "outer", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 63, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "outer.vg", + "type": "rectangle", + "pos": { + "x": 62, + "y": 208 + }, + "width": 308, + "height": 286, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume group", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 140, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "outer.vg.vd", + "type": "rectangle", + "pos": { + "x": 112, + "y": 273 + }, + "width": 208, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume definition", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 147, + "labelHeight": 26, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "outer.vg.vd.volume", + "type": "rectangle", + "pos": { + "x": 162, + "y": 333 + }, + "width": 98, + "height": 66, + "opacity": 1, + "strokeDash": 3, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 4 + }, + { + "id": "start", + "type": "rectangle", + "pos": { + "x": 176, + "y": 12 + }, + "width": 80, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "start", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 35, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "end", + "type": "rectangle", + "pos": { + "x": 180, + "y": 624 + }, + "width": 72, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "end", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 27, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(start -> outer.vg.vd.volume)[0]", + "src": "start", + "srcArrow": "none", + "dst": "outer.vg.vd.volume", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 216, + "y": 78 + }, + { + "x": 216, + "y": 323 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(outer.vg.vd.volume -> end)[0]", + "src": "outer.vg.vd.volume", + "srcArrow": "none", + "dst": "end", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 216, + "y": 399 + }, + { + "x": 216, + "y": 624 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg new file mode 100644 index 000000000..93034112c --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg @@ -0,0 +1,107 @@ +outerstartendvolume groupvolume definitionvolume + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg index 12e0480ff..3eb8f462a 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghijklmnopqrstuvw - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg index ff6f374ed..14b157375 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghijklmnopqrstuvw - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg index a5b49a368..691347821 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghijklmnopqrstu - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg index 5893a6f9a..e417fabf9 100644 --- a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdefghijklmnopqrstu - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg b/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg index 3f5ddb469..b5b0d4b18 100644 --- a/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -xyz - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg b/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg index 3f5ddb469..b5b0d4b18 100644 --- a/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -xyz - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg index 642c80d17..02835b148 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -zaxybabcdbabcdabcdaccd - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg index 29cf3b64c..7b26c4868 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -zaxybabcdbabcdabcdaccd - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near_keys_for_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container/dagre/sketch.exp.svg index b40752543..c970ab150 100644 --- a/e2etests/testdata/stable/near_keys_for_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -12Foo Bazhello - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg index ccb5824a7..27987f446 100644 --- a/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -12Foo Bazhello - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg index 117297ba3..67750d9d0 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -acdefgbh - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg index a99901731..1d0e07194 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -acdefgbh - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg index 834e1b02d..b8f3dd184 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -top2abcbottomstartend - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg b/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg index 8095ee718..f6bc5f6d4 100644 --- a/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -top2abcbottomstartend - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json b/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json new file mode 100644 index 000000000..0b07ba894 --- /dev/null +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json @@ -0,0 +1,454 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "p1", + "type": "person", + "pos": { + "x": 0, + "y": 0 + }, + "width": 174, + "height": 116, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Daphne Snickerdoodle", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 159, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "p2", + "type": "person", + "pos": { + "x": 9, + "y": 447 + }, + "width": 157, + "height": 105, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Prudence McSnortle", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 142, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "p3", + "type": "person", + "pos": { + "x": 28, + "y": 242 + }, + "width": 118, + "height": 79, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Polly Pizzazzle", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 103, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(p1 -> p3)[0]", + "src": "p1", + "srcArrow": "none", + "dst": "p3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 142 + }, + { + "x": 68.5999984741211, + "y": 182 + }, + { + "x": 69, + "y": 202.1999969482422 + }, + { + "x": 77, + "y": 243 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p2 -> p3)[0]", + "src": "p2", + "srcArrow": "none", + "dst": "p3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 87, + "y": 447 + }, + { + "x": 87, + "y": 407 + }, + { + "x": 87, + "y": 387 + }, + { + "x": 87, + "y": 347 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p1 -> p3)[1]", + "src": "p1", + "srcArrow": "none", + "dst": "p3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 87, + "y": 142 + }, + { + "x": 87, + "y": 182 + }, + { + "x": 87, + "y": 202 + }, + { + "x": 87, + "y": 242 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p2 -> p3)[1]", + "src": "p2", + "srcArrow": "none", + "dst": "p3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 98, + "y": 448 + }, + { + "x": 105.19999694824219, + "y": 407.20001220703125 + }, + { + "x": 105, + "y": 387 + }, + { + "x": 97, + "y": 347 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p3 -> p2)[0]", + "src": "p3", + "srcArrow": "none", + "dst": "p2", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 77, + "y": 347 + }, + { + "x": 69, + "y": 387 + }, + { + "x": 68.80000305175781, + "y": 407.20001220703125 + }, + { + "x": 76, + "y": 448 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p3 -> p1)[0]", + "src": "p3", + "srcArrow": "none", + "dst": "p1", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 97, + "y": 243 + }, + { + "x": 105, + "y": 202.1999969482422 + }, + { + "x": 105.4000015258789, + "y": 182 + }, + { + "x": 99, + "y": 142 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg new file mode 100644 index 000000000..bf848899a --- /dev/null +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg @@ -0,0 +1,97 @@ +Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json b/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json new file mode 100644 index 000000000..d67978742 --- /dev/null +++ b/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json @@ -0,0 +1,448 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "p1", + "type": "person", + "pos": { + "x": 12, + "y": 12 + }, + "width": 174, + "height": 116, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Daphne Snickerdoodle", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 159, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "p2", + "type": "person", + "pos": { + "x": 206, + "y": 23 + }, + "width": 157, + "height": 105, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Prudence McSnortle", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 142, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "p3", + "type": "person", + "pos": { + "x": 113, + "y": 334 + }, + "width": 160, + "height": 79, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Polly Pizzazzle", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 103, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(p1 -> p3)[0]", + "src": "p1", + "srcArrow": "none", + "dst": "p3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 55.5, + "y": 154 + }, + { + "x": 55.5, + "y": 294 + }, + { + "x": 136.73199462890625, + "y": 294 + }, + { + "x": 137, + "y": 354 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p2 -> p3)[0]", + "src": "p2", + "srcArrow": "none", + "dst": "p3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 245.25, + "y": 154 + }, + { + "x": 245.25, + "y": 194 + }, + { + "x": 205.30299377441406, + "y": 194 + }, + { + "x": 205, + "y": 334 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p1 -> p3)[1]", + "src": "p1", + "srcArrow": "none", + "dst": "p3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 99, + "y": 154 + }, + { + "x": 99, + "y": 244 + }, + { + "x": 159.58900451660156, + "y": 244 + }, + { + "x": 160, + "y": 339 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p2 -> p3)[1]", + "src": "p2", + "srcArrow": "none", + "dst": "p3", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 284.5, + "y": 154 + }, + { + "x": 284.5, + "y": 244 + }, + { + "x": 228.16000366210938, + "y": 244 + }, + { + "x": 228, + "y": 339 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p3 -> p2)[0]", + "src": "p3", + "srcArrow": "none", + "dst": "p2", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 251, + "y": 353 + }, + { + "x": 251.01699829101562, + "y": 294 + }, + { + "x": 323.75, + "y": 294 + }, + { + "x": 323.75, + "y": 154 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(p3 -> p1)[0]", + "src": "p3", + "srcArrow": "none", + "dst": "p1", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 182, + "y": 335 + }, + { + "x": 182.4459991455078, + "y": 194 + }, + { + "x": 142.5, + "y": 194 + }, + { + "x": 142.5, + "y": 154 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg new file mode 100644 index 000000000..802688175 --- /dev/null +++ b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg @@ -0,0 +1,97 @@ +Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg b/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg index c1029abfd..b67810589 100644 --- a/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ --------------------------------------------------------------------------------------------------------------------------------12345 - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ovals/elk/sketch.exp.svg b/e2etests/testdata/stable/ovals/elk/sketch.exp.svg index de1e435a5..9d7f3c6e6 100644 --- a/e2etests/testdata/stable/ovals/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ovals/elk/sketch.exp.svg @@ -1,4 +1,4 @@ --------------------------------------------------------------------------------------------------------------------------------12345 - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg index 03193acfe..3bf1bc2fc 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg index 3713ac815..6e9c94a61 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/p/dagre/sketch.exp.svg b/e2etests/testdata/stable/p/dagre/sketch.exp.svg index 9c2bc597d..70dde9fbb 100644 --- a/e2etests/testdata/stable/p/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/p/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ --------------------------------------------------------------------------------------------------------------------------------12345 - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/people/elk/sketch.exp.svg b/e2etests/testdata/stable/people/elk/sketch.exp.svg index e9932eb8a..5401f84c8 100644 --- a/e2etests/testdata/stable/people/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/people/elk/sketch.exp.svg @@ -1,4 +1,4 @@ --------------------------------------------------------------------------------------------------------------------------------12345 - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/pre/dagre/sketch.exp.svg b/e2etests/testdata/stable/pre/dagre/sketch.exp.svg index b6f1b67b0..279681f60 100644 --- a/e2etests/testdata/stable/pre/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/pre/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -xyz hello + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg index e366e9def..0b41c7c7c 100644 --- a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -xyz hello + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg index cc9cbc822..c742e427c 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -AB fooredirectbar + + diff --git a/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg index cc9cbc822..c742e427c 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -AB fooredirectbar + + diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg index e4be1ac44..554f645f2 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg index e4be1ac44..554f645f2 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + + + + + + 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..1ef95f75f 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 + + + + + + + + + + + + + + + + + + \ No newline at end of file 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..1ef95f75f 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 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg index 4ffc47ac0..6c5587319 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg index 4ffc47ac0..6c5587319 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg index e3e7a430c..99799803c 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + @@ -107,4 +111,6 @@ + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg index e3e7a430c..99799803c 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + @@ -107,4 +111,6 @@ + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg index cd1734cc6..53e13d9db 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ab a note here to remember that padding must consider notes toojustalongnotehere - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg index cd1734cc6..53e13d9db 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ab a note here to remember that padding must consider notes toojustalongnotehere - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg index fbc400ce9..ced7d260c 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere + + + @@ -101,4 +104,7 @@ + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg index fbc400ce9..ced7d260c 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere + + + @@ -101,4 +104,7 @@ + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg index dce85069e..b569ac1e7 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -scoreritemResponseitemessayRubricconceptitemOutcome - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg index dce85069e..b569ac1e7 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -scoreritemResponseitemessayRubricconceptitemOutcome - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg index a9d960cfe..ce7f78b4a 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg index a9d960cfe..ce7f78b4a 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg index 249e0ed62..b8d65f647 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + + + + + + + + + + @@ -112,4 +122,5 @@ + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg index 8671cbbc3..63a35b099 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + + + + + + + + + + @@ -112,4 +122,5 @@ + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg index 6e301aaf3..dff65325d 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + + diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg index 6e301aaf3..dff65325d 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + + diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg index 03e526a96..5c18da243 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg index 03e526a96..5c18da243 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg index 3ca5f2ad3..3bb8937b0 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg index 3ca5f2ad3..3bb8937b0 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index a997b224a..d079a9325 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index 681bab423..62057a24d 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + + + + + + + + + + + + + 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..b91f8f523 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..3a423554d 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..b407c93a4 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json @@ -0,0 +1,554 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "sql_table", + "pos": { + "x": 0, + "y": 36 + }, + "width": 146, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "unique" + ], + "reference": "" + } + ], + "label": "a", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "b", + "type": "sql_table", + "pos": { + "x": 206, + "y": 36 + }, + "width": 161, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ], + "label": "b", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "c", + "type": "sql_table", + "pos": { + "x": 427, + "y": 36 + }, + "width": 177, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "c", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "d", + "type": "sql_table", + "pos": { + "x": 664, + "y": 36 + }, + "width": 209, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "d", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "e", + "type": "sql_table", + "pos": { + "x": 933, + "y": 0 + }, + "width": 312, + "height": 144, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "no_abbrev", + "foreign_key", + "hello" + ], + "reference": "" + }, + { + "name": { + "label": "y", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "z", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 26 + }, + "type": { + "label": "STRING", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 62, + "labelHeight": 26 + }, + "constraint": [ + "yo" + ], + "reference": "" + } + ], + "label": "e", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "f", + "type": "sql_table", + "pos": { + "x": 1305, + "y": 36 + }, + "width": 88, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + } + ], + "label": "f", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg new file mode 100644 index 000000000..a39806fd9 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg @@ -0,0 +1,95 @@ +axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json new file mode 100644 index 000000000..5717ef2fb --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json @@ -0,0 +1,554 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "sql_table", + "pos": { + "x": 12, + "y": 48 + }, + "width": 146, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "unique" + ], + "reference": "" + } + ], + "label": "a", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "b", + "type": "sql_table", + "pos": { + "x": 178, + "y": 48 + }, + "width": 161, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ], + "label": "b", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "c", + "type": "sql_table", + "pos": { + "x": 359, + "y": 48 + }, + "width": 177, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "c", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "d", + "type": "sql_table", + "pos": { + "x": 556, + "y": 48 + }, + "width": 209, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "d", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "e", + "type": "sql_table", + "pos": { + "x": 785, + "y": 12 + }, + "width": 312, + "height": 144, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "no_abbrev", + "foreign_key", + "hello" + ], + "reference": "" + }, + { + "name": { + "label": "y", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "z", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 26 + }, + "type": { + "label": "STRING", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 62, + "labelHeight": 26 + }, + "constraint": [ + "yo" + ], + "reference": "" + } + ], + "label": "e", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "f", + "type": "sql_table", + "pos": { + "x": 1117, + "y": 48 + }, + "width": 88, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + } + ], + "label": "f", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg new file mode 100644 index 000000000..9bf391076 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg @@ -0,0 +1,95 @@ +axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json index 24914b479..9e4967a4c 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -127,7 +127,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg index 8ba3bfcec..6a5562dc2 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..ed16923ce 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..c400a4c67 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 0, "y": 0 }, - "width": 268, + "width": 251, "height": 216, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -167,7 +167,9 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ], @@ -191,7 +193,7 @@ "id": "products", "type": "sql_table", "pos": { - "x": 328, + "x": 311, "y": 18 }, "width": 164, @@ -239,7 +241,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -267,7 +269,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -295,7 +297,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -323,7 +325,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -347,7 +349,7 @@ "id": "orders", "type": "sql_table", "pos": { - "x": 328, + "x": 311, "y": 316 }, "width": 164, @@ -395,7 +397,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -423,7 +425,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -451,7 +453,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -475,7 +477,7 @@ "id": "shipments", "type": "sql_table", "pos": { - "x": 552, + "x": 535, "y": 18 }, "width": 244, @@ -523,7 +525,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -551,7 +553,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -579,7 +581,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -607,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -654,20 +656,20 @@ "labelPercentage": 0, "route": [ { - "x": 134, + "x": 125.5, "y": 216 }, { - "x": 134, + "x": 125.5, "y": 256 }, { - "x": 172.8000030517578, - "y": 283.20001220703125 + "x": 162.6999969482422, + "y": 283 }, { - "x": 328, - "y": 352 + "x": 311.5, + "y": 351 } ], "isCurve": true, @@ -701,19 +703,19 @@ "labelPercentage": 0, "route": [ { - "x": 410, + "x": 393, "y": 198 }, { - "x": 410, + "x": 393, "y": 252.39999389648438 }, { - "x": 410, + "x": 393, "y": 276 }, { - "x": 410, + "x": 393, "y": 316 } ], @@ -748,19 +750,19 @@ "labelPercentage": 0, "route": [ { - "x": 674, + "x": 657, "y": 198 }, { - "x": 674, + "x": 657, "y": 252.39999389648438 }, { - "x": 637.5999755859375, + "x": 620.5999755859375, "y": 282.79998779296875 }, { - "x": 492, + "x": 475, "y": 350 } ], diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index 49496713c..0e9fd0177 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-995024594 .fill-N1{fill:#0A0F25;} + .d2-995024594 .fill-N2{fill:#676C7E;} + .d2-995024594 .fill-N3{fill:#9499AB;} + .d2-995024594 .fill-N4{fill:#CFD2DD;} + .d2-995024594 .fill-N5{fill:#DEE1EB;} + .d2-995024594 .fill-N6{fill:#EEF1F8;} + .d2-995024594 .fill-N7{fill:#FFFFFF;} + .d2-995024594 .fill-B1{fill:#0D32B2;} + .d2-995024594 .fill-B2{fill:#0D32B2;} + .d2-995024594 .fill-B3{fill:#E3E9FD;} + .d2-995024594 .fill-B4{fill:#E3E9FD;} + .d2-995024594 .fill-B5{fill:#EDF0FD;} + .d2-995024594 .fill-B6{fill:#F7F8FE;} + .d2-995024594 .fill-AA2{fill:#4A6FF3;} + .d2-995024594 .fill-AA4{fill:#EDF0FD;} + .d2-995024594 .fill-AA5{fill:#F7F8FE;} + .d2-995024594 .fill-AB4{fill:#EDF0FD;} + .d2-995024594 .fill-AB5{fill:#F7F8FE;} + .d2-995024594 .stroke-N1{stroke:#0A0F25;} + .d2-995024594 .stroke-N2{stroke:#676C7E;} + .d2-995024594 .stroke-N3{stroke:#9499AB;} + .d2-995024594 .stroke-N4{stroke:#CFD2DD;} + .d2-995024594 .stroke-N5{stroke:#DEE1EB;} + .d2-995024594 .stroke-N6{stroke:#EEF1F8;} + .d2-995024594 .stroke-N7{stroke:#FFFFFF;} + .d2-995024594 .stroke-B1{stroke:#0D32B2;} + .d2-995024594 .stroke-B2{stroke:#0D32B2;} + .d2-995024594 .stroke-B3{stroke:#E3E9FD;} + .d2-995024594 .stroke-B4{stroke:#E3E9FD;} + .d2-995024594 .stroke-B5{stroke:#EDF0FD;} + .d2-995024594 .stroke-B6{stroke:#F7F8FE;} + .d2-995024594 .stroke-AA2{stroke:#4A6FF3;} + .d2-995024594 .stroke-AA4{stroke:#EDF0FD;} + .d2-995024594 .stroke-AA5{stroke:#F7F8FE;} + .d2-995024594 .stroke-AB4{stroke:#EDF0FD;} + .d2-995024594 .stroke-AB5{stroke:#F7F8FE;} + .d2-995024594 .background-color-N1{background-color:#0A0F25;} + .d2-995024594 .background-color-N2{background-color:#676C7E;} + .d2-995024594 .background-color-N3{background-color:#9499AB;} + .d2-995024594 .background-color-N4{background-color:#CFD2DD;} + .d2-995024594 .background-color-N5{background-color:#DEE1EB;} + .d2-995024594 .background-color-N6{background-color:#EEF1F8;} + .d2-995024594 .background-color-N7{background-color:#FFFFFF;} + .d2-995024594 .background-color-B1{background-color:#0D32B2;} + .d2-995024594 .background-color-B2{background-color:#0D32B2;} + .d2-995024594 .background-color-B3{background-color:#E3E9FD;} + .d2-995024594 .background-color-B4{background-color:#E3E9FD;} + .d2-995024594 .background-color-B5{background-color:#EDF0FD;} + .d2-995024594 .background-color-B6{background-color:#F7F8FE;} + .d2-995024594 .background-color-AA2{background-color:#4A6FF3;} + .d2-995024594 .background-color-AA4{background-color:#EDF0FD;} + .d2-995024594 .background-color-AA5{background-color:#F7F8FE;} + .d2-995024594 .background-color-AB4{background-color:#EDF0FD;} + .d2-995024594 .background-color-AB5{background-color:#F7F8FE;} + .d2-995024594 .color-N1{color:#0A0F25;} + .d2-995024594 .color-N2{color:#676C7E;} + .d2-995024594 .color-N3{color:#9499AB;} + .d2-995024594 .color-N4{color:#CFD2DD;} + .d2-995024594 .color-N5{color:#DEE1EB;} + .d2-995024594 .color-N6{color:#EEF1F8;} + .d2-995024594 .color-N7{color:#FFFFFF;} + .d2-995024594 .color-B1{color:#0D32B2;} + .d2-995024594 .color-B2{color:#0D32B2;} + .d2-995024594 .color-B3{color:#E3E9FD;} + .d2-995024594 .color-B4{color:#E3E9FD;} + .d2-995024594 .color-B5{color:#EDF0FD;} + .d2-995024594 .color-B6{color:#F7F8FE;} + .d2-995024594 .color-AA2{color:#4A6FF3;} + .d2-995024594 .color-AA4{color:#EDF0FD;} + .d2-995024594 .color-AA5{color:#F7F8FE;} + .d2-995024594 .color-AB4{color:#EDF0FD;} + .d2-995024594 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 286573e69..fece8e814 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 12 }, - "width": 268, + "width": 251, "height": 216, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -167,7 +167,9 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ], @@ -191,7 +193,7 @@ "id": "products", "type": "sql_table", "pos": { - "x": 300, + "x": 283, "y": 48 }, "width": 164, @@ -239,7 +241,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -267,7 +269,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -295,7 +297,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -323,7 +325,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -347,7 +349,7 @@ "id": "orders", "type": "sql_table", "pos": { - "x": 300, + "x": 283, "y": 308 }, "width": 164, @@ -395,7 +397,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -423,7 +425,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -451,7 +453,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -475,7 +477,7 @@ "id": "shipments", "type": "sql_table", "pos": { - "x": 484, + "x": 467, "y": 48 }, "width": 244, @@ -523,7 +525,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -551,7 +553,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -579,7 +581,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -607,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -654,19 +656,19 @@ "labelPercentage": 0, "route": [ { - "x": 146, + "x": 137.5, "y": 228 }, { - "x": 146, + "x": 137.5, "y": 268 }, { - "x": 341, + "x": 324, "y": 268 }, { - "x": 341, + "x": 324, "y": 308 } ], @@ -700,11 +702,11 @@ "labelPercentage": 0, "route": [ { - "x": 382, + "x": 365, "y": 228 }, { - "x": 382, + "x": 365, "y": 308 } ], @@ -738,19 +740,19 @@ "labelPercentage": 0, "route": [ { - "x": 606, + "x": 589, "y": 228 }, { - "x": 606, + "x": 589, "y": 268 }, { - "x": 423, + "x": 406, "y": 268 }, { - "x": 423, + "x": 406, "y": 308 } ], diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index 5a7475ea3..fc4ea01de 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-2093233888 .fill-N1{fill:#0A0F25;} + .d2-2093233888 .fill-N2{fill:#676C7E;} + .d2-2093233888 .fill-N3{fill:#9499AB;} + .d2-2093233888 .fill-N4{fill:#CFD2DD;} + .d2-2093233888 .fill-N5{fill:#DEE1EB;} + .d2-2093233888 .fill-N6{fill:#EEF1F8;} + .d2-2093233888 .fill-N7{fill:#FFFFFF;} + .d2-2093233888 .fill-B1{fill:#0D32B2;} + .d2-2093233888 .fill-B2{fill:#0D32B2;} + .d2-2093233888 .fill-B3{fill:#E3E9FD;} + .d2-2093233888 .fill-B4{fill:#E3E9FD;} + .d2-2093233888 .fill-B5{fill:#EDF0FD;} + .d2-2093233888 .fill-B6{fill:#F7F8FE;} + .d2-2093233888 .fill-AA2{fill:#4A6FF3;} + .d2-2093233888 .fill-AA4{fill:#EDF0FD;} + .d2-2093233888 .fill-AA5{fill:#F7F8FE;} + .d2-2093233888 .fill-AB4{fill:#EDF0FD;} + .d2-2093233888 .fill-AB5{fill:#F7F8FE;} + .d2-2093233888 .stroke-N1{stroke:#0A0F25;} + .d2-2093233888 .stroke-N2{stroke:#676C7E;} + .d2-2093233888 .stroke-N3{stroke:#9499AB;} + .d2-2093233888 .stroke-N4{stroke:#CFD2DD;} + .d2-2093233888 .stroke-N5{stroke:#DEE1EB;} + .d2-2093233888 .stroke-N6{stroke:#EEF1F8;} + .d2-2093233888 .stroke-N7{stroke:#FFFFFF;} + .d2-2093233888 .stroke-B1{stroke:#0D32B2;} + .d2-2093233888 .stroke-B2{stroke:#0D32B2;} + .d2-2093233888 .stroke-B3{stroke:#E3E9FD;} + .d2-2093233888 .stroke-B4{stroke:#E3E9FD;} + .d2-2093233888 .stroke-B5{stroke:#EDF0FD;} + .d2-2093233888 .stroke-B6{stroke:#F7F8FE;} + .d2-2093233888 .stroke-AA2{stroke:#4A6FF3;} + .d2-2093233888 .stroke-AA4{stroke:#EDF0FD;} + .d2-2093233888 .stroke-AA5{stroke:#F7F8FE;} + .d2-2093233888 .stroke-AB4{stroke:#EDF0FD;} + .d2-2093233888 .stroke-AB5{stroke:#F7F8FE;} + .d2-2093233888 .background-color-N1{background-color:#0A0F25;} + .d2-2093233888 .background-color-N2{background-color:#676C7E;} + .d2-2093233888 .background-color-N3{background-color:#9499AB;} + .d2-2093233888 .background-color-N4{background-color:#CFD2DD;} + .d2-2093233888 .background-color-N5{background-color:#DEE1EB;} + .d2-2093233888 .background-color-N6{background-color:#EEF1F8;} + .d2-2093233888 .background-color-N7{background-color:#FFFFFF;} + .d2-2093233888 .background-color-B1{background-color:#0D32B2;} + .d2-2093233888 .background-color-B2{background-color:#0D32B2;} + .d2-2093233888 .background-color-B3{background-color:#E3E9FD;} + .d2-2093233888 .background-color-B4{background-color:#E3E9FD;} + .d2-2093233888 .background-color-B5{background-color:#EDF0FD;} + .d2-2093233888 .background-color-B6{background-color:#F7F8FE;} + .d2-2093233888 .background-color-AA2{background-color:#4A6FF3;} + .d2-2093233888 .background-color-AA4{background-color:#EDF0FD;} + .d2-2093233888 .background-color-AA5{background-color:#F7F8FE;} + .d2-2093233888 .background-color-AB4{background-color:#EDF0FD;} + .d2-2093233888 .background-color-AB5{background-color:#F7F8FE;} + .d2-2093233888 .color-N1{color:#0A0F25;} + .d2-2093233888 .color-N2{color:#676C7E;} + .d2-2093233888 .color-N3{color:#9499AB;} + .d2-2093233888 .color-N4{color:#CFD2DD;} + .d2-2093233888 .color-N5{color:#DEE1EB;} + .d2-2093233888 .color-N6{color:#EEF1F8;} + .d2-2093233888 .color-N7{color:#FFFFFF;} + .d2-2093233888 .color-B1{color:#0D32B2;} + .d2-2093233888 .color-B2{color:#0D32B2;} + .d2-2093233888 .color-B3{color:#E3E9FD;} + .d2-2093233888 .color-B4{color:#E3E9FD;} + .d2-2093233888 .color-B5{color:#EDF0FD;} + .d2-2093233888 .color-B6{color:#F7F8FE;} + .d2-2093233888 .color-AA2{color:#4A6FF3;} + .d2-2093233888 .color-AA4{color:#EDF0FD;} + .d2-2093233888 .color-AA5{color:#F7F8FE;} + .d2-2093233888 .color-AB4{color:#EDF0FD;} + .d2-2093233888 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + \ No newline at end of file diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index fcf8202d3..2a6778bd9 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg index b799ae018..4994c5aca 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg index 3ab272179..1d06a16d9 100644 --- a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ --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..84eaeaf36 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..f2571ee8b 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..58de4f7c9 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/stable/us_map/dagre/sketch.exp.svg b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg index df9b03f61..84f55ae99 100644 --- a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg index 70c48ca13..4b8459f3d 100644 --- a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..6443dd135 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": "" } ], @@ -1049,12 +1049,12 @@ "labelPercentage": 0, "route": [ { - "x": 155, - "y": 169 + "x": 163.5, + "y": 194.5 }, { - "x": 198.60000610351562, - "y": 303 + "x": 200.3000030517578, + "y": 308.1000061035156 }, { "x": 209.5, @@ -1096,12 +1096,12 @@ "labelPercentage": 0, "route": [ { - "x": 134, - "y": 169 + "x": 124.75, + "y": 194.5 }, { - "x": 86.5999984741211, - "y": 303 + "x": 84.75, + "y": 308.1000061035156 }, { "x": 74.75, 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..95d6816a8 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

+networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

  • of
  • two cities
    • @@ -908,14 +908,28 @@     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 + + + + + + + + + + + + + + - - + + \ No newline at end of file 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..57fd5ed74 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

    +networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    • of
    • two cities
      • @@ -908,8 +908,22 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist + + + + + + + + + + + + + + diff --git a/e2etests/testdata/themes/origami/dagre/board.exp.json b/e2etests/testdata/themes/origami/dagre/board.exp.json index ebc2188fe..00460a587 100644 --- a/e2etests/testdata/themes/origami/dagre/board.exp.json +++ b/e2etests/testdata/themes/origami/dagre/board.exp.json @@ -775,12 +775,12 @@ "labelPercentage": 0, "route": [ { - "x": 127, - "y": 87 + "x": 111.75, + "y": 112.5 }, { - "x": 85.1989974975586, - "y": 156.1999969482422 + "x": 82.1500015258789, + "y": 161.3000030517578 }, { "x": 74.75, diff --git a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg index c9cbd8e53..95b6a1f75 100644 --- a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -Big fontabca - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg b/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg index 399e39090..b9702dcec 100644 --- a/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -Big fontabca - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg index 766c9f609..d4ee0b98c 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -aa container labeldefgc - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg index a629b8415..763056b6a 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -aa container labeldefgc - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg index 4fca91046..688f602e3 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -xbarz foo - + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg index e2b77fa7d..49d79af6d 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -xbarz foo - + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg index 27b4d2c87..478eba267 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + + + diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg index 7d108731f..9ce0dc454 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + + + diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg index d8a7844f1..21fb1a14d 100644 --- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + + + diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg index 7ce6d1f10..2f05e9e0f 100644 --- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + + + diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json index 157966adc..491f6822d 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/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/dagre/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg index b2bd1c952..bc00734fb 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/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

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

      markdown text expanded to 800x400

      a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 @@ -859,7 +859,21 @@ 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..5081e5695 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

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

      markdown text expanded to 800x400

      a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 @@ -859,7 +859,21 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg b/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg index 22685b9db..fb44fc254 100644 --- a/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ - + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg b/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg index 99aea3331..f2fee0ad8 100644 --- a/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ - + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg index e77eb090b..3c8ed46c6 100644 --- a/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ああああああああああ - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg index 3f0dc3b3e..2ce61e4ad 100644 --- a/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ああああああああああ - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg index 518b0f16b..d508b9dcc 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg index d76bcde99..cdb5094de 100644 --- a/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg index a62f0447e..5f4778338 100644 --- a/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg index 586f168b3..fd9eba9ec 100644 --- a/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg b/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg index 4be60e36c..1f694da89 100644 --- a/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -고생끝에낙이온다 - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/korean/elk/sketch.exp.svg b/e2etests/testdata/unicode/korean/elk/sketch.exp.svg index 2e7d483f6..4f9aa497e 100644 --- a/e2etests/testdata/unicode/korean/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/korean/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -고생끝에낙이온다 - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg index d31b00401..b73ffa386 100644 --- a/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg index 1fa77832d..f84cb6cde 100644 --- a/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg index 13ec0b93c..f8b63e9f9 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -おやすみなさい - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg b/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg index eed0ee527..6d526739b 100644 --- a/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -おやすみなさい - + \ No newline at end of file diff --git a/go.mod b/go.mod index ce86dfc85..92b1ac752 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 gonum.org/v1/plot v0.12.0 nhooyr.io/websocket v1.8.7 - oss.terrastruct.com/util-go v0.0.0-20230320053557-dcb5aac7d972 + oss.terrastruct.com/util-go v0.0.0-20230604222829-11c3c60fec14 ) require ( diff --git a/go.sum b/go.sum index 900e291b9..545957784 100644 --- a/go.sum +++ b/go.sum @@ -329,6 +329,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -oss.terrastruct.com/util-go v0.0.0-20230320053557-dcb5aac7d972 h1:HS7fg2GzGsqRLApsoh7ztaLMvXzxSln/Hfz4wy4tIDA= -oss.terrastruct.com/util-go v0.0.0-20230320053557-dcb5aac7d972/go.mod h1:eMWv0sOtD9T2RUl90DLWfuShZCYp4NrsqNpI8eqO6U4= +oss.terrastruct.com/util-go v0.0.0-20230604222829-11c3c60fec14 h1:oy5vtt6O2qYxeSpqWhyevrdUenFfuhphixozUlpL6qY= +oss.terrastruct.com/util-go v0.0.0-20230604222829-11c3c60fec14/go.mod h1:eMWv0sOtD9T2RUl90DLWfuShZCYp4NrsqNpI8eqO6U4= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= diff --git a/lib/env/env.go b/lib/env/env.go index 07ba22eef..c37eea66d 100644 --- a/lib/env/env.go +++ b/lib/env/env.go @@ -2,6 +2,7 @@ package env import ( "os" + "strconv" ) func Test() bool { @@ -25,3 +26,13 @@ func DevOnly() bool { func SkipGraphDiffTests() bool { return os.Getenv("SKIP_GRAPH_DIFF_TESTS") != "" } + +func Timeout() (int, bool) { + if s := os.Getenv("D2_TIMEOUT"); s != "" { + i, err := strconv.ParseInt(s, 10, 64) + if err == nil { + return int(i), true + } + } + return -1, false +} diff --git a/lib/geo/point.go b/lib/geo/point.go index 0b0a4ff51..ab8e034a0 100644 --- a/lib/geo/point.go +++ b/lib/geo/point.go @@ -305,3 +305,22 @@ func (p *Point) TruncateDecimals() { p.X = TruncateDecimals(p.X) p.Y = TruncateDecimals(p.Y) } + +// RemovePoints returns a new Points slice without the points in toRemove +func RemovePoints(points Points, toRemove []bool) Points { + newLen := len(points) + for _, should := range toRemove { + if should { + newLen-- + } + } + + without := make([]*Point, 0, newLen) + for i := 0; i < len(points); i++ { + if toRemove[i] { + continue + } + without = append(without, points[i]) + } + return without +} diff --git a/lib/imgbundler/imgbundler.go b/lib/imgbundler/imgbundler.go index 5c6de7038..526f3bf8d 100644 --- a/lib/imgbundler/imgbundler.go +++ b/lib/imgbundler/imgbundler.go @@ -23,6 +23,8 @@ import ( "oss.terrastruct.com/util-go/xmain" ) +var imgCache sync.Map + const maxImageSize int64 = 1 << 25 // 33_554_432 var imageRegex = regexp.MustCompile(`ab +`, url1, url2) + + ms := &xmain.State{ + Name: "test", + + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + + Env: xos.NewEnv(os.Environ()), + } + ms.Log = cmdlog.NewTB(ms.Env, t) + + count := 0 + + httpClient.Transport = roundTripFunc(func(req *http.Request) *http.Response { + count++ + respRecorder := httptest.NewRecorder() + respRecorder.WriteString(`\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n`) + respRecorder.WriteHeader(200) + return respRecorder.Result() + }) + + out, err := BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + tassert.Equal(t, 1, count) + if strings.Contains(string(out), url1) { + t.Fatal("links still exist") + } + tassert.Equal(t, 2, strings.Count(string(out), "image/svg+xml")) +} + +func TestImgCache(t *testing.T) { + imgCache = sync.Map{} + ctx := context.Background() + url1 := "https://icons.terrastruct.com/essentials/004-picture.svg" + url2 := "https://icons.terrastruct.com/essentials/004-picture.svg" + + sampleSVG := fmt.Sprintf(` +ab +`, url1, url2) + + ms := &xmain.State{ + Name: "test", + + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + + Env: xos.NewEnv(os.Environ()), + } + ms.Log = cmdlog.NewTB(ms.Env, t) + + count := 0 + + httpClient.Transport = roundTripFunc(func(req *http.Request) *http.Response { + count++ + respRecorder := httptest.NewRecorder() + respRecorder.WriteString(`\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n`) + respRecorder.WriteHeader(200) + return respRecorder.Result() + }) + + // Using a cache, imgs are not refetched on multiple runs + ms.Env.Setenv("IMG_CACHE", "1") + _, err := BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + _, err = BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + tassert.Equal(t, 1, count) + + // With cache disabled, it refetches + ms.Env.Setenv("IMG_CACHE", "0") + count = 0 + _, err = BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + _, err = BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + tassert.Equal(t, 2, count) +} diff --git a/lib/time/time.go b/lib/time/time.go new file mode 100644 index 000000000..a9a1f692b --- /dev/null +++ b/lib/time/time.go @@ -0,0 +1,26 @@ +package time + +import ( + "context" + "time" + + "oss.terrastruct.com/d2/lib/env" +) + +func HumanDate(t time.Time) string { + local := t.Local() + return local.Format(time.RFC822) +} + +// WithTimeout returns context.WithTimeout(ctx, timeout) but timeout is overridden with D2_TIMEOUT if set +func WithTimeout(ctx context.Context, timeout time.Duration) (context.Context, context.CancelFunc) { + t := timeout + if seconds, has := env.Timeout(); has { + t = time.Duration(seconds) * time.Second + } + if t <= 0 { + return ctx, func() {} + } + + return context.WithTimeout(ctx, t) +} diff --git a/lib/version/version.go b/lib/version/version.go index c39637fc2..aeaa91c5c 100644 --- a/lib/version/version.go +++ b/lib/version/version.go @@ -3,7 +3,7 @@ package version import "regexp" // Pre-built binaries will have version set correctly during build time. -var Version = "v0.4.2-HEAD" +var Version = "v0.5.1-HEAD" func OnlyNumbers() string { re, err := regexp.Compile("[0-9]+.[0-9]+.[0-9]+") diff --git a/testdata/d2compiler/TestCompile/3d_oval.exp.json b/testdata/d2compiler/TestCompile/3d_oval.exp.json index 997f4d61c..abc612f0c 100644 --- a/testdata/d2compiler/TestCompile/3d_oval.exp.json +++ b/testdata/d2compiler/TestCompile/3d_oval.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/3d_oval.d2,1:0:17-1:19:36", diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 4dfed8f49..55f49e18a 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,0:9:9-13:0:184", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,0:9:9-13:1:185", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,1:15:26-5:2:85", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,1:15:26-5:3:86", "nodes": [ { "map_key": { @@ -185,7 +185,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,6:8:95-9:2:143", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,6:8:95-9:3:144", "nodes": [ { "map_key": { @@ -287,7 +287,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,10:8:153-12:1:182", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,10:8:153-12:2:183", "nodes": [ { "map_key": { @@ -361,7 +361,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,14:8:194-14:37:223", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,14:8:194-14:38:224", "nodes": [ { "map_key": { @@ -441,7 +441,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,15:7:232-15:36:261", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,15:7:232-15:37:262", "nodes": [ { "map_key": { @@ -544,7 +544,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:17:281-17:40:304", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:17:281-17:41:305", "nodes": [ { "map_key": { @@ -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/bad-style-nesting.exp.json b/testdata/d2compiler/TestCompile/bad-style-nesting.exp.json index 4017433f8..51bcf33f8 100644 --- a/testdata/d2compiler/TestCompile/bad-style-nesting.exp.json +++ b/testdata/d2compiler/TestCompile/bad-style-nesting.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/bad-style-nesting.d2,0:12:12-0:17:17", diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index bc9297187..c4e7552f6 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -32,7 +32,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,0:8:8-2:0:75", + "range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,0:8:8-2:1:76", "nodes": [ { "map_key": { @@ -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..f5e4620d6 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,0:3:3-2:0:31", + "range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,0:3:3-2:1:32", "nodes": [ { "map_key": { @@ -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..ff306f1c4 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,1:3:4-3:0:22", + "range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,1:3:4-3:1:23", "nodes": [ { "map_key": { @@ -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..8a855ee99 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/basic_style.d2,1:3:4-3:0:26", + "range": "d2/testdata/d2compiler/TestCompile/basic_style.d2,1:3:4-3:1:27", "nodes": [ { "map_key": { @@ -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/blank_underscore.exp.json b/testdata/d2compiler/TestCompile/blank_underscore.exp.json index 01f1b3a53..2407686ee 100644 --- a/testdata/d2compiler/TestCompile/blank_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/blank_underscore.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/blank_underscore.d2,2:2:11-2:3:12", diff --git a/testdata/d2compiler/TestCompile/border-radius-negative.exp.json b/testdata/d2compiler/TestCompile/border-radius-negative.exp.json index fe11d846b..c1c73b875 100644 --- a/testdata/d2compiler/TestCompile/border-radius-negative.exp.json +++ b/testdata/d2compiler/TestCompile/border-radius-negative.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/border-radius-negative.d2,2:23:30-2:25:32", diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json index a787bab08..049d4ed34 100644 --- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json +++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,0:9:9-4:0:48", + "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,0:9:9-4:1:49", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,1:14:25-3:2:46", + "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,1:14:25-3:3:47", "nodes": [ { "map_key": { @@ -118,7 +118,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,6:8:59-9:0:97", + "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,6:8:59-9:1:98", "nodes": [ { "map_key": { @@ -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..c6b641edc 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,0:17:17-6:0:80", + "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,0:17:17-6:1:81", "nodes": [ { "map_key": { @@ -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..f139da4f2 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,0:17:17-4:0:80", + "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,0:17:17-4:1:81", "nodes": [ { "map_key": { @@ -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-internal-edge.exp.json b/testdata/d2compiler/TestCompile/classes-internal-edge.exp.json index c3a2adf37..26af3fe34 100644 --- a/testdata/d2compiler/TestCompile/classes-internal-edge.exp.json +++ b/testdata/d2compiler/TestCompile/classes-internal-edge.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/classes-internal-edge.d2,7:2:72-7:16:86", diff --git a/testdata/d2compiler/TestCompile/classes-unreserved.exp.json b/testdata/d2compiler/TestCompile/classes-unreserved.exp.json index b33e928eb..ed16fbcd9 100644 --- a/testdata/d2compiler/TestCompile/classes-unreserved.exp.json +++ b/testdata/d2compiler/TestCompile/classes-unreserved.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/classes-unreserved.d2,2:4:26-2:8:30", diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index a96e1034f..ac50b12bd 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,0:9:9-10:0:145", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,0:9:9-10:1:146", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,1:15:26-5:2:85", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,1:15:26-5:3:86", "nodes": [ { "map_key": { @@ -185,7 +185,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,6:8:95-9:2:143", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,6:8:95-9:3:144", "nodes": [ { "map_key": { @@ -292,7 +292,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,11:8:155-11:29:176", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,11:8:155-11:30:177", "nodes": [ { "map_key": { @@ -364,7 +364,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:11:189-12:49:227", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:11:189-12:50:228", "nodes": [ { "map_key": { @@ -470,7 +470,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:7:236-13:41:270", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:7:236-13:42:271", "nodes": [ { "map_key": { @@ -588,7 +588,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:17:290-15:31:304", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:17:290-15:32:305", "nodes": [ { "map_key": { @@ -649,9 +649,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -686,9 +684,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "path" ] @@ -762,9 +758,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] @@ -836,9 +830,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] @@ -890,9 +882,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] diff --git a/testdata/d2compiler/TestCompile/comma-array-class.exp.json b/testdata/d2compiler/TestCompile/comma-array-class.exp.json new file mode 100644 index 000000000..e67c0ec48 --- /dev/null +++ b/testdata/d2compiler/TestCompile/comma-array-class.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/comma-array-class.d2,11:10:157-11:15:162", + "errmsg": "d2/testdata/d2compiler/TestCompile/comma-array-class.d2:12:11: class \"dragon_ball, path\" not found. Did you mean to use \";\" to separate array items?" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index 9441a3351..a866cd12c 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -1,182 +1,11 @@ { - "graph": { - "name": "", - "isFolderOnly": false, - "ast": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-3:1:38", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-3:1:38", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:3:3", - "value": [ - { - "string": "foo", - "raw_string": "foo" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:4:4-3:0:37", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,1:2:8-1:12:18", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,1:2:8-1:7:13", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,1:2:8-1:7:13", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,1:9:15-1:12:18", - "value": [ - { - "string": "bar", - "raw_string": "bar" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,2:2:21-2:17:36", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,2:2:21-2:12:31", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,2:2:21-2:12:31", - "value": [ - { - "string": "constraint", - "raw_string": "constraint" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,2:14:33-2:17:36", - "value": [ - { - "string": "BIZ", - "raw_string": "BIZ" - } - ] - } - } - } - } - ] - } - } - } - } - ] - }, - "root": { - "id": "", - "id_val": "", - "attributes": { - "label": { - "value": "" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - }, - "edges": null, - "objects": [ + "graph": null, + "err": { + "errs": [ { - "id": "foo", - "id_val": "foo", - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:3:3", - "value": [ - { - "string": "foo", - "raw_string": "foo" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": -1 - } - ], - "attributes": { - "label": { - "value": "bar" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "BIZ" - } - }, - "zIndex": 0 + "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,2:2:21-2:17:36", + "errmsg": "d2/testdata/d2compiler/TestCompile/constraint_label.d2:3:3: \"constraint\" keyword can only be used in \"sql_table\" shapes" } ] - }, - "err": null + } } 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..0f9d3dd6b 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimension_with_style.d2,0:3:3-3:0:41", + "range": "d2/testdata/d2compiler/TestCompile/dimension_with_style.d2,0:3:3-3:1:42", "nodes": [ { "map_key": { @@ -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..6072848cd 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,1:12:13-44:0:503", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,1:12:13-44:1:504", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,2:19:34-11:1:130", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,2:19:34-11:2:131", "nodes": [ { "map_key": { @@ -137,7 +137,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,6:11:77-10:2:127", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,6:11:77-10:3:128", "nodes": [ { "map_key": { @@ -262,7 +262,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,12:20:152-21:1:247", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,12:20:152-21:2:248", "nodes": [ { "map_key": { @@ -377,7 +377,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,17:10:209-20:2:244", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,17:10:209-20:3:245", "nodes": [ { "map_key": { @@ -473,7 +473,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,22:17:266-32:1:374", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,22:17:266-32:2:375", "nodes": [ { "map_key": { @@ -588,7 +588,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,27:11:321-31:2:371", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,27:11:321-31:3:372", "nodes": [ { "map_key": { @@ -713,7 +713,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,33:20:396-43:1:501", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,33:20:396-43:2:502", "nodes": [ { "map_key": { @@ -828,7 +828,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,38:8:451-42:2:498", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,38:8:451-42:3:499", "nodes": [ { "map_key": { @@ -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..2aad6eb2d 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -32,7 +32,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,0:8:8-4:0:52", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,0:8:8-4:1:53", "nodes": [ { "map_key": { @@ -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..573bd41bb 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:8:8-8:0:166", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:8:8-8:1:167", "nodes": [ { "map_key": { @@ -84,7 +84,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,1:57:67-3:2:90", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,1:57:67-3:3:91", "nodes": [ { "map_key": { @@ -179,7 +179,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,5:20:137-7:2:164", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,5:20:137-7:3:165", "nodes": [ { "map_key": { @@ -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..43dbe6934 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:8:8-2:0:67", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:8:8-2:1:68", "nodes": [ { "map_key": { @@ -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..7b58cb7bd 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -87,7 +87,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:13:14-3:0:105", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:13:14-3:1:106", "nodes": [ { "map_key": { @@ -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..a1f43e986 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:5:5-4:0:47", + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:5:5-4:1:48", "nodes": [ { "map_key": { @@ -155,7 +155,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:5:55-10:0:98", + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:5:55-10:1:99", "nodes": [ { "map_key": { @@ -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..a2e8b7dc6 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:8:9-3:0:33", + "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:8:9-3:1:34", "nodes": [ { "map_key": { @@ -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..bccfb9129 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:8:8-3:0:51", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:8:8-3:1:52", "nodes": [ { "comment": { @@ -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_in_column.exp.json b/testdata/d2compiler/TestCompile/edge_in_column.exp.json index 4a390573c..7e501c52a 100644 --- a/testdata/d2compiler/TestCompile/edge_in_column.exp.json +++ b/testdata/d2compiler/TestCompile/edge_in_column.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", 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..14c91274e 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -101,7 +101,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:13:21-4:0:112", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:13:21-4:1:113", "nodes": [ { "map_key": { @@ -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..6ebba4d34 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,1:3:4-4:0:37", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,1:3:4-4:1:38", "nodes": [ { "map_key": { @@ -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..084167741 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,1:3:4-3:0:19", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,1:3:4-3:1:20", "nodes": [ { "map_key": { @@ -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_invalid_style.exp.json b/testdata/d2compiler/TestCompile/edge_invalid_style.exp.json index ec8465277..673768d0d 100644 --- a/testdata/d2compiler/TestCompile/edge_invalid_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_invalid_style.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/edge_invalid_style.d2,1:2:12-1:9:19", 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..5a9afc37d 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,1:3:4-3:0:15", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,1:3:4-3:1:16", "nodes": [ { "map_key": { @@ -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..846333d45 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,2:3:11-4:0:49", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,2:3:11-4:1:50", "nodes": [ { "map_key": { @@ -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..6ac0e489b 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,2:3:11-6:0:57", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,2:3:11-6:1:58", "nodes": [ { "map_key": { @@ -147,7 +147,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:18:31-5:1:55", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:18:31-5:2:56", "nodes": [ { "map_key": { @@ -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..b3a8c19ed 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,2:3:11-8:0:67", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,2:3:11-8:1:68", "nodes": [ { "map_key": { @@ -147,7 +147,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:18:31-7:1:65", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:18:31-7:2:66", "nodes": [ { "map_key": { @@ -171,7 +171,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,4:9:42-6:2:62", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,4:9:42-6:3:63", "nodes": [ { "map_key": { @@ -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..04edc0e31 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -60,7 +60,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:21:21-0:40:40", + "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:21:21-0:41:41", "nodes": [ { "map_key": { @@ -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..4e4652c77 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:8:9-3:0:100", + "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:8:9-3:1:101", "nodes": [ { "map_key": { @@ -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..9874c0c27 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:8:8-4:0:55", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:8:8-4:1:56", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,1:20:30-3:2:53", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,1:20:30-3:3:54", "nodes": [ { "map_key": { @@ -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..1a0f715fa 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:19:26-3:0:43", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:19:26-3:1:44", "nodes": [ { "map_key": { @@ -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..ab4523fa7 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:8:9-5:0:43", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:8:9-5:1:44", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,2:9:20-4:2:41", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,2:9:20-4:3:42", "nodes": [ { "map_key": { @@ -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..6e83a2f2e 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:8:9-3:0:31", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:8:9-3:1:32", "nodes": [ { "map_key": { @@ -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_map_non_reserved.exp.json b/testdata/d2compiler/TestCompile/edge_map_non_reserved.exp.json index b33df932b..5c68aaac6 100644 --- a/testdata/d2compiler/TestCompile/edge_map_non_reserved.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_non_reserved.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/edge_map_non_reserved.d2,2:2:13-2:3:14", diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 8ae05a29c..c00936b2d 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:8:8-2:0:44", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:8:8-2:1:45", "nodes": [ { "map_key": { @@ -167,7 +167,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:30:76-5:0:95", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:30:76-5:1:96", "nodes": [ { "map_key": { @@ -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..6f5721e7c 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:8:8-0:43:43", + "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:8:8-0:44:44", "nodes": [ { "map_key": { @@ -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..18c537b79 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:30:37-3:0:56", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:30:37-3:1:57", "nodes": [ { "map_key": { @@ -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/edge_to_style.exp.json b/testdata/d2compiler/TestCompile/edge_to_style.exp.json index 4b0ac711c..2651a89b4 100644 --- a/testdata/d2compiler/TestCompile/edge_to_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_to_style.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/edge_to_style.d2,1:7:31-1:12:36", diff --git a/testdata/d2compiler/TestCompile/edge_unquoted_hex.exp.json b/testdata/d2compiler/TestCompile/edge_unquoted_hex.exp.json index 153cd212a..1c33c9730 100644 --- a/testdata/d2compiler/TestCompile/edge_unquoted_hex.exp.json +++ b/testdata/d2compiler/TestCompile/edge_unquoted_hex.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/edge_unquoted_hex.d2,2:9:29-2:10:30", diff --git a/testdata/d2compiler/TestCompile/equal_dimensions_on_circle.exp.json b/testdata/d2compiler/TestCompile/equal_dimensions_on_circle.exp.json index dd0a210f2..210bf49c7 100644 --- a/testdata/d2compiler/TestCompile/equal_dimensions_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/equal_dimensions_on_circle.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/equal_dimensions_on_circle.d2,2:1:26-2:11:36", diff --git a/testdata/d2compiler/TestCompile/errors/missing_shape_icon.exp.json b/testdata/d2compiler/TestCompile/errors/missing_shape_icon.exp.json index e4b3afbd9..b73ef0eb3 100644 --- a/testdata/d2compiler/TestCompile/errors/missing_shape_icon.exp.json +++ b/testdata/d2compiler/TestCompile/errors/missing_shape_icon.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/errors/missing_shape_icon.d2,0:0:0-0:14:14", diff --git a/testdata/d2compiler/TestCompile/errors/reserved_icon_style.exp.json b/testdata/d2compiler/TestCompile/errors/reserved_icon_style.exp.json index 26dde5d47..1286cf4bf 100644 --- a/testdata/d2compiler/TestCompile/errors/reserved_icon_style.exp.json +++ b/testdata/d2compiler/TestCompile/errors/reserved_icon_style.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/errors/reserved_icon_style.d2,2:8:23-2:27:42", 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..fcdeecfc7 100644 --- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,0:3:3-4:0:42", + "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,0:3:3-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,1:8:13-3:2:40", + "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,1:8:13-3:3:41", "nodes": [ { "map_key": { @@ -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..2b2c4b674 100644 --- a/testdata/d2compiler/TestCompile/grid.exp.json +++ b/testdata/d2compiler/TestCompile/grid.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/grid.d2,0:5:5-3:0:42", + "range": "d2/testdata/d2compiler/TestCompile/grid.d2,0:5:5-3:1:43", "nodes": [ { "map_key": { @@ -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_edge.exp.json b/testdata/d2compiler/TestCompile/grid_edge.exp.json index 52a77accb..e1a46d1d8 100644 --- a/testdata/d2compiler/TestCompile/grid_edge.exp.json +++ b/testdata/d2compiler/TestCompile/grid_edge.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,2:1:22-2:7:28", diff --git a/testdata/d2compiler/TestCompile/grid_gap_negative.exp.json b/testdata/d2compiler/TestCompile/grid_gap_negative.exp.json index 70f2a05d4..fdccd8642 100644 --- a/testdata/d2compiler/TestCompile/grid_gap_negative.exp.json +++ b/testdata/d2compiler/TestCompile/grid_gap_negative.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/grid_gap_negative.d2,1:17:24-1:21:28", diff --git a/testdata/d2compiler/TestCompile/grid_negative.exp.json b/testdata/d2compiler/TestCompile/grid_negative.exp.json index 7999bc2b6..dcc2302a6 100644 --- a/testdata/d2compiler/TestCompile/grid_negative.exp.json +++ b/testdata/d2compiler/TestCompile/grid_negative.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/grid_negative.d2,2:15:38-2:19:42", diff --git a/testdata/d2compiler/TestCompile/grid_nested.exp.json b/testdata/d2compiler/TestCompile/grid_nested.exp.json index a6a72499e..c424ef3df 100644 --- a/testdata/d2compiler/TestCompile/grid_nested.exp.json +++ b/testdata/d2compiler/TestCompile/grid_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/grid_nested.d2,0:5:5-15:0:123", + "range": "d2/testdata/d2compiler/TestCompile/grid_nested.d2,0:5:5-15:1:124", "nodes": [ { "map_key": { @@ -212,7 +212,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/grid_nested.d2,8:4:76-14:1:121", + "range": "d2/testdata/d2compiler/TestCompile/grid_nested.d2,8:4:76-14:2:122", "nodes": [ { "map_key": { @@ -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/illegal-stroke-width.exp.json b/testdata/d2compiler/TestCompile/illegal-stroke-width.exp.json index 4bdd9802f..89001ac94 100644 --- a/testdata/d2compiler/TestCompile/illegal-stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/illegal-stroke-width.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/illegal-stroke-width.d2,1:22:28-1:24:30", diff --git a/testdata/d2compiler/TestCompile/image_children_Steps.exp.json b/testdata/d2compiler/TestCompile/image_children_Steps.exp.json index 7958d0e1b..b9b6f483f 100644 --- a/testdata/d2compiler/TestCompile/image_children_Steps.exp.json +++ b/testdata/d2compiler/TestCompile/image_children_Steps.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/image_children_Steps.d2,3:2:115-3:7:120", diff --git a/testdata/d2compiler/TestCompile/image_non_style.exp.json b/testdata/d2compiler/TestCompile/image_non_style.exp.json index 29ce4ba85..d111a25d3 100644 --- a/testdata/d2compiler/TestCompile/image_non_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_non_style.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/image_non_style.d2,3:2:115-3:6:119", diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index deba163ae..0f22863e9 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -32,7 +32,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,0:8:8-4:0:116", + "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,0:8:8-4:1:117", "nodes": [ { "map_key": { @@ -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/improper-class-ref.exp.json b/testdata/d2compiler/TestCompile/improper-class-ref.exp.json index 02fd3f333..faa6daf73 100644 --- a/testdata/d2compiler/TestCompile/improper-class-ref.exp.json +++ b/testdata/d2compiler/TestCompile/improper-class-ref.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/improper-class-ref.d2,0:6:6-0:11:11", diff --git a/testdata/d2compiler/TestCompile/invalid-fill-pattern.exp.json b/testdata/d2compiler/TestCompile/invalid-fill-pattern.exp.json index 8c1a03f92..3d31630e8 100644 --- a/testdata/d2compiler/TestCompile/invalid-fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/invalid-fill-pattern.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/invalid-fill-pattern.d2,2:18:33-2:23:38", diff --git a/testdata/d2compiler/TestCompile/invalid_direction.exp.json b/testdata/d2compiler/TestCompile/invalid_direction.exp.json index d140cb2bf..f6d5ce213 100644 --- a/testdata/d2compiler/TestCompile/invalid_direction.exp.json +++ b/testdata/d2compiler/TestCompile/invalid_direction.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/invalid_direction.d2,1:13:18-1:21:26", diff --git a/testdata/d2compiler/TestCompile/keyword-container.exp.json b/testdata/d2compiler/TestCompile/keyword-container.exp.json index 898e9071a..e802be7d9 100644 --- a/testdata/d2compiler/TestCompile/keyword-container.exp.json +++ b/testdata/d2compiler/TestCompile/keyword-container.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/keyword-container.d2,0:2:2-0:6:6", diff --git a/testdata/d2compiler/TestCompile/leaky_sequence.exp.json b/testdata/d2compiler/TestCompile/leaky_sequence.exp.json index e0a147f90..0df098fef 100644 --- a/testdata/d2compiler/TestCompile/leaky_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/leaky_sequence.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/leaky_sequence.d2,4:0:37-4:8:45", diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index a06090d29..66fe44602 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:0:24", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:1:25", "nodes": [ { "map_key": { @@ -61,7 +61,7 @@ }, "primary": {}, "value": { - "double_quoted_string": { + "unquoted_string": { "range": ",0:0:0-0:0:0", "value": [ { @@ -99,7 +99,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:54", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:1:55", "nodes": [ { "map_key": { @@ -123,7 +123,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:2:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:3:53", "nodes": [ { "map_key": { @@ -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 } @@ -301,21 +295,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-7:1:55", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-2:1:25", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "yo" } ] } @@ -323,137 +316,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:0:24", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:18:23", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:8:13", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:3:8", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:4:9-1:8:13", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - } - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-7:1:55", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:54", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-6:3:53", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-4:3:39", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-4:3:39", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:2:52", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", - "value": [ - { - "string": "yo", - "raw_string": "yo" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -477,9 +340,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -526,9 +387,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..974fc5fbc 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -70,7 +70,7 @@ }, "primary": {}, "value": { - "double_quoted_string": { + "unquoted_string": { "range": ",0:0:0-0:0:0", "value": [ { @@ -103,7 +103,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:0:112", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:1:113", "nodes": [ { "map_key": { @@ -127,7 +127,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:2:110", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:3:111", "nodes": [ { "map_key": { @@ -217,7 +217,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:174", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:1:175", "nodes": [ { "map_key": { @@ -241,7 +241,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:172", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:3:173", "nodes": [ { "map_key": { @@ -329,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -412,9 +410,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -424,21 +420,20 @@ "name": "cat", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:175", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:30:30", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "question", - "raw_string": "question" + "string": "the cat" } ] } @@ -446,43 +441,21 @@ ] }, "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30", - "value": [ - { - "string": "How does the cat go?", - "raw_string": "How does the cat go?" - } - ] - } - } + "value": {} } }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:25:56", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:8:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "question", - "raw_string": "question" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", - "value": [ - { - "string": "link", - "raw_string": "link" + "string": "meeeowwww" } ] } @@ -490,243 +463,61 @@ ] }, "primary": {}, - "value": { - "double_quoted_string": { + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "edges": [ + { "range": ",0:0:0-0:0:0", + "src": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "the cat" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "meeeowwww" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", "value": [ { - "string": "root.layers.cat" + "string": "goes", + "raw_string": "goes" } ] } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-7:1:113", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:0:112", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-6:3:111", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", - "value": [ - { - "string": "cat", - "raw_string": "cat" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:2:110", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:30:107", - "edges": [ - { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", - "src": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", - "value": [ - { - "string": "the cat", - "raw_string": "the cat" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", - "value": [ - { - "string": "meeeowwww", - "raw_string": "meeeowwww" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", - "value": [ - { - "string": "goes", - "raw_string": "goes" - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:175", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", - "value": [ - { - "string": "scenarios", - "raw_string": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:174", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:173", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", - "value": [ - { - "string": "green", - "raw_string": "green" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:172", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:30:169", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:23:162", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:12:151", - "value": [ - { - "string": "question", - "raw_string": "question" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", - "value": [ - { - "string": "green", - "raw_string": "green" - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -750,9 +541,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -783,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -832,9 +619,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -879,9 +664,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -893,29 +676,27 @@ "name": "green", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:175", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:30:30", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "question", - "raw_string": "question" + "string": "question" } ] } } ] }, - "primary": {}, - "value": { + "primary": { "unquoted_string": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30", "value": [ @@ -925,203 +706,54 @@ } ] } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:25:56", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:8:39", - "value": [ - { - "string": "question", - "raw_string": "question" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] }, - "primary": {}, - "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.cat" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-7:1:113", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:0:112", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-6:3:111", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "cat", - "raw_string": "cat" + "string": "link" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:2:110", - "nodes": [ + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:30:107", - "edges": [ - { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", - "src": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", - "value": [ - { - "string": "the cat", - "raw_string": "the cat" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", - "value": [ - { - "string": "meeeowwww", - "raw_string": "meeeowwww" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", - "value": [ - { - "string": "goes", - "raw_string": "goes" - } - ] - } - } - } + "string": "root.layers.cat" } ] } - } + }, + "value": {} } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:175", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", - "value": [ - { - "string": "scenarios", - "raw_string": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:174", - "nodes": [ + }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:173", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "green", - "raw_string": "green" + "string": "style" } ] } @@ -1131,51 +763,27 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:172", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:30:169", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:23:162", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:12:151", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "question", - "raw_string": "question" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162", - "value": [ - { - "string": "fill", - "raw_string": "fill" + "string": "fill" } ] } } ] }, - "primary": {}, - "value": { + "primary": { "unquoted_string": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", "value": [ @@ -1185,7 +793,8 @@ } ] } - } + }, + "value": {} } } ] @@ -1219,9 +828,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1348,9 +955,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..e1ba86106 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -37,7 +37,7 @@ }, "primary": {}, "value": { - "double_quoted_string": { + "unquoted_string": { "range": ",0:0:0-0:0:0", "value": [ { @@ -70,7 +70,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:100", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:1:101", "nodes": [ { "map_key": { @@ -94,7 +94,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:2:98", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:3:99", "nodes": [ { "map_key": { @@ -118,7 +118,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:4:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:5:95", "nodes": [ { "map_key": { @@ -142,7 +142,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:6:88", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:7:89", "nodes": [ { "map_key": { @@ -208,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -283,64 +279,20 @@ "name": "x", "isFolderOnly": true, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:101", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:2:2-0:6:6", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x.layers.x" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:101", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", - "value": [ - { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -350,21 +302,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:100", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-8:3:99", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -374,21 +325,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:2:98", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-7:5:95", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "hello" } ] } @@ -396,65 +346,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:4:94", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-6:7:89", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:6:88", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", - "value": [ - { - "string": "hello", - "raw_string": "hello" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -488,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -501,32 +391,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:101", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:2:2-0:6:6", - "value": [ - { - "string": "link", - "raw_string": "link" + "string": "hello" } ] } @@ -534,155 +412,7 @@ ] }, "primary": {}, - "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x.layers.x" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:101", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:100", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-8:3:99", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:2:98", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-7:5:95", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:4:94", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-6:7:89", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:6:88", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", - "value": [ - { - "string": "hello", - "raw_string": "hello" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -706,9 +436,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -755,9 +483,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json index d8f1db764..0cac84653 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2,1:0:4-1:18:22", diff --git a/testdata/d2compiler/TestCompile/link-board-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-not-found.exp.json index 29ff2fdde..f448bcd36 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-found.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-found.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found.d2,0:0:0-0:16:16", diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index 77fab9ab6..1f8db4193 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -37,7 +37,7 @@ }, "primary": {}, "value": { - "double_quoted_string": { + "unquoted_string": { "range": ",0:0:0-0:0:0", "value": [ { @@ -70,7 +70,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:0:41", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:1:42", "nodes": [ { "map_key": { @@ -94,7 +94,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:1:39", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:2:40", "nodes": [ { "map_key": { @@ -150,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -225,32 +221,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-5:1:42", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:16:16", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:2:2-0:6:6", - "value": [ - { - "string": "link", - "raw_string": "link" + "string": "y" } ] } @@ -258,97 +242,7 @@ ] }, "primary": {}, - "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-5:1:42", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-1:6:23", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-1:6:23", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:0:41", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-4:2:40", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-2:2:29", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-2:2:29", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:1:39", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -372,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json index c5d2aaac6..378536db9 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:8:59-6:18:69", diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index 2fba9e04d..a8ba7e509 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:120", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:1:121", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:118", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:3:119", "nodes": [ { "map_key": { @@ -121,7 +121,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:114", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:5:115", "nodes": [ { "map_key": { @@ -145,7 +145,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:6:108", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:7:109", "nodes": [ { "map_key": { @@ -179,7 +179,7 @@ }, "primary": {}, "value": { - "double_quoted_string": { + "unquoted_string": { "range": ",0:0:0-0:0:0", "value": [ { @@ -222,7 +222,7 @@ }, "primary": {}, "value": { - "double_quoted_string": { + "unquoted_string": { "range": ",0:0:0-0:0:0", "value": [ { @@ -274,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -335,21 +331,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:121", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "yo" } ] } @@ -362,17 +357,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:121", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -382,21 +376,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:120", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:119", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -406,44 +399,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:118", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "yo", - "raw_string": "yo" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:115", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", - "value": [ - { - "string": "layers", - "raw_string": "layers" + "string": "hello" } ] } @@ -453,121 +422,96 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:114", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:7:109", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "link" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:6:108", - "nodes": [ + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:32:81", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:18:67", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", - "value": [ - { - "string": "hello", - "raw_string": "hello" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:19:101", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:16:98", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", - "value": [ - { - "string": "hey", - "raw_string": "hey" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - } - } + "string": "root.layers.x" } ] } + }, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "hey" } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "value": {} } } ] @@ -606,9 +550,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -655,9 +597,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -667,44 +607,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:121", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:121", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", - "value": [ - { - "string": "layers", - "raw_string": "layers" + "string": "hello" } ] } @@ -714,202 +630,96 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:120", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:119", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "link" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:118", - "nodes": [ + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", - "value": [ - { - "string": "yo", - "raw_string": "yo" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:115", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:114", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:7:109", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:6:108", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:32:81", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:18:67", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", - "value": [ - { - "string": "hello", - "raw_string": "hello" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:19:101", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:16:98", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", - "value": [ - { - "string": "hey", - "raw_string": "hey" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } + "string": "root.layers.x" } ] } + }, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "hey" } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "value": {} } } ] @@ -938,9 +748,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1001,9 +809,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1062,9 +868,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/md_block_string_err.exp.json b/testdata/d2compiler/TestCompile/md_block_string_err.exp.json index d5f3db2b7..499d56caf 100644 --- a/testdata/d2compiler/TestCompile/md_block_string_err.exp.json +++ b/testdata/d2compiler/TestCompile/md_block_string_err.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/md_block_string_err.d2,3:18:50-3:24:56", 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/name-with-dot-underscore.exp.json b/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json new file mode 100644 index 000000000..7c2ec3cf4 --- /dev/null +++ b/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json @@ -0,0 +1,341 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-7:0:31", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-2:1:12", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-0:1:1", + "value": [ + { + "string": "A", + "raw_string": "A" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:3:3-2:1:12", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:5:10", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:5:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:3:8", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:4:9-1:5:10", + "value": [ + { + "string": "C", + "raw_string": "C" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-6:1:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-4:5:19", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-4:5:19", + "value": [ + { + "string": "D.E", + "raw_string": "D.E" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:7:21-6:1:30", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:5:28", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:5:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:3:26", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:4:27-5:5:28", + "value": [ + { + "string": "C", + "raw_string": "C" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "A", + "id_val": "A", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-0:1:1", + "value": [ + { + "string": "A", + "raw_string": "A" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "A" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "C", + "id_val": "C", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:5:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:3:8", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:4:9-1:5:10", + "value": [ + { + "string": "C", + "raw_string": "C" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:5:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:3:26", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:4:27-5:5:28", + "value": [ + { + "string": "C", + "raw_string": "C" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "C" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "\"D.E\"", + "id_val": "D.E", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-4:5:19", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-4:5:19", + "value": [ + { + "string": "D.E", + "raw_string": "D.E" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "D.E" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/near-invalid.exp.json b/testdata/d2compiler/TestCompile/near-invalid.exp.json index f04575527..a65591ba6 100644 --- a/testdata/d2compiler/TestCompile/near-invalid.exp.json +++ b/testdata/d2compiler/TestCompile/near-invalid.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/near-invalid.d2,8:10:133-8:17:140", diff --git a/testdata/d2compiler/TestCompile/near_bad_connected.exp.json b/testdata/d2compiler/TestCompile/near_bad_connected.exp.json index b5ac2eb4a..e84042317 100644 --- a/testdata/d2compiler/TestCompile/near_bad_connected.exp.json +++ b/testdata/d2compiler/TestCompile/near_bad_connected.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/near_bad_connected.d2,4:4:42-4:10:48", diff --git a/testdata/d2compiler/TestCompile/near_bad_constant.exp.json b/testdata/d2compiler/TestCompile/near_bad_constant.exp.json index 8f045ca18..dce81d8ac 100644 --- a/testdata/d2compiler/TestCompile/near_bad_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_bad_constant.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/near_bad_constant.d2,0:8:8-0:19:19", 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/near_descendant_connect_to_outside.exp.json b/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json index ca04fbf51..4aeaa944a 100644 --- a/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json +++ b/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.d2,5:4:47-5:12:55", diff --git a/testdata/d2compiler/TestCompile/near_near_const.exp.json b/testdata/d2compiler/TestCompile/near_near_const.exp.json index 7b5fe99af..cb7ca846c 100644 --- a/testdata/d2compiler/TestCompile/near_near_const.exp.json +++ b/testdata/d2compiler/TestCompile/near_near_const.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/near_near_const.d2,6:7:50-6:12:55", diff --git a/testdata/d2compiler/TestCompile/near_sequence.exp.json b/testdata/d2compiler/TestCompile/near_sequence.exp.json index dc86eb89c..20532dafe 100644 --- a/testdata/d2compiler/TestCompile/near_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/near_sequence.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/near_sequence.d2,4:8:45-4:11:48", diff --git a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json index 4a65875df..a897f1678 100644 --- a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:9:9-7:0:110", + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:9:9-7:1:111", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:14:25-3:2:57", + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:14:25-3:3:58", "nodes": [ { "map_key": { @@ -120,7 +120,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:14:73-6:1:108", + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:14:73-6:2:109", "nodes": [ { "map_key": { @@ -221,7 +221,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:8:121-9:43:156", + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:8:121-9:44:157", "nodes": [ { "map_key": { @@ -324,7 +324,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:8:166-10:43:201", + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:8:166-10:44:202", "nodes": [ { "map_key": { @@ -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_edge.exp.json b/testdata/d2compiler/TestCompile/nested_edge.exp.json index 87eeebaf1..6f263f6d4 100644 --- a/testdata/d2compiler/TestCompile/nested_edge.exp.json +++ b/testdata/d2compiler/TestCompile/nested_edge.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/nested_edge.d2,1:2:23-1:16:37", diff --git a/testdata/d2compiler/TestCompile/nested_near_constant.exp.json b/testdata/d2compiler/TestCompile/nested_near_constant.exp.json index b088c5663..b11bb9e56 100644 --- a/testdata/d2compiler/TestCompile/nested_near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/nested_near_constant.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/nested_near_constant.d2,0:10:10-0:20:20", diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 9c3d344c9..1781b2ac6 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,0:7:7-7:0:83", + "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,0:7:7-7:1:84", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,1:9:18-6:2:81", + "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,1:9:18-6:3:82", "nodes": [ { "map_key": { @@ -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..94c666990 100644 --- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json +++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nil_scope_obj_regression.d2,1:3:5-3:0:13", + "range": "d2/testdata/d2compiler/TestCompile/nil_scope_obj_regression.d2,1:3:5-3:1:14", "nodes": [ { "map_key": { @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -192,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/no-class-inside-classes.exp.json b/testdata/d2compiler/TestCompile/no-class-inside-classes.exp.json index 99c67b8e6..d7e810d00 100644 --- a/testdata/d2compiler/TestCompile/no-class-inside-classes.exp.json +++ b/testdata/d2compiler/TestCompile/no-class-inside-classes.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no-class-inside-classes.d2,2:4:22-2:9:27", diff --git a/testdata/d2compiler/TestCompile/no-class-primary.exp.json b/testdata/d2compiler/TestCompile/no-class-primary.exp.json index dafb78a69..f137a4b3e 100644 --- a/testdata/d2compiler/TestCompile/no-class-primary.exp.json +++ b/testdata/d2compiler/TestCompile/no-class-primary.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no-class-primary.d2,0:2:2-0:7:7", diff --git a/testdata/d2compiler/TestCompile/no-nested-columns-class.exp.json b/testdata/d2compiler/TestCompile/no-nested-columns-class.exp.json index cc9546885..4fd0b95e2 100644 --- a/testdata/d2compiler/TestCompile/no-nested-columns-class.exp.json +++ b/testdata/d2compiler/TestCompile/no-nested-columns-class.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no-nested-columns-class.d2,2:4:24-2:5:25", diff --git a/testdata/d2compiler/TestCompile/no-nested-columns-sql-2.exp.json b/testdata/d2compiler/TestCompile/no-nested-columns-sql-2.exp.json index 15bef32df..f09cc847a 100644 --- a/testdata/d2compiler/TestCompile/no-nested-columns-sql-2.exp.json +++ b/testdata/d2compiler/TestCompile/no-nested-columns-sql-2.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no-nested-columns-sql-2.d2,4:4:34-4:5:35", diff --git a/testdata/d2compiler/TestCompile/no-nested-columns-sql.exp.json b/testdata/d2compiler/TestCompile/no-nested-columns-sql.exp.json index 782ccce94..c3b6f2e18 100644 --- a/testdata/d2compiler/TestCompile/no-nested-columns-sql.exp.json +++ b/testdata/d2compiler/TestCompile/no-nested-columns-sql.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no-nested-columns-sql.d2,2:9:33-2:10:34", diff --git a/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json b/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json index bf0a8c3a8..36c36c51e 100644 --- a/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json +++ b/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no_empty_block_string.d2,0:0:0-0:11:11", diff --git a/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json b/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json index 2dff86029..3f6be6e7b 100644 --- a/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json +++ b/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.d2,0:0:0-3:1:13", diff --git a/testdata/d2compiler/TestCompile/no_url_link_and_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/no_url_link_and_url_tooltip_concurrently.exp.json index 289bd8ec8..97b8088bb 100644 --- a/testdata/d2compiler/TestCompile/no_url_link_and_url_tooltip_concurrently.exp.json +++ b/testdata/d2compiler/TestCompile/no_url_link_and_url_tooltip_concurrently.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no_url_link_and_url_tooltip_concurrently.d2,0:43:43-0:61:61", diff --git a/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json b/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json index ab68a6cc0..45e64ba5c 100644 --- a/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json +++ b/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.d2,0:0:0-0:16:16", 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/obj_invalid_style.exp.json b/testdata/d2compiler/TestCompile/obj_invalid_style.exp.json index 4f9d5590b..f91901c5e 100644 --- a/testdata/d2compiler/TestCompile/obj_invalid_style.exp.json +++ b/testdata/d2compiler/TestCompile/obj_invalid_style.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/obj_invalid_style.d2,1:2:7-1:9:14", diff --git a/testdata/d2compiler/TestCompile/object_arrowhead_shape.exp.json b/testdata/d2compiler/TestCompile/object_arrowhead_shape.exp.json index d1fef4a09..efd37e9f7 100644 --- a/testdata/d2compiler/TestCompile/object_arrowhead_shape.exp.json +++ b/testdata/d2compiler/TestCompile/object_arrowhead_shape.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/object_arrowhead_shape.d2,0:4:4-0:19:19", diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 8d2ad1a19..af370962e 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,0:3:3-2:0:45", + "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,0:3:3-2:1:46", "nodes": [ { "map_key": { @@ -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..700810882 100644 --- a/testdata/d2compiler/TestCompile/positions.exp.json +++ b/testdata/d2compiler/TestCompile/positions.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/positions.d2,0:5:5-3:0:28", + "range": "d2/testdata/d2compiler/TestCompile/positions.d2,0:5:5-3:1:29", "nodes": [ { "map_key": { @@ -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/positions_negative.exp.json b/testdata/d2compiler/TestCompile/positions_negative.exp.json index 308bba5fe..a81756142 100644 --- a/testdata/d2compiler/TestCompile/positions_negative.exp.json +++ b/testdata/d2compiler/TestCompile/positions_negative.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/positions_negative.d2,2:7:24-2:11:28", diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json index 556b25462..07280d1c2 100644 --- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json +++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,0:9:9-4:0:40", + "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,0:9:9-4:1:41", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,1:5:16-3:2:38", + "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,1:5:16-3:3:39", "nodes": [ { "map_key": { @@ -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-composite.exp.json b/testdata/d2compiler/TestCompile/reserved-composite.exp.json new file mode 100644 index 000000000..bd9bbab98 --- /dev/null +++ b/testdata/d2compiler/TestCompile/reserved-composite.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/reserved-composite.d2,0:0:0-3:1:158", + "errmsg": "d2/testdata/d2compiler/TestCompile/reserved-composite.d2:1:1: reserved field shape does not accept composite" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 3a21e6622..d037b9da4 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,0:3:3-5:0:80", + "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,0:3:3-5:1:81", "nodes": [ { "map_key": { @@ -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..4c90eaac0 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -106,7 +106,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,4:15:44-9:0:135", + "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,4:15:44-9:1:136", "nodes": [ { "map_key": { @@ -130,7 +130,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,5:29:75-8:2:133", + "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,5:29:75-8:3:134", "nodes": [ { "map_key": { @@ -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..5dd16ad44 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -150,7 +150,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,2:4:43-4:0:61", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,2:4:43-4:1:62", "nodes": [ { "map_key": { @@ -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..503423b6c 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -105,7 +105,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,2:4:34-5:0:58", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,2:4:34-5:1:59", "nodes": [ { "map_key": { @@ -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..1958d8227 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -106,7 +106,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:6:34-4:0:52", + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:6:34-4:1:53", "nodes": [ { "map_key": { @@ -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..0870aa4c1 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:3:3-8:0:99", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:3:3-8:1:100", "nodes": [ { "map_key": { @@ -130,7 +130,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:9:45-7:2:97", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:9:45-7:3:98", "nodes": [ { "map_key": { @@ -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..b59d6d0da 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,0:3:3-2:0:23", + "range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,0:3:3-2:1:24", "nodes": [ { "map_key": { @@ -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/shape_edge_style.exp.json b/testdata/d2compiler/TestCompile/shape_edge_style.exp.json index b475d3889..83e7f0642 100644 --- a/testdata/d2compiler/TestCompile/shape_edge_style.exp.json +++ b/testdata/d2compiler/TestCompile/shape_edge_style.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,2:1:7-2:21:27", diff --git a/testdata/d2compiler/TestCompile/shape_unquoted_hex.exp.json b/testdata/d2compiler/TestCompile/shape_unquoted_hex.exp.json index 10960df9e..fe5b34bf5 100644 --- a/testdata/d2compiler/TestCompile/shape_unquoted_hex.exp.json +++ b/testdata/d2compiler/TestCompile/shape_unquoted_hex.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/shape_unquoted_hex.d2,2:9:24-2:10:25", diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index 258a6a4a5..3cf517caa 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -32,7 +32,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,0:8:8-3:0:38", + "range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,0:8:8-3:1:39", "nodes": [ { "map_key": { @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sql-constraints.exp.json b/testdata/d2compiler/TestCompile/sql-constraints.exp.json new file mode 100644 index 000000000..db24296fa --- /dev/null +++ b/testdata/d2compiler/TestCompile/sql-constraints.exp.json @@ -0,0 +1,372 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:3:3-4:1:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:18:23", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:9:14-1:18:23", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:34:58", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:5:29-2:8:32", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:9:33-2:34:58", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:33:57", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:22:46-2:33:57", + "value": [ + { + "string": "primary_key", + "raw_string": "primary_key" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:49:108", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:5:64-3:8:67", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:9:68-3:49:108", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:48:107", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:22:81-3:47:106", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:23:82-3:34:93", + "value": [ + { + "string": "primary_key", + "raw_string": "primary_key" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:36:95-3:47:106", + "value": [ + { + "string": "foreign_key", + "raw_string": "foreign_key" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "sql_table": { + "columns": [ + { + "name": { + "label": "a", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": [ + "primary_key" + ], + "reference": "" + }, + { + "name": { + "label": "b", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sql_table" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/sql-panic.exp.json b/testdata/d2compiler/TestCompile/sql-panic.exp.json index 251f47c7a..d45b7ba02 100644 --- a/testdata/d2compiler/TestCompile/sql-panic.exp.json +++ b/testdata/d2compiler/TestCompile/sql-panic.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/sql-panic.d2,2:26:54-2:64:92", diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 29516d953..64b5d46e5 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,0:3:3-9:0:85", + "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,0:3:3-9:1:86", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,1:9:14-3:2:41", + "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,1:9:14-3:3:42", "nodes": [ { "map_key": { @@ -113,7 +113,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,4:5:48-7:2:79", + "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,4:5:48-7:3:80", "nodes": [ { "map_key": { @@ -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..8064ff8ed 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,0:17:17-5:0:72", + "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,0:17:17-5:1:73", "nodes": [ { "map_key": { @@ -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..1be890e5d 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:4:4-2:0:30", + "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:4:4-2:1:31", "nodes": [ { "map_key": { @@ -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..9012bd927 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,0:3:3-3:0:28", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,0:3:3-3:1:29", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,4:3:33-7:0:58", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,4:3:33-7:1:59", "nodes": [ { "map_key": { @@ -242,7 +242,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:12:72-10:0:97", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:12:72-10:1:98", "nodes": [ { "map_key": { @@ -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..b68772eff 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,0:17:17-4:0:79", + "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,0:17:17-4:1:80", "nodes": [ { "map_key": { @@ -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..bd065d54f 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,0:17:17-7:0:111", + "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,0:17:17-7:1:112", "nodes": [ { "map_key": { @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,3:9:67-6:2:109", + "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,3:9:67-6:3:110", "nodes": [ { "map_key": { @@ -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/tail-style-map.exp.json b/testdata/d2compiler/TestCompile/tail-style-map.exp.json index 96995af66..ded914368 100644 --- a/testdata/d2compiler/TestCompile/tail-style-map.exp.json +++ b/testdata/d2compiler/TestCompile/tail-style-map.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/tail-style-map.d2,0:6:6-0:11:11", diff --git a/testdata/d2compiler/TestCompile/tail-style.exp.json b/testdata/d2compiler/TestCompile/tail-style.exp.json index 3788c9e9f..e4991245e 100644 --- a/testdata/d2compiler/TestCompile/tail-style.exp.json +++ b/testdata/d2compiler/TestCompile/tail-style.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/tail-style.d2,0:6:6-0:11:11", diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index 19be4223d..6d32e0f75 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -93,7 +93,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:11:28-5:0:76", + "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:11:28-5:1:77", "nodes": [ { "map_key": { @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,2:9:39-4:2:74", + "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,2:9:39-4:3:75", "nodes": [ { "map_key": { @@ -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..a1f7d0132 100644 --- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,0:3:3-2:0:22", + "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,0:3:3-2:1:23", "nodes": [ { "map_key": { @@ -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..3e00fcc33 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,1:3:4-3:0:19", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,1:3:4-3:1:20", "nodes": [ { "map_key": { @@ -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..ab721e9e3 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,1:3:4-3:0:26", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,1:3:4-3:1:27", "nodes": [ { "map_key": { @@ -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..7b44d6ac8 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -83,7 +83,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,2:3:82-4:0:165", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,2:3:82-4:1:166", "nodes": [ { "map_key": { @@ -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..25aa72494 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -83,7 +83,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,2:3:82-4:0:170", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,2:3:82-4:1:171", "nodes": [ { "map_key": { @@ -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..3533194a7 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,1:3:4-5:0:30", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,1:3:4-5:1:31", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,2:4:10-4:1:28", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,2:4:10-4:2:29", "nodes": [ { "map_key": { @@ -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..1145d7dcb 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_create.d2,1:3:4-3:0:11", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_create.d2,1:3:4-3:1:12", "nodes": [ { "map_key": { @@ -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_middle_path.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_middle_path.exp.json index 31762bc1a..370b9f0c5 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_middle_path.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_middle_path.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_middle_path.d2,2:4:10-2:5:11", diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index fc6b50a55..f2af3ad4d 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,1:3:4-5:0:25", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,1:3:4-5:1:26", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,2:5:11-4:2:23", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,2:5:11-4:3:24", "nodes": [ { "map_key": { @@ -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..8e1ecb3f2 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,1:3:4-3:0:91", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,1:3:4-3:1:92", "nodes": [ { "map_key": { @@ -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..e8850d2a2 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -60,7 +60,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,2:3:85-4:0:172", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,2:3:85-4:1:173", "nodes": [ { "map_key": { @@ -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_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_root.exp.json index 204fefcb0..409e70f7f 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_root.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_root.d2,1:0:1-1:1:2", diff --git a/testdata/d2compiler/TestCompile/underscore_parent_sandwich_path.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_sandwich_path.exp.json index 923d3fd80..adb0687c9 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_sandwich_path.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_sandwich_path.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_sandwich_path.d2,2:6:12-2:7:13", diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index c81350873..7d9f8ed7f 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,1:3:4-5:0:27", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,1:3:4-5:1:28", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,2:5:11-4:2:25", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,2:5:11-4:3:26", "nodes": [ { "map_key": { @@ -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..2caaa6a50 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_unresolved_obj.d2,1:3:4-3:0:11", + "range": "d2/testdata/d2compiler/TestCompile/underscore_unresolved_obj.d2,1:3:4-3:1:12", "nodes": [ { "map_key": { @@ -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/unsemantic_markdown.exp.json b/testdata/d2compiler/TestCompile/unsemantic_markdown.exp.json index b0dbf4465..3a4c3dcb4 100644 --- a/testdata/d2compiler/TestCompile/unsemantic_markdown.exp.json +++ b/testdata/d2compiler/TestCompile/unsemantic_markdown.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/unsemantic_markdown.d2,0:0:0-3:1:19", diff --git a/testdata/d2compiler/TestCompile/unsemantic_markdown_2.exp.json b/testdata/d2compiler/TestCompile/unsemantic_markdown_2.exp.json index adfb7f026..e8fa4b7ff 100644 --- a/testdata/d2compiler/TestCompile/unsemantic_markdown_2.exp.json +++ b/testdata/d2compiler/TestCompile/unsemantic_markdown_2.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/unsemantic_markdown_2.d2,0:0:0-3:1:20", diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 6bd4fe629..0ee2c0378 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,0:3:3-2:0:32", + "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,0:3:3-2:1:33", "nodes": [ { "map_key": { @@ -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..4fc6b9851 100644 --- a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:3:3-0:50:50", + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:3:3-0:51:51", "nodes": [ { "map_key": { @@ -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_link_non_url_tooltip_ok.exp.json b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json new file mode 100644 index 000000000..55017b2a1 --- /dev/null +++ b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json @@ -0,0 +1,184 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:0:0-0:93:93", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:0:0-0:93:93", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:3:3-0:93:93", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:4:4-0:32:32", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:4:4-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:4:4-0:8:8", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:10:10-0:32:32", + "value": [ + { + "string": "https://not-google.com", + "raw_string": "https://not-google.com" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:34:34-0:92:92", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:34:34-0:41:41", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:34:34-0:41:41", + "value": [ + { + "string": "tooltip", + "raw_string": "tooltip" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:43:43-0:92:92", + "value": [ + { + "string": "note: url.ParseRequestURI might see this as a URL", + "raw_string": "note: url.ParseRequestURI might see this as a URL" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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/url_link_non_url_tooltip_ok.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "tooltip": { + "value": "note: url.ParseRequestURI might see this as a URL" + }, + "link": { + "value": "https://not-google.com" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json index 8895108bd..5191349ed 100644 --- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json +++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/url_tooltip.d2,0:3:3-0:31:31", + "range": "d2/testdata/d2compiler/TestCompile/url_tooltip.d2,0:3:3-0:32:32", "nodes": [ { "map_key": { @@ -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..555ed3efc 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,0:13:13-8:0:203", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,0:13:13-8:1:204", "nodes": [ { "map_key": { @@ -94,7 +94,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,2:10:44-2:34:68", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,2:10:44-2:35:69", "nodes": [ { "map_key": { @@ -265,7 +265,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,6:14:134-6:38:158", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,6:14:134-6:39:159", "nodes": [ { "map_key": { @@ -337,7 +337,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,7:17:177-7:41:201", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,7:17:177-7:42:202", "nodes": [ { "map_key": { @@ -404,7 +404,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,10:26:232-15:0:350", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,10:26:232-15:1:351", "nodes": [ { "map_key": { @@ -504,7 +504,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,13:18:281-13:42:305", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,13:18:281-13:43:306", "nodes": [ { "map_key": { @@ -576,7 +576,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,14:17:324-14:41:348", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,14:17:324-14:42:349", "nodes": [ { "map_key": { @@ -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/errs/duplicate_board.exp.json b/testdata/d2compiler/TestCompile2/boards/errs/duplicate_board.exp.json index 663733cfe..2ee865e7d 100644 --- a/testdata/d2compiler/TestCompile2/boards/errs/duplicate_board.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/errs/duplicate_board.exp.json @@ -1,7 +1,6 @@ { "graph": null, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2compiler/TestCompile2/boards/errs/duplicate_board.d2,8:1:51-8:4:54", diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 0a2c78652..75999c067 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", "nodes": [ { "map_key": { @@ -103,7 +103,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", "nodes": [ { "map_key": { @@ -150,7 +150,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", "nodes": [ { "map_key": { @@ -174,7 +174,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", "nodes": null } } @@ -202,7 +202,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", "nodes": [ { "map_key": { @@ -226,7 +226,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", "nodes": [ { "map_key": { @@ -307,9 +307,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -320,21 +318,20 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "santa" } ] } @@ -342,265 +339,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", - "value": [ - { - "string": "one", - "raw_string": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", - "value": [ - { - "string": "santa", - "raw_string": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", - "value": [ - { - "string": "two", - "raw_string": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", - "value": [ - { - "string": "clause", - "raw_string": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", - "value": [ - { - "string": "scenarios", - "raw_string": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", - "value": [ - { - "string": "seinfeld", - "raw_string": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", - "nodes": null - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "value": [ - { - "string": "steps", - "raw_string": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "value": [ - { - "string": "missus", - "raw_string": "missus" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -624,9 +363,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +410,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -685,21 +420,42 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "scenarios" } ] } @@ -709,21 +465,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "seinfeld" } ] } @@ -733,21 +488,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "clause" } ] } @@ -765,17 +519,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "missoula" } ] } @@ -785,21 +538,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -812,17 +564,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios", - "raw_string": "scenarios" + "string": "steps" } ] } @@ -832,125 +583,38 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "seinfeld", - "raw_string": "seinfeld" + "string": "missus" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", - "nodes": null - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", - "nodes": [ + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", + "value": [ { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "value": [ - { - "string": "steps", - "raw_string": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "value": [ - { - "string": "missus", - "raw_string": "missus" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - } - } - } - ] - } - } - } + "string": "one two three", + "raw_string": "one two three" } ] } - } + }, + "value": {} } } ] @@ -989,9 +653,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1038,9 +700,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1050,21 +710,20 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "clause" } ] } @@ -1072,265 +731,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", - "value": [ - { - "string": "one", - "raw_string": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", - "value": [ - { - "string": "santa", - "raw_string": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", - "value": [ - { - "string": "two", - "raw_string": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", - "value": [ - { - "string": "clause", - "raw_string": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", - "value": [ - { - "string": "scenarios", - "raw_string": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", - "value": [ - { - "string": "seinfeld", - "raw_string": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", - "nodes": null - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "value": [ - { - "string": "steps", - "raw_string": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "value": [ - { - "string": "missus", - "raw_string": "missus" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -1354,9 +755,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1403,9 +802,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1415,21 +812,42 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "steps" } ] } @@ -1439,258 +857,38 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "missus" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", - "nodes": [ + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", + "value": [ { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", - "value": [ - { - "string": "santa", - "raw_string": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } + "string": "one two three", + "raw_string": "one two three" } ] } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", - "value": [ - { - "string": "two", - "raw_string": "two" - } - ] - } - } - ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", - "value": [ - { - "string": "clause", - "raw_string": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", - "value": [ - { - "string": "scenarios", - "raw_string": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", - "value": [ - { - "string": "seinfeld", - "raw_string": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", - "nodes": null - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "value": [ - { - "string": "steps", - "raw_string": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "value": [ - { - "string": "missus", - "raw_string": "missus" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -1719,9 +917,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1768,9 +964,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..7d087020c 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -126,7 +126,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", "nodes": [ { "map_key": { @@ -173,7 +173,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", "nodes": [ { "map_key": { @@ -197,7 +197,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", "nodes": [ { "map_key": { @@ -249,7 +249,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", "nodes": [ { "map_key": { @@ -315,9 +315,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -364,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -376,21 +372,20 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "santa" } ] } @@ -400,272 +395,6 @@ "primary": {}, "value": {} } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-17:1:144", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-5:3:38", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", - "value": [ - { - "string": "one", - "raw_string": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", - "value": [ - { - "string": "santa", - "raw_string": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-16:3:142", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", - "value": [ - { - "string": "two", - "raw_string": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", - "value": [ - { - "string": "clause", - "raw_string": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-15:3:138", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", - "value": [ - { - "string": "steps", - "raw_string": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-11:4:102", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "value": [ - { - "string": "seinfeld", - "raw_string": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "value": [ - { - "string": "reindeer", - "raw_string": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-14:4:134", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "value": [ - { - "string": "montana", - "raw_string": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } } ] }, @@ -688,9 +417,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -737,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -749,21 +474,20 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "clause" } ] } @@ -776,17 +500,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-17:1:144", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "steps" } ] } @@ -796,21 +519,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-5:3:38", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "seinfeld" } ] } @@ -820,21 +542,42 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "reindeer" } ] } @@ -852,17 +595,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-16:3:142", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "missoula" } ] } @@ -872,21 +614,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -899,17 +640,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-15:3:138", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps", - "raw_string": "steps" + "string": "reindeer" } ] } @@ -917,117 +657,29 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-11:4:102", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "value": [ - { - "string": "seinfeld", - "raw_string": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "value": [ - { - "string": "reindeer", - "raw_string": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "montana" } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-14:4:134", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "value": [ - { - "string": "montana", - "raw_string": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } + ] } - ] - } - } + } + ] + }, + "primary": {}, + "value": {} } } ] @@ -1061,9 +713,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1110,9 +760,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1122,21 +770,20 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "clause" } ] } @@ -1149,17 +796,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-17:1:144", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "reindeer" } ] } @@ -1167,250 +813,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-5:3:38", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", - "value": [ - { - "string": "one", - "raw_string": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", - "value": [ - { - "string": "santa", - "raw_string": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-16:3:142", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", - "value": [ - { - "string": "two", - "raw_string": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", - "value": [ - { - "string": "clause", - "raw_string": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-15:3:138", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", - "value": [ - { - "string": "steps", - "raw_string": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-11:4:102", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "value": [ - { - "string": "seinfeld", - "raw_string": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "value": [ - { - "string": "reindeer", - "raw_string": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-14:4:134", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "value": [ - { - "string": "montana", - "raw_string": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -1434,9 +837,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1483,9 +884,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1530,9 +929,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1542,21 +939,20 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "clause" } ] } @@ -1569,17 +965,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-17:1:144", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "reindeer" } ] } @@ -1587,250 +982,29 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-5:3:38", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", - "value": [ - { - "string": "one", - "raw_string": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", - "value": [ - { - "string": "santa", - "raw_string": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "montana" } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-16:3:142", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", - "value": [ - { - "string": "two", - "raw_string": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", - "value": [ - { - "string": "clause", - "raw_string": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-15:3:138", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", - "value": [ - { - "string": "steps", - "raw_string": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-11:4:102", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "value": [ - { - "string": "seinfeld", - "raw_string": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "value": [ - { - "string": "reindeer", - "raw_string": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-14:4:134", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "value": [ - { - "string": "montana", - "raw_string": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } + ] } - ] - } - } + } + ] + }, + "primary": {}, + "value": {} } } ] @@ -1854,9 +1028,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1903,9 +1075,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1950,9 +1120,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1997,9 +1165,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..ae5deb1ec 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:0:63", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:1:64", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -126,7 +126,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:2:61", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:3:62", "nodes": [ { "map_key": { @@ -182,9 +182,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -231,9 +229,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -243,21 +239,20 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "santa" } ] } @@ -267,139 +262,6 @@ "primary": {}, "value": {} } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-9:1:64", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-2:6:12", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-2:6:12", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:0:63", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-5:3:38", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-3:5:21", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-3:5:21", - "value": [ - { - "string": "one", - "raw_string": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:2:37", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", - "value": [ - { - "string": "santa", - "raw_string": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-8:3:62", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-6:5:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-6:5:44", - "value": [ - { - "string": "two", - "raw_string": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:2:61", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", - "value": [ - { - "string": "clause", - "raw_string": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } } ] }, @@ -422,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -471,9 +331,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -483,21 +341,20 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "clause" } ] } @@ -507,139 +364,6 @@ "primary": {}, "value": {} } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-9:1:64", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-2:6:12", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-2:6:12", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:0:63", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-5:3:38", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-3:5:21", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-3:5:21", - "value": [ - { - "string": "one", - "raw_string": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:2:37", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", - "value": [ - { - "string": "santa", - "raw_string": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-8:3:62", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-6:5:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-6:5:44", - "value": [ - { - "string": "two", - "raw_string": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:2:61", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", - "value": [ - { - "string": "clause", - "raw_string": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } } ] }, @@ -662,9 +386,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -711,9 +433,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..1310e7d72 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:11:19-6:0:67", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:11:19-6:1:68", "nodes": [ { "map_key": { @@ -97,7 +97,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:5:26-5:2:65", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:5:26-5:3:66", "nodes": [ { "map_key": { @@ -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 } @@ -355,24 +347,67 @@ "name": "1", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-7:0:69", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:6:6", + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", "edges": [ { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:6:6", + "range": ",0:0:0-0:0:0", "src": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "a", - "raw_string": "a" + "string": "a" } ] } @@ -381,15 +416,14 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -400,46 +434,22 @@ } ], "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:0:8-6:1:68", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:0:8-2:9:17", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:0:8-2:9:17", - "value": [ - { - "string": "scenarios", - "raw_string": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:11:19-6:0:67", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:2:23-5:3:66", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:2:23-3:3:24", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:2:23-3:3:24", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "1", - "raw_string": "1" + "string": "style" } ] } @@ -449,90 +459,34 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:5:26-5:2:65", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:4:32-4:34:62", - "edges": [ - { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:11:39", - "src": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:12:40-4:15:43", - "int": 0, - "glob": false - }, - "edge_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:16:44-4:29:57", + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:16:44-4:21:49", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:22:50-4:29:57", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" + "string": "opacity" } ] } } ] }, - "primary": {}, - "value": { + "primary": { "number": { "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:31:59-4:34:62", "raw": "0.1", "value": "1/10" } - } + }, + "value": {} } } ] @@ -566,9 +520,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -606,9 +558,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -675,9 +625,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -742,9 +690,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2ir/TestCompile/classes/basic.exp.json b/testdata/d2ir/TestCompile/classes/basic.exp.json index 5b67fed1d..eed20a6c8 100644 --- a/testdata/d2ir/TestCompile/classes/basic.exp.json +++ b/testdata/d2ir/TestCompile/classes/basic.exp.json @@ -309,7 +309,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/basic.d2,2:9:22-4:2:49", + "range": "TestCompile/classes/basic.d2,2:9:22-4:3:50", "nodes": [ { "map_key": { @@ -416,7 +416,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/basic.d2,1:9:11-5:0:51", + "range": "TestCompile/classes/basic.d2,1:9:11-5:1:52", "nodes": [ { "map_key": { @@ -440,7 +440,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/basic.d2,2:9:22-4:2:49", + "range": "TestCompile/classes/basic.d2,2:9:22-4:3:50", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/classes/inherited.exp.json b/testdata/d2ir/TestCompile/classes/inherited.exp.json index 8e5054f05..f88697361 100644 --- a/testdata/d2ir/TestCompile/classes/inherited.exp.json +++ b/testdata/d2ir/TestCompile/classes/inherited.exp.json @@ -253,7 +253,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -360,7 +360,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -384,7 +384,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -704,7 +704,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -811,7 +811,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -835,7 +835,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1155,7 +1155,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1458,7 +1458,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -1565,7 +1565,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -1589,7 +1589,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1695,7 +1695,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -1719,7 +1719,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -1887,7 +1887,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,8:9:96-15:6:203", + "range": "TestCompile/classes/inherited.d2,8:9:96-15:7:204", "nodes": [ { "map_key": { @@ -1911,7 +1911,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -1935,7 +1935,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -2279,7 +2279,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -2582,7 +2582,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -2689,7 +2689,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -2713,7 +2713,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -2819,7 +2819,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -2843,7 +2843,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -3067,7 +3067,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,16:9:214-18:6:232", + "range": "TestCompile/classes/inherited.d2,16:9:214-18:7:233", "nodes": [ { "map_key": { @@ -3357,7 +3357,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -3826,7 +3826,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -3927,7 +3927,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -4034,7 +4034,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -4058,7 +4058,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -4164,7 +4164,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -4188,7 +4188,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -4294,7 +4294,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -4318,7 +4318,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -4593,7 +4593,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,19:9:243-26:6:351", + "range": "TestCompile/classes/inherited.d2,19:9:243-26:7:352", "nodes": [ { "map_key": { @@ -4617,7 +4617,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -4641,7 +4641,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -4985,7 +4985,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -5454,7 +5454,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -5555,7 +5555,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -5662,7 +5662,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -5686,7 +5686,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -5792,7 +5792,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -5816,7 +5816,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -5922,7 +5922,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -5946,7 +5946,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -6536,7 +6536,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -7005,7 +7005,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -7106,7 +7106,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -7213,7 +7213,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -7237,7 +7237,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -7343,7 +7343,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -7367,7 +7367,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -7473,7 +7473,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -7497,7 +7497,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -7609,7 +7609,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -7695,7 +7695,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -7719,7 +7719,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -7810,7 +7810,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,27:9:362-34:6:452", + "range": "TestCompile/classes/inherited.d2,27:9:362-34:7:453", "nodes": [ { "map_key": { @@ -7834,7 +7834,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -7858,7 +7858,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -7977,7 +7977,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,7:9:85-35:4:458", + "range": "TestCompile/classes/inherited.d2,7:9:85-35:5:459", "nodes": [ { "map_key": { @@ -8001,7 +8001,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,8:9:96-15:6:203", + "range": "TestCompile/classes/inherited.d2,8:9:96-15:7:204", "nodes": [ { "map_key": { @@ -8025,7 +8025,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -8049,7 +8049,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -8155,7 +8155,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,16:9:214-18:6:232", + "range": "TestCompile/classes/inherited.d2,16:9:214-18:7:233", "nodes": [ { "map_key": { @@ -8207,7 +8207,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,19:9:243-26:6:351", + "range": "TestCompile/classes/inherited.d2,19:9:243-26:7:352", "nodes": [ { "map_key": { @@ -8231,7 +8231,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -8255,7 +8255,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -8361,7 +8361,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,27:9:362-34:6:452", + "range": "TestCompile/classes/inherited.d2,27:9:362-34:7:453", "nodes": [ { "map_key": { @@ -8385,7 +8385,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -8409,7 +8409,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -8533,7 +8533,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,6:10:74-36:2:462", + "range": "TestCompile/classes/inherited.d2,6:10:74-36:3:463", "nodes": [ { "map_key": { @@ -8557,7 +8557,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,7:9:85-35:4:458", + "range": "TestCompile/classes/inherited.d2,7:9:85-35:5:459", "nodes": [ { "map_key": { @@ -8581,7 +8581,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,8:9:96-15:6:203", + "range": "TestCompile/classes/inherited.d2,8:9:96-15:7:204", "nodes": [ { "map_key": { @@ -8605,7 +8605,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -8629,7 +8629,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -8735,7 +8735,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,16:9:214-18:6:232", + "range": "TestCompile/classes/inherited.d2,16:9:214-18:7:233", "nodes": [ { "map_key": { @@ -8787,7 +8787,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,19:9:243-26:6:351", + "range": "TestCompile/classes/inherited.d2,19:9:243-26:7:352", "nodes": [ { "map_key": { @@ -8811,7 +8811,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -8835,7 +8835,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -8941,7 +8941,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,27:9:362-34:6:452", + "range": "TestCompile/classes/inherited.d2,27:9:362-34:7:453", "nodes": [ { "map_key": { @@ -8965,7 +8965,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -8989,7 +8989,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -9118,7 +9118,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,5:11:62-37:0:464", + "range": "TestCompile/classes/inherited.d2,5:11:62-37:1:465", "nodes": [ { "map_key": { @@ -9142,7 +9142,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,6:10:74-36:2:462", + "range": "TestCompile/classes/inherited.d2,6:10:74-36:3:463", "nodes": [ { "map_key": { @@ -9166,7 +9166,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,7:9:85-35:4:458", + "range": "TestCompile/classes/inherited.d2,7:9:85-35:5:459", "nodes": [ { "map_key": { @@ -9190,7 +9190,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,8:9:96-15:6:203", + "range": "TestCompile/classes/inherited.d2,8:9:96-15:7:204", "nodes": [ { "map_key": { @@ -9214,7 +9214,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -9238,7 +9238,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -9344,7 +9344,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,16:9:214-18:6:232", + "range": "TestCompile/classes/inherited.d2,16:9:214-18:7:233", "nodes": [ { "map_key": { @@ -9396,7 +9396,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,19:9:243-26:6:351", + "range": "TestCompile/classes/inherited.d2,19:9:243-26:7:352", "nodes": [ { "map_key": { @@ -9420,7 +9420,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -9444,7 +9444,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -9550,7 +9550,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,27:9:362-34:6:452", + "range": "TestCompile/classes/inherited.d2,27:9:362-34:7:453", "nodes": [ { "map_key": { @@ -9574,7 +9574,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -9598,7 +9598,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json index b1fdcab52..087bc4de2 100644 --- a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json +++ b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json @@ -253,7 +253,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:2:45", + "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:3:46", "nodes": [ { "map_key": { @@ -360,7 +360,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,0:9:9-4:0:47", + "range": "TestCompile/classes/layer-modify.d2,0:9:9-4:1:48", "nodes": [ { "map_key": { @@ -384,7 +384,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:2:45", + "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:3:46", "nodes": [ { "map_key": { @@ -974,7 +974,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:2:45", + "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:3:46", "nodes": [ { "map_key": { @@ -1208,7 +1208,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,0:9:9-4:0:47", + "range": "TestCompile/classes/layer-modify.d2,0:9:9-4:1:48", "nodes": [ { "map_key": { @@ -1232,7 +1232,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:2:45", + "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:3:46", "nodes": [ { "map_key": { @@ -1344,7 +1344,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,6:5:64-8:2:102", + "range": "TestCompile/classes/layer-modify.d2,6:5:64-8:3:103", "nodes": [ { "map_key": { @@ -1473,7 +1473,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,5:8:57-9:0:104", + "range": "TestCompile/classes/layer-modify.d2,5:8:57-9:1:105", "nodes": [ { "map_key": { @@ -1497,7 +1497,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,6:5:64-8:2:102", + "range": "TestCompile/classes/layer-modify.d2,6:5:64-8:3:103", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/classes/merge.exp.json b/testdata/d2ir/TestCompile/classes/merge.exp.json index 9cc9a1320..1ad04233f 100644 --- a/testdata/d2ir/TestCompile/classes/merge.exp.json +++ b/testdata/d2ir/TestCompile/classes/merge.exp.json @@ -322,7 +322,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,1:9:20-4:2:59", + "range": "TestCompile/classes/merge.d2,1:9:20-4:3:60", "nodes": [ { "map_key": { @@ -458,7 +458,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,0:9:9-5:0:61", + "range": "TestCompile/classes/merge.d2,0:9:9-5:1:62", "nodes": [ { "map_key": { @@ -482,7 +482,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,1:9:20-4:2:59", + "range": "TestCompile/classes/merge.d2,1:9:20-4:3:60", "nodes": [ { "map_key": { @@ -957,7 +957,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,1:9:20-4:2:59", + "range": "TestCompile/classes/merge.d2,1:9:20-4:3:60", "nodes": [ { "map_key": { @@ -1087,7 +1087,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,9:13:113-11:6:141", + "range": "TestCompile/classes/merge.d2,9:13:113-11:7:142", "nodes": [ { "map_key": { @@ -1179,7 +1179,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,0:9:9-5:0:61", + "range": "TestCompile/classes/merge.d2,0:9:9-5:1:62", "nodes": [ { "map_key": { @@ -1203,7 +1203,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,1:9:20-4:2:59", + "range": "TestCompile/classes/merge.d2,1:9:20-4:3:60", "nodes": [ { "map_key": { @@ -1344,7 +1344,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,7:10:83-13:2:151", + "range": "TestCompile/classes/merge.d2,7:10:83-13:3:152", "nodes": [ { "map_key": { @@ -1368,7 +1368,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,8:13:98-12:4:147", + "range": "TestCompile/classes/merge.d2,8:13:98-12:5:148", "nodes": [ { "map_key": { @@ -1392,7 +1392,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,9:13:113-11:6:141", + "range": "TestCompile/classes/merge.d2,9:13:113-11:7:142", "nodes": [ { "map_key": { @@ -1494,7 +1494,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,6:8:71-14:0:153", + "range": "TestCompile/classes/merge.d2,6:8:71-14:1:154", "nodes": [ { "map_key": { @@ -1518,7 +1518,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,7:10:83-13:2:151", + "range": "TestCompile/classes/merge.d2,7:10:83-13:3:152", "nodes": [ { "map_key": { @@ -1542,7 +1542,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,8:13:98-12:4:147", + "range": "TestCompile/classes/merge.d2,8:13:98-12:5:148", "nodes": [ { "map_key": { @@ -1566,7 +1566,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,9:13:113-11:6:141", + "range": "TestCompile/classes/merge.d2,9:13:113-11:7:142", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/classes/nested.exp.json b/testdata/d2ir/TestCompile/classes/nested.exp.json index 576dc9642..9fec0c647 100644 --- a/testdata/d2ir/TestCompile/classes/nested.exp.json +++ b/testdata/d2ir/TestCompile/classes/nested.exp.json @@ -253,7 +253,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -360,7 +360,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/nested.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -384,7 +384,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -768,7 +768,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -875,7 +875,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/nested.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -899,7 +899,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1011,7 +1011,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,8:12:97-10:6:115", + "range": "TestCompile/classes/nested.d2,8:12:97-10:7:116", "nodes": [ { "map_key": { @@ -1097,7 +1097,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,7:10:83-11:4:121", + "range": "TestCompile/classes/nested.d2,7:10:83-11:5:122", "nodes": [ { "map_key": { @@ -1121,7 +1121,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,8:12:97-10:6:115", + "range": "TestCompile/classes/nested.d2,8:12:97-10:7:116", "nodes": [ { "map_key": { @@ -1412,7 +1412,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1519,7 +1519,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/nested.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -1543,7 +1543,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1655,7 +1655,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,6:10:71-12:2:125", + "range": "TestCompile/classes/nested.d2,6:10:71-12:3:126", "nodes": [ { "map_key": { @@ -1679,7 +1679,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,7:10:83-11:4:121", + "range": "TestCompile/classes/nested.d2,7:10:83-11:5:122", "nodes": [ { "map_key": { @@ -1703,7 +1703,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,8:12:97-10:6:115", + "range": "TestCompile/classes/nested.d2,8:12:97-10:7:116", "nodes": [ { "map_key": { @@ -1799,7 +1799,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,5:8:59-13:0:127", + "range": "TestCompile/classes/nested.d2,5:8:59-13:1:128", "nodes": [ { "map_key": { @@ -1823,7 +1823,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,6:10:71-12:2:125", + "range": "TestCompile/classes/nested.d2,6:10:71-12:3:126", "nodes": [ { "map_key": { @@ -1847,7 +1847,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,7:10:83-11:4:121", + "range": "TestCompile/classes/nested.d2,7:10:83-11:5:122", "nodes": [ { "map_key": { @@ -1871,7 +1871,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,8:12:97-10:6:115", + "range": "TestCompile/classes/nested.d2,8:12:97-10:7:116", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index fc2b7b1bf..878a4cff4 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -194,7 +194,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/edges/underscore.d2,0:3:3-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:3:3-0:15:15", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/fields/array.exp.json b/testdata/d2ir/TestCompile/fields/array.exp.json index 1c8abdcad..4530ab3bc 100644 --- a/testdata/d2ir/TestCompile/fields/array.exp.json +++ b/testdata/d2ir/TestCompile/fields/array.exp.json @@ -84,7 +84,7 @@ "primary": {}, "value": { "array": { - "range": "TestCompile/fields/array.d2,0:3:3-0:11:11", + "range": "TestCompile/fields/array.d2,0:3:3-0:12:12", "nodes": [ { "number": { diff --git a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json index 273034225..815fc5fcc 100644 --- a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json @@ -160,7 +160,7 @@ }, "value": { "map": { - "range": "TestCompile/fields/primary/nested.d2,0:9:9-0:16:16", + "range": "TestCompile/fields/primary/nested.d2,0:9:9-0:17:17", "nodes": [ { "map_key": { @@ -278,7 +278,7 @@ }, "value": { "map": { - "range": "TestCompile/fields/primary/nested.d2,0:9:9-0:16:16", + "range": "TestCompile/fields/primary/nested.d2,0:9:9-0:17:17", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/fields/primary/root.exp.json b/testdata/d2ir/TestCompile/fields/primary/root.exp.json index 91b910a6e..5b82d2d85 100644 --- a/testdata/d2ir/TestCompile/fields/primary/root.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/root.exp.json @@ -134,7 +134,7 @@ }, "value": { "map": { - "range": "TestCompile/fields/primary/root.d2,0:7:7-0:14:14", + "range": "TestCompile/fields/primary/root.d2,0:7:7-0:15:15", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/imports/#00.exp.json b/testdata/d2ir/TestCompile/imports/#00.exp.json new file mode 100644 index 000000000..cc2a0a3e5 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/#00.exp.json @@ -0,0 +1,82 @@ +{ + "fields": [ + { + "name": "x", + "primary": { + "value": { + "range": "x.d2,0:3:3-0:7:7", + "value": [ + { + "string": "wowa", + "raw_string": "wowa" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:7:7", + "key": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,0:3:3-0:7:7", + "value": [ + { + "string": "wowa", + "raw_string": "wowa" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/boards.exp.json b/testdata/d2ir/TestCompile/imports/boards.exp.json new file mode 100644 index 000000000..6b5e2d61c --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/boards.exp.json @@ -0,0 +1,817 @@ +{ + "fields": [ + { + "name": "x", + "composite": { + "fields": [ + { + "name": "link", + "primary": { + "value": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "references": [ + { + "string": { + "range": "index.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:16:16", + "key": { + "range": "index.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:16:16", + "key": { + "range": "index.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + } + } + } + } + ] + }, + { + "name": "layers", + "composite": { + "fields": [ + { + "name": "x", + "composite": { + "fields": [ + { + "name": "y", + "composite": { + "fields": [ + { + "name": "link", + "primary": { + "value": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x.layers.y" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + }, + { + "unquoted_string": { + "range": "x.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:16:16", + "key": { + "range": "x.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + }, + { + "unquoted_string": { + "range": "x.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.y" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + }, + { + "unquoted_string": { + "range": "x.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:16:16", + "key": { + "range": "x.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + }, + { + "unquoted_string": { + "range": "x.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.y" + } + ] + } + } + } + } + } + ] + }, + { + "name": "layers", + "composite": { + "fields": [ + { + "name": "y", + "composite": { + "fields": [ + { + "name": "meow", + "references": [ + { + "string": { + "range": "y.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, + "key_path": { + "range": "y.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "y.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "y.d2,0:0:0-0:4:4", + "key": { + "range": "y.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "y.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "x.d2,0:28:28-0:29:29", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "x.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:28:28-0:29:29", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:28:28-0:34:34", + "key": { + "range": "x.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:28:28-0:29:29", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "x.d2,0:31:31-0:34:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:32:32-0:33:33", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "x.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, + "key_path": { + "range": "x.d2,0:18:18-0:24:24", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:18:18-0:35:35", + "key": { + "range": "x.d2,0:18:18-0:24:24", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "x.d2,0:26:26-0:35:35", + "nodes": [ + { + "map_key": { + "range": "x.d2,0:28:28-0:34:34", + "key": { + "range": "x.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:28:28-0:29:29", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "x.d2,0:31:31-0:34:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:32:32-0:33:33", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:28:28-0:34:34", + "key": { + "range": "index.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:31:31-0:34:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:32:32-0:33:33", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, + "key_path": { + "range": "index.d2,0:18:18-0:24:24", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:18:18-0:35:35", + "key": { + "range": "index.d2,0:18:18-0:24:24", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:26:26-0:35:35", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:28:28-0:34:34", + "key": { + "range": "index.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:31:31-0:34:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:32:32-0:33:33", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/nested.exp.json b/testdata/d2ir/TestCompile/imports/nested.exp.json new file mode 100644 index 000000000..d6a74f941 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/nested.exp.json @@ -0,0 +1,249 @@ +{ + "fields": [ + { + "name": "x", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "x.d2,1:8:13-1:14:19", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,1:1:6-1:6:11", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "x.d2,1:1:6-1:6:11", + "path": [ + { + "unquoted_string": { + "range": "x.d2,1:1:6-1:6:11", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,1:1:6-1:14:19", + "key": { + "range": "x.d2,1:1:6-1:6:11", + "path": [ + { + "unquoted_string": { + "range": "x.d2,1:1:6-1:6:11", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,1:8:13-1:14:19", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + } + ] + }, + { + "name": "label", + "primary": { + "value": { + "range": "x.d2,2:8:28-2:12:32", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,2:1:21-2:6:26", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "x.d2,2:1:21-2:6:26", + "path": [ + { + "unquoted_string": { + "range": "x.d2,2:1:21-2:6:26", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,2:1:21-2:12:32", + "key": { + "range": "x.d2,2:1:21-2:6:26", + "path": [ + { + "unquoted_string": { + "range": "x.d2,2:1:21-2:6:26", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,2:8:28-2:12:32", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:7:7", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:7:7", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/nested/array.exp.json b/testdata/d2ir/TestCompile/imports/nested/array.exp.json new file mode 100644 index 000000000..9e1737148 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/nested/array.exp.json @@ -0,0 +1,106 @@ +{ + "fields": [ + { + "name": "x", + "composite": { + "values": [ + { + "value": { + "range": "x.d2,0:4:4-0:8:8", + "value": [ + { + "string": "1, 2", + "raw_string": "1, 2" + } + ] + } + } + ] + }, + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:7:7", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:7:7", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/nested/map.exp.json b/testdata/d2ir/TestCompile/imports/nested/map.exp.json new file mode 100644 index 000000000..b1dedaa35 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/nested/map.exp.json @@ -0,0 +1,250 @@ +{ + "fields": [ + { + "name": "x", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "x.d2,1:8:13-1:14:19", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,1:1:6-1:6:11", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "x.d2,1:1:6-1:6:11", + "path": [ + { + "unquoted_string": { + "range": "x.d2,1:1:6-1:6:11", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,1:1:6-1:14:19", + "key": { + "range": "x.d2,1:1:6-1:6:11", + "path": [ + { + "unquoted_string": { + "range": "x.d2,1:1:6-1:6:11", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,1:8:13-1:14:19", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + } + ] + }, + { + "name": "label", + "primary": { + "value": { + "range": "x.d2,2:8:28-2:12:32", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,2:1:21-2:6:26", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "x.d2,2:1:21-2:6:26", + "path": [ + { + "unquoted_string": { + "range": "x.d2,2:1:21-2:6:26", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,2:1:21-2:12:32", + "key": { + "range": "x.d2,2:1:21-2:6:26", + "path": [ + { + "unquoted_string": { + "range": "x.d2,2:1:21-2:6:26", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,2:8:28-2:12:32", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:7:7", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:7:7", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json new file mode 100644 index 000000000..ed273c2c0 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json @@ -0,0 +1,102 @@ +{ + "fields": [ + { + "name": "x", + "primary": { + "value": { + "range": "x.d2,0:3:3-0:7:7", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + }, + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:7:7", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:7:7", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/nested/spread.exp.json b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json new file mode 100644 index 000000000..6a7baa961 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json @@ -0,0 +1,117 @@ +{ + "fields": [ + { + "name": "jon", + "references": [ + { + "string": { + "range": "x.d2,0:5:5-0:8:8", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + }, + "key_path": { + "range": "x.d2,0:5:5-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:5:5-0:8:8", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:5:5-0:8:8", + "key": { + "range": "x.d2,0:5:5-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:5:5-0:8:8", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "jan", + "references": [ + { + "string": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + }, + "key_path": { + "range": "x.d2,0:10:10-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:10:10-0:14:14", + "key": { + "range": "x.d2,0:10:10-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json b/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json new file mode 100644 index 000000000..1dbc2241c --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json @@ -0,0 +1,226 @@ +{ + "fields": [ + { + "name": "q", + "primary": { + "value": { + "range": "x.d2,0:3:3-0:7:7", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + }, + "composite": { + "fields": [ + { + "name": "jon", + "references": [ + { + "string": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + }, + "key_path": { + "range": "x.d2,0:10:10-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:10:10-0:13:13", + "key": { + "range": "x.d2,0:10:10-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "jan", + "references": [ + { + "string": { + "range": "x.d2,0:15:15-0:18:18", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + }, + "key_path": { + "range": "x.d2,0:15:15-0:18:18", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:15:15-0:18:18", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:15:15-0:19:19", + "key": { + "range": "x.d2,0:15:15-0:18:18", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:15:15-0:18:18", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:14:14", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:3:3-0:14:14", + "nodes": [ + { + "import": { + "range": "index.d2,0:5:5-0:13:13", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:9:9-0:10:10", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:11:11-0:12:12", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/spread.exp.json b/testdata/d2ir/TestCompile/imports/spread.exp.json new file mode 100644 index 000000000..cc2a0a3e5 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/spread.exp.json @@ -0,0 +1,82 @@ +{ + "fields": [ + { + "name": "x", + "primary": { + "value": { + "range": "x.d2,0:3:3-0:7:7", + "value": [ + { + "string": "wowa", + "raw_string": "wowa" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:7:7", + "key": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,0:3:3-0:7:7", + "value": [ + { + "string": "wowa", + "raw_string": "wowa" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json new file mode 100644 index 000000000..e80dff636 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json @@ -0,0 +1,1187 @@ +{ + "fields": [ + { + "name": "z", + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "scenarios", + "composite": { + "fields": [ + { + "name": "x", + "composite": { + "fields": [ + { + "name": "z", + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "a", + "references": [ + { + "string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:1:1", + "key": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:41:41-0:42:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:41:41-0:42:42", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:41:41-0:42:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:41:41-0:46:46", + "key": { + "range": "index.d2,0:41:41-0:42:42", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:41:41-0:42:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:44:44-0:46:46", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:45:45-0:46:46", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "y", + "composite": { + "fields": [ + { + "name": "z", + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "b", + "references": [ + { + "string": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "y.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "y.d2,0:0:0-0:1:1", + "key": { + "range": "y.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:48:48-0:49:49", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "index.d2,0:48:48-0:49:49", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:48:48-0:49:49", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:48:48-0:54:54", + "key": { + "range": "index.d2,0:48:48-0:49:49", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:48:48-0:49:49", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:51:51-0:54:54", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:52:52-0:53:53", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:28:28-0:37:37", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, + "key_path": { + "range": "index.d2,0:28:28-0:37:37", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:28:28-0:37:37", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:28:28-0:55:55", + "key": { + "range": "index.d2,0:28:28-0:37:37", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:28:28-0:37:37", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:39:39-0:55:55", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:41:41-0:46:46", + "key": { + "range": "index.d2,0:41:41-0:42:42", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:41:41-0:42:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:44:44-0:46:46", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:45:45-0:46:46", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,0:48:48-0:54:54", + "key": { + "range": "index.d2,0:48:48-0:49:49", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:48:48-0:49:49", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:51:51-0:54:54", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:52:52-0:53:53", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "steps", + "composite": { + "fields": [ + { + "name": "1", + "composite": { + "fields": [ + { + "name": "z", + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "a", + "references": [ + { + "string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:1:1", + "key": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, + "key_path": { + "range": "index.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:12:12-0:17:17", + "key": { + "range": "index.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:15:15-0:17:17", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:16:16-0:17:17", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "2", + "composite": { + "fields": [ + { + "name": "z", + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "a", + "references": [ + { + "string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:1:1", + "key": { + "range": "x.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "b", + "references": [ + { + "string": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "y.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "y.d2,0:0:0-0:1:1", + "key": { + "range": "y.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:19:19-0:20:20", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + }, + "key_path": { + "range": "index.d2,0:19:19-0:20:20", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:19:19-0:20:20", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:19:19-0:25:25", + "key": { + "range": "index.d2,0:19:19-0:20:20", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:19:19-0:20:20", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:22:22-0:25:25", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:23:23-0:24:24", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:3:3-0:8:8", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, + "key_path": { + "range": "index.d2,0:3:3-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:3:3-0:8:8", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:3:3-0:26:26", + "key": { + "range": "index.d2,0:3:3-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:3:3-0:8:8", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:10:10-0:26:26", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:12:12-0:17:17", + "key": { + "range": "index.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:15:15-0:17:17", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:16:16-0:17:17", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,0:19:19-0:25:25", + "key": { + "range": "index.d2,0:19:19-0:20:20", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:19:19-0:20:20", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:22:22-0:25:25", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:23:23-0:24:24", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/value.exp.json b/testdata/d2ir/TestCompile/imports/value.exp.json new file mode 100644 index 000000000..8e5c0f021 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/value.exp.json @@ -0,0 +1,239 @@ +{ + "fields": [ + { + "name": "x", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "x.d2,0:7:7-0:13:13", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,0:0:0-0:5:5", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:5:5", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:13:13", + "key": { + "range": "x.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:5:5", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,0:7:7-0:13:13", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + } + ] + }, + { + "name": "label", + "primary": { + "value": { + "range": "x.d2,1:7:21-1:11:25", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,1:0:14-1:5:19", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "x.d2,1:0:14-1:5:19", + "path": [ + { + "unquoted_string": { + "range": "x.d2,1:0:14-1:5:19", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,1:0:14-1:11:25", + "key": { + "range": "x.d2,1:0:14-1:5:19", + "path": [ + { + "unquoted_string": { + "range": "x.d2,1:0:14-1:5:19", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,1:7:21-1:11:25", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:8:8", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:8:8", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index 7cf8bf4b1..27e7e95c6 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -601,7 +601,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/layers/root.d2,2:8:25-2:16:33", + "range": "TestCompile/layers/root.d2,2:8:25-2:17:34", "nodes": [ { "map_key": { @@ -709,7 +709,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/layers/root.d2,1:8:15-3:0:35", + "range": "TestCompile/layers/root.d2,1:8:15-3:1:36", "nodes": [ { "map_key": { @@ -733,7 +733,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/layers/root.d2,2:8:25-2:16:33", + "range": "TestCompile/layers/root.d2,2:8:25-2:17:34", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index 45d6ef21a..37f6f502a 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -1386,7 +1386,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/edge.d2,2:5:25-4:2:64", + "range": "TestCompile/scenarios/edge.d2,2:5:25-4:3:65", "nodes": [ { "map_key": { @@ -1533,7 +1533,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/edge.d2,1:11:18-5:0:66", + "range": "TestCompile/scenarios/edge.d2,1:11:18-5:1:67", "nodes": [ { "map_key": { @@ -1557,7 +1557,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/edge.d2,2:5:25-4:2:64", + "range": "TestCompile/scenarios/edge.d2,2:5:25-4:3:65", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index 9b077fb06..591518abf 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -932,7 +932,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,2:8:28-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:8:28-2:17:37", "nodes": [ { "map_key": { @@ -1431,7 +1431,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,3:10:48-3:19:57", + "range": "TestCompile/scenarios/root.d2,3:10:48-3:20:58", "nodes": [ { "map_key": { @@ -1517,7 +1517,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,1:11:18-4:0:59", + "range": "TestCompile/scenarios/root.d2,1:11:18-4:1:60", "nodes": [ { "map_key": { @@ -1541,7 +1541,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,2:8:28-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:8:28-2:17:37", "nodes": [ { "map_key": { @@ -1615,7 +1615,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,3:10:48-3:19:57", + "range": "TestCompile/scenarios/root.d2,3:10:48-3:20:58", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index 01c07121f..3e09926d4 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -932,7 +932,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,2:8:24-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:8:24-2:17:33", "nodes": [ { "map_key": { @@ -2401,7 +2401,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,6:13:83-8:3:105", + "range": "TestCompile/steps/recursive.d2,6:13:83-8:4:106", "nodes": [ { "map_key": { @@ -2487,7 +2487,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,5:13:68-9:2:109", + "range": "TestCompile/steps/recursive.d2,5:13:68-9:3:110", "nodes": [ { "map_key": { @@ -2511,7 +2511,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,6:13:83-8:3:105", + "range": "TestCompile/steps/recursive.d2,6:13:83-8:4:106", "nodes": [ { "map_key": { @@ -2703,7 +2703,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,3:10:44-10:1:112", + "range": "TestCompile/steps/recursive.d2,3:10:44-10:2:113", "nodes": [ { "map_key": { @@ -2750,7 +2750,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,5:13:68-9:2:109", + "range": "TestCompile/steps/recursive.d2,5:13:68-9:3:110", "nodes": [ { "map_key": { @@ -2774,7 +2774,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,6:13:83-8:3:105", + "range": "TestCompile/steps/recursive.d2,6:13:83-8:4:106", "nodes": [ { "map_key": { @@ -2870,7 +2870,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,1:7:14-11:0:114", + "range": "TestCompile/steps/recursive.d2,1:7:14-11:1:115", "nodes": [ { "map_key": { @@ -2894,7 +2894,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,2:8:24-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:8:24-2:17:33", "nodes": [ { "map_key": { @@ -2968,7 +2968,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,3:10:44-10:1:112", + "range": "TestCompile/steps/recursive.d2,3:10:44-10:2:113", "nodes": [ { "map_key": { @@ -3015,7 +3015,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,5:13:68-9:2:109", + "range": "TestCompile/steps/recursive.d2,5:13:68-9:3:110", "nodes": [ { "map_key": { @@ -3039,7 +3039,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,6:13:83-8:3:105", + "range": "TestCompile/steps/recursive.d2,6:13:83-8:4:106", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index a4357ba31..ec142d977 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -932,7 +932,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,2:8:24-2:16:32", + "range": "TestCompile/steps/root.d2,2:8:24-2:17:33", "nodes": [ { "map_key": { @@ -1741,7 +1741,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,3:10:44-3:19:53", + "range": "TestCompile/steps/root.d2,3:10:44-3:20:54", "nodes": [ { "map_key": { @@ -1827,7 +1827,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,1:7:14-4:0:55", + "range": "TestCompile/steps/root.d2,1:7:14-4:1:56", "nodes": [ { "map_key": { @@ -1851,7 +1851,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,2:8:24-2:16:32", + "range": "TestCompile/steps/root.d2,2:8:24-2:17:33", "nodes": [ { "map_key": { @@ -1925,7 +1925,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,3:10:44-3:19:53", + "range": "TestCompile/steps/root.d2,3:10:44-3:20:54", "nodes": [ { "map_key": { 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..a98e70b9f 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/container.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestCreate/container.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..be325688f 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { @@ -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..5e2691e80 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,0:8:8-2:0:19", + "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,0:8:8-2:1:20", "nodes": [ { "map_key": { @@ -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..96a1cef5e 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,0:11:11-2:0:22", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,0:11:11-2:1:23", "nodes": [ { "map_key": { @@ -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..6d529ec3e 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,0:11:11-2:0:22", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,0:11:11-2:1:23", "nodes": [ { "map_key": { @@ -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..6aa1e8666 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -38,7 +38,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,0:5:5-2:0:16", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,0:5:5-2:1:17", "nodes": [ { "map_key": { @@ -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..d35ac1de8 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/gen_key_n.d2,0:7:7-12:0:130", + "range": "d2/testdata/d2oracle/TestCreate/gen_key_n.d2,0:7:7-12:1:131", "nodes": [ { "map_key": { @@ -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..0bcfa43e5 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/gen_key_scope.d2,0:7:7-3:0:29", + "range": "d2/testdata/d2oracle/TestCreate/gen_key_scope.d2,0:7:7-3:1:30", "nodes": [ { "map_key": { @@ -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..3b2eb0b98 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,0:6:6-3:0:33", + "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,0:6:6-3:1:34", "nodes": [ { "map_key": { @@ -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..c5e68d3cb 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,1:6:13-4:0:40", + "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,1:6:13-4:1:41", "nodes": [ { "map_key": { @@ -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..b5616c220 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,2:6:14-5:0:41", + "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,2:6:14-5:1:42", "nodes": [ { "map_key": { @@ -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..54f4d8c6a 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/scope.d2,0:7:7-2:0:18", + "range": "d2/testdata/d2oracle/TestCreate/scope.d2,0:7:7-2:1:19", "nodes": [ { "map_key": { @@ -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..0ca9c574f 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:8:8-2:0:44", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:8:8-2:1:45", "nodes": [ { "map_key": { @@ -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..dc0352817 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:4:4-0:20:20", + "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:4:4-0:21:21", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:11:33-1:51:73", + "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:11:33-1:52:74", "nodes": [ { "map_key": { @@ -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..c8465ce86 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/children_nested_conflicts.d2,0:5:5-2:0:11", + "range": "d2/testdata/d2oracle/TestDelete/children_nested_conflicts.d2,0:5:5-2:1:12", "nodes": [ { "map_key": { @@ -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..a85079f82 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/children_order.d2,0:3:3-6:0:32", + "range": "d2/testdata/d2oracle/TestDelete/children_order.d2,0:3:3-6:1:33", "nodes": [ { "map_key": { @@ -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..13e8a86d1 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -38,7 +38,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,0:5:5-3:0:28", + "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,0:5:5-3:1:29", "nodes": [ { "map_key": { @@ -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..031c8c0ee 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/conflicts_generated.d2,2:8:16-4:0:27", + "range": "d2/testdata/d2oracle/TestDelete/conflicts_generated.d2,2:8:16-4:1:28", "nodes": [ { "map_key": { @@ -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..5044d5f4b 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,0:3:3-2:0:15", + "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,0:3:3-2:1:16", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,4:3:22-6:0:34", + "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,4:3:22-6:1:35", "nodes": [ { "map_key": { @@ -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..09b4bbab9 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -38,7 +38,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,0:5:5-2:0:34", + "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,0:5:5-2:1:35", "nodes": [ { "map_key": { @@ -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..b92c2fb3a 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:7:7-0:22:22", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:7:7-0:23:23", "nodes": [ { "map_key": { @@ -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..1d565e6c8 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:7:7-0:27:27", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:7:7-0:28:28", "nodes": [ { "map_key": { @@ -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..28c0fcd11 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:7:7-0:27:27", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:7:7-0:28:28", "nodes": [ { "map_key": { @@ -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..3d7092713 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/empty_map.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestDelete/empty_map.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..2e9eb254e 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/hoist_children.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestDelete/hoist_children.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..f6c3e68b1 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,1:10:14-3:0:28", + "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,1:10:14-3:1:29", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,4:4:34-6:0:49", + "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,4:4:34-6:1:50", "nodes": [ { "map_key": { @@ -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..88f938d40 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { @@ -79,7 +79,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,3:3:16-5:0:22", + "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,3:3:16-5:1:23", "nodes": [ { "map_key": { @@ -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..2e67684d4 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..01edf7efc 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,0:3:3-4:0:37", + "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,0:3:3-4:1:38", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,1:9:14-3:2:35", + "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,1:9:14-3:3:36", "nodes": [ { "map_key": { @@ -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..084c5aba9 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { @@ -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..73b193b3f 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/nested_underscore_update.d2,0:7:7-2:0:18", + "range": "d2/testdata/d2oracle/TestDelete/nested_underscore_update.d2,0:7:7-2:1:19", "nodes": [ { "map_key": { @@ -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..dc3c6c44f 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -119,7 +119,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,2:4:18-4:0:32", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,2:4:18-4:1:33", "nodes": [ { "map_key": { @@ -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..117af5395 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -158,7 +158,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,1:5:22-3:0:36", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,1:5:22-3:1:37", "nodes": [ { "map_key": { @@ -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..b5c7ccdae 100644 --- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/only-underscore-nested.d2,0:8:8-2:0:18", + "range": "d2/testdata/d2oracle/TestDelete/only-underscore-nested.d2,0:8:8-2:1:19", "nodes": [ { "map_key": { @@ -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..2309c924e 100644 --- a/testdata/d2oracle/TestDelete/only-underscore.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/only-underscore.d2,0:8:8-2:0:18", + "range": "d2/testdata/d2oracle/TestDelete/only-underscore.d2,0:8:8-2:1:19", "nodes": [ { "map_key": { @@ -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..b93c9f0c6 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:3:3-0:27:27", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:3:3-0:28:28", "nodes": [ { "map_key": { @@ -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..35f4eac8b 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:8:12-2:32:36", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:8:12-2:33:37", "nodes": [ { "map_key": { @@ -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..340e97382 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,0:3:3-3:0:23", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,0:3:3-3:1:24", "nodes": [ { "map_key": { @@ -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..010f688df 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/order_6.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestDelete/order_6.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { @@ -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..d85b7b0cc 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/order_7.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestDelete/order_7.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { @@ -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..f9a437bd2 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:3:3-2:0:21", + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:3:3-2:1:22", "nodes": [ { "map_key": { @@ -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..9135e9999 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:9:9-2:0:27", + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:9:9-2:1:28", "nodes": [ { "map_key": { @@ -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..279fee006 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,0:7:7-8:0:123", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,0:7:7-8:1:124", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,1:9:18-4:2:81", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,1:9:18-4:3:82", "nodes": [ { "map_key": { @@ -118,7 +118,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,3:12:53-3:36:77", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,3:12:53-3:37:78", "nodes": [ { "map_key": { @@ -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..8dddf30b2 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/table_refs.d2,0:3:3-3:0:28", + "range": "d2/testdata/d2oracle/TestDelete/table_refs.d2,0:3:3-3:1:29", "nodes": [ { "map_key": { @@ -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..95ef38dd6 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_no_conflict.d2,0:3:3-4:0:16", + "range": "d2/testdata/d2oracle/TestDelete/underscore_no_conflict.d2,0:3:3-4:1:17", "nodes": [ { "map_key": { @@ -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..f35e81c9d 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,0:3:3-11:0:102", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,0:3:3-11:1:103", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,1:5:10-5:2:52", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,1:5:10-5:3:53", "nodes": [ { "map_key": { @@ -75,7 +75,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,2:11:23-4:4:48", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,2:11:23-4:5:49", "nodes": [ { "map_key": { @@ -138,7 +138,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,6:5:59-10:2:100", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,6:5:59-10:3:101", "nodes": [ { "map_key": { @@ -162,7 +162,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,7:11:72-9:4:96", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,7:11:72-9:5:97", "nodes": [ { "map_key": { @@ -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..16fc91031 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/basic_nested.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/basic_nested.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..8e4ec8375 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/between_containers.d2,1:3:5-3:0:11", + "range": "d2/testdata/d2oracle/TestMove/between_containers.d2,1:3:5-3:1:12", "nodes": [ { "map_key": { @@ -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..2bb20536a 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -83,7 +83,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,3:10:35-5:0:52", + "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,3:10:35-5:1:53", "nodes": [ { "map_key": { @@ -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..cab5389a5 100644 --- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json +++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..95d0a5982 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_near.d2,0:3:3-5:0:38", + "range": "d2/testdata/d2oracle/TestMove/container_near.d2,0:3:3-5:1:39", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_near.d2,1:5:10-3:2:30", + "range": "d2/testdata/d2oracle/TestMove/container_near.d2,1:5:10-3:3:31", "nodes": [ { "map_key": { @@ -152,7 +152,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_near.d2,6:3:43-8:0:49", + "range": "d2/testdata/d2oracle/TestMove/container_near.d2,6:3:43-8:1:50", "nodes": [ { "map_key": { @@ -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..322268428 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:3:8-5:0:28", + "range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:3:8-5:1:29", "nodes": [ { "map_key": { @@ -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..0b27a1251 100644 --- a/testdata/d2oracle/TestMove/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestMove/duplicate_generated.exp.json @@ -142,7 +142,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/duplicate_generated.d2,7:3:23-9:0:31", + "range": "d2/testdata/d2oracle/TestMove/duplicate_generated.d2,7:3:23-9:1:32", "nodes": [ { "map_key": { @@ -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..a796860ef 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,0:3:3-2:0:18", + "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,0:3:3-2:1:19", "nodes": [ { "map_key": { @@ -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..0fdadf058 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,0:3:3-2:0:23", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,0:3:3-2:1:24", "nodes": [ { "map_key": { @@ -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..71c90c3cf 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,0:3:3-2:0:21", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,0:3:3-2:1:22", "nodes": [ { "map_key": { @@ -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..208bbc7c6 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -95,7 +95,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,1:3:18-3:0:24", + "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,1:3:18-3:1:25", "nodes": [ { "map_key": { @@ -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..8ea6e91c5 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..34eb8ef15 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { @@ -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..f5b230e67 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,0:3:3-2:0:16", + "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,0:3:3-2:1:17", "nodes": [ { "map_key": { @@ -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..65216fcde 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -79,7 +79,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,3:3:14-7:0:33", + "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,3:3:14-7:1:34", "nodes": [ { "map_key": { @@ -103,7 +103,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,4:5:21-6:2:31", + "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,4:5:21-6:3:32", "nodes": [ { "map_key": { @@ -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..c727e8304 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -72,7 +72,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,1:3:9-5:0:28", + "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,1:3:9-5:1:29", "nodes": [ { "map_key": { @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,2:5:16-4:2:26", + "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,2:5:16-4:3:27", "nodes": [ { "map_key": { @@ -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..dfe4b4932 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_between_containers.d2,1:3:5-3:0:11", + "range": "d2/testdata/d2oracle/TestMove/flat_between_containers.d2,1:3:5-3:1:12", "nodes": [ { "map_key": { @@ -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..735394e90 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,1:3:5-4:0:21", + "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,1:3:5-4:1:22", "nodes": [ { "map_key": { @@ -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..249f6e625 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -61,7 +61,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_middle_container.d2,1:3:7-3:0:13", + "range": "d2/testdata/d2oracle/TestMove/flat_middle_container.d2,1:3:7-3:1:14", "nodes": [ { "map_key": { @@ -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..88af9eb39 100644 --- a/testdata/d2oracle/TestMove/flat_near.exp.json +++ b/testdata/d2oracle/TestMove/flat_near.exp.json @@ -71,7 +71,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_near.d2,1:3:15-3:0:21", + "range": "d2/testdata/d2oracle/TestMove/flat_near.d2,1:3:15-3:1:22", "nodes": [ { "map_key": { @@ -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..5e057fe71 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -94,7 +94,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge.d2,1:5:13-4:0:27", + "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge.d2,1:5:13-4:1:28", "nodes": [ { "map_key": { @@ -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..a1abcb3b1 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,0:3:3-7:0:38", + "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,0:3:3-7:1:39", "nodes": [ { "map_key": { @@ -62,7 +62,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,1:7:12-4:2:28", + "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,1:7:12-4:3:29", "nodes": [ { "map_key": { @@ -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..28401eb18 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,1:3:5-3:0:24", + "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,1:3:5-3:1:25", "nodes": [ { "map_key": { @@ -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..5ca987152 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,0:3:3-3:0:25", + "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,0:3:3-3:1:26", "nodes": [ { "comment": { @@ -85,7 +85,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,4:3:30-7:0:70", + "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,4:3:30-7:1:71", "nodes": [ { "comment": { @@ -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..ac3ee7326 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,0:3:3-3:0:50", + "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,0:3:3-3:1:51", "nodes": [ { "map_key": { @@ -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..fa669a32d 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,0:3:3-3:0:20", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,0:3:3-3:1:21", "nodes": [ { "map_key": { @@ -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..7ac3ed662 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/full_slice.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/full_slice.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..d4fdf0016 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,1:3:18-3:0:30", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,1:3:18-3:1:31", "nodes": [ { "map_key": { @@ -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..e1175fec1 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/hoist_container_children.d2,3:3:8-5:0:14", + "range": "d2/testdata/d2oracle/TestMove/hoist_container_children.d2,3:3:8-5:1:15", "nodes": [ { "map_key": { @@ -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..891d371f0 100644 --- a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_conflict.d2,0:3:3-3:0:17", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_conflict.d2,0:3:3-3:1:18", "nodes": [ { "map_key": { @@ -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..ae2d5dbd4 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_child.d2,0:3:3-4:0:27", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_child.d2,0:3:3-4:1:28", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_child.d2,1:5:10-3:2:25", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_child.d2,1:5:10-3:3:26", "nodes": [ { "map_key": { @@ -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..e2cdeca29 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..588c19dc5 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.d2,0:5:5-4:0:28", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.d2,0:5:5-4:1:29", "nodes": [ { "map_key": { @@ -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..b3266b6ad 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -169,7 +169,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.d2,4:3:29-6:0:52", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.d2,4:3:29-6:1:53", "nodes": [ { "map_key": { @@ -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..abfb18ae5 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_flat_1.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_flat_1.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { @@ -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..bbb9dbc8f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json @@ -61,7 +61,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_flat_2.d2,1:5:7-3:0:15", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_flat_2.d2,1:5:7-3:1:16", "nodes": [ { "map_key": { @@ -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..bc210a92d 100644 --- a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,0:3:3-7:0:47", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,0:3:3-7:1:48", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,1:5:10-6:2:45", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,1:5:10-6:3:46", "nodes": [ { "map_key": { @@ -109,7 +109,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,3:7:27-5:4:41", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,3:7:27-5:5:42", "nodes": [ { "map_key": { @@ -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..22437cde7 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_1.d2,0:3:3-4:0:22", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_1.d2,0:3:3-4:1:23", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_1.d2,1:5:10-3:2:20", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_1.d2,1:5:10-3:3:21", "nodes": [ { "map_key": { @@ -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..c87d5f62d 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_2.d2,3:3:9-5:0:15", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_2.d2,3:3:9-5:1:16", "nodes": [ { "map_key": { @@ -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..c80f7b086 100644 --- a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_move_out.d2,1:3:5-5:0:24", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_move_out.d2,1:3:5-5:1:25", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_move_out.d2,2:5:12-4:2:22", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_move_out.d2,2:5:12-4:3:23", "nodes": [ { "map_key": { @@ -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..fe66e976f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_near.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_near.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_near.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { @@ -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..e3892169e 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_1.d2,1:3:5-3:0:11", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_1.d2,1:3:5-3:1:12", "nodes": [ { "map_key": { @@ -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..ca86b08a0 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json @@ -61,7 +61,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_2.d2,1:5:7-3:0:13", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_2.d2,1:5:7-3:1:14", "nodes": [ { "map_key": { @@ -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..ea03a4bf6 100644 --- a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_non_conflict.d2,0:3:3-3:0:17", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_non_conflict.d2,0:3:3-3:1:18", "nodes": [ { "map_key": { @@ -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..990495062 100644 --- a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,0:3:3-5:0:46", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,0:3:3-5:1:47", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,1:5:10-4:2:44", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,1:5:10-4:3:45", "nodes": [ { "map_key": { @@ -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..7c897ae05 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json @@ -95,7 +95,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore.d2,2:8:34-6:0:83", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore.d2,2:8:34-6:1:84", "nodes": [ { "map_key": { @@ -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..6b24d0ce9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_2.d2,1:3:5-3:0:15", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_2.d2,1:3:5-3:1:16", "nodes": [ { "map_key": { @@ -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..e9279e02e 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_3.d2,1:3:5-4:0:37", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_3.d2,1:3:5-4:1:38", "nodes": [ { "map_key": { @@ -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..44caff5d9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..14b463daf 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { @@ -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..2d4b8dd57 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_existing_map.d2,0:3:3-3:0:13", + "range": "d2/testdata/d2oracle/TestMove/into_container_existing_map.d2,0:3:3-3:1:14", "nodes": [ { "map_key": { @@ -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..8f07eb54c 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_nonexisting_map.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/into_container_nonexisting_map.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..409433d81 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,0:3:3-6:0:93", + "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,0:3:3-6:1:94", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,1:5:10-5:2:91", + "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,1:5:10-5:3:92", "nodes": [ { "map_key": { @@ -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..1d1344607 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_style.d2,0:3:3-3:0:34", + "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_style.d2,0:3:3-3:1:35", "nodes": [ { "map_key": { @@ -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..e5eb38532 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,4:3:9-12:0:77", + "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,4:3:9-12:1:78", "nodes": [ { "map_key": { @@ -97,7 +97,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,5:5:16-11:2:75", + "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,5:5:16-11:3:76", "nodes": [ { "map_key": { @@ -121,7 +121,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,6:11:29-8:4:54", + "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,6:11:29-8:5:55", "nodes": [ { "map_key": { @@ -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..fd11c8959 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,2:3:6-4:0:18", + "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,2:3:6-4:1:19", "nodes": [ { "map_key": { @@ -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..7d9fbadc8 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,0:3:3-10:0:65", + "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,0:3:3-10:1:66", "nodes": [ { "map_key": { @@ -164,7 +164,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,4:5:30-9:2:63", + "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,4:5:30-9:3:64", "nodes": [ { "map_key": { @@ -188,7 +188,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,5:7:39-7:4:53", + "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,5:7:39-7:5:54", "nodes": [ { "map_key": { @@ -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..26d98f1c7 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,0:3:3-8:0:68", + "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,0:3:3-8:1:69", "nodes": [ { "map_key": { @@ -173,7 +173,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,4:5:48-7:2:66", + "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,4:5:48-7:3:67", "nodes": [ { "map_key": { @@ -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..c987f6b4e 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/middle_container.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/middle_container.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..68f5d2343 100644 --- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json +++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json @@ -152,7 +152,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,4:3:43-11:0:81", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,4:3:43-11:1:82", "nodes": [ { "map_key": { @@ -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..25c452213 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/move_container_children.d2,4:3:10-6:0:16", + "range": "d2/testdata/d2oracle/TestMove/move_container_children.d2,4:3:10-6:1:17", "nodes": [ { "map_key": { @@ -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..aad213c61 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/move_container_conflict_children.d2,4:3:12-6:0:18", + "range": "d2/testdata/d2oracle/TestMove/move_container_conflict_children.d2,4:3:12-6:1:19", "nodes": [ { "map_key": { @@ -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..f50f54085 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/move_into_key_with_value.d2,0:8:8-2:0:14", + "range": "d2/testdata/d2oracle/TestMove/move_into_key_with_value.d2,0:8:8-2:1:15", "nodes": [ { "map_key": { @@ -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..c92dbe439 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,1:5:18-3:0:24", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,1:5:18-3:1:25", "nodes": [ { "map_key": { @@ -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..7d2be161a 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,0:3:3-9:0:61", + "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,0:3:3-9:1:62", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,1:5:10-7:2:51", + "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,1:5:10-7:3:52", "nodes": [ { "map_key": { @@ -98,7 +98,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,3:7:25-6:4:47", + "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,3:7:25-6:5:48", "nodes": [ { "map_key": { @@ -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..bb04cafce 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/near.d2,0:3:3-2:0:17", + "range": "d2/testdata/d2oracle/TestMove/near.d2,0:3:3-2:1:18", "nodes": [ { "map_key": { @@ -89,7 +89,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/near.d2,3:3:22-5:0:28", + "range": "d2/testdata/d2oracle/TestMove/near.d2,3:3:22-5:1:29", "nodes": [ { "map_key": { @@ -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..062b7e87b 100644 --- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json +++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nested-underscore-move-out.d2,0:8:8-3:0:25", + "range": "d2/testdata/d2oracle/TestMove/nested-underscore-move-out.d2,0:8:8-3:1:26", "nodes": [ { "map_key": { @@ -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..6e727d799 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json @@ -72,7 +72,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,1:5:9-6:0:48", + "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,1:5:9-6:1:49", "nodes": [ { "map_key": { @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,2:5:16-5:2:46", + "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,2:5:16-5:3:47", "nodes": [ { "map_key": { @@ -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..10b00ea68 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -79,7 +79,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,3:3:14-5:0:20", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,3:3:14-5:1:21", "nodes": [ { "map_key": { @@ -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..c6d2f7e36 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,0:3:3-2:0:17", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,0:3:3-2:1:18", "nodes": [ { "map_key": { @@ -102,7 +102,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,3:3:22-6:0:32", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,3:3:22-6:1:33", "nodes": [ { "map_key": { @@ -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..91bc7ec8e 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/rename_2.d2,4:3:14-6:0:20", + "range": "d2/testdata/d2oracle/TestMove/rename_2.d2,4:3:14-6:1:21", "nodes": [ { "map_key": { @@ -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..a630a7c6a 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,0:3:3-6:0:37", + "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,0:3:3-6:1:38", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,1:5:10-4:2:28", + "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,1:5:10-4:3:29", "nodes": [ { "map_key": { @@ -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..364083c4e 100644 --- a/testdata/d2oracle/TestMove/underscore-connection.exp.json +++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,0:3:3-2:0:22", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,0:3:3-2:1:23", "nodes": [ { "map_key": { @@ -146,7 +146,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,4:3:28-7:0:38", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,4:3:28-7:1:39", "nodes": [ { "map_key": { @@ -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..3076328ff 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_children.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestMove/underscore_children.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { @@ -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..060e1bb9c 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,0:3:3-2:0:16", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,0:3:3-2:1:17", "nodes": [ { "map_key": { @@ -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..adcab65e8 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { @@ -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..0c8db60f3 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,0:3:3-2:0:16", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,0:3:3-2:1:17", "nodes": [ { "map_key": { @@ -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..7036b433c 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,0:3:3-2:0:16", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,0:3:3-2:1:17", "nodes": [ { "map_key": { @@ -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..0fc0392c9 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { @@ -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..50271e49f 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,0:3:3-2:0:20", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,0:3:3-2:1:21", "nodes": [ { "map_key": { @@ -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..906801970 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_6.d2,0:3:3-2:0:18", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_6.d2,0:3:3-2:1:19", "nodes": [ { "map_key": { @@ -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..7dd497bd3 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,0:3:3-4:0:30", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,0:3:3-4:1:31", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,1:5:10-3:2:28", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,1:5:10-3:3:29", "nodes": [ { "map_key": { @@ -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..914e4dc1b 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,2:3:6-5:0:30", + "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,2:3:6-5:1:31", "nodes": [ { "map_key": { @@ -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..a78f65a45 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,0:3:3-4:0:24", + "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,0:3:3-4:1:25", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,1:5:10-3:2:22", + "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,1:5:10-3:3:23", "nodes": [ { "map_key": { @@ -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..f50e03ce7 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,0:3:3-9:0:58", + "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,0:3:3-9:1:59", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,1:5:10-3:2:22", + "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,1:5:10-3:3:23", "nodes": [ { "map_key": { @@ -114,7 +114,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,4:5:29-8:2:56", + "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,4:5:29-8:3:57", "nodes": [ { "map_key": { @@ -138,7 +138,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,5:7:38-7:4:52", + "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,5:7:38-7:5:53", "nodes": [ { "map_key": { @@ -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..f0d5a7646 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_transplant.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/underscore_transplant.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -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..bde09595f 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/unique_name.d2,0:3:3-3:0:15", + "range": "d2/testdata/d2oracle/TestMove/unique_name.d2,0:3:3-3:1:16", "nodes": [ { "map_key": { @@ -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..d71534069 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,0:3:3-3:0:15", + "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,0:3:3-3:1:16", "nodes": [ { "map_key": { @@ -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..00644f955 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,0:3:3-7:0:38", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,0:3:3-7:1:39", "nodes": [ { "map_key": { @@ -131,7 +131,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,4:5:26-6:2:36", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,4:5:26-6:3:37", "nodes": [ { "map_key": { @@ -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..7d974c12b 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,0:3:3-3:0:20", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,0:3:3-3:1:21", "nodes": [ { "map_key": { @@ -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..5f52b761f 100644 --- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:8:8-2:0:31", + "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:8:8-2:1:32", "nodes": [ { "map_key": { @@ -146,7 +146,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:8:41-5:0:63", + "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:8:41-5:1:64", "nodes": [ { "map_key": { @@ -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..598ec3077 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/conflict_2.d2,0:7:7-3:0:19", + "range": "d2/testdata/d2oracle/TestRename/conflict_2.d2,0:7:7-3:1:20", "nodes": [ { "map_key": { @@ -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..1d4593223 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -327,7 +327,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,1:16:87-4:0:114", + "range": "d2/testdata/d2oracle/TestRename/container.d2,1:16:87-4:1:115", "nodes": [ { "map_key": { @@ -472,7 +472,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,5:4:120-9:0:149", + "range": "d2/testdata/d2oracle/TestRename/container.d2,5:4:120-9:1:150", "nodes": [ { "map_key": { @@ -496,7 +496,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,6:15:137-8:2:147", + "range": "d2/testdata/d2oracle/TestRename/container.d2,6:15:137-8:3:148", "nodes": [ { "map_key": { @@ -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..6e5ab0650 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -272,7 +272,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,1:3:41-4:0:72", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,1:3:41-4:1:73", "nodes": [ { "map_key": { @@ -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..7c7ddf563 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/near.d2,0:3:3-2:0:15", + "range": "d2/testdata/d2oracle/TestRename/near.d2,0:3:3-2:1:16", "nodes": [ { "map_key": { @@ -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..9c0a5f917 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -127,7 +127,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/nested.d2,1:9:36-3:0:59", + "range": "d2/testdata/d2oracle/TestRename/nested.d2,1:9:36-3:1:60", "nodes": [ { "map_key": { @@ -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..a99073d1f 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,0:9:9-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,0:9:9-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,1:5:16-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,1:5:16-3:3:41", "nodes": [ { "map_key": { @@ -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..9c74249a8 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,0:9:9-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,0:9:9-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,1:5:16-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,1:5:16-3:3:41", "nodes": [ { "map_key": { @@ -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..a215df715 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:8:8-0:29:29", + "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:8:8-0:30:30", "nodes": [ { "map_key": { @@ -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..e36df946d 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,0:6:6-3:0:91", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,0:6:6-3:1:92", "nodes": [ { "map_key": { @@ -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..3bd0f42a8 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,0:6:6-3:0:61", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,0:6:6-3:1:62", "nodes": [ { "map_key": { @@ -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..d1eb8f9c3 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,0:8:8-2:0:36", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,0:8:8-2:1:37", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,3:3:41-5:0:52", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,3:3:41-5:1:53", "nodes": [ { "map_key": { @@ -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..1abf22a57 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,0:6:6-2:0:23", + "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,0:6:6-2:1:24", "nodes": [ { "map_key": { @@ -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..b2b5df2bc 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -95,7 +95,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:12:14-1:33:35", + "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:12:14-1:34:36", "nodes": [ { "map_key": { @@ -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..bc87c278f 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -60,7 +60,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:13:13-0:34:34", + "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:13:13-0:35:35", "nodes": [ { "map_key": { @@ -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..e647ebf85 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:8:8-5:0:68", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:8:8-5:1:69", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,1:20:30-4:2:66", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,1:20:30-4:3:67", "nodes": [ { "map_key": { @@ -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..dd6f28c99 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:8:8-5:0:61", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:8:8-5:1:62", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,1:9:19-4:2:59", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,1:9:19-4:3:60", "nodes": [ { "map_key": { @@ -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..64f975592 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,0:6:6-2:0:21", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,0:6:6-2:1:22", "nodes": [ { "map_key": { @@ -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..cddd2cccb 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,0:6:6-2:0:44", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,0:6:6-2:1:45", "nodes": [ { "map_key": { @@ -84,7 +84,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:15:23-1:34:42", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:15:23-1:35:43", "nodes": [ { "map_key": { @@ -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..88538296c 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:8:8-0:40:40", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:8:8-0:41:41", "nodes": [ { "map_key": { @@ -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..4a3477968 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:8:8-0:40:40", + "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:8:8-0:41:41", "nodes": [ { "map_key": { @@ -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..cd0111b35 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,0:8:8-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,0:8:8-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,1:9:19-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,1:9:19-3:3:41", "nodes": [ { "map_key": { @@ -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..ab79c0a72 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:6:6-0:66:66", + "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:6:6-0:67:67", "nodes": [ { "map_key": { @@ -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..032b0654e 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,0:8:8-3:0:49", + "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,0:8:8-3:1:50", "nodes": [ { "map_key": { @@ -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..612f2cff8 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -33,7 +33,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,0:50:50-2:0:61", + "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,0:50:50-2:1:62", "nodes": [ { "map_key": { @@ -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..97bb445e0 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,0:6:6-4:0:200", + "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,0:6:6-4:1:201", "nodes": [ { "map_key": { @@ -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..4a8400833 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/new_style.d2,0:8:8-0:27:27", + "range": "d2/testdata/d2oracle/TestSet/new_style.d2,0:8:8-0:28:28", "nodes": [ { "map_key": { @@ -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..9870e4e34 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:8:8-2:0:43", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:8:8-2:1:44", "nodes": [ { "map_key": { @@ -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..2c26e580a 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:8:8-4:0:54", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:8:8-4:1:55", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,1:20:30-3:2:52", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,1:20:30-3:3:53", "nodes": [ { "map_key": { @@ -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..892cd96b3 100644 --- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_dimensions.d2,0:8:8-2:0:23", + "range": "d2/testdata/d2oracle/TestSet/replace_dimensions.d2,0:8:8-2:1:24", "nodes": [ { "map_key": { @@ -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..6704cc4f9 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:8:8-3:0:57", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:8:8-3:1:58", "nodes": [ { "map_key": { @@ -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..97d772826 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:8:8-4:0:44", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:8:8-4:1:45", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,1:9:19-3:2:42", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,1:9:19-3:3:43", "nodes": [ { "map_key": { @@ -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..e85fb417b 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_fill_pattern.d2,0:8:8-2:0:38", + "range": "d2/testdata/d2oracle/TestSet/replace_fill_pattern.d2,0:8:8-2:1:39", "nodes": [ { "map_key": { @@ -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..e6ac31625 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,0:8:8-2:0:36", + "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,0:8:8-2:1:37", "nodes": [ { "map_key": { @@ -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..464357f3e 100644 --- a/testdata/d2oracle/TestSet/replace_position.exp.json +++ b/testdata/d2oracle/TestSet/replace_position.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_position.d2,0:8:8-4:0:45", + "range": "d2/testdata/d2oracle/TestSet/replace_position.d2,0:8:8-4:1:46", "nodes": [ { "map_key": { @@ -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..c1490dc89 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,0:8:8-2:0:23", + "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,0:8:8-2:1:24", "nodes": [ { "map_key": { @@ -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..548d0f7b7 100644 --- a/testdata/d2oracle/TestSet/set_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/set_dimensions.d2,0:8:8-0:19:19", + "range": "d2/testdata/d2oracle/TestSet/set_dimensions.d2,0:8:8-0:20:20", "nodes": [ { "map_key": { @@ -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..476a81bc1 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/set_fill_pattern.d2,0:8:8-0:34:34", + "range": "d2/testdata/d2oracle/TestSet/set_fill_pattern.d2,0:8:8-0:35:35", "nodes": [ { "map_key": { @@ -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..699f78ae8 100644 --- a/testdata/d2oracle/TestSet/set_position.exp.json +++ b/testdata/d2oracle/TestSet/set_position.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/set_position.d2,0:8:8-0:17:17", + "range": "d2/testdata/d2oracle/TestSet/set_position.d2,0:8:8-0:18:18", "nodes": [ { "map_key": { @@ -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..a832f994d 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:8:8-0:19:19", + "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:8:8-0:20:20", "nodes": [ { "map_key": { @@ -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..bd4bedb40 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:8:8-0:22:22", + "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:8:8-0:23:23", "nodes": [ { "map_key": { @@ -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..25e8aeedb 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/shape_nested_style_set.d2,0:3:3-0:22:22", + "range": "d2/testdata/d2oracle/TestSet/shape_nested_style_set.d2,0:3:3-0:23:23", "nodes": [ { "map_key": { @@ -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..fce9058ea 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,0:9:9-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,0:9:9-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,1:5:16-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,1:5:16-3:3:41", "nodes": [ { "map_key": { @@ -129,7 +129,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,5:3:47-5:21:65", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,5:3:47-5:22:66", "nodes": [ { "map_key": { @@ -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..b7ac7a166 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,0:9:9-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,0:9:9-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,1:5:16-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,1:5:16-3:3:41", "nodes": [ { "map_key": { @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -258,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2parser/TestParse/bad_curly.exp.json b/testdata/d2parser/TestParse/bad_curly.exp.json index f85aaf0f4..60b55f77a 100644 --- a/testdata/d2parser/TestParse/bad_curly.exp.json +++ b/testdata/d2parser/TestParse/bad_curly.exp.json @@ -4,7 +4,6 @@ "nodes": null }, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2parser/TestParse/bad_curly.d2,0:3:3-0:4:4", diff --git a/testdata/d2parser/TestParse/block_string.exp.json b/testdata/d2parser/TestParse/block_string.exp.json index cc9f06c07..e088e4678 100644 --- a/testdata/d2parser/TestParse/block_string.exp.json +++ b/testdata/d2parser/TestParse/block_string.exp.json @@ -97,7 +97,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/block_string.d2,19:3:107-20:0:109", + "range": "d2/testdata/d2parser/TestParse/block_string.d2,19:3:107-20:1:110", "nodes": null } } diff --git a/testdata/d2parser/TestParse/errs.exp.json b/testdata/d2parser/TestParse/errs.exp.json index fd23802c4..ce617209c 100644 --- a/testdata/d2parser/TestParse/errs.exp.json +++ b/testdata/d2parser/TestParse/errs.exp.json @@ -397,7 +397,6 @@ ] }, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2parser/TestParse/errs.d2,1:0:1-1:1:2", diff --git a/testdata/d2parser/TestParse/import/#00.exp.json b/testdata/d2parser/TestParse/import/#00.exp.json new file mode 100644 index 000000000..77bf3dfd6 --- /dev/null +++ b/testdata/d2parser/TestParse/import/#00.exp.json @@ -0,0 +1,50 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#00.d2,0:0:0-0:8:8", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2parser/TestParse/import/#00.d2,0:0:0-0:8:8", + "key": { + "range": "d2/testdata/d2parser/TestParse/import/#00.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#00.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "d2/testdata/d2parser/TestParse/import/#00.d2,0:3:3-0:8:8", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#00.d2,0:4:4-0:8:8", + "value": [ + { + "string": "file", + "raw_string": "file" + } + ] + } + } + ] + } + } + } + } + ] + }, + "err": null +} diff --git a/testdata/d2parser/TestParse/import/#01.exp.json b/testdata/d2parser/TestParse/import/#01.exp.json new file mode 100644 index 000000000..298304786 --- /dev/null +++ b/testdata/d2parser/TestParse/import/#01.exp.json @@ -0,0 +1,50 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#01.d2,0:0:0-0:11:11", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2parser/TestParse/import/#01.d2,0:0:0-0:11:11", + "key": { + "range": "d2/testdata/d2parser/TestParse/import/#01.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#01.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "d2/testdata/d2parser/TestParse/import/#01.d2,0:3:3-0:11:11", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#01.d2,0:4:4-0:8:8", + "value": [ + { + "string": "file", + "raw_string": "file" + } + ] + } + } + ] + } + } + } + } + ] + }, + "err": null +} diff --git a/testdata/d2parser/TestParse/import/#02.exp.json b/testdata/d2parser/TestParse/import/#02.exp.json new file mode 100644 index 000000000..caf633d2b --- /dev/null +++ b/testdata/d2parser/TestParse/import/#02.exp.json @@ -0,0 +1,28 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#02.d2,0:0:0-0:11:11", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2parser/TestParse/import/#02.d2,0:0:0-0:11:11", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#02.d2,0:4:4-0:8:8", + "value": [ + { + "string": "file", + "raw_string": "file" + } + ] + } + } + ] + } + } + ] + }, + "err": null +} diff --git a/testdata/d2parser/TestParse/import/#03.exp.json b/testdata/d2parser/TestParse/import/#03.exp.json new file mode 100644 index 000000000..6109861ef --- /dev/null +++ b/testdata/d2parser/TestParse/import/#03.exp.json @@ -0,0 +1,57 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#03.d2,0:0:0-0:16:16", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2parser/TestParse/import/#03.d2,0:0:0-0:16:16", + "key": { + "range": "d2/testdata/d2parser/TestParse/import/#03.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#03.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2parser/TestParse/import/#03.d2,0:3:3-0:16:16", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2parser/TestParse/import/#03.d2,0:4:4-0:15:15", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#03.d2,0:8:8-0:12:12", + "value": [ + { + "string": "file", + "raw_string": "file" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + }, + "err": null +} diff --git a/testdata/d2parser/TestParse/import/#04.exp.json b/testdata/d2parser/TestParse/import/#04.exp.json new file mode 100644 index 000000000..8cc0420e8 --- /dev/null +++ b/testdata/d2parser/TestParse/import/#04.exp.json @@ -0,0 +1,39 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#04.d2,0:0:0-0:13:13", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2parser/TestParse/import/#04.d2,0:0:0-0:13:13", + "spread": true, + "pre": "", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#04.d2,0:4:4-0:10:10", + "value": [ + { + "string": "file", + "raw_string": "file" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#04.d2,0:11:11-0:13:13", + "value": [ + { + "string": "d2", + "raw_string": "d2" + } + ] + } + } + ] + } + } + ] + }, + "err": null +} diff --git a/testdata/d2parser/TestParse/import/#05.exp.json b/testdata/d2parser/TestParse/import/#05.exp.json new file mode 100644 index 000000000..f9491edd1 --- /dev/null +++ b/testdata/d2parser/TestParse/import/#05.exp.json @@ -0,0 +1,39 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#05.d2,0:0:0-0:13:13", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2parser/TestParse/import/#05.d2,0:0:0-0:13:13", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#05.d2,0:4:4-0:8:8", + "value": [ + { + "string": "file", + "raw_string": "file" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#05.d2,0:9:9-0:13:13", + "value": [ + { + "string": "d2", + "raw_string": "d2" + } + ] + } + } + ] + } + } + ] + }, + "err": null +} diff --git a/testdata/d2parser/TestParse/import/#06.exp.json b/testdata/d2parser/TestParse/import/#06.exp.json new file mode 100644 index 000000000..1a4eafe51 --- /dev/null +++ b/testdata/d2parser/TestParse/import/#06.exp.json @@ -0,0 +1,28 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#06.d2,0:0:0-0:11:11", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2parser/TestParse/import/#06.d2,0:0:0-0:11:11", + "spread": true, + "pre": "../", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#06.d2,0:7:7-0:11:11", + "value": [ + { + "string": "file", + "raw_string": "file" + } + ] + } + } + ] + } + } + ] + }, + "err": null +} diff --git a/testdata/d2parser/TestParse/import/#07.exp.json b/testdata/d2parser/TestParse/import/#07.exp.json new file mode 100644 index 000000000..b9b56bff8 --- /dev/null +++ b/testdata/d2parser/TestParse/import/#07.exp.json @@ -0,0 +1,38 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#07.d2,0:0:0-0:5:5", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2parser/TestParse/import/#07.d2,0:0:0-0:5:5", + "key": { + "range": "d2/testdata/d2parser/TestParse/import/#07.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#07.d2,0:0:0-0:5:5", + "value": [ + { + "string": "@file", + "raw_string": "@file" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "err": { + "errs": [ + { + "range": "d2/testdata/d2parser/TestParse/import/#07.d2,0:0:0-0:5:5", + "errmsg": "d2/testdata/d2parser/TestParse/import/#07.d2:1:1: @file is not a valid import, did you mean ...@file?" + } + ] + } +} diff --git a/testdata/d2parser/TestParse/import/#08.exp.json b/testdata/d2parser/TestParse/import/#08.exp.json new file mode 100644 index 000000000..73e586aeb --- /dev/null +++ b/testdata/d2parser/TestParse/import/#08.exp.json @@ -0,0 +1,28 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#08.d2,0:0:0-0:18:18", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2parser/TestParse/import/#08.d2,0:0:0-0:18:18", + "spread": true, + "pre": "./../.././", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#08.d2,0:14:14-0:18:18", + "value": [ + { + "string": "file", + "raw_string": "file" + } + ] + } + } + ] + } + } + ] + }, + "err": null +} diff --git a/testdata/d2parser/TestParse/import/#09.exp.json b/testdata/d2parser/TestParse/import/#09.exp.json new file mode 100644 index 000000000..690c52489 --- /dev/null +++ b/testdata/d2parser/TestParse/import/#09.exp.json @@ -0,0 +1,48 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#09.d2,0:0:0-0:14:14", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2parser/TestParse/import/#09.d2,0:0:0-0:14:14", + "key": { + "range": "d2/testdata/d2parser/TestParse/import/#09.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#09.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#09.d2,0:6:6-0:14:14", + "value": [ + { + "string": "...@file", + "raw_string": "...@file" + } + ] + } + } + } + } + ] + }, + "err": { + "errs": [ + { + "range": "d2/testdata/d2parser/TestParse/import/#09.d2,0:6:6-0:10:10", + "errmsg": "d2/testdata/d2parser/TestParse/import/#09.d2:1:7: unquoted strings cannot begin with ...@ as that's import spread syntax" + } + ] + } +} diff --git a/testdata/d2parser/TestParse/missing_map_value.exp.json b/testdata/d2parser/TestParse/missing_map_value.exp.json index 68179de80..c57f8e612 100644 --- a/testdata/d2parser/TestParse/missing_map_value.exp.json +++ b/testdata/d2parser/TestParse/missing_map_value.exp.json @@ -28,7 +28,6 @@ ] }, "err": { - "ioerr": null, "errs": [ { "range": "d2/testdata/d2parser/TestParse/missing_map_value.d2,1:1:2-1:2:3", diff --git a/testdata/d2parser/TestParse/primary.exp.json b/testdata/d2parser/TestParse/primary.exp.json index da623705c..25125e314 100644 --- a/testdata/d2parser/TestParse/primary.exp.json +++ b/testdata/d2parser/TestParse/primary.exp.json @@ -83,7 +83,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/primary.d2,1:19:20-16:0:741", + "range": "d2/testdata/d2parser/TestParse/primary.d2,1:19:20-16:1:742", "nodes": [ { "map_key": { diff --git a/testdata/d2parser/TestParse/table_and_class.exp.json b/testdata/d2parser/TestParse/table_and_class.exp.json index b44e38f25..d5ab2c9ed 100644 --- a/testdata/d2parser/TestParse/table_and_class.exp.json +++ b/testdata/d2parser/TestParse/table_and_class.exp.json @@ -34,7 +34,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,1:25:26-44:0:1006", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,1:25:26-44:1:1007", "nodes": [ { "map_key": { @@ -58,7 +58,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,2:9:37-11:2:310", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,2:9:37-11:3:311", "nodes": [ { "map_key": { @@ -125,7 +125,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,4:12:72-4:36:96", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,4:12:72-4:37:97", "nodes": [ { "map_key": { @@ -197,7 +197,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,5:15:113-5:39:137", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,5:15:113-5:40:138", "nodes": [ { "map_key": { @@ -269,7 +269,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,6:17:156-6:41:180", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,6:17:156-6:42:181", "nodes": [ { "map_key": { @@ -758,7 +758,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,23:12:516-27:2:620", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,23:12:516-27:3:621", "nodes": [ { "map_key": { @@ -815,7 +815,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,25:8:547-25:43:582", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,25:8:547-25:44:583", "nodes": [ { "map_key": { @@ -877,7 +877,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,26:20:604-26:32:616", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,26:20:604-26:33:617", "nodes": [ { "map_key": { @@ -944,7 +944,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,29:9:632-34:2:779", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,29:9:632-34:3:780", "nodes": [ { "map_key": { @@ -1001,7 +1001,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,31:8:663-31:43:698", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,31:8:663-31:44:699", "nodes": [ { "map_key": { @@ -1063,7 +1063,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,32:20:720-32:32:732", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,32:20:720-32:33:733", "nodes": [ { "map_key": { @@ -1135,7 +1135,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,33:17:751-33:41:775", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,33:17:751-33:42:776", "nodes": [ { "map_key": { @@ -1270,7 +1270,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,46:15:1024-56:0:1178", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,46:15:1024-56:1:1179", "nodes": [ { "map_key": {