From c9793b9a87be4eb782f904fffedf14648edc4223 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 10 Jul 2023 19:24:21 -0700 Subject: [PATCH 001/138] label works --- d2ast/d2ast.go | 6 + d2compiler/compile.go | 23 +++ d2compiler/compile_test.go | 73 ++++++++ d2ir/compile.go | 81 +++++++++ d2parser/parse.go | 3 + .../TestCompile2/vars/basic/label.exp.json | 168 ++++++++++++++++++ .../TestCompile2/vars/errors/missing.exp.json | 11 ++ 7 files changed, 365 insertions(+) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/label.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index a5be3fa98..d49b1b268 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -423,6 +423,7 @@ func (s *BlockString) value() {} func (a *Array) value() {} func (m *Map) value() {} func (i *Import) value() {} +func (i *Substitution) value() {} func (n *Null) scalar() {} func (b *Boolean) scalar() {} @@ -901,6 +902,7 @@ type ValueBox struct { Array *Array `json:"array,omitempty"` Map *Map `json:"map,omitempty"` Import *Import `json:"import,omitempty"` + Substitution *Substitution `json:"substitution,omitempty"` } func (vb ValueBox) Unbox() Value { @@ -925,6 +927,8 @@ func (vb ValueBox) Unbox() Value { return vb.Map case vb.Import != nil: return vb.Import + case vb.Substitution != nil: + return vb.Substitution default: return nil } @@ -953,6 +957,8 @@ func MakeValueBox(v Value) ValueBox { vb.Map = v case *Import: vb.Import = v + case *Substitution: + vb.Substitution = v } return vb } diff --git a/d2compiler/compile.go b/d2compiler/compile.go index fdb24e551..4c11ac5dd 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -1,6 +1,7 @@ package d2compiler import ( + "encoding/json" "encoding/xml" "fmt" "io" @@ -64,6 +65,8 @@ func compileIR(ast *d2ast.Map, m *d2ir.Map) (*d2graph.Graph, error) { g := d2graph.NewGraph() g.AST = ast c.compileBoard(g, m) + b, _ := json.MarshalIndent(m, "", " ") + println("\033[1;31m--- DEBUG:", string(b), "\033[m") if len(c.err.Errors) > 0 { return nil, c.err } @@ -277,6 +280,26 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { } } return + } else if f.Name == "vars" { + if f.Map() != nil { + if len(f.Map().Edges) > 0 { + c.errorf(f.Map().Edges[0].LastRef().AST(), "vars cannot contain an edge") + } + // for _, varField := range f.Map().Fields { + // if varField.Map() != nil { + // c.errorf(varField.LastRef().AST(), "vars must be simple") + // } + // for _, cf := range classesField.Map().Fields { + // if _, ok := d2graph.ReservedKeywords[cf.Name]; !ok { + // c.errorf(cf.LastRef().AST(), "%s is an invalid class field, must be reserved keyword", cf.Name) + // } + // if cf.Name == "class" { + // c.errorf(cf.LastRef().AST(), `"class" cannot appear within "classes"`) + // } + // } + // } + } + return } else if isReserved { c.compileReserved(&obj.Attributes, f) return diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index f0dbaa1bb..08fef43fd 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2744,6 +2744,7 @@ func TestCompile2(t *testing.T) { t.Run("boards", testBoards) t.Run("seqdiagrams", testSeqDiagrams) t.Run("nulls", testNulls) + t.Run("vars", testVars) } func testBoards(t *testing.T) { @@ -3168,6 +3169,78 @@ scenarios: { }) } +func testVars(t *testing.T) { + t.Parallel() + + t.Run("basic", func(t *testing.T) { + t.Parallel() + + tca := []struct { + name string + skip bool + run func(t *testing.T) + }{ + { + name: "label", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im a var +} +hi: ${x} +`, "") + assert.Equal(t, 1, len(g.Objects)) + assert.Equal(t, "im a var", g.Objects[0].Label.Value) + }, + }, + } + + for _, tc := range tca { + tc := tc + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + if tc.skip { + t.SkipNow() + } + tc.run(t) + }) + } + }) + + t.Run("errors", func(t *testing.T) { + t.Parallel() + + tca := []struct { + name string + skip bool + run func(t *testing.T) + }{ + { + name: "missing", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: hey +} +hi: ${z} +`, "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable z") + }, + }, + } + + for _, tc := range tca { + tc := tc + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + if tc.skip { + t.SkipNow() + } + tc.run(t) + }) + } + }) +} + func assertCompile(t *testing.T, text string, expErr string) *d2graph.Graph { d2Path := fmt.Sprintf("d2/testdata/d2compiler/%v.d2", t.Name()) g, err := d2compiler.Compile(d2Path, strings.NewReader(text), nil) diff --git a/d2ir/compile.go b/d2ir/compile.go index f5d92d043..27c11233b 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -53,6 +53,8 @@ func Compile(ast *d2ast.Map, opts *CompileOptions) (*Map, error) { c.compileMap(m, ast, ast) c.compileClasses(m) + c.compileVars(m) + c.compileSubstitutions(m) if !c.err.Empty() { return nil, c.err } @@ -96,6 +98,81 @@ func (c *compiler) compileClasses(m *Map) { } } +func (c *compiler) compileSubstitutions(m *Map) { + vars := m.GetField("vars") + for _, f := range m.Fields { + // No substitutions within vars itself + if f.Name == "vars" { + continue + } + for _, ref := range f.References { + if ref.Context.Key != nil && ref.Context.Key.Value.Substitution != nil { + var resolved *Field + m := vars + for _, p := range ref.Context.Key.Value.Substitution.Path { + r := m.Map().GetField(p.Unbox().ScalarString()) + if r == nil { + resolved = nil + break + } + m = r + resolved = r + } + if resolved == nil { + c.errorf(ref.Context.Key, "could not resolve variable %s", strings.Join(ref.Context.Key.Value.Substitution.IDA(), ".")) + } else { + // TODO do i need this + // ref.Context.Key.Value = d2ast.MakeValueBox(resolved.Primary().Value) + + // TODO maps + f.Primary_ = &Scalar{ + parent: f, + Value: resolved.Primary().Value, + } + } + ref.Context.Key.Value.Substitution = nil + } + } + } +} + +func (c *compiler) compileVars(m *Map) { + vars := m.GetField("vars") + if vars == nil || vars.Map() == nil { + return + } + + layersField := m.GetField("layers") + if layersField == nil { + return + } + layers := layersField.Map() + if layers == nil { + return + } + + for _, lf := range layers.Fields { + if lf.Map() == nil || lf.Primary() != nil { + c.errorf(lf.References[0].Context.Key, "invalid layer") + continue + } + l := lf.Map() + lVars := l.GetField("vars") + + if lVars == nil { + lVars = vars.Copy(l).(*Field) + l.Fields = append(l.Fields, lVars) + } else { + base := vars.Copy(l).(*Field) + OverlayMap(base.Map(), lVars.Map()) + l.DeleteField("vars") + l.Fields = append(l.Fields, base) + } + + c.compileVars(l) + } +} + func (c *compiler) overlay(base *Map, f *Field) { if f.Map() == nil || f.Primary() != nil { c.errorf(f.References[0].Context.Key, "invalid %s", NodeBoardKind(f)) @@ -244,6 +321,10 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) c.compileClasses(f.Map()) } } + } else if refctx.Key.Value.Substitution != nil { + // b, _ := json.MarshalIndent(refctx.Key.Value.Substitution.IDA(), "", " ") + // println("\033[1;31m--- DEBUG:", string(b), "\033[m") + // println("\033[1;31m--- DEBUG:", "=======what===============", "\033[m") } 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" { diff --git a/d2parser/parse.go b/d2parser/parse.go index fa64531a3..490505e4d 100644 --- a/d2parser/parse.go +++ b/d2parser/parse.go @@ -1596,6 +1596,9 @@ func (p *parser) parseValue() d2ast.ValueBox { case '@': box.Import = p.parseImport(false) return box + case '$': + box.Substitution = p.parseSubstitution(false) + return box } p.replay(r) diff --git a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json new file mode 100644 index 000000000..0270f685c --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json @@ -0,0 +1,168 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,0:0:0-5:0:34", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:0:25-4:8:33", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im a var" + }, + "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/TestCompile2/vars/errors/missing.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json new file mode 100644 index 000000000..64d495784 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2,4:0:20-4:8:28", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable z" + } + ] + } +} From 05802edb07e19c4e23e61123df52c4b3eb4adafb Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 10 Jul 2023 21:18:18 -0700 Subject: [PATCH 002/138] edge label working --- d2compiler/compile.go | 3 - d2compiler/compile_test.go | 63 ++++ d2ir/compile.go | 105 ++++--- .../vars/basic/edge_label.exp.json | 285 ++++++++++++++++++ .../TestCompile2/vars/basic/label.exp.json | 20 +- .../TestCompile2/vars/override/label.exp.json | 239 +++++++++++++++ 6 files changed, 667 insertions(+), 48 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/override/label.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 4c11ac5dd..9c27c1459 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -1,7 +1,6 @@ package d2compiler import ( - "encoding/json" "encoding/xml" "fmt" "io" @@ -65,8 +64,6 @@ func compileIR(ast *d2ast.Map, m *d2ir.Map) (*d2graph.Graph, error) { g := d2graph.NewGraph() g.AST = ast c.compileBoard(g, m) - b, _ := json.MarshalIndent(m, "", " ") - println("\033[1;31m--- DEBUG:", string(b), "\033[m") if len(c.err.Errors) > 0 { return nil, c.err } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 08fef43fd..bbd0b4e16 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3193,6 +3193,69 @@ hi: ${x} assert.Equal(t, "im a var", g.Objects[0].Label.Value) }, }, + { + // TODO: text before/after substitutions + name: "combined", + skip: true, + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im a var +} +hi: 1 ${x} 2 +`, "") + assert.Equal(t, "1 im a var 2", g.Objects[0].Label.Value) + }, + }, + { + name: "edge label", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im a var +} +a -> b: ${x} +`, "") + assert.Equal(t, 1, len(g.Edges)) + assert.Equal(t, "im a var", g.Edges[0].Label.Value) + }, + }, + } + + for _, tc := range tca { + tc := tc + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + if tc.skip { + t.SkipNow() + } + tc.run(t) + }) + } + }) + + t.Run("override", func(t *testing.T) { + t.Parallel() + + tca := []struct { + name string + skip bool + run func(t *testing.T) + }{ + { + name: "label", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im a var +} +hi: ${x} +hi: not a var +`, "") + assert.Equal(t, 1, len(g.Objects)) + assert.Equal(t, "not a var", g.Objects[0].Label.Value) + }, + }, } for _, tc := range tca { diff --git a/d2ir/compile.go b/d2ir/compile.go index 27c11233b..a19bda567 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -52,16 +52,15 @@ func Compile(ast *d2ast.Map, opts *CompileOptions) (*Map, error) { defer c.popImportStack() c.compileMap(m, ast, ast) - c.compileClasses(m) - c.compileVars(m) - c.compileSubstitutions(m) + c.overlayClasses(m) + c.overlayVars(m) if !c.err.Empty() { return nil, c.err } return m, nil } -func (c *compiler) compileClasses(m *Map) { +func (c *compiler) overlayClasses(m *Map) { classes := m.GetField("classes") if classes == nil || classes.Map() == nil { return @@ -94,49 +93,49 @@ func (c *compiler) compileClasses(m *Map) { l.Fields = append(l.Fields, base) } - c.compileClasses(l) + c.overlayClasses(l) } } -func (c *compiler) compileSubstitutions(m *Map) { - vars := m.GetField("vars") - for _, f := range m.Fields { - // No substitutions within vars itself - if f.Name == "vars" { - continue +func (c *compiler) resolveSubstitution(vars *Map, mk *d2ast.Key, substitution *d2ast.Substitution) d2ast.Scalar { + var resolved *Field + for _, p := range substitution.Path { + if vars == nil { + resolved = nil + break } - for _, ref := range f.References { - if ref.Context.Key != nil && ref.Context.Key.Value.Substitution != nil { - var resolved *Field - m := vars - for _, p := range ref.Context.Key.Value.Substitution.Path { - r := m.Map().GetField(p.Unbox().ScalarString()) - if r == nil { - resolved = nil - break - } - m = r - resolved = r - } - if resolved == nil { - c.errorf(ref.Context.Key, "could not resolve variable %s", strings.Join(ref.Context.Key.Value.Substitution.IDA(), ".")) - } else { - // TODO do i need this - // ref.Context.Key.Value = d2ast.MakeValueBox(resolved.Primary().Value) + r := vars.GetField(p.Unbox().ScalarString()) + if r == nil { + resolved = nil + break + } + vars = r.Map() + resolved = r + } + if resolved == nil { + c.errorf(mk, "could not resolve variable %s", strings.Join(substitution.IDA(), ".")) + } else { + // TODO maps + return resolved.Primary().Value + } + return nil +} - // TODO maps - f.Primary_ = &Scalar{ - parent: f, - Value: resolved.Primary().Value, - } - } - ref.Context.Key.Value.Substitution = nil - } +func (c *compiler) compileVars(m *Map, ast *d2ast.Map) { + for _, n := range ast.Nodes { + if n.MapKey != nil && n.MapKey.Key != nil && len(n.MapKey.Key.Path) == 1 && strings.EqualFold(n.MapKey.Key.Path[0].Unbox().ScalarString(), "vars") { + c.compileKey(&RefContext{ + Key: n.MapKey, + Scope: ast, + ScopeMap: m, + ScopeAST: ast, + }) + break } } } -func (c *compiler) compileVars(m *Map) { +func (c *compiler) overlayVars(m *Map) { vars := m.GetField("vars") if vars == nil || vars.Map() == nil { return @@ -169,7 +168,7 @@ func (c *compiler) compileVars(m *Map) { l.Fields = append(l.Fields, base) } - c.compileVars(l) + c.overlayVars(l) } } @@ -184,6 +183,10 @@ func (c *compiler) overlay(base *Map, f *Field) { } func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { + // When compiling a new board, compile vars before all else, as it might be referenced + if NodeBoardKind(dst) != "" { + c.compileVars(dst, ast) + } for _, n := range ast.Nodes { switch { case n.MapKey != nil: @@ -279,7 +282,7 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) c.compileMap(f.Map(), refctx.Key.Value.Map, scopeAST) switch NodeBoardKind(f) { case BoardScenario, BoardStep: - c.compileClasses(f.Map()) + c.overlayClasses(f.Map()) } } else if refctx.Key.Value.Import != nil { n, ok := c._import(refctx.Key.Value.Import) @@ -318,13 +321,18 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) c.updateLinks(f.Map()) switch NodeBoardKind(f) { case BoardScenario, BoardStep: - c.compileClasses(f.Map()) + c.overlayClasses(f.Map()) } } } else if refctx.Key.Value.Substitution != nil { - // b, _ := json.MarshalIndent(refctx.Key.Value.Substitution.IDA(), "", " ") - // println("\033[1;31m--- DEBUG:", string(b), "\033[m") - // println("\033[1;31m--- DEBUG:", "=======what===============", "\033[m") + vars := ParentBoard(f).Map().GetField("vars") + resolved := c.resolveSubstitution(vars.Map(), refctx.Key, refctx.Key.Value.Substitution) + if resolved != nil { + f.Primary_ = &Scalar{ + parent: f, + Value: resolved, + } + } } 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" { @@ -502,6 +510,15 @@ func (c *compiler) compileEdges(refctx *RefContext) { } } c.compileMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) + } else if refctx.Key.Value.Substitution != nil { + vars := ParentBoard(e).Map().GetField("vars") + resolved := c.resolveSubstitution(vars.Map(), refctx.Key, refctx.Key.Value.Substitution) + if resolved != nil { + e.Primary_ = &Scalar{ + parent: e, + Value: resolved, + } + } } else if refctx.Key.Value.ScalarBox().Unbox() != nil { e.Primary_ = &Scalar{ parent: e, diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json new file mode 100644 index 000000000..55c12d65d --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json @@ -0,0 +1,285 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,0:0:0-5:0:38", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:0:25-4:12:37", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:0:25-4:6:31", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:0:25-4:1:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:0:25-4:1:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:5:30-4:6:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:5:30-4:6:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:8:33-4:12:37", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:10:35-4:11:36", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "im a var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:0:25-4:1:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:0:25-4:1:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:5:30-4:6:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:5:30-4:6:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json index 0270f685c..41f1864ae 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json @@ -87,7 +87,25 @@ ] }, "primary": {}, - "value": {} + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:4:29-4:8:33", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:6:31-4:7:32", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } } } ] diff --git a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json new file mode 100644 index 000000000..585e192ee --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json @@ -0,0 +1,239 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,0:0:0-6:0:48", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:0:25-4:8:33", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:4:29-4:8:33", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:6:31-4:7:32", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,5:0:34-5:13:47", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,5:0:34-5:2:36", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,5:0:34-5:2:36", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,5:4:38-5:13:47", + "value": [ + { + "string": "not a var", + "raw_string": "not a var" + } + ] + } + } + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,5:0:34-5:2:36", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,5:0:34-5:2:36", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "not a var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} From fd70b5ef4627cc36572fae3ce07a5c1027a73bb2 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 10 Jul 2023 21:32:30 -0700 Subject: [PATCH 003/138] layers work --- d2compiler/compile_test.go | 40 ++ d2ir/compile.go | 44 +-- .../TestCompile2/vars/boards/layer.exp.json | 372 ++++++++++++++++++ 3 files changed, 425 insertions(+), 31 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index bbd0b4e16..eb33cf1a4 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3270,6 +3270,46 @@ hi: not a var } }) + t.Run("boards", func(t *testing.T) { + t.Parallel() + + tca := []struct { + name string + skip bool + run func(t *testing.T) + }{ + { + name: "layer", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im a var +} + +layers: { + l: { + hi: ${x} + } +} +`, "") + assert.Equal(t, 1, len(g.Layers[0].Objects)) + assert.Equal(t, "im a var", g.Layers[0].Objects[0].Label.Value) + }, + }, + } + + for _, tc := range tca { + tc := tc + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + if tc.skip { + t.SkipNow() + } + tc.run(t) + }) + } + }) + t.Run("errors", func(t *testing.T) { t.Parallel() diff --git a/d2ir/compile.go b/d2ir/compile.go index a19bda567..bf5d91d8b 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -53,7 +53,6 @@ func Compile(ast *d2ast.Map, opts *CompileOptions) (*Map, error) { c.compileMap(m, ast, ast) c.overlayClasses(m) - c.overlayVars(m) if !c.err.Empty() { return nil, c.err } @@ -135,40 +134,22 @@ func (c *compiler) compileVars(m *Map, ast *d2ast.Map) { } } -func (c *compiler) overlayVars(m *Map) { - vars := m.GetField("vars") - if vars == nil || vars.Map() == nil { +func (c *compiler) overlayVars(base, overlay *Map) { + vars := overlay.GetField("vars") + if vars == nil { return } - layersField := m.GetField("layers") - if layersField == nil { - return - } - layers := layersField.Map() - if layers == nil { - return - } + lVars := base.GetField("vars") - for _, lf := range layers.Fields { - if lf.Map() == nil || lf.Primary() != nil { - c.errorf(lf.References[0].Context.Key, "invalid layer") - continue - } - l := lf.Map() - lVars := l.GetField("vars") - - if lVars == nil { - lVars = vars.Copy(l).(*Field) - l.Fields = append(l.Fields, lVars) - } else { - base := vars.Copy(l).(*Field) - OverlayMap(base.Map(), lVars.Map()) - l.DeleteField("vars") - l.Fields = append(l.Fields, base) - } - - c.overlayVars(l) + if lVars == nil { + lVars = vars.Copy(base).(*Field) + base.Fields = append(base.Fields, lVars) + } else { + overlayed := vars.Copy(base).(*Field) + OverlayMap(overlayed.Map(), lVars.Map()) + base.DeleteField("vars") + base.Fields = append(base.Fields, overlayed) } } @@ -275,6 +256,7 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } } case BoardLayer: + c.overlayVars(f.Map(), ParentBoard(f).Map()) default: // If new board type, use that as the new scope AST, otherwise, carry on scopeAST = refctx.ScopeAST diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json new file mode 100644 index 000000000..a336caf0b --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -0,0 +1,372 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,0:0:0-10:0:62", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,5:0:26-9:1:61", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,5:0:26-5:6:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,5:0:26-5:6:32", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,5:8:34-9:1:61", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,6:2:38-8:3:59", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,6:2:38-6:3:39", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,6:2:38-6:3:39", + "value": [ + { + "string": "l", + "raw_string": "l" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,6:5:41-8:3:59", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:4:47-7:12:55", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:4:47-7:6:49", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:4:47-7:6:49", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:12:55", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:10:53-7:11:54", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": null, + "layers": [ + { + "name": "l", + "isFolderOnly": false, + "ast": { + "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": "vars" + } + ] + } + } + ] + }, + "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": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + }, + "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": "hi" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:4:47-7:6:49", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:4:47-7:6:49", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im a var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} From 7269ee170630968027d5d6e041e940cb05aa40ca Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 10 Jul 2023 21:54:34 -0700 Subject: [PATCH 004/138] add overlay tests --- d2compiler/compile_test.go | 53 + .../TestCompile2/vars/boards/overlay.exp.json | 1069 +++++++++++++++++ .../vars/boards/scenario.exp.json | 372 ++++++ 3 files changed, 1494 insertions(+) create mode 100644 testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index eb33cf1a4..8c28c3a2a 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3296,6 +3296,59 @@ layers: { assert.Equal(t, "im a var", g.Layers[0].Objects[0].Label.Value) }, }, + { + name: "scenario", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im a var +} + +scenarios: { + l: { + hi: ${x} + } +} +`, "") + assert.Equal(t, 1, len(g.Scenarios[0].Objects)) + assert.Equal(t, "im a var", g.Scenarios[0].Objects[0].Label.Value) + }, + }, + { + name: "overlay", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im x var +} + +scenarios: { + l: { + vars: { + y: im y var + } + x: ${x} + y: ${y} + } +} +layers: { + l2: { + vars: { + y: im y var + } + x: ${x} + y: ${y} + } +} +`, "") + assert.Equal(t, 2, len(g.Scenarios[0].Objects)) + assert.Equal(t, "im x var", g.Scenarios[0].Objects[0].Label.Value) + assert.Equal(t, "im y var", g.Scenarios[0].Objects[1].Label.Value) + assert.Equal(t, 2, len(g.Layers[0].Objects)) + assert.Equal(t, "im x var", g.Layers[0].Objects[0].Label.Value) + assert.Equal(t, "im y var", g.Layers[0].Objects[1].Label.Value) + }, + }, } for _, tc := range tca { diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json new file mode 100644 index 000000000..a256b8aab --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -0,0 +1,1069 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,0:0:0-23:0:196", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im x var", + "raw_string": "im x var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,5:0:26-13:1:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,5:0:26-5:9:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,5:0:26-5:9:35", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,5:11:37-13:1:111", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,6:2:41-12:3:109", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,6:2:41-6:3:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,6:2:41-6:3:42", + "value": [ + { + "string": "l", + "raw_string": "l" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,6:5:44-12:3:109", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,7:4:50-9:5:81", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,7:4:50-7:8:54", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,7:4:50-7:8:54", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,7:10:56-9:5:81", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:6:64-8:17:75", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:6:64-8:7:65", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:6:64-8:7:65", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", + "value": [ + { + "string": "im y var", + "raw_string": "im y var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:4:86-10:11:93", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:4:86-10:5:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:4:86-10:5:87", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:11:93", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:9:91-10:10:92", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:4:98-11:11:105", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:4:98-11:5:99", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:4:98-11:5:99", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:11:105", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:9:103-11:10:104", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,14:0:112-22:1:195", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,14:0:112-14:6:118", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,14:0:112-14:6:118", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,14:8:120-22:1:195", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,15:2:124-21:3:193", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,15:2:124-15:4:126", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,15:2:124-15:4:126", + "value": [ + { + "string": "l2", + "raw_string": "l2" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,15:6:128-21:3:193", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,16:4:134-18:5:165", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,16:4:134-16:8:138", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,16:4:134-16:8:138", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,16:10:140-18:5:165", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:6:148-17:17:159", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:6:148-17:7:149", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:6:148-17:7:149", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", + "value": [ + { + "string": "im y var", + "raw_string": "im y var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:4:170-19:11:177", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:4:170-19:5:171", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:4:170-19:5:171", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:11:177", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:9:175-19:10:176", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:4:182-20:11:189", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:4:182-20:5:183", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:4:182-20:5:183", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:11:189", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:9:187-20:10:188", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": null, + "layers": [ + { + "name": "l2", + "isFolderOnly": false, + "ast": { + "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": "vars" + } + ] + } + } + ] + }, + "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": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im x var", + "raw_string": "im x var" + } + ] + } + }, + "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": "y" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", + "value": [ + { + "string": "im y var", + "raw_string": "im y var" + } + ] + } + }, + "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": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im x var", + "raw_string": "im x var" + } + ] + } + }, + "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": "y" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", + "value": [ + { + "string": "im y var", + "raw_string": "im y var" + } + ] + } + }, + "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": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:4:170-19:5:171", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:4:170-19:5:171", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im x var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:4:182-20:5:183", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:4:182-20:5:183", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im y var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ], + "scenarios": [ + { + "name": "l", + "isFolderOnly": false, + "ast": { + "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": "vars" + } + ] + } + } + ] + }, + "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": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im x var", + "raw_string": "im x var" + } + ] + } + }, + "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": "y" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", + "value": [ + { + "string": "im y var", + "raw_string": "im y var" + } + ] + } + }, + "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": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im x var", + "raw_string": "im x var" + } + ] + } + }, + "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": "y" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", + "value": [ + { + "string": "im y var", + "raw_string": "im y var" + } + ] + } + }, + "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": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:4:86-10:5:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:4:86-10:5:87", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im x var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:4:98-11:5:99", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:4:98-11:5:99", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im y var" + }, + "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/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json new file mode 100644 index 000000000..a4b99e65d --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -0,0 +1,372 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,0:0:0-10:0:65", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,5:0:26-9:1:64", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,5:0:26-5:9:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,5:0:26-5:9:35", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,5:11:37-9:1:64", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,6:2:41-8:3:62", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,6:2:41-6:3:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,6:2:41-6:3:42", + "value": [ + { + "string": "l", + "raw_string": "l" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,6:5:44-8:3:62", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:4:50-7:12:58", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:4:50-7:6:52", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:4:50-7:6:52", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:12:58", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:10:56-7:11:57", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": null, + "scenarios": [ + { + "name": "l", + "isFolderOnly": false, + "ast": { + "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": "vars" + } + ] + } + } + ] + }, + "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": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + }, + "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": "hi" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:4:50-7:6:52", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:4:50-7:6:52", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im a var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} From acdbfddf239fb52dacb51e5fd8d618d80ab97310 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 10 Jul 2023 21:55:49 -0700 Subject: [PATCH 005/138] add replace tests --- d2compiler/compile_test.go | 31 + .../TestCompile2/vars/boards/replace.exp.json | 769 ++++++++++++++++++ 2 files changed, 800 insertions(+) create mode 100644 testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 8c28c3a2a..83ba27c33 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3349,6 +3349,37 @@ layers: { assert.Equal(t, "im y var", g.Layers[0].Objects[1].Label.Value) }, }, + { + name: "replace", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im x var +} + +scenarios: { + l: { + vars: { + x: im replaced x var + } + x: ${x} + } +} +layers: { + l2: { + vars: { + x: im replaced x var + } + x: ${x} + } +} +`, "") + assert.Equal(t, 1, len(g.Scenarios[0].Objects)) + assert.Equal(t, "im replaced x var", g.Scenarios[0].Objects[0].Label.Value) + assert.Equal(t, 1, len(g.Layers[0].Objects)) + assert.Equal(t, "im replaced x var", g.Layers[0].Objects[0].Label.Value) + }, + }, } for _, tc := range tca { diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json new file mode 100644 index 000000000..a5a4d56e9 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -0,0 +1,769 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,0:0:0-21:0:190", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im x var", + "raw_string": "im x var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,5:0:26-12:1:108", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,5:0:26-5:9:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,5:0:26-5:9:35", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,5:11:37-12:1:108", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,6:2:41-11:3:106", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,6:2:41-6:3:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,6:2:41-6:3:42", + "value": [ + { + "string": "l", + "raw_string": "l" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,6:5:44-11:3:106", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,7:4:50-9:5:90", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,7:4:50-7:8:54", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,7:4:50-7:8:54", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,7:10:56-9:5:90", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:6:64-8:26:84", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:6:64-8:7:65", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:6:64-8:7:65", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", + "value": [ + { + "string": "im replaced x var", + "raw_string": "im replaced x var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:4:95-10:11:102", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:4:95-10:5:96", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:4:95-10:5:96", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:11:102", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:9:100-10:10:101", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,13:0:109-20:1:189", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,13:0:109-13:6:115", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,13:0:109-13:6:115", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,13:8:117-20:1:189", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,14:2:121-19:3:187", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,14:2:121-14:4:123", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,14:2:121-14:4:123", + "value": [ + { + "string": "l2", + "raw_string": "l2" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,14:6:125-19:3:187", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,15:4:131-17:5:171", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,15:4:131-15:8:135", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,15:4:131-15:8:135", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,15:10:137-17:5:171", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:6:145-16:26:165", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:6:145-16:7:146", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:6:145-16:7:146", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:9:148-16:26:165", + "value": [ + { + "string": "im replaced x var", + "raw_string": "im replaced x var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:11:183", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:5:177", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:5:177", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:7:179-18:11:183", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:9:181-18:10:182", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": null, + "layers": [ + { + "name": "l2", + "isFolderOnly": false, + "ast": { + "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": "vars" + } + ] + } + } + ] + }, + "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": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:9:148-16:26:165", + "value": [ + { + "string": "im replaced x var", + "raw_string": "im replaced x var" + } + ] + } + }, + "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": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:9:148-16:26:165", + "value": [ + { + "string": "im replaced x var", + "raw_string": "im replaced x var" + } + ] + } + }, + "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": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:5:177", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:5:177", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im replaced x var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ], + "scenarios": [ + { + "name": "l", + "isFolderOnly": false, + "ast": { + "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": "vars" + } + ] + } + } + ] + }, + "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": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", + "value": [ + { + "string": "im replaced x var", + "raw_string": "im replaced x var" + } + ] + } + }, + "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": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", + "value": [ + { + "string": "im replaced x var", + "raw_string": "im replaced x var" + } + ] + } + }, + "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": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:4:95-10:5:96", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:4:95-10:5:96", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im replaced x var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} From 0347dff7a4ca79e6cb45611fdaf3b4d3632df326 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 10 Jul 2023 22:02:58 -0700 Subject: [PATCH 006/138] more tests --- d2compiler/compile_test.go | 48 +++ .../TestCompile2/vars/basic/nested.exp.json | 310 ++++++++++++++++++ .../TestCompile2/vars/basic/number.exp.json | 282 ++++++++++++++++ .../TestCompile2/vars/basic/style.exp.json | 230 +++++++++++++ 4 files changed, 870 insertions(+) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/number.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/style.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 83ba27c33..f6518d0fa 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3193,6 +3193,54 @@ hi: ${x} assert.Equal(t, "im a var", g.Objects[0].Label.Value) }, }, + { + name: "style", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + primary-color: red +} +hi: { + style.fill: ${primary-color} +} +`, "") + assert.Equal(t, 1, len(g.Objects)) + assert.Equal(t, "red", g.Objects[0].Style.Fill.Value) + }, + }, + { + name: "number", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + columns: 2 +} +hi: { + grid-columns: ${columns} + x +} +`, "") + assert.Equal(t, "2", g.Objects[0].GridColumns.Value) + }, + }, + { + name: "nested", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + colors: { + primary: { + button: red + } + } +} +hi: { + style.fill: ${colors.primary.button} +} +`, "") + assert.Equal(t, "red", g.Objects[0].Style.Fill.Value) + }, + }, { // TODO: text before/after substitutions name: "combined", diff --git a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json new file mode 100644 index 000000000..b0bc434b4 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json @@ -0,0 +1,310 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,0:0:0-11:0:112", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,1:0:1-7:1:64", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,1:6:7-7:1:64", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,2:1:10-6:3:62", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,2:1:10-2:7:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,2:1:10-2:7:16", + "value": [ + { + "string": "colors", + "raw_string": "colors" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,2:9:18-6:3:62", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,3:4:24-5:5:58", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,3:4:24-3:11:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,3:4:24-3:11:31", + "value": [ + { + "string": "primary", + "raw_string": "primary" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,3:13:33-5:5:58", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:6:41-4:17:52", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:6:41-4:12:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:6:41-4:12:47", + "value": [ + { + "string": "button", + "raw_string": "button" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:14:49-4:17:52", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,8:0:65-10:1:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,8:0:65-8:2:67", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,8:0:65-8:2:67", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,8:4:69-10:1:111", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:2:73-9:38:109", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:2:73-9:12:83", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:2:73-9:7:78", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:8:79-9:12:83", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:14:85-9:38:109", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:16:87-9:22:93", + "value": [ + { + "string": "colors", + "raw_string": "colors" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:23:94-9:30:101", + "value": [ + { + "string": "primary", + "raw_string": "primary" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:31:102-9:37:108", + "value": [ + { + "string": "button", + "raw_string": "button" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,8:0:65-8:2:67", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,8:0:65-8:2:67", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json new file mode 100644 index 000000000..b9898d320 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json @@ -0,0 +1,282 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,0:0:0-8:0:60", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,1:0:1-3:1:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,1:6:7-3:1:22", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,2:1:10-2:11:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,2:1:10-2:8:17", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,2:1:10-2:8:17", + "value": [ + { + "string": "columns", + "raw_string": "columns" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,2:10:19-2:11:20", + "raw": "2", + "value": "2" + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,4:0:23-7:1:59", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,4:0:23-4:2:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,4:0:23-4:2:25", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,4:4:27-7:1:59", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:1:30-5:25:54", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:1:30-5:13:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:1:30-5:13:42", + "value": [ + { + "string": "grid-columns", + "raw_string": "grid-columns" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:15:44-5:25:54", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:17:46-5:24:53", + "value": [ + { + "string": "columns", + "raw_string": "columns" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,6:1:56-6:2:57", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,6:1:56-6:2:57", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,6:1:56-6:2:57", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,4:0:23-4:2:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,4:0:23-4:2:25", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null, + "gridColumns": { + "value": "2" + } + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,6:1:56-6:2:57", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,6:1:56-6:2:57", + "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": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json new file mode 100644 index 000000000..6925d574c --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json @@ -0,0 +1,230 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,0:0:0-7:0:71", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,1:0:1-3:1:31", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,1:6:7-3:1:31", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:2:11-2:20:29", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:2:11-2:15:24", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:2:11-2:15:24", + "value": [ + { + "string": "primary-color", + "raw_string": "primary-color" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:17:26-2:20:29", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,4:0:32-6:1:70", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,4:0:32-4:2:34", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,4:0:32-4:2:34", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,4:4:36-6:1:70", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:2:40-5:30:68", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:2:40-5:12:50", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:2:40-5:7:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:8:46-5:12:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:14:52-5:30:68", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:16:54-5:29:67", + "value": [ + { + "string": "primary-color", + "raw_string": "primary-color" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,4:0:32-4:2:34", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,4:0:32-4:2:34", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} From 08cc907f07fe81fee5e974042553ffc62e261276 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 10 Jul 2023 22:22:04 -0700 Subject: [PATCH 007/138] more test --- d2compiler/compile_test.go | 11 + d2ir/compile.go | 5 +- d2ir/import_test.go | 11 + .../d2ir/TestCompile/imports/vars/1.exp.json | 392 ++++++++++++++++++ 4 files changed, 417 insertions(+), 2 deletions(-) create mode 100644 testdata/d2ir/TestCompile/imports/vars/1.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index f6518d0fa..7638e9d22 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3458,6 +3458,17 @@ vars: { x: hey } hi: ${z} +`, "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable z") + }, + }, + { + name: "key", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: hey +} +${x} `, "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable z") }, }, diff --git a/d2ir/compile.go b/d2ir/compile.go index bf5d91d8b..bc5450f1e 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -170,6 +170,9 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { } for _, n := range ast.Nodes { switch { + case n.Substitution != nil: + println("\033[1;31m--- DEBUG:", "=======================", "\033[m") + c.errorf(n.Substitution, "only values can use substitutions") case n.MapKey != nil: c.compileKey(&RefContext{ Key: n.MapKey, @@ -196,8 +199,6 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { } } } - case n.Substitution != nil: - panic("TODO") } } } diff --git a/d2ir/import_test.go b/d2ir/import_test.go index 38b3a3a2c..c04cb6a25 100644 --- a/d2ir/import_test.go +++ b/d2ir/import_test.go @@ -138,6 +138,17 @@ label: meow`, assertQuery(t, m, 0, 0, nil, "q.jon") }, }, + { + name: "vars/1", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "vars: { ...@x }; q: ${meow}", + "x.d2": "meow: var replaced", + }) + assert.Success(t, err) + assertQuery(t, m, 0, 0, "var replaced", "q") + }, + }, } runa(t, tca) diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json new file mode 100644 index 000000000..de94a458d --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json @@ -0,0 +1,392 @@ +{ + "fields": [ + { + "name": "vars", + "composite": { + "fields": [ + { + "name": "meow", + "primary": { + "value": { + "range": "x.d2,0:6:6-0:18:18", + "value": [ + { + "string": "var replaced", + "raw_string": "var replaced" + } + ] + } + }, + "references": [ + { + "string": { + "range": "x.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:18:18", + "key": { + "range": "x.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,0:6:6-0:18:18", + "value": [ + { + "string": "var replaced", + "raw_string": "var replaced" + } + ] + } + } + } + } + }, + { + "string": { + "range": "x.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, + "key_path": { + "range": "x.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:0:0-0:18:18", + "key": { + "range": "x.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "x.d2,0:6:6-0:18:18", + "value": [ + { + "string": "var replaced", + "raw_string": "var replaced" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:15:15", + "key": { + "range": "index.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:6:6-0:15:15", + "nodes": [ + { + "import": { + "range": "index.d2,0:8:8-0:14:14", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:15:15", + "key": { + "range": "index.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:6:6-0:15:15", + "nodes": [ + { + "import": { + "range": "index.d2,0:8:8-0:14:14", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "q", + "primary": { + "value": { + "range": "x.d2,0:6:6-0:18:18", + "value": [ + { + "string": "var replaced", + "raw_string": "var replaced" + } + ] + } + }, + "references": [ + { + "string": { + "range": "index.d2,0:17:17-0:18:18", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, + "key_path": { + "range": "index.d2,0:17:17-0:18:18", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:17:17-0:18:18", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:17:17-0:27:27", + "key": { + "range": "index.d2,0:17:17-0:18:18", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:17:17-0:18:18", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "substitution": { + "range": "index.d2,0:20:20-0:27:27", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:22:22-0:26:26", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} From e7e256656457bad08b4e6ccef9f14ffd8f165289 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 11:19:50 -0700 Subject: [PATCH 008/138] save --- d2compiler/compile_test.go | 2 - d2ir/compile.go | 3 + .../TestCompile2/vars/basic/combined.exp.json | 201 ++++++++++++++++++ 3 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 7638e9d22..096cc1cac 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3242,9 +3242,7 @@ hi: { }, }, { - // TODO: text before/after substitutions name: "combined", - skip: true, run: func(t *testing.T) { g := assertCompile(t, ` vars: { diff --git a/d2ir/compile.go b/d2ir/compile.go index bc5450f1e..b97362077 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -204,6 +204,7 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { } func (c *compiler) compileKey(refctx *RefContext) { + // resolve substitutions here if len(refctx.Key.Edges) == 0 { c.compileField(refctx.ScopeMap, refctx.Key.Key, refctx) } else { @@ -325,6 +326,8 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) parent: f, Value: refctx.Key.Value.ScalarBox().Unbox(), } + + // InterpolationBox within any of these values can be substitutions too } } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json new file mode 100644 index 000000000..f03a3b5ca --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json @@ -0,0 +1,201 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,0:0:0-5:0:38", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:0:25-4:12:37", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:4:29-4:12:37", + "value": [ + { + "string": "1 ", + "raw_string": "1 " + }, + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:6:31-4:10:35", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:8:33-4:9:34", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + }, + { + "string": " 2", + "raw_string": "1 2" + } + ] + } + } + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "1 " + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} From 090d10e9cae3a7cd83f72453de9dabf09679aeac Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 13:32:07 -0700 Subject: [PATCH 009/138] handle interpolation --- d2ast/d2ast.go | 22 ++ d2compiler/compile_test.go | 45 ++- d2ir/compile.go | 82 +++- .../TestCompile/array-classes.exp.json | 15 +- .../TestCompile/basic_icon.exp.json | 3 +- .../TestCompile/basic_sequence.exp.json | 3 +- .../TestCompile/basic_shape.exp.json | 3 +- .../TestCompile/class-shape-class.exp.json | 9 +- .../TestCompile/class_paren.exp.json | 9 +- .../TestCompile/class_style.exp.json | 6 +- .../d2compiler/TestCompile/classes.exp.json | 33 +- .../dimensions_on_containers.exp.json | 24 +- .../dimensions_on_nonimage.exp.json | 3 +- .../edge_arrowhead_fields.exp.json | 6 +- .../edge_arrowhead_primary.exp.json | 3 +- .../TestCompile/edge_chain.exp.json | 3 +- .../TestCompile/edge_chain_map.exp.json | 3 +- .../TestCompile/edge_column_index.exp.json | 18 +- .../TestCompile/edge_flat_arrowhead.exp.json | 3 +- .../edge_flat_label_arrowhead.exp.json | 3 +- .../TestCompile/edge_index.exp.json | 6 +- .../TestCompile/edge_index_map.exp.json | 3 +- .../TestCompile/edge_index_nested.exp.json | 6 +- .../edge_index_nested_cross_scope.exp.json | 6 +- .../d2compiler/TestCompile/edge_map.exp.json | 3 +- .../TestCompile/edge_map_arrowhead.exp.json | 3 +- .../TestCompile/edge_mixed_arrowhead.exp.json | 6 +- .../edge_non_shape_arrowhead.exp.json | 3 +- .../edge_semiflat_arrowhead.exp.json | 3 +- .../TestCompile/fill-pattern.exp.json | 3 +- .../icon-near-composite-together.exp.json | 3 +- .../TestCompile/image_style.exp.json | 9 +- .../label-near-composite-separate.exp.json | 6 +- .../label-near-composite-together.exp.json | 3 +- .../TestCompile/label-near-parent.exp.json | 3 +- .../TestCompile/link-board-mixed.exp.json | 18 +- .../TestCompile/missing-class.exp.json | 3 +- .../TestCompile/near_constant.exp.json | 3 +- .../TestCompile/nested-array-classes.exp.json | 3 +- .../TestCompile/nested_sql.exp.json | 9 +- .../d2compiler/TestCompile/path_link.exp.json | 3 +- .../TestCompile/reordered-classes.exp.json | 9 +- .../reserved_icon_near_style.exp.json | 12 +- .../TestCompile/root_direction.exp.json | 3 +- .../TestCompile/root_sequence.exp.json | 3 +- .../TestCompile/sequence-timestamp.exp.json | 3 +- .../TestCompile/sequence_container.exp.json | 3 +- .../TestCompile/sequence_container_2.exp.json | 3 +- .../sequence_grouped_note.exp.json | 3 +- .../TestCompile/sequence_scoping.exp.json | 3 +- .../TestCompile/set_direction.exp.json | 3 +- .../single_dimension_on_circle.exp.json | 3 +- .../TestCompile/sql-constraints.exp.json | 6 +- .../TestCompile/sql-regression.exp.json | 6 +- .../d2compiler/TestCompile/sql_paren.exp.json | 9 +- .../table_connection_attr.exp.json | 6 +- .../TestCompile/table_style.exp.json | 6 +- .../TestCompile/table_style_map.exp.json | 9 +- .../TestCompile/text-transform.exp.json | 12 +- .../underscore_edge_existing.exp.json | 6 +- .../underscore_edge_index.exp.json | 6 +- .../underscore_parent_preference_1.exp.json | 6 +- .../underscore_parent_preference_2.exp.json | 6 +- .../d2compiler/TestCompile/url_link.exp.json | 3 +- ..._and_not_url_tooltip_concurrently.exp.json | 6 +- .../url_link_non_url_tooltip_ok.exp.json | 6 +- .../TestCompile/url_tooltip.exp.json | 3 +- .../TestCompile/wrong_column_index.exp.json | 33 +- .../TestCompile2/boards/isFolderOnly.exp.json | 9 +- .../TestCompile2/vars/basic/combined.exp.json | 31 +- .../vars/basic/double-quoted.exp.json | 176 +++++++++ .../vars/basic/edge_label.exp.json | 20 +- .../TestCompile2/vars/basic/label.exp.json | 20 +- .../TestCompile2/vars/basic/nested.exp.json | 42 +- .../TestCompile2/vars/basic/number.exp.json | 20 +- .../vars/basic/single-quoted.exp.json | 173 +++++++++ .../TestCompile2/vars/basic/style.exp.json | 20 +- .../TestCompile2/vars/boards/layer.exp.json | 26 +- .../TestCompile2/vars/boards/overlay.exp.json | 101 ++--- .../TestCompile2/vars/boards/replace.exp.json | 366 +----------------- .../vars/boards/scenario.exp.json | 26 +- .../TestCompile2/vars/override/label.exp.json | 23 +- 82 files changed, 692 insertions(+), 939 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index d49b1b268..25d325cf5 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -503,6 +503,17 @@ type UnquotedString struct { Value []InterpolationBox `json:"value"` } +func (s *UnquotedString) Coalesce() { + var b strings.Builder + for _, box := range s.Value { + if box.String == nil { + break + } + b.WriteString(*box.String) + } + s.SetString(b.String()) +} + func FlatUnquotedString(s string) *UnquotedString { return &UnquotedString{ Value: []InterpolationBox{{String: &s}}, @@ -514,6 +525,17 @@ type DoubleQuotedString struct { Value []InterpolationBox `json:"value"` } +func (s *DoubleQuotedString) Coalesce() { + var b strings.Builder + for _, box := range s.Value { + if box.String == nil { + break + } + b.WriteString(*box.String) + } + s.SetString(b.String()) +} + func FlatDoubleQuotedString(s string) *DoubleQuotedString { return &DoubleQuotedString{ Value: []InterpolationBox{{String: &s}}, diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 096cc1cac..22373fac5 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3253,6 +3253,30 @@ hi: 1 ${x} 2 assert.Equal(t, "1 im a var 2", g.Objects[0].Label.Value) }, }, + { + name: "double-quoted", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im a var +} +hi: "1 ${x} 2" +`, "") + assert.Equal(t, "1 im a var 2", g.Objects[0].Label.Value) + }, + }, + { + name: "single-quoted", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im a var +} +hi: '1 ${x} 2' +`, "") + assert.Equal(t, "1 ${x} 2", g.Objects[0].Label.Value) + }, + }, { name: "edge label", run: func(t *testing.T) { @@ -3411,19 +3435,9 @@ scenarios: { x: ${x} } } -layers: { - l2: { - vars: { - x: im replaced x var - } - x: ${x} - } -} `, "") assert.Equal(t, 1, len(g.Scenarios[0].Objects)) assert.Equal(t, "im replaced x var", g.Scenarios[0].Objects[0].Label.Value) - assert.Equal(t, 1, len(g.Layers[0].Objects)) - assert.Equal(t, "im replaced x var", g.Layers[0].Objects[0].Label.Value) }, }, } @@ -3456,17 +3470,6 @@ vars: { x: hey } hi: ${z} -`, "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable z") - }, - }, - { - name: "key", - run: func(t *testing.T) { - assertCompile(t, ` -vars: { - x: hey -} -${x} `, "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable z") }, }, diff --git a/d2ir/compile.go b/d2ir/compile.go index b97362077..8e69091de 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -7,6 +7,7 @@ import ( "oss.terrastruct.com/d2/d2ast" "oss.terrastruct.com/d2/d2format" "oss.terrastruct.com/d2/d2parser" + "oss.terrastruct.com/util-go/go2" ) type compiler struct { @@ -96,7 +97,47 @@ func (c *compiler) overlayClasses(m *Map) { } } -func (c *compiler) resolveSubstitution(vars *Map, mk *d2ast.Key, substitution *d2ast.Substitution) d2ast.Scalar { +func (c *compiler) resolveSubstitutions(refctx *RefContext) { + varsMap := &Map{} + boardScope := refctx.ScopeMap + if NodeBoardKind(refctx.ScopeMap) == "" { + boardScope = ParentBoard(refctx.ScopeMap).Map() + } + vars := boardScope.GetField("vars") + if vars != nil { + varsMap = vars.Map() + } + + switch { + case refctx.Key.Value.Substitution != nil: + resolvedField := c.resolveSubstitution(varsMap, refctx.Key, refctx.Key.Value.Substitution) + if resolvedField != nil { + refctx.Key.Value = d2ast.MakeValueBox(resolvedField.Primary().Value) + } + case refctx.Key.Value.UnquotedString != nil: + for i, box := range refctx.Key.Value.UnquotedString.Value { + if box.Substitution != nil { + resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution) + if resolvedField != nil { + refctx.Key.Value.UnquotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + } + } + } + refctx.Key.Value.UnquotedString.Coalesce() + case refctx.Key.Value.DoubleQuotedString != nil: + for i, box := range refctx.Key.Value.DoubleQuotedString.Value { + if box.Substitution != nil { + resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution) + if resolvedField != nil { + refctx.Key.Value.DoubleQuotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + } + } + } + refctx.Key.Value.DoubleQuotedString.Coalesce() + } +} + +func (c *compiler) resolveSubstitution(vars *Map, mk *d2ast.Key, substitution *d2ast.Substitution) *Field { var resolved *Field for _, p := range substitution.Path { if vars == nil { @@ -115,7 +156,7 @@ func (c *compiler) resolveSubstitution(vars *Map, mk *d2ast.Key, substitution *d c.errorf(mk, "could not resolve variable %s", strings.Join(substitution.IDA(), ".")) } else { // TODO maps - return resolved.Primary().Value + return resolved } return nil } @@ -205,6 +246,7 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { func (c *compiler) compileKey(refctx *RefContext) { // resolve substitutions here + c.resolveSubstitutions(refctx) if len(refctx.Key.Edges) == 0 { c.compileField(refctx.ScopeMap, refctx.Key.Key, refctx) } else { @@ -308,15 +350,15 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) c.overlayClasses(f.Map()) } } - } else if refctx.Key.Value.Substitution != nil { - vars := ParentBoard(f).Map().GetField("vars") - resolved := c.resolveSubstitution(vars.Map(), refctx.Key, refctx.Key.Value.Substitution) - if resolved != nil { - f.Primary_ = &Scalar{ - parent: f, - Value: resolved, - } - } + // } else if refctx.Key.Value.Substitution != nil { + // vars := ParentBoard(f).Map().GetField("vars") + // resolved := c.resolveSubstitution(vars.Map(), refctx.Key, refctx.Key.Value.Substitution) + // if resolved != nil { + // f.Primary_ = &Scalar{ + // parent: f, + // Value: resolved, + // } + // } } 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" { @@ -496,15 +538,15 @@ func (c *compiler) compileEdges(refctx *RefContext) { } } c.compileMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) - } else if refctx.Key.Value.Substitution != nil { - vars := ParentBoard(e).Map().GetField("vars") - resolved := c.resolveSubstitution(vars.Map(), refctx.Key, refctx.Key.Value.Substitution) - if resolved != nil { - e.Primary_ = &Scalar{ - parent: e, - Value: resolved, - } - } + // } else if refctx.Key.Value.Substitution != nil { + // vars := ParentBoard(e).Map().GetField("vars") + // resolved := c.resolveSubstitution(vars.Map(), refctx.Key, refctx.Key.Value.Substitution) + // if resolved != nil { + // e.Primary_ = &Scalar{ + // parent: e, + // Value: resolved, + // } + // } } else if refctx.Key.Value.ScalarBox().Unbox() != nil { e.Primary_ = &Scalar{ parent: e, diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 55f49e18a..dc757ba5e 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -76,7 +76,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,2:11:39-2:13:41", - "value": null + "value": [ + { + "string": "" + } + ] } } } @@ -106,8 +110,7 @@ "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,3:11:53-3:17:59", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -150,8 +153,7 @@ "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,4:16:76-4:22:82", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -212,8 +214,7 @@ "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,7:11:108-7:17:114", "value": [ { - "string": "then", - "raw_string": "then" + "string": "then" } ] } diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index c4e7552f6..eab1c4dec 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -59,8 +59,7 @@ "range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,1:8:18-1:64:74", "value": [ { - "string": "https://icons.terrastruct.com/essentials/004-picture.svg", - "raw_string": "https://icons.terrastruct.com/essentials/004-picture.svg" + "string": "https://icons.terrastruct.com/essentials/004-picture.svg" } ] } diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index f5e4620d6..16840f3df 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,1:9:14-1:25:30", "value": [ { - "string": "sequence_diagram", - "raw_string": "sequence_diagram" + "string": "sequence_diagram" } ] } diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index ff306f1c4..d15fdb390 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,2:9:15-2:15:21", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json index 049d4ed34..0e3f13227 100644 --- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json +++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,2:11:38-2:16:43", "value": [ { - "string": "class", - "raw_string": "class" + "string": "class" } ] } @@ -145,8 +144,7 @@ "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,7:9:70-7:19:80", "value": [ { - "string": "classClass", - "raw_string": "classClass" + "string": "classClass" } ] } @@ -178,8 +176,7 @@ "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,8:12:93-8:15:96", "value": [ { - "string": "int", - "raw_string": "int" + "string": "int" } ] } diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index c6b641edc..c6965fce8 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -64,8 +64,7 @@ "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,1:9:28-1:14:33", "value": [ { - "string": "class", - "raw_string": "class" + "string": "class" } ] } @@ -120,8 +119,7 @@ "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,4:13:60-4:19:66", "value": [ { - "string": "string", - "raw_string": "string" + "string": "string" } ] } @@ -153,8 +151,7 @@ "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,5:8:75-5:12:79", "value": [ { - "string": "bool", - "raw_string": "bool" + "string": "bool" } ] } diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index f139da4f2..469bf1f8a 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,1:9:28-1:16:35", "value": [ { - "string": "class", - "raw_string": "class" + "string": "class" } ] } @@ -87,8 +86,7 @@ "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,2:14:50-2:22:58", "value": [ { - "string": "string", - "raw_string": "string" + "string": "string" } ] } diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index ac50b12bd..35438dba3 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -76,7 +76,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2compiler/TestCompile/classes.d2,2:11:39-2:13:41", - "value": null + "value": [ + { + "string": "" + } + ] } } } @@ -106,8 +110,7 @@ "range": "d2/testdata/d2compiler/TestCompile/classes.d2,3:11:53-3:17:59", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -150,8 +153,7 @@ "range": "d2/testdata/d2compiler/TestCompile/classes.d2,4:16:76-4:22:82", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -212,8 +214,7 @@ "range": "d2/testdata/d2compiler/TestCompile/classes.d2,7:11:108-7:17:114", "value": [ { - "string": "then", - "raw_string": "then" + "string": "then" } ] } @@ -319,8 +320,7 @@ "range": "d2/testdata/d2compiler/TestCompile/classes.d2,11:17:164-11:28:175", "value": [ { - "string": "dragon_ball", - "raw_string": "dragon_ball" + "string": "dragon_ball" } ] } @@ -391,8 +391,7 @@ "range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:20:198-12:31:209", "value": [ { - "string": "dragon_ball", - "raw_string": "dragon_ball" + "string": "dragon_ball" } ] } @@ -435,8 +434,7 @@ "range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:45:223-12:48:226", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -497,8 +495,7 @@ "range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:16:245-13:20:249", "value": [ { - "string": "**", - "raw_string": "**" + "string": "**" } ] } @@ -530,8 +527,7 @@ "range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:29:258-13:40:269", "value": [ { - "string": "dragon_ball", - "raw_string": "dragon_ball" + "string": "dragon_ball" } ] } @@ -615,8 +611,7 @@ "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:26:299-15:30:303", "value": [ { - "string": "path", - "raw_string": "path" + "string": "path" } ] } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json index 6072848cd..7be798b03 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,3:9:45-3:15:51", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -164,8 +163,7 @@ "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,7:10:89-7:17:96", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } @@ -289,8 +287,7 @@ "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,13:9:163-13:16:170", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } @@ -404,8 +401,7 @@ "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,18:10:221-18:16:227", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -500,8 +496,7 @@ "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,23:9:277-23:13:281", "value": [ { - "string": "oval", - "raw_string": "oval" + "string": "oval" } ] } @@ -615,8 +610,7 @@ "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,28:10:333-28:17:340", "value": [ { - "string": "hexagon", - "raw_string": "hexagon" + "string": "hexagon" } ] } @@ -740,8 +734,7 @@ "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,34:9:407-34:16:414", "value": [ { - "string": "hexagon", - "raw_string": "hexagon" + "string": "hexagon" } ] } @@ -855,8 +848,7 @@ "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,39:10:463-39:14:467", "value": [ { - "string": "oval", - "raw_string": "oval" + "string": "oval" } ] } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 2aad6eb2d..a182d32e9 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -59,8 +59,7 @@ "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,1:9:19-1:16:26", "value": [ { - "string": "hexagon", - "raw_string": "hexagon" + "string": "hexagon" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 573bd41bb..0dc322a3f 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -111,8 +111,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,2:11:80-2:18:87", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } @@ -149,8 +148,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,4:20:112-4:24:116", "value": [ { - "string": "QOTD", - "raw_string": "QOTD" + "string": "QOTD" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json index 43dbe6934..b9ffad1a6 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,1:20:30-1:56:66", "value": [ { - "string": "Reisner's Rule of Conceptual Inertia", - "raw_string": "Reisner's Rule of Conceptual Inertia" + "string": "Reisner's Rule of Conceptual Inertia" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index fc3cb532e..683290ef1 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -90,8 +90,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:13:14-1:55:56", "value": [ { - "string": "The kids will love our inflatable slides", - "raw_string": "The kids will love our inflatable slides" + "string": "The kids will love our inflatable slides" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index 7b58cb7bd..f6b01e3b1 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -114,8 +114,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,2:9:25-2:88:104", "value": [ { - "string": "Space: the final frontier. These are the voyages of the starship Enterprise.", - "raw_string": "Space: the final frontier. These are the voyages of the starship Enterprise." + "string": "Space: the final frontier. These are the voyages of the starship Enterprise." } ] } diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index a1f43e986..c0b4d7be4 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:8:15-1:17:24", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -87,8 +86,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:5:30-2:8:33", "value": [ { - "string": "int", - "raw_string": "int" + "string": "int" } ] } @@ -120,8 +118,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:9:43-3:12:46", "value": [ { - "string": "int", - "raw_string": "int" + "string": "int" } ] } @@ -182,8 +179,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:8:65-7:17:74", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -215,8 +211,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:5:80-8:8:83", "value": [ { - "string": "int", - "raw_string": "int" + "string": "int" } ] } @@ -248,8 +243,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:7:91-9:13:97", "value": [ { - "string": "string", - "raw_string": "string" + "string": "string" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index 50be77f89..5d842efab 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -131,8 +131,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:36:43-1:43:50", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index bccfb9129..052c0ff53 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -94,8 +94,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,2:26:48-2:28:50", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index dec38ad77..95a7d7d14 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -53,8 +53,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:8:9-1:11:12", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -114,8 +113,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:13:26-2:16:29", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 14c91274e..d97ce029d 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -128,8 +128,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,3:9:32-3:88:111", "value": [ { - "string": "Space: the final frontier. These are the voyages of the starship Enterprise.", - "raw_string": "Space: the final frontier. These are the voyages of the starship Enterprise." + "string": "Space: the final frontier. These are the voyages of the starship Enterprise." } ] } diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index 6ebba4d34..340db8107 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:9:15-2:12:18", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -138,8 +137,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:14:33-3:17:36", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 084167741..a2d139a60 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:9:15-2:12:18", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -159,8 +158,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:15:36-4:18:39", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 4e4652c77..4c010a354 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,2:9:20-2:88:99", "value": [ { - "string": "Space: the final frontier. These are the voyages of the starship Enterprise.", - "raw_string": "Space: the final frontier. These are the voyages of the starship Enterprise." + "string": "Space: the final frontier. These are the voyages of the starship Enterprise." } ] } diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 9874c0c27..3e1995bad 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -101,8 +101,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,2:11:43-2:18:50", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index c00936b2d..617802255 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,1:26:36-1:33:43", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } @@ -194,8 +193,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,4:9:87-4:16:94", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 6f5721e7c..08e3122d8 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:34:34-0:42:42", "value": [ { - "string": "triangle", - "raw_string": "triangle" + "string": "triangle" } ] } diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index 18c537b79..51c1ca72f 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -144,8 +144,7 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,2:9:48-2:16:55", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json index fcdeecfc7..24e740e1e 100644 --- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,2:18:33-2:22:37", "value": [ { - "string": "dots", - "raw_string": "dots" + "string": "dots" } ] } diff --git a/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json b/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json index 1d0b6974e..632db4569 100644 --- a/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json +++ b/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2compiler/TestCompile/icon-near-composite-together.d2,2:8:41-2:24:57", "value": [ { - "string": "outside-top-left", - "raw_string": "outside-top-left" + "string": "outside-top-left" } ] } diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 0f22863e9..183ccb980 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -59,8 +59,7 @@ "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,1:8:18-1:64:74", "value": [ { - "string": "https://icons.terrastruct.com/essentials/004-picture.svg", - "raw_string": "https://icons.terrastruct.com/essentials/004-picture.svg" + "string": "https://icons.terrastruct.com/essentials/004-picture.svg" } ] } @@ -92,8 +91,7 @@ "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,2:9:84-2:14:89", "value": [ { - "string": "image", - "raw_string": "image" + "string": "image" } ] } @@ -136,8 +134,7 @@ "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,3:16:106-3:25:115", "value": [ { - "string": "#0D32B2", - "raw_string": "#0D32B2" + "string": "#0D32B2" } ] } diff --git a/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json b/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json index b73200e7a..22ecfc551 100644 --- a/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json +++ b/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/label-near-composite-separate.d2,1:8:15-1:13:20", "value": [ { - "string": "sushi", - "raw_string": "sushi" + "string": "sushi" } ] } @@ -98,8 +97,7 @@ "range": "d2/testdata/d2compiler/TestCompile/label-near-composite-separate.d2,2:13:34-2:29:50", "value": [ { - "string": "outside-top-left", - "raw_string": "outside-top-left" + "string": "outside-top-left" } ] } diff --git a/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json b/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json index ee68c9863..bedc9a9a8 100644 --- a/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json +++ b/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2compiler/TestCompile/label-near-composite-together.d2,2:8:32-2:24:48", "value": [ { - "string": "outside-top-left", - "raw_string": "outside-top-left" + "string": "outside-top-left" } ] } diff --git a/testdata/d2compiler/TestCompile/label-near-parent.exp.json b/testdata/d2compiler/TestCompile/label-near-parent.exp.json index 192949f56..261465cf6 100644 --- a/testdata/d2compiler/TestCompile/label-near-parent.exp.json +++ b/testdata/d2compiler/TestCompile/label-near-parent.exp.json @@ -75,8 +75,7 @@ "range": "d2/testdata/d2compiler/TestCompile/label-near-parent.d2,1:13:26-1:29:42", "value": [ { - "string": "outside-top-left", - "raw_string": "outside-top-left" + "string": "outside-top-left" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 974fc5fbc..e0120bcc5 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -30,8 +30,7 @@ "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?" + "string": "How does the cat go?" } ] } @@ -177,8 +176,7 @@ "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", "value": [ { - "string": "goes", - "raw_string": "goes" + "string": "goes" } ] } @@ -290,8 +288,7 @@ "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } @@ -511,8 +508,7 @@ "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", "value": [ { - "string": "goes", - "raw_string": "goes" + "string": "goes" } ] } @@ -701,8 +697,7 @@ "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?" + "string": "How does the cat go?" } ] } @@ -788,8 +783,7 @@ "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } diff --git a/testdata/d2compiler/TestCompile/missing-class.exp.json b/testdata/d2compiler/TestCompile/missing-class.exp.json index 1aa7a9673..25f2adca7 100644 --- a/testdata/d2compiler/TestCompile/missing-class.exp.json +++ b/testdata/d2compiler/TestCompile/missing-class.exp.json @@ -41,8 +41,7 @@ "range": "d2/testdata/d2compiler/TestCompile/missing-class.d2,0:9:9-0:11:11", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index 6139e09c5..d6f5751d1 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -41,8 +41,7 @@ "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:8:8-0:18:18", "value": [ { - "string": "top-center", - "raw_string": "top-center" + "string": "top-center" } ] } diff --git a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json index a897f1678..0ba0aac3f 100644 --- a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json @@ -158,8 +158,7 @@ "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:26:101-5:31:106", "value": [ { - "string": "arrow", - "raw_string": "arrow" + "string": "arrow" } ] } diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 1781b2ac6..6c15ddb77 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,2:11:31-2:20:40", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -111,8 +110,7 @@ "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,4:15:57-4:21:63", "value": [ { - "string": "string", - "raw_string": "string" + "string": "string" } ] } @@ -144,8 +142,7 @@ "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,5:10:74-5:14:78", "value": [ { - "string": "bool", - "raw_string": "bool" + "string": "bool" } ] } diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index af370962e..c2daa0039 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44", "value": [ { - "string": "Overview.Untitled board 7.zzzzz", - "raw_string": "Overview.Untitled board 7.zzzzz" + "string": "Overview.Untitled board 7.zzzzz" } ] } diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json index 07280d1c2..0e9844908 100644 --- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json +++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,2:11:29-2:17:35", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -132,8 +131,7 @@ "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,5:9:51-5:10:52", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -187,8 +185,7 @@ "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,6:17:70-6:24:77", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index d037b9da4..e2cc05144 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,1:8:13-1:14:19", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -138,8 +137,7 @@ "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,3:16:57-3:19:60", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -182,8 +180,7 @@ "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,4:13:74-4:18:79", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } @@ -231,8 +228,7 @@ "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,6:8:90-6:9:91", "value": [ { - "string": "y", - "raw_string": "y" + "string": "y" } ] } diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 98ba30eda..8fdf89c77 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2compiler/TestCompile/root_direction.d2,0:11:11-0:16:16", "value": [ { - "string": "right", - "raw_string": "right" + "string": "right" } ] } diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 353ce9a61..510f8fe47 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2compiler/TestCompile/root_sequence.d2,0:7:7-0:23:23", "value": [ { - "string": "sequence_diagram", - "raw_string": "sequence_diagram" + "string": "sequence_diagram" } ] } diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json index 4c90eaac0..8248fadb1 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,0:7:7-0:23:23", "value": [ { - "string": "sequence_diagram", - "raw_string": "sequence_diagram" + "string": "sequence_diagram" } ] } diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index 5dd16ad44..170abd9c8 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,0:7:7-0:23:23", "value": [ { - "string": "sequence_diagram", - "raw_string": "sequence_diagram" + "string": "sequence_diagram" } ] } diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index 503423b6c..dc7b3eb12 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,0:7:7-0:23:23", "value": [ { - "string": "sequence_diagram", - "raw_string": "sequence_diagram" + "string": "sequence_diagram" } ] } diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index 1958d8227..459a76786 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:7:7-0:23:23", "value": [ { - "string": "sequence_diagram", - "raw_string": "sequence_diagram" + "string": "sequence_diagram" } ] } diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index 0870aa4c1..a46a3fa31 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,1:9:14-1:25:30", "value": [ { - "string": "sequence_diagram", - "raw_string": "sequence_diagram" + "string": "sequence_diagram" } ] } diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index b59d6d0da..92d4166c1 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,1:13:18-1:17:22", "value": [ { - "string": "left", - "raw_string": "left" + "string": "left" } ] } diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index 3cf517caa..afba4f2c6 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -59,8 +59,7 @@ "range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,1:8:18-1:14:24", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2compiler/TestCompile/sql-constraints.exp.json b/testdata/d2compiler/TestCompile/sql-constraints.exp.json index db24296fa..a74178a5e 100644 --- a/testdata/d2compiler/TestCompile/sql-constraints.exp.json +++ b/testdata/d2compiler/TestCompile/sql-constraints.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:9:14-1:18:23", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -121,8 +120,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:22:46-2:33:57", "value": [ { - "string": "primary_key", - "raw_string": "primary_key" + "string": "primary_key" } ] } diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 64b5d46e5..47cfcf60c 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,2:10:26-2:22:38", "value": [ { - "string": "lemonchiffon", - "raw_string": "lemonchiffon" + "string": "lemonchiffon" } ] } @@ -140,8 +139,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,5:11:61-5:20:70", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 8064ff8ed..4bc3e381e 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -64,8 +64,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,1:9:28-1:18:37", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -97,8 +96,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,3:13:52-3:19:58", "value": [ { - "string": "string", - "raw_string": "string" + "string": "string" } ] } @@ -130,8 +128,7 @@ "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,4:8:67-4:12:71", "value": [ { - "string": "bool", - "raw_string": "bool" + "string": "bool" } ] } diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index 9012bd927..8d0548dea 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,1:9:14-1:18:23", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -139,8 +138,7 @@ "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,5:9:44-5:18:53", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index b68772eff..782284d04 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,1:9:28-1:18:37", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -87,8 +86,7 @@ "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,2:13:51-2:19:57", "value": [ { - "string": "string", - "raw_string": "string" + "string": "string" } ] } diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index bd065d54f..a2e8f3ff5 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,1:9:28-1:18:37", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -87,8 +86,7 @@ "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,2:13:51-2:19:57", "value": [ { - "string": "string", - "raw_string": "string" + "string": "string" } ] } @@ -173,8 +171,7 @@ "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,5:16:102-5:20:106", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index 6d32e0f75..e8e1fd4a1 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,0:11:11-0:16:16", "value": [ { - "string": "right", - "raw_string": "right" + "string": "right" } ] } @@ -144,8 +143,7 @@ "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,3:20:61-3:30:71", "value": [ { - "string": "capitalize", - "raw_string": "capitalize" + "string": "capitalize" } ] } @@ -209,8 +207,7 @@ "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,6:24:102-6:33:111", "value": [ { - "string": "uppercase", - "raw_string": "uppercase" + "string": "uppercase" } ] } @@ -264,8 +261,7 @@ "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,7:24:136-7:33:145", "value": [ { - "string": "lowercase", - "raw_string": "lowercase" + "string": "lowercase" } ] } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 7b44d6ac8..6d2eaca67 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -53,8 +53,7 @@ "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:8:9-1:77:78", "value": [ { - "string": "Can you imagine how life could be improved if we could do away with", - "raw_string": "Can you imagine how life could be improved if we could do away with" + "string": "Can you imagine how life could be improved if we could do away with" } ] } @@ -155,8 +154,7 @@ "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:13:97-3:80:164", "value": [ { - "string": "Well, it's garish, ugly, and derelicts have used it for a toilet.", - "raw_string": "Well, it's garish, ugly, and derelicts have used it for a toilet." + "string": "Well, it's garish, ugly, and derelicts have used it for a toilet." } ] } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index 25aa72494..b88843238 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -53,8 +53,7 @@ "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:8:9-1:77:78", "value": [ { - "string": "Can you imagine how life could be improved if we could do away with", - "raw_string": "Can you imagine how life could be improved if we could do away with" + "string": "Can you imagine how life could be improved if we could do away with" } ] } @@ -160,8 +159,7 @@ "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:18:102-3:85:169", "value": [ { - "string": "Well, it's garish, ugly, and derelicts have used it for a toilet.", - "raw_string": "Well, it's garish, ugly, and derelicts have used it for a toilet." + "string": "Well, it's garish, ugly, and derelicts have used it for a toilet." } ] } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 8e1ecb3f2..ea91c3114 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -65,8 +65,7 @@ "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,2:6:12-2:84:90", "value": [ { - "string": "All we are given is possibilities -- to make ourselves one thing or another.", - "raw_string": "All we are given is possibilities -- to make ourselves one thing or another." + "string": "All we are given is possibilities -- to make ourselves one thing or another." } ] } @@ -103,8 +102,7 @@ "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,4:3:96-4:80:173", "value": [ { - "string": "But it's real. And if it's real it can be affected ... we may not be able", - "raw_string": "But it's real. And if it's real it can be affected ... we may not be able" + "string": "But it's real. And if it's real it can be affected ... we may not be able" } ] } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index e8850d2a2..b241f3064 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,1:3:4-1:80:81", "value": [ { - "string": "But it's real. And if it's real it can be affected ... we may not be able", - "raw_string": "But it's real. And if it's real it can be affected ... we may not be able" + "string": "But it's real. And if it's real it can be affected ... we may not be able" } ] } @@ -98,8 +97,7 @@ "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,3:6:93-3:84:171", "value": [ { - "string": "All we are given is possibilities -- to make ourselves one thing or another.", - "raw_string": "All we are given is possibilities -- to make ourselves one thing or another." + "string": "All we are given is possibilities -- to make ourselves one thing or another." } ] } diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 0ee2c0378..ec370207a 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31", "value": [ { - "string": "https://google.com", - "raw_string": "https://google.com" + "string": "https://google.com" } ] } diff --git a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json index 4fc6b9851..c581bc47f 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 @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:10:10-0:28:28", "value": [ { - "string": "https://google.com", - "raw_string": "https://google.com" + "string": "https://google.com" } ] } @@ -87,8 +86,7 @@ "range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:39:39-0:50:50", "value": [ { - "string": "hello world", - "raw_string": "hello world" + "string": "hello world" } ] } diff --git a/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json index 55017b2a1..201fb038a 100644 --- a/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json @@ -54,8 +54,7 @@ "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" + "string": "https://not-google.com" } ] } @@ -87,8 +86,7 @@ "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" + "string": "note: url.ParseRequestURI might see this as a URL" } ] } diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json index 5191349ed..302556ce6 100644 --- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json +++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/url_tooltip.d2,0:13:13-0:31:31", "value": [ { - "string": "https://google.com", - "raw_string": "https://google.com" + "string": "https://google.com" } ] } diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index 555ed3efc..17739cdd2 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,1:9:24-1:18:33", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -121,8 +120,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,2:23:57-2:34:68", "value": [ { - "string": "primary_key", - "raw_string": "primary_key" + "string": "primary_key" } ] } @@ -159,8 +157,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,3:15:85-3:18:88", "value": [ { - "string": "int", - "raw_string": "int" + "string": "int" } ] } @@ -192,8 +189,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,4:13:102-4:19:108", "value": [ { - "string": "string", - "raw_string": "string" + "string": "string" } ] } @@ -225,8 +221,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,5:7:116-5:10:119", "value": [ { - "string": "int", - "raw_string": "int" + "string": "int" } ] } @@ -292,8 +287,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,6:27:147-6:38:158", "value": [ { - "string": "foreign_key", - "raw_string": "foreign_key" + "string": "foreign_key" } ] } @@ -364,8 +358,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,7:30:190-7:41:201", "value": [ { - "string": "foreign_key", - "raw_string": "foreign_key" + "string": "foreign_key" } ] } @@ -431,8 +424,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,11:9:243-11:18:252", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -464,8 +456,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,12:6:259-12:9:262", "value": [ { - "string": "int", - "raw_string": "int" + "string": "int" } ] } @@ -531,8 +522,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,13:31:294-13:42:305", "value": [ { - "string": "foreign_key", - "raw_string": "foreign_key" + "string": "foreign_key" } ] } @@ -603,8 +593,7 @@ "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,14:30:337-14:41:348", "value": [ { - "string": "foreign_key", - "raw_string": "foreign_key" + "string": "foreign_key" } ] } diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 75999c067..31148f447 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -253,8 +253,7 @@ "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" } ] } @@ -608,8 +607,7 @@ "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" } ] } @@ -882,8 +880,7 @@ "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" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json index f03a3b5ca..091481ef5 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } @@ -92,31 +91,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:4:29-4:12:37", "value": [ { - "string": "1 ", - "raw_string": "1 " - }, - { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:6:31-4:10:35", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,4:8:33-4:9:34", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } - }, - { - "string": " 2", - "raw_string": "1 2" + "string": "1 im a var 2" } ] } @@ -177,7 +152,7 @@ ], "attributes": { "label": { - "value": "1 " + "value": "1 im a var 2" }, "labelDimensions": { "width": 0, diff --git a/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json new file mode 100644 index 000000000..1be8d8d91 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json @@ -0,0 +1,176 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,0:0:0-5:0:40", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,4:0:25-4:14:39", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,4:4:29-4:14:39", + "value": [ + { + "string": "1 im a var 2" + } + ] + } + } + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "1 im a var 2" + }, + "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/TestCompile2/vars/basic/edge_label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json index 55c12d65d..9f1b92d8d 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } @@ -111,20 +110,11 @@ ], "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:8:33-4:12:37", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:5:14-2:13:22", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:10:35-4:11:36", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } + "string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json index 41f1864ae..3d376033f 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } @@ -88,20 +87,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:4:29-4:8:33", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:5:14-2:13:22", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:6:31-4:7:32", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } + "string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json index b0bc434b4..37a8d3819 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json @@ -102,8 +102,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:14:49-4:17:52", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -181,42 +180,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:14:85-9:38:109", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:14:49-4:17:52", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:16:87-9:22:93", - "value": [ - { - "string": "colors", - "raw_string": "colors" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:23:94-9:30:101", - "value": [ - { - "string": "primary", - "raw_string": "primary" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:31:102-9:37:108", - "value": [ - { - "string": "button", - "raw_string": "button" - } - ] - } + "string": "red" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json index b9898d320..a7a5fb0e5 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json @@ -108,22 +108,10 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:15:44-5:25:54", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:17:46-5:24:53", - "value": [ - { - "string": "columns", - "raw_string": "columns" - } - ] - } - } - ] + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,2:10:19-2:11:20", + "raw": "2", + "value": "2" } } } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json new file mode 100644 index 000000000..f2717ee09 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json @@ -0,0 +1,173 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,0:0:0-5:0:40", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,4:0:25-4:14:39", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "single_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,4:4:29-4:14:39", + "raw": "", + "value": "1 ${x} 2" + } + } + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "1 ${x} 2" + }, + "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/TestCompile2/vars/basic/style.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json index 6925d574c..43318c722 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:17:26-2:20:29", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -123,20 +122,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:14:52-5:30:68", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:17:26-2:20:29", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:16:54-5:29:67", - "value": [ - { - "string": "primary-color", - "raw_string": "primary-color" - } - ] - } + "string": "red" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index a336caf0b..7bde70cfe 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } @@ -136,20 +135,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:12:55", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:10:53-7:11:54", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } + "string": "im a var" } ] } @@ -246,8 +236,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } @@ -283,8 +272,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index a256b8aab..01550e52a 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "string": "im x var" } ] } @@ -164,8 +163,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "string": "im y var" } ] } @@ -198,20 +196,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:11:93", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:9:91-10:10:92", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } + "string": "im x var" } ] } @@ -239,20 +228,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:11:105", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:9:103-11:10:104", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } + "string": "im y var" } ] } @@ -366,8 +346,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "string": "im y var" } ] } @@ -400,20 +379,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:11:177", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:9:175-19:10:176", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } + "string": "im x var" } ] } @@ -441,20 +411,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:11:189", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:9:187-20:10:188", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } + "string": "im y var" } ] } @@ -551,8 +512,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "string": "im x var" } ] } @@ -583,8 +543,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "string": "im y var" } ] } @@ -620,8 +579,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "string": "im x var" } ] } @@ -652,8 +610,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "string": "im y var" } ] } @@ -834,8 +791,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "string": "im x var" } ] } @@ -866,8 +822,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "string": "im y var" } ] } @@ -903,8 +858,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "string": "im x var" } ] } @@ -935,8 +889,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "string": "im y var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index a5a4d56e9..ad2348046 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -3,7 +3,7 @@ "name": "", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,0:0:0-21:0:190", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,0:0:0-13:0:109", "nodes": [ { "map_key": { @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "string": "im x var" } ] } @@ -164,8 +163,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", "value": [ { - "string": "im replaced x var", - "raw_string": "im replaced x var" + "string": "im replaced x var" } ] } @@ -198,181 +196,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:11:102", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:9:100-10:10:101", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,13:0:109-20:1:189", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,13:0:109-13:6:115", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,13:0:109-13:6:115", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,13:8:117-20:1:189", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,14:2:121-19:3:187", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,14:2:121-14:4:123", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,14:2:121-14:4:123", - "value": [ - { - "string": "l2", - "raw_string": "l2" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,14:6:125-19:3:187", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,15:4:131-17:5:171", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,15:4:131-15:8:135", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,15:4:131-15:8:135", - "value": [ - { - "string": "vars", - "raw_string": "vars" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,15:10:137-17:5:171", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:6:145-16:26:165", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:6:145-16:7:146", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:6:145-16:7:146", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:9:148-16:26:165", - "value": [ - { - "string": "im replaced x var", - "raw_string": "im replaced x var" - } - ] - } - } - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:11:183", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:5:177", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:5:177", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:7:179-18:11:183", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:9:181-18:10:182", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } + "string": "im replaced x var" } ] } @@ -416,180 +244,6 @@ }, "edges": null, "objects": null, - "layers": [ - { - "name": "l2", - "isFolderOnly": false, - "ast": { - "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": "vars" - } - ] - } - } - ] - }, - "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": "x" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:9:148-16:26:165", - "value": [ - { - "string": "im replaced x var", - "raw_string": "im replaced x var" - } - ] - } - }, - "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": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,16:9:148-16:26:165", - "value": [ - { - "string": "im replaced x var", - "raw_string": "im replaced x var" - } - ] - } - }, - "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": "x", - "id_val": "x", - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:5:177", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,18:4:176-18:5:177", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": -1 - } - ], - "attributes": { - "label": { - "value": "im replaced x var" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 - } - ] - } - ], "scenarios": [ { "name": "l", @@ -643,8 +297,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", "value": [ { - "string": "im replaced x var", - "raw_string": "im replaced x var" + "string": "im replaced x var" } ] } @@ -680,8 +333,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", "value": [ { - "string": "im replaced x var", - "raw_string": "im replaced x var" + "string": "im replaced x var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index a4b99e65d..8c02a62f5 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } @@ -136,20 +135,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:12:58", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:10:56-7:11:57", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } + "string": "im a var" } ] } @@ -246,8 +236,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } @@ -283,8 +272,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json index 585e192ee..10ff44f21 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } @@ -88,20 +87,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:4:29-4:8:33", - "spread": false, - "path": [ + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:5:14-2:13:22", + "value": [ { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:6:31-4:7:32", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } + "string": "im a var" } ] } @@ -133,8 +123,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,5:4:38-5:13:47", "value": [ { - "string": "not a var", - "raw_string": "not a var" + "string": "not a var" } ] } From 741a9aa306ad0c65423a276c5a438ca5afd7d353 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 13:40:44 -0700 Subject: [PATCH 010/138] cleanup --- d2compiler/compile.go | 13 -------- d2compiler/compile_test.go | 26 +++++++++++++++- d2ir/compile.go | 30 ++++--------------- .../TestCompile2/vars/errors/edge.exp.json | 11 +++++++ .../TestCompile2/vars/errors/map.exp.json | 11 +++++++ .../TestCompile2/vars/errors/missing.exp.json | 2 +- 6 files changed, 53 insertions(+), 40 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/edge.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/map.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 9c27c1459..c1800e571 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -282,19 +282,6 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { if len(f.Map().Edges) > 0 { c.errorf(f.Map().Edges[0].LastRef().AST(), "vars cannot contain an edge") } - // for _, varField := range f.Map().Fields { - // if varField.Map() != nil { - // c.errorf(varField.LastRef().AST(), "vars must be simple") - // } - // for _, cf := range classesField.Map().Fields { - // if _, ok := d2graph.ReservedKeywords[cf.Name]; !ok { - // c.errorf(cf.LastRef().AST(), "%s is an invalid class field, must be reserved keyword", cf.Name) - // } - // if cf.Name == "class" { - // c.errorf(cf.LastRef().AST(), `"class" cannot appear within "classes"`) - // } - // } - // } } return } else if isReserved { diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 22373fac5..1912a9258 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3470,7 +3470,31 @@ vars: { x: hey } hi: ${z} -`, "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable z") +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable "z"`) + }, + }, + { + name: "edge", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x -> a +} +hi +`, "d2/testdata/d2compiler/TestCompile2/vars/errors/edge.d2:3:3: vars cannot contain an edge") + }, + }, + { + name: "map", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + colors: { + button: red + } +} +hi: ${colors} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/map.d2:7:1: cannot reference map variable "colors"`) }, }, } diff --git a/d2ir/compile.go b/d2ir/compile.go index 8e69091de..4a7ef23c0 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -153,9 +153,12 @@ func (c *compiler) resolveSubstitution(vars *Map, mk *d2ast.Key, substitution *d resolved = r } if resolved == nil { - c.errorf(mk, "could not resolve variable %s", strings.Join(substitution.IDA(), ".")) + c.errorf(mk, `could not resolve variable "%s"`, strings.Join(substitution.IDA(), ".")) } else { - // TODO maps + if resolved.Composite != nil { + c.errorf(mk, `cannot reference map variable "%s"`, strings.Join(substitution.IDA(), ".")) + return nil + } return resolved } return nil @@ -211,9 +214,6 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { } for _, n := range ast.Nodes { switch { - case n.Substitution != nil: - println("\033[1;31m--- DEBUG:", "=======================", "\033[m") - c.errorf(n.Substitution, "only values can use substitutions") case n.MapKey != nil: c.compileKey(&RefContext{ Key: n.MapKey, @@ -350,15 +350,6 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) c.overlayClasses(f.Map()) } } - // } else if refctx.Key.Value.Substitution != nil { - // vars := ParentBoard(f).Map().GetField("vars") - // resolved := c.resolveSubstitution(vars.Map(), refctx.Key, refctx.Key.Value.Substitution) - // if resolved != nil { - // f.Primary_ = &Scalar{ - // parent: f, - // Value: resolved, - // } - // } } 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" { @@ -368,8 +359,6 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) parent: f, Value: refctx.Key.Value.ScalarBox().Unbox(), } - - // InterpolationBox within any of these values can be substitutions too } } @@ -538,15 +527,6 @@ func (c *compiler) compileEdges(refctx *RefContext) { } } c.compileMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) - // } else if refctx.Key.Value.Substitution != nil { - // vars := ParentBoard(e).Map().GetField("vars") - // resolved := c.resolveSubstitution(vars.Map(), refctx.Key, refctx.Key.Value.Substitution) - // if resolved != nil { - // e.Primary_ = &Scalar{ - // parent: e, - // Value: resolved, - // } - // } } else if refctx.Key.Value.ScalarBox().Unbox() != nil { e.Primary_ = &Scalar{ parent: e, diff --git a/testdata/d2compiler/TestCompile2/vars/errors/edge.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/edge.exp.json new file mode 100644 index 000000000..b83fda7d8 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/edge.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/edge.d2,2:2:11-2:8:17", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/edge.d2:3:3: vars cannot contain an edge" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/errors/map.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/map.exp.json new file mode 100644 index 000000000..0d8156660 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/map.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/map.d2,6:0:43-6:13:56", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/map.d2:7:1: cannot reference map variable \"colors\"" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json index 64d495784..bf2e45fed 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json @@ -4,7 +4,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2,4:0:20-4:8:28", - "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable z" + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable \"z\"" } ] } From b193b9be8a8d26dcafbba5bf3deecf4c2070097f Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 13:44:00 -0700 Subject: [PATCH 011/138] cleanup --- d2ast/d2ast.go | 6 ------ d2ir/compile.go | 6 ------ d2parser/parse.go | 3 --- .../TestCompile2/vars/basic/edge_label.exp.json | 2 +- .../TestCompile2/vars/basic/label.exp.json | 2 +- .../TestCompile2/vars/basic/nested.exp.json | 2 +- .../TestCompile2/vars/basic/number.exp.json | 11 +++++++---- .../TestCompile2/vars/basic/style.exp.json | 2 +- .../TestCompile2/vars/boards/layer.exp.json | 4 ++-- .../TestCompile2/vars/boards/overlay.exp.json | 16 ++++++++-------- .../TestCompile2/vars/boards/replace.exp.json | 4 ++-- .../TestCompile2/vars/boards/scenario.exp.json | 4 ++-- .../TestCompile2/vars/override/label.exp.json | 2 +- 13 files changed, 26 insertions(+), 38 deletions(-) diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 25d325cf5..6313dbe0d 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -423,7 +423,6 @@ func (s *BlockString) value() {} func (a *Array) value() {} func (m *Map) value() {} func (i *Import) value() {} -func (i *Substitution) value() {} func (n *Null) scalar() {} func (b *Boolean) scalar() {} @@ -924,7 +923,6 @@ type ValueBox struct { Array *Array `json:"array,omitempty"` Map *Map `json:"map,omitempty"` Import *Import `json:"import,omitempty"` - Substitution *Substitution `json:"substitution,omitempty"` } func (vb ValueBox) Unbox() Value { @@ -949,8 +947,6 @@ func (vb ValueBox) Unbox() Value { return vb.Map case vb.Import != nil: return vb.Import - case vb.Substitution != nil: - return vb.Substitution default: return nil } @@ -979,8 +975,6 @@ func MakeValueBox(v Value) ValueBox { vb.Map = v case *Import: vb.Import = v - case *Substitution: - vb.Substitution = v } return vb } diff --git a/d2ir/compile.go b/d2ir/compile.go index 4a7ef23c0..9b880b767 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -109,11 +109,6 @@ func (c *compiler) resolveSubstitutions(refctx *RefContext) { } switch { - case refctx.Key.Value.Substitution != nil: - resolvedField := c.resolveSubstitution(varsMap, refctx.Key, refctx.Key.Value.Substitution) - if resolvedField != nil { - refctx.Key.Value = d2ast.MakeValueBox(resolvedField.Primary().Value) - } case refctx.Key.Value.UnquotedString != nil: for i, box := range refctx.Key.Value.UnquotedString.Value { if box.Substitution != nil { @@ -245,7 +240,6 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { } func (c *compiler) compileKey(refctx *RefContext) { - // resolve substitutions here c.resolveSubstitutions(refctx) if len(refctx.Key.Edges) == 0 { c.compileField(refctx.ScopeMap, refctx.Key.Key, refctx) diff --git a/d2parser/parse.go b/d2parser/parse.go index 490505e4d..fa64531a3 100644 --- a/d2parser/parse.go +++ b/d2parser/parse.go @@ -1596,9 +1596,6 @@ func (p *parser) parseValue() d2ast.ValueBox { case '@': box.Import = p.parseImport(false) return box - case '$': - box.Substitution = p.parseSubstitution(false) - return box } p.replay(r) diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json index 9f1b92d8d..f58e67429 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json @@ -111,7 +111,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:8:33-4:9:34", "value": [ { "string": "im a var" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json index 3d376033f..2e0d918a0 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json @@ -88,7 +88,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:4:29-4:5:30", "value": [ { "string": "im a var" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json index 37a8d3819..6fd7ef761 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json @@ -181,7 +181,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:14:49-4:17:52", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:14:85-9:15:86", "value": [ { "string": "red" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json index a7a5fb0e5..37d67c845 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json @@ -108,10 +108,13 @@ }, "primary": {}, "value": { - "number": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,2:10:19-2:11:20", - "raw": "2", - "value": "2" + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:15:44-5:16:45", + "value": [ + { + "string": "2" + } + ] } } } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json index 43318c722..47d41ae5d 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json @@ -123,7 +123,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:17:26-2:20:29", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:14:52-5:15:53", "value": [ { "string": "red" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index 7bde70cfe..a48942633 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -136,7 +136,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:9:52", "value": [ { "string": "im a var" @@ -269,7 +269,7 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:9:52", "value": [ { "string": "im a var" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index 01550e52a..24b73c55d 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -197,7 +197,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:8:90", "value": [ { "string": "im x var" @@ -229,7 +229,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:8:102", "value": [ { "string": "im y var" @@ -380,7 +380,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:8:174", "value": [ { "string": "im x var" @@ -412,7 +412,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:8:186", "value": [ { "string": "im y var" @@ -576,7 +576,7 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:8:174", "value": [ { "string": "im x var" @@ -607,7 +607,7 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:8:186", "value": [ { "string": "im y var" @@ -855,7 +855,7 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:8:90", "value": [ { "string": "im x var" @@ -886,7 +886,7 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:8:102", "value": [ { "string": "im y var" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index ad2348046..75089a991 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -197,7 +197,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:8:99", "value": [ { "string": "im replaced x var" @@ -330,7 +330,7 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:8:99", "value": [ { "string": "im replaced x var" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index 8c02a62f5..dbf4881e3 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -136,7 +136,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:9:55", "value": [ { "string": "im a var" @@ -269,7 +269,7 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:9:55", "value": [ { "string": "im a var" diff --git a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json index 10ff44f21..72267b626 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json @@ -88,7 +88,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:4:29-4:5:30", "value": [ { "string": "im a var" From 22bd50a7ef2370b5f53cfc56357b1d3eb9cfe721 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 13:45:58 -0700 Subject: [PATCH 012/138] tests --- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 79993 -> 80096 bytes .../d2ir/TestCompile/classes/basic.exp.json | 15 +- .../TestCompile/classes/inherited.exp.json | 240 ++++++------------ .../TestCompile/classes/layer-modify.exp.json | 48 ++-- .../d2ir/TestCompile/classes/merge.exp.json | 30 +-- .../d2ir/TestCompile/classes/nested.exp.json | 45 ++-- .../d2ir/TestCompile/fields/label.exp.json | 6 +- .../d2ir/TestCompile/fields/nested.exp.json | 9 +- .../TestCompile/imports/nested/map.exp.json | 12 +- .../imports/nested/scalar.exp.json | 3 +- .../d2ir/TestCompile/imports/spread.exp.json | 6 +- .../d2ir/TestCompile/imports/value.exp.json | 12 +- .../d2ir/TestCompile/imports/vars/1.exp.json | 31 +-- .../TestCreate/make_scope_multiline.exp.json | 3 +- .../make_scope_multiline_spacing_1.exp.json | 3 +- .../make_scope_multiline_spacing_2.exp.json | 3 +- .../TestDelete/arrowhead_label.exp.json | 3 +- testdata/d2oracle/TestDelete/chaos_1.exp.json | 9 +- .../children_edge_conflicts.exp.json | 3 +- .../children_edges_flat_conflicts.exp.json | 6 +- .../children_flat_conflicts.exp.json | 3 +- .../children_multiple_conflicts.exp.json | 3 +- ...ldren_nested_referenced_conflicts.exp.json | 6 +- .../children_referenced_conflicts.exp.json | 3 +- .../TestDelete/container_near.exp.json | 6 +- .../delete_container_of_near.exp.json | 6 +- .../d2oracle/TestDelete/delete_icon.exp.json | 3 +- .../TestDelete/edge_decrement.exp.json | 12 +- .../d2oracle/TestDelete/multi_near.exp.json | 6 +- .../only_delete_edge_reserved.exp.json | 3 +- .../only_delete_obj_reserved.exp.json | 3 +- .../d2oracle/TestDelete/save_map.exp.json | 3 +- .../TestDelete/save_map_with_primary.exp.json | 3 +- .../TestDelete/shape_sql_table.exp.json | 6 +- .../d2oracle/TestDelete/table_refs.exp.json | 3 +- .../TestMove/append_multiple_styles.exp.json | 3 +- .../container_conflicts_generated.exp.json | 18 +- .../d2oracle/TestMove/container_near.exp.json | 3 +- testdata/d2oracle/TestMove/duplicate.exp.json | 3 +- .../d2oracle/TestMove/flat_merge.exp.json | 3 +- testdata/d2oracle/TestMove/flat_near.exp.json | 3 +- .../flat_reparent_with_map_value.exp.json | 3 +- ...lat_reparent_with_mixed_map_value.exp.json | 3 +- .../flat_reparent_with_value.exp.json | 3 +- .../d2oracle/TestMove/flat_style.exp.json | 3 +- testdata/d2oracle/TestMove/gnarly_1.exp.json | 6 +- .../include_descendants_near.exp.json | 3 +- ...ude_descendants_nested_reserved_2.exp.json | 3 +- ...ude_descendants_nested_reserved_3.exp.json | 3 +- .../TestMove/include_descendants_sql.exp.json | 6 +- .../into_container_with_flat_keys.exp.json | 6 +- .../d2oracle/TestMove/map_transplant.exp.json | 3 +- .../d2oracle/TestMove/map_with_label.exp.json | 3 +- .../d2oracle/TestMove/merge_reserved.exp.json | 6 +- testdata/d2oracle/TestMove/near.exp.json | 3 +- .../TestMove/nested_reserved_2.exp.json | 3 +- .../TestMove/nested_reserved_3.exp.json | 3 +- .../d2oracle/TestMove/parentheses.exp.json | 6 +- .../d2oracle/TestMove/slice_style.exp.json | 3 +- .../TestMove/underscore_merge.exp.json | 6 +- .../TestReconnectEdge/indexed_ref.exp.json | 3 +- .../preserve_old_obj.exp.json | 3 +- .../TestReconnectEdge/second_index.exp.json | 6 +- .../d2oracle/TestRename/container.exp.json | 9 +- testdata/d2oracle/TestRename/edges.exp.json | 3 +- testdata/d2oracle/TestRename/near.exp.json | 3 +- .../d2oracle/TestSet/classes-style.exp.json | 9 +- .../TestSet/dupe-classes-style.exp.json | 9 +- testdata/d2oracle/TestSet/edge.exp.json | 3 +- testdata/d2oracle/TestSet/edge_chain.exp.json | 6 +- .../TestSet/edge_chain_nested_set.exp.json | 3 +- .../edge_flat_merge_arrowhead.exp.json | 3 +- .../d2oracle/TestSet/edge_index_case.exp.json | 3 +- .../TestSet/edge_index_nested.exp.json | 3 +- .../TestSet/edge_merge_arrowhead.exp.json | 3 +- .../TestSet/edge_nested_label_set.exp.json | 3 +- .../TestSet/edge_replace_arrowhead.exp.json | 3 +- .../edge_replace_arrowhead_indexed.exp.json | 3 +- .../TestSet/edge_set_arrowhead.exp.json | 3 +- testdata/d2oracle/TestSet/icon.exp.json | 3 +- .../d2oracle/TestSet/inline_style.exp.json | 3 +- testdata/d2oracle/TestSet/label.exp.json | 3 +- .../d2oracle/TestSet/label_replace.exp.json | 3 +- .../d2oracle/TestSet/map_key_missing.exp.json | 3 +- .../d2oracle/TestSet/nested_alex.exp.json | 9 +- .../TestSet/replace_arrowhead.exp.json | 3 +- .../TestSet/replace_arrowhead_map.exp.json | 3 +- .../TestSet/replace_fill_pattern.exp.json | 3 +- .../d2oracle/TestSet/replace_link.exp.json | 3 +- .../d2oracle/TestSet/replace_shape.exp.json | 3 +- .../TestSet/replace_style_edgecase.exp.json | 3 +- .../d2oracle/TestSet/replace_tooltip.exp.json | 3 +- .../TestSet/scenarios-arrowhead.exp.json | 9 +- .../scenarios-label-primary-missing.exp.json | 6 +- ...scenarios-nested-usable-ref-style.exp.json | 3 +- .../scenarios-usable-ref-style.exp.json | 3 +- .../TestSet/set_fill_pattern.exp.json | 3 +- .../d2oracle/TestSet/set_tooltip.exp.json | 3 +- testdata/d2oracle/TestSet/shape.exp.json | 3 +- .../unapplied-classes-style-2.exp.json | 6 +- .../TestSet/unapplied-classes-style.exp.json | 6 +- 101 files changed, 288 insertions(+), 544 deletions(-) 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 87b6e616ebd993c5764f71d54757f39e0f941759..c3f44895dd54e116e5a1400d3a6fee089be81b9d 100644 GIT binary patch delta 5771 zcmZu#c{r49-?ofhW9(!bWQ&-^EV7djk;ctAG(hJuDk_Y4FHd_L7e-&o zm)G^~i^3tR4{~NNIBjDR$+9}tWFd*h(nh`%7upIw4?XR$WhR4R&c%Qf~DN-R96n(KegY0 zF&`_cewc8kvNyZ#=IhQw3msD%;`KBK@ZZ(jnK7!wp#z&xdr)G!OeQOe71vfe16zqW z-q=!fEeE2^fM8CeCnaS(Fqs2CbpRO2@!z!|IZYs5N_PzLX$9uGF(_+_gjkmJ_1QG`#U{N#qa&j^QBM$?#|O(|uf6iuXudL*Lj!HE%2mdYFTGDe9u zk6|_BnH!Rco^`Oq??Nxw<)JX>bw)XTdshdqdr$-l4aZidLoJwqoCkaw1KI?gbKfYGfiW0*Sd86dp+3ELuK{qto;B1m1l2Q6N#qxLLuMcDl zLSwg%?fYz2zIRv`bl%6|Zo|X*g8r42S|4X6s?9pds1u)jP%sY#B1Db(ed13wnNhji zX9s}`%TVsxhcDKEzgR)Dz*OOY*o->+6<)5$fprCn=c-h23d1igyuoJTfy0*$l<6pb zYD2@h!{*jQp(aY!o)#yjrBPqE{tBZ$+AZ{%3@}S=R>dD%^scIDmuc{4dGGDU$rxB= z#B`puhEnj_!)YxWKT&#Lpx&8&d)7GNfI^3Qv$QWq zGLOs3e~_f34Iw05R|Evl=LxE8{G?piG!vGUQ5CWjx-P_LmpxQZnk9aoqOH|l4CZc2 zT5q((XwtVHvl0%cQjkPeLbNoW!|`gUIRkC%9Tmh8Rjtw$mPRP#mMCOzkBC{HXh8NP zM^e(arUn2Y+`byQG;Zq6JF38RUTkE3o+6{AM}P3!Es>^2tFJu9Rz15~DTv&JZq?%g z73Rq+!TJr`-y^m+*$Fe6V=*)YR>FnI?Z2dDFUFf#wGK-_3QpMB3Gg)f){P4;?NqJw zt;wx^{hZtauxH%n>^)@EZ!+c=-E| zH`Q&aAHU?x@+M-gYs@AvG`2V5aVM}ht;ng>+9}PWf6a}{eD<-(&!kwW* zH$ZktDVT>>3mWbg&dU@p47rsMrWIl7_1@CTuK1=?$As0&_vevDw6op|Ud;i{n`svT z+p~AWc-W)Wn5RA?xu9y$>T`Ng;JP0{b&a1abSDcN%p2kUhdF1O&_lz+rlzK`re@~m zqhn);6Peq2Ttj@t*r7Ns72VT03J}hYJD8^_%|S*jNX=O{nM1&{pAzr)wCc<9&iSf? z9j7|dArc(1GQMV2H6A@~^mB;VcgY1{B|N=N&cNO5atcbSaxwGkUZ1q+KF?`=>r$W7 zaatw%Kgjm--(0gYb~1iAaRi?FlP8lypkghwu91-O3iHuh!t=pUD?R_svpr?(9h)y` zMoDZ}$P70BVDKO_)U(WQiMWa=IB5VKb$a#0-NuBu(Wbc z*Wrr1Q@8nLqAmlhy{hSXR5q~%3+73?Og4I+mkC0Sc7<+KiP@gbD>AN@Q=pmhkcFZG z(34X+F!Xkew7Ri4Aoudjnabc)+hJHaIc6@ec$sQtsLBClvYxhj>Xu|~56w=8%sbiH z^*(#ag+_`scT`+`4E#NgM%LG6T2nfKl3Mi~S8#|;4zJxAve8C?(=@>&*;w&<+(fWV zcXVy;w$^OjC{9>)_5L&%)zYh;2Y)j+Q+`KS9AXQhf(P(LUd#B^qjGppZIL?>$`|>Zbl-0@D#7OBK z9#L-+*#z8JFj(RCM`}?80mor+@BO(HwQlagWWWMox2 zlFsr)!RgLXK#8w;2$c3j9U_Wu7GU~8fDR3SaBB6AzNN6)ne$G4a`U})i!GZ25*
mit3PXLj5Qlah|N1JW$#+IbfA zjm;-&+`gRy=x4J?mnN1=^fyosMnZno?fbFs51>=FwGh(K$zX13OwTz8T z9kUlm2hVFnO)*idaSq;j?XXo@{y=3YJ`kHT_c0{i?Tbh#g8C+s+9ZE~7s zxM;|~bYC4aQ0``I~m~WF(x25Zot*({blkJ<;TytCj#C&J#qcXrA)iYm;N#KmZ>;Bj+|K5 z48R*tg%%-DN2Lc*)sr4u;=PcgP*2FR=ze}yqf9@PFcVGAq%cOpIu;6+^xc(OoM-p# z>AyN(ovO}X9qzMJamf}BIc=MK7olZ5??Itz^=XJV&_vdAGo*_s`vbHjq9|oQnt#jD z8B#l!oHx{!|GMhH+2XGsBJ}A|i}`DS#pLi6?pr<>j&mH1!Rpo_>R}~}B48yr2e@wp z*|hOciO7uin`+^mKO}YFClxxjvu9@Z4i7x}KRHqCk>4pB;jRW0AS(DRXWN|Z%nX+9 z3gS2YmzENchK;SV@3zAwbB5?MlxAV%mE|k?6dZr71YXwC;AB{)v>G*H)R?Q)ptO@_ z-r^LD!KoLj%i|ad3R)}nvC3&C0aWmD`IRxJ7BbZcQ!tOO?Pwx}BnVe+Mxzp*naxI= zCH@T1$C3veN2-Jb@*#u|R`jj!`H0ydH7Eqxac-l$?cSBoZ{oMNZ3GCs`7^y`F#Sj> z4K<~Mz;1XzBMG`#AEMics z`IF|);=_{_^ZE;lAY4!b6hiGLFy#9juL+%xay+mL-zmEI{Gt>T;L-7gsM zJ%wrT-y6QRSt_H`3epNu#@ZlUjm~?vS1i_YAl&rTCxXtx3!5cI)eB-3&RVBF;@fOO^XpipSZ_bT8P)$Wh;94`Y4v5qvW;_Hkn)3YT2A4 zqlY4H`>T-LJ5(31_B@jV0WObhyNPcxGH>{Oskfo=Z<0wJ_P z2)Vbride+*77R0$G{sfj)lR1j_zkOH_X-e7hZlE+_Md%ojuTYQSK%Ib=kHTd2>R7l zD!6;@=kN{&s&WPU4qWt_mGF}aUw*81+K#XofC@AoqxE!9*QCu-+2kF~zvu%!QNpNR z+_isLxeygcBJJcg2!P2#G@-Pz&qg=Muh{4aHD(jZN|n|=tJ?J!%m^0@bE~2cpyYFc z^E?a*Qe$?d3+Ac4cDIEH3LargiEc9!PL4n*|0GBQPXDo%$7``UNazeVwNt^(xF z^J)AW`Y8xkWnpaWH*`-vImt9r1z%lMBqAw!4Jl(*cxL@e+pLczDXi;=y+F>YKA@6x zx0ymUR{WgjN@;`l>V1`kgfH8wCnNgpEgBJ1J~@^#+8$UiyJV1NV-z>;cqrJCHZr{KM1f`zq(q#fsLLTe1w zOtk}rgXEi;O>u@+bwHCguk>m<-05Uc8a1oe(RTS=M)lFjp+A9+MqN_6)E95_u``h- zUx4+LVk)Vd+b~<+NM78su$ZYoCRfxv?QkddfVZ@__}!yWFk?u3=Fi>Fi@?2m`zJf3 zXz=kund7UTR)#p&vG}ountGS#NhM7-n~J(WwcBr6PX__c<^VU>#h51}-C+ngRk;#} zvCwYdGgejq+$6rZ=-9EhHc5Wa$<*xYHv?R^hgN6tgZBrs1=izukrqml^cs44-D5i$ z15@KykeFPP!t06bvpAPP>*G6grx~@l2gZY9o)=M`t<;W%$zQ&|DRkR+Kb-U#ekWI# z2~91j6-U9v>wz6=qO8@?>8JjS;ZZQZ_}q1{_LjI(=a)cn1s1#2r=@Ny}o#N}E*`E|g9jn_T9*$9J#$%3OvfNBp%!9jDf~U+m}hIl91YetDbAoT0*Q5RFk3g}Dbg zc7)`0-x$C+S8e>&`Ls_(P+^vGOS7PyMb-Xng?_O~pi%tl=)!`TFfEjP6f>!PnjQK3SzTy6%i!&F@FU`x6DfhCAGyw-fAiev7y) zM5r^nh08wD$nfUP0ErWn(2bmE^Ja7;zxCSJ*B>Qv9$6tu2E$pv{Hb`E^`)fr*2iI` z$BVtjla}!tA9mlJyRXXedUbT$fhMdif$lAt9N}6fuNu|09!)1`O$*1GQTp{)p zfQjko-Q>f%Ar;zY}U5e={AYmvpOhMir4Y#$kgJJJtF$y*q6bfet$D!nr zwg@}SU8IdX4vIjgaG)sd#V~L<94Rl4Kua;oU3Ig&WaDKImArHj0Ye~R|2vnGjiOBA zL_=Y}K2TRE z(Fp9n)civX77qWD7@+`%|LGP|L0;j{y=W8?{bwO$572)K#3&#!l$aDrETuN1JO;%m LCZ=V0nel%Bm0?-8 delta 5632 zcmZWtcU)83(xrsnf>fzNnn+6^kc1lPO0!(56bV(T2-4vY1qoe^bO8kgq*ozSg#ao7 zVhO#70wTQ^DKFgb-uK<-%^%76?K3lL&6+v0&(72uXm1r%sRcTR)X-q`^S|Zn;Kdk3 z`Rt0JyC@92bUSxi)|Fc{O+&oyrHh(&wO<~S!E?MP2m&y~10-DrafGd|A|gYLD{byl zb)D?P!n1#Pkv^EPiztG#ANlnvV8G#8MC17=@>ZST}wA-ejT&fZRcNkhK!!MHQRYGP@u`S7@7F??DkfRBc-fs~YB@EWNsYbHRr zkVRzZ#+Rtt;^IqJ>M2FeyG?!eOFjr@A#k%AjImcl^2ZUSEWA09tBgqTKLkXvXK;CM z#9nfY@{jU|(wQ+`HbbdyEB0Gf9Uj_P*HyW8RprbT4lFMgnR>#h)(FTXdzGtq(99GZ zWD;xS3^HXzTZ1vxryRk_9~1b0Yq#3O$x(ot;cL1@7S0Z37B zkCVO9gToAJiV#t-D6YLD_ZES;N`tRiPqX9BnCWEX**!$8w1ihw`nw+eOpzLoW_5@` zYAh@Y3xqyyR+dmDM(^a#<{WP;w27eENFy)0YLY__*rsAaq9BZHxwE%`u%8WN#?fpyg%SlZKdFhOb&0OIarUe>Vl|GG zSNuFQFWSdFg38-TWXwdPW#Fu7Mwf)A@{dL(HRS0+-Yr^2aGml2kCQo}ZSHyx1W;Qr>+aJu<)f z%{@1r-cK$bM|wy5W2Gd_RqcisNs?cl7qRhjVtJpU02OYCcE^SoQ+ym;V(P4XwMd?e zbX=x&vUj<8$@42xhhx)7J6l`hDY!Z8mecrgVYN8 zGVTqFbPb*01a?z_PH=z=CqQFlpo<~)<8_4LX#Rfr)vYQ5fzaBz92QeoSGTm}HJ9ux zZIN%?k|DNzwC*~r8B9sWo0jE>ynu&dJ88~yhP>L4E)cm({?6|o4k4r{n2VTl?58CM$As>^ zQy`2HoC*eL`31_LBhiZ&9&>U9_rJEa3%h54h_%lOpCL^vb(+Q87t&m;S2u!m>HH&X z*uy;T71XAg9Wme1Bl(;p$vS0Yuzhc(R>>pa7#VV~D?N`sv_ZeG^5DG&!bFiQx~XV& zA={EBan{X}AAEw@*&bwy4#P_4i0&Gh3yLda9B#)d|A_DlO?jV!uvxnAHtlm`10EQ;?BHRqI{Q5$Su@=)@ zL9B8%U@fLXaT&3sW20Fg1RpI*WId#yq*1bJR+4)v8eLi#8+*QpY1K_WvnEs11|h)Qrx5|DsW7h}m#6W} zWNDU{`ZYQO3>EPAEU;~EEN@k?k<1fSs;V3b(R+C%uPa*I`WiFkYnpkJS^MmASYsmQ zx~`Xn`f2nm^g8r*bhO?`M<=xClJRylQI%=*#E{HL-neqww(UGr4=NCqm6j3?si;(H zGngw4KU|2Oc4nZ0tqN1YFdJExXnhby-5AYm09f1$jA0kHunP4>1@;-|CfKV1A@(~& zQsYMb23-2FVp{w{Mccl~e$9{Fz7emcDzqo_A>{-;5!V}PLum`fZ4n2cGPb8D1oixE z%*=RdqW!$pRD#yNemdGAkEpO;gJ3nqH>>hWUz$kVZ zCF%8>6t0!WeJX8uEPlg$&S#6s!{bgkS)J|EJg~dv^*|LEh&v{Ck;lXxlY?7Q*=s2k!2bVU# zkRwJOt^2^;J6_C_A_g5zweqi7VC4CRGgc^xGzU#X+Gn-IZ@?Z(h^l*Jy&L)RQ>7<< zD~65k?pr5+c=_?jhSQZceV71iX7|W?UM=ag1vxm(9KZY5h>3^bZ-sPzx>vKd3{;-XXv% zAGdGbJ)*ED*JKv)JTi$l=)6vEG*w)PSec%$jbuulRVt#sb+4^o=U}sEG2YZP0jAkz z*Si0`!7dKEHCUz;FZMBf)vNV#!+A*85qSzJzkNhy&5pZ^%ciG!CVs&>aZ`p+;}c;C z9CybHx7i>2+0zqWxtz2>#uai4_?|tCXp3JT=!w9-=L#RaZ}q}vzYr8s%ylFvS2 z`mcpSW8yS2Hk5^!JQI?RW+o4L3_juPNv4l-I2@#P)!V)EkprWLG#D$siK;;o=?B~D z$phHVPUG4AiU}y{*BOeg6*8-TAoO!igQ^P2h_K9fm4DI=#q2cAOjzWTi0bQsA46)# z^+L*HCa9|vSp2jTy6=z+UMtEtghLBlVmtpKzFf$we;|7zuN!?}kpH)K1%f88^q89? z^YqY^w(26GN#ze&&d_1P>07-d)5Q5U>2?9~PVw@72ZN>K6b+}^w$%JjhA}_?&M_`U zaEx(BQ=`nl(3tR%!^(1g-nk8Aq~;5!g@l|Gp5Qf_ly7oBKtIo@N;wY~T(j~7H_W6y zC%r3pQ5T{td)c2IWZdb0HBfeP@M4;EAc9kj)BZIC`ud5MMKqYsggLt7w5p#_c=H6{ zOY1TlEEkx*GFK6rOZap+KEL`aoM3}(rM)RhPlWKzeFdQ%rq((U+l0Qlkf4`>gXbRj z<)Rn6>SNYC2469p*z~^zy@G%@{>O%c8|NFktNep)>MRHYPMmY1x(;34o#y}5aFZaG z)7w3R@dk6?_J9J1omPa=Q_aYHFz!4&N0A}&^{a337E|Be%sfOQgwqzPz+l`S*($<6 z{X9USF9N>n_Sp3lMKrcsFzr=0PvOIc+aiMtUj=cfg0Foy9sg@IrpF%1Nh=gsUZ~C< z^hakK6UvsW5d9uTr$|qn8aM$v%BQCQj^k{=g?>56gNvtz;z#VC)nF}ks9aRcI15%; z6p@TrUL6i()GNHh6vM|O&qA>Yv$Yk&rP2>;XqmH&f$dWTIR!(qBZn*zsu14=mt{61)O@6WrWgWC^{@xALVw{7UZ&_A~Rh|HU_)A*aKUooa!wWrK-{wyMB6;?j|P{3|Bx*pk#}}N@l+KF|YQ( zOlqJMj7!1(MdDF9YznL9K6N^=7oThDdGwWTUvs3V#{(d-Hp*tcq4+7*X*fMh)S<2D}Q3SNX@P~VFeW&GSivf)1AUeW#* z@J_`d_2P3~7x@MIU!xNe7Q_%sY=Bjz=cmc~DvzUuk2H#QIqd=GPikJ4xJEH0a1!G@ zBvlJ?Px(cS=A+bX^?(CT*$DJ;L|ZmA$s172Rt4L?KrD{$FtiLUk2je{NR(fz_x877 zIVll2j8-aQ@i<|>-55plxSw5p!K0b|E&2j>~76L ze$|?Mb-eo3TS&+gw$Y`VC;dqUqkr0mm87StQUYNrwX+XJd}j~Tg`Ebf)d48jXL9fB zB7tds=H$2|M2F>#x-|ES1B4you8;3*&@N>rgRLctb8@A8FnvW$y|!Mfbh?D}sYf3| z%NB)Z)++LwVmQM@v@R=X{8>BfDOXXX7W~scIM~_1pwio|$WAzT&{nx^`dpuxpnAai zL3I3}b@>(x_(J)Ppq?DGLeYn=m-6+JavAEpSVkGg2=efNQ>Q?)QAut!} z*5{%Jtr{)!lu`FbR?0a!1>|MU%@4{OAY}aC|0pWAZL+p&z{m4=++v-vu&{T#af5+* zm5qPDr)p=?b#7OgU?HIgF~3*5Pu@C;OPWHyTn{>U>zb9Bu*pFWFt1Nm-;f>OUYl1B zx&#$j*OxGNmdRKjTVY{IjMnWeG~vqXb;*|dLwHMC)szpebh?I3ptyAZW$VP$%8IJn zRODK++OvVpCz9@k3xgFr+$oR3E(fe#Nqqa6k6T4d#{bPKefI69hJfD9EyNcyv&qN5 zii-;h-dg2x+5CKo0hefTDwfpz&f+1TSudrUQ#KH>6T z;&$Y)RiAS0tM~iLum6R2bP; zyX9;~0xSJF3b#}Jb@jHnhY3Pq*NyBVu)w11ALP`pO^llPmd7n$6eo6<_8Z~L!_4+> zd$z|{gZg*(LWJMFWnA5Hls35;Z<&BDWj5QQE2ORxv`^*U-C1*{<4x?9H_A@Q3XCdy z6ISihbo*ZF4KJ_orT+MU#eIX9eU;s6)fz{WpVM4wwp6WC5A>#m?I9p6?-VTv1Aw*6 zs7>Kk26fscUmkG@FArbUPL@)=su5r_8hFp#S%`Y4rBqKYI;K(^@Zg}K<^_x(_@^Fc(iFfNFUAAja()QYh2yvEh5Z2;s zY7Dh5)7!QuAN`H&+qJgWKPyRF_*9loaPp|GX@olk1lVoAZqD-f4rJH8z@Lif4#>WX zW{xT<(G+;IC*!5-;^$Yh7^=l5#~@r?NuDi zldSA=(>5na<8b#$VXm^3fp4zSy5iMzvfOP-KBV{aY4XQ4NCJZ%NVcK-5MSo2U4uLR z3dd__Lh-A!i)f;%}WJ1Dp~D!@@LN-i)M$`J#_U?2*xv`{5VXK`g15(a}Ip(rUv zd1D_Z9S47B$XOi~1*n1|^uPDgXp|{axDXKN$p_*MVf^y~fkeVlX%)(p7yt(S?H&}S z3@3B?AA6_*OhM^iYf3QGzt@nzV?h-VsDH&fVfd#n@c*Qsa0Cqbdq6l+>0iJ~ii-aN zRzfJkfA>{FLKS{rQzobP&o$sAPh|z<|FQW88M3y&11l;bk-rm!BjAYNvr|UG5x?6Z fP%!1+l}4Zx5R~w=WF)0Nqas3qQCwWtRFCmLH&`6r diff --git a/testdata/d2ir/TestCompile/classes/basic.exp.json b/testdata/d2ir/TestCompile/classes/basic.exp.json index eed20a6c8..b53c72817 100644 --- a/testdata/d2ir/TestCompile/classes/basic.exp.json +++ b/testdata/d2ir/TestCompile/classes/basic.exp.json @@ -75,8 +75,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -156,8 +155,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -245,8 +243,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -347,8 +344,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -478,8 +474,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } diff --git a/testdata/d2ir/TestCompile/classes/inherited.exp.json b/testdata/d2ir/TestCompile/classes/inherited.exp.json index f88697361..48f9fe144 100644 --- a/testdata/d2ir/TestCompile/classes/inherited.exp.json +++ b/testdata/d2ir/TestCompile/classes/inherited.exp.json @@ -19,8 +19,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -100,8 +99,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -189,8 +187,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -291,8 +288,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -422,8 +418,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -470,8 +465,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -551,8 +545,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -640,8 +633,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -742,8 +734,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -873,8 +864,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -921,8 +911,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1002,8 +991,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1091,8 +1079,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1193,8 +1180,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1224,8 +1210,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1305,8 +1290,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1394,8 +1378,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1496,8 +1479,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1627,8 +1609,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1757,8 +1738,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1973,8 +1953,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2045,8 +2024,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2126,8 +2104,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2215,8 +2192,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2317,8 +2293,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2348,8 +2323,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2429,8 +2403,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2518,8 +2491,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2620,8 +2592,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2751,8 +2722,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2881,8 +2851,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -3123,8 +3092,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -3204,8 +3172,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -3293,8 +3260,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -3395,8 +3361,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -3426,8 +3391,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -3507,8 +3471,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -3590,8 +3553,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -3679,8 +3641,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -3762,8 +3723,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -3864,8 +3824,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -3965,8 +3924,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -4096,8 +4054,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -4226,8 +4183,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -4356,8 +4312,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -4679,8 +4634,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -4751,8 +4705,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -4832,8 +4785,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -4921,8 +4873,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -5023,8 +4974,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -5054,8 +5004,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -5135,8 +5084,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -5218,8 +5166,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -5307,8 +5254,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -5390,8 +5336,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -5492,8 +5437,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -5593,8 +5537,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -5724,8 +5667,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -5854,8 +5796,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -5984,8 +5925,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -6302,8 +6242,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -6383,8 +6322,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -6472,8 +6410,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -6574,8 +6511,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -6605,8 +6541,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -6686,8 +6621,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -6769,8 +6703,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -6858,8 +6791,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -6941,8 +6873,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -7043,8 +6974,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -7144,8 +7074,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -7275,8 +7204,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -7405,8 +7333,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -7535,8 +7462,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -8087,8 +8013,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -8293,8 +8218,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -8667,8 +8591,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -8873,8 +8796,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -9276,8 +9198,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -9482,8 +9403,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } diff --git a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json index 087bc4de2..07e31f3f8 100644 --- a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json +++ b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json @@ -19,8 +19,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -100,8 +99,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -189,8 +187,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -291,8 +288,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -422,8 +418,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -470,8 +465,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -551,8 +545,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -569,8 +562,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -694,8 +686,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -783,8 +774,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -910,8 +900,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1012,8 +1001,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -1144,8 +1132,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1270,8 +1257,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -1404,8 +1390,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1557,8 +1542,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2ir/TestCompile/classes/merge.exp.json b/testdata/d2ir/TestCompile/classes/merge.exp.json index 1ad04233f..fc776823c 100644 --- a/testdata/d2ir/TestCompile/classes/merge.exp.json +++ b/testdata/d2ir/TestCompile/classes/merge.exp.json @@ -19,8 +19,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -100,8 +99,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -189,8 +187,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -360,8 +357,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -520,8 +516,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -597,8 +592,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -678,8 +672,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -767,8 +760,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -995,8 +987,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1241,8 +1232,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } diff --git a/testdata/d2ir/TestCompile/classes/nested.exp.json b/testdata/d2ir/TestCompile/classes/nested.exp.json index 9fec0c647..40fcad16d 100644 --- a/testdata/d2ir/TestCompile/classes/nested.exp.json +++ b/testdata/d2ir/TestCompile/classes/nested.exp.json @@ -19,8 +19,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -100,8 +99,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -189,8 +187,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -291,8 +288,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -422,8 +418,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -534,8 +529,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -615,8 +609,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -704,8 +697,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -806,8 +798,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -937,8 +928,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1178,8 +1168,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1259,8 +1248,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1348,8 +1336,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1450,8 +1437,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1581,8 +1567,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } diff --git a/testdata/d2ir/TestCompile/fields/label.exp.json b/testdata/d2ir/TestCompile/fields/label.exp.json index 278d70857..be26669b0 100644 --- a/testdata/d2ir/TestCompile/fields/label.exp.json +++ b/testdata/d2ir/TestCompile/fields/label.exp.json @@ -7,8 +7,7 @@ "range": "TestCompile/fields/label.d2,0:3:3-0:6:6", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } @@ -66,8 +65,7 @@ "range": "TestCompile/fields/label.d2,0:3:3-0:6:6", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } diff --git a/testdata/d2ir/TestCompile/fields/nested.exp.json b/testdata/d2ir/TestCompile/fields/nested.exp.json index 042d9865f..48b7c3ec1 100644 --- a/testdata/d2ir/TestCompile/fields/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/nested.exp.json @@ -11,8 +11,7 @@ "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } @@ -92,8 +91,7 @@ "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } @@ -181,8 +179,7 @@ "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/map.exp.json b/testdata/d2ir/TestCompile/imports/nested/map.exp.json index b1dedaa35..e6f547dbd 100644 --- a/testdata/d2ir/TestCompile/imports/nested/map.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/map.exp.json @@ -11,8 +11,7 @@ "range": "x.d2,1:8:13-1:14:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -70,8 +69,7 @@ "range": "x.d2,1:8:13-1:14:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -88,8 +86,7 @@ "range": "x.d2,2:8:28-2:12:32", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } @@ -147,8 +144,7 @@ "range": "x.d2,2:8:28-2:12:32", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json index ed273c2c0..750095b9a 100644 --- a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json @@ -7,8 +7,7 @@ "range": "x.d2,0:3:3-0:7:7", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } diff --git a/testdata/d2ir/TestCompile/imports/spread.exp.json b/testdata/d2ir/TestCompile/imports/spread.exp.json index cc2a0a3e5..b43e59e20 100644 --- a/testdata/d2ir/TestCompile/imports/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/spread.exp.json @@ -7,8 +7,7 @@ "range": "x.d2,0:3:3-0:7:7", "value": [ { - "string": "wowa", - "raw_string": "wowa" + "string": "wowa" } ] } @@ -66,8 +65,7 @@ "range": "x.d2,0:3:3-0:7:7", "value": [ { - "string": "wowa", - "raw_string": "wowa" + "string": "wowa" } ] } diff --git a/testdata/d2ir/TestCompile/imports/value.exp.json b/testdata/d2ir/TestCompile/imports/value.exp.json index 8e5c0f021..7828f5ba2 100644 --- a/testdata/d2ir/TestCompile/imports/value.exp.json +++ b/testdata/d2ir/TestCompile/imports/value.exp.json @@ -11,8 +11,7 @@ "range": "x.d2,0:7:7-0:13:13", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -70,8 +69,7 @@ "range": "x.d2,0:7:7-0:13:13", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -88,8 +86,7 @@ "range": "x.d2,1:7:21-1:11:25", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } @@ -147,8 +144,7 @@ "range": "x.d2,1:7:21-1:11:25", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json index de94a458d..7da5d84d7 100644 --- a/testdata/d2ir/TestCompile/imports/vars/1.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json @@ -11,8 +11,7 @@ "range": "x.d2,0:6:6-0:18:18", "value": [ { - "string": "var replaced", - "raw_string": "var replaced" + "string": "var replaced" } ] } @@ -70,8 +69,7 @@ "range": "x.d2,0:6:6-0:18:18", "value": [ { - "string": "var replaced", - "raw_string": "var replaced" + "string": "var replaced" } ] } @@ -131,8 +129,7 @@ "range": "x.d2,0:6:6-0:18:18", "value": [ { - "string": "var replaced", - "raw_string": "var replaced" + "string": "var replaced" } ] } @@ -306,11 +303,10 @@ "name": "q", "primary": { "value": { - "range": "x.d2,0:6:6-0:18:18", + "range": "index.d2,0:20:20-0:21:21", "value": [ { - "string": "var replaced", - "raw_string": "var replaced" + "string": "var replaced" } ] } @@ -364,20 +360,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "index.d2,0:20:20-0:27:27", - "spread": false, - "path": [ + "unquoted_string": { + "range": "index.d2,0:20:20-0:21:21", + "value": [ { - "unquoted_string": { - "range": "index.d2,0:22:22-0:26:26", - "value": [ - { - "string": "meow", - "raw_string": "meow" - } - ] - } + "string": "var replaced" } ] } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index 3b2eb0b98..379eb30af 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,1:9:17-1:15:23", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index c5e68d3cb..021d825c5 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,2:9:24-2:15:30", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index b5616c220..4457a46e7 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,3:9:25-3:15:31", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index 0ca9c574f..408321427 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,1:26:36-1:33:43", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index dc0352817..7cdb43a60 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:12:12-0:20:20", "value": [ { - "string": "cylinder", - "raw_string": "cylinder" + "string": "cylinder" } ] } @@ -150,8 +149,7 @@ "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:36:58-1:51:73", "value": [ { - "string": "cf-one-required", - "raw_string": "cf-one-required" + "string": "cf-one-required" } ] } @@ -188,8 +186,7 @@ "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,2:4:79-2:5:80", "value": [ { - "string": "z", - "raw_string": "z" + "string": "z" } ] } diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 7759732a2..f995a64cc 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -99,8 +99,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,4:5:18-4:9:22", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index a11ffdd2c..ee7d331d5 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -159,8 +159,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,4:5:26-4:9:30", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } @@ -192,8 +191,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,5:5:36-5:9:40", "value": [ { - "string": "ey", - "raw_string": "ey" + "string": "ey" } ] } diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index fe212f64a..4b7ffd6ad 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -76,8 +76,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_flat_conflicts.d2,3:5:12-3:9:16", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index c1cf6e922..e6a9fe976 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -168,8 +168,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,7:5:30-7:9:34", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 489e99551..b4bef5253 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -87,8 +87,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.d2,4:5:15-4:9:19", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } @@ -131,8 +130,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.d2,5:7:27-5:12:32", "value": [ { - "string": "hey", - "raw_string": "hey" + "string": "hey" } ] } diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index 25088c478..e61acceb2 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -76,8 +76,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_referenced_conflicts.d2,4:5:13-4:9:17", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 5044d5f4b..f9a7d69e9 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,1:8:13-1:9:14", "value": [ { - "string": "z", - "raw_string": "z" + "string": "z" } ] } @@ -139,8 +138,7 @@ "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,5:8:32-5:9:33", "value": [ { - "string": "z", - "raw_string": "z" + "string": "z" } ] } diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json index 4c52363d8..5555f957e 100644 --- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,0:11:11-0:15:15", "value": [ { - "string": "down", - "raw_string": "down" + "string": "down" } ] } @@ -452,8 +451,7 @@ "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,9:19:236-9:37:254", "value": [ { - "string": "collision detected", - "raw_string": "collision detected" + "string": "collision detected" } ] } diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 09b4bbab9..2c04083ce 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -65,8 +65,7 @@ "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:8:15-1:26:33", "value": [ { - "string": "https://google.com", - "raw_string": "https://google.com" + "string": "https://google.com" } ] } diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 13a576bb8..d9910b9db 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -242,8 +242,7 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:13:42-5:17:46", "value": [ { - "string": "zero", - "raw_string": "zero" + "string": "zero" } ] } @@ -303,8 +302,7 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:13:60-6:16:63", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -364,8 +362,7 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:13:78-8:18:83", "value": [ { - "string": "three", - "raw_string": "three" + "string": "three" } ] } @@ -425,8 +422,7 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:13:97-9:17:101", "value": [ { - "string": "four", - "raw_string": "four" + "string": "four" } ] } diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index f6c3e68b1..78ba7c9a8 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,2:8:24-2:11:27", "value": [ { - "string": "API", - "raw_string": "API" + "string": "API" } ] } @@ -139,8 +138,7 @@ "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,5:8:44-5:12:48", "value": [ { - "string": "Blah", - "raw_string": "Blah" + "string": "Blah" } ] } diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index b93c9f0c6..224894d55 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -65,8 +65,7 @@ "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:18:18-0:27:27", "value": [ { - "string": "#000e3d", - "raw_string": "#000e3d" + "string": "#000e3d" } ] } diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 35f4eac8b..6a06bf2ad 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -134,8 +134,7 @@ "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:23:27-2:32:36", "value": [ { - "string": "#2b50c2", - "raw_string": "#2b50c2" + "string": "#2b50c2" } ] } diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json index f9a437bd2..6050b7dec 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:9:14-1:15:20", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json index 9135e9999..7a09a0b95 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -64,8 +64,7 @@ "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,1:9:20-1:15:26", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 279fee006..48896ea4c 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,2:11:31-2:20:40", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -145,8 +144,7 @@ "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,3:25:66-3:36:77", "value": [ { - "string": "primary_key", - "raw_string": "primary_key" + "string": "primary_key" } ] } diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json index 8dddf30b2..903675ede 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestDelete/table_refs.d2,1:9:14-1:18:23", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index f35e81c9d..84fb3f5cc 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -189,8 +189,7 @@ "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,8:12:86-8:17:91", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json index 2bb20536a..53bcaad10 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -28,7 +28,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,0:10:10-0:12:12", - "value": null + "value": [ + { + "string": "" + } + ] } } } @@ -56,7 +60,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,2:8:22-2:10:24", - "value": null + "value": [ + { + "string": "" + } + ] } } } @@ -108,7 +116,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,4:12:49-4:14:51", - "value": null + "value": [ + { + "string": "" + } + ] } } } diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 95d0a5982..a48adc76c 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2oracle/TestMove/container_near.d2,2:10:22-2:15:27", "value": [ { - "string": "x.a.z", - "raw_string": "x.a.z" + "string": "x.a.z" } ] } diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json index 322268428..099aaf357 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -100,8 +100,7 @@ "range": "d2/testdata/d2oracle/TestMove/duplicate.d2,4:9:19-4:17:27", "value": [ { - "string": "cylinder", - "raw_string": "cylinder" + "string": "cylinder" } ] } diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 735394e90..21adc5115 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,2:5:12-2:9:16", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } diff --git a/testdata/d2oracle/TestMove/flat_near.exp.json b/testdata/d2oracle/TestMove/flat_near.exp.json index 88af9eb39..bcefc6a77 100644 --- a/testdata/d2oracle/TestMove/flat_near.exp.json +++ b/testdata/d2oracle/TestMove/flat_near.exp.json @@ -41,8 +41,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_near.d2,0:8:8-0:11:11", "value": [ { - "string": "a.y", - "raw_string": "a.y" + "string": "a.y" } ] } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index 28401eb18..0521ffd8b 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,2:9:16-2:16:23", "value": [ { - "string": "hexagon", - "raw_string": "hexagon" + "string": "hexagon" } ] } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index 5ca987152..12ba9058d 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 @@ -118,8 +118,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,6:9:62-6:16:69", "value": [ { - "string": "hexagon", - "raw_string": "hexagon" + "string": "hexagon" } ] } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index 936069718..369217c57 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -53,8 +53,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_value.d2,1:3:5-1:7:9", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index ac3ee7326..0fc9d191c 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -127,8 +127,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,2:16:44-2:21:49", "value": [ { - "string": "black", - "raw_string": "black" + "string": "black" } ] } diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index d4fdf0016..20eecde9f 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -144,8 +144,7 @@ "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,2:5:25-2:9:29", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } @@ -182,8 +181,7 @@ "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,4:3:35-4:8:40", "value": [ { - "string": "eyy", - "raw_string": "eyy" + "string": "eyy" } ] } diff --git a/testdata/d2oracle/TestMove/include_descendants_near.exp.json b/testdata/d2oracle/TestMove/include_descendants_near.exp.json index fe66e976f..d98ded6e2 100644 --- a/testdata/d2oracle/TestMove/include_descendants_near.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_near.exp.json @@ -104,8 +104,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_near.d2,3:8:21-3:13:26", "value": [ { - "string": "z.x.y", - "raw_string": "z.x.y" + "string": "z.x.y" } ] } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json index 16780889e..561c3dc9c 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json @@ -75,8 +75,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.d2,1:9:13-1:15:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json index 354853776..553161a8f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json @@ -75,8 +75,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.d2,1:11:13-1:17:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json index 990495062..61a5f3bc9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,2:11:23-2:20:32", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -111,8 +110,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,3:7:40-3:8:41", "value": [ { - "string": "b", - "raw_string": "b" + "string": "b" } ] } diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 409433d81..0c07d2608 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -129,8 +129,7 @@ "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,3:16:51-3:25:60", "value": [ { - "string": "#FFFFFF", - "raw_string": "#FFFFFF" + "string": "#FFFFFF" } ] } @@ -173,8 +172,7 @@ "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,4:18:79-4:27:88", "value": [ { - "string": "#FFFFFF", - "raw_string": "#FFFFFF" + "string": "#FFFFFF" } ] } diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index e5eb38532..d9bdd3d73 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -182,8 +182,7 @@ "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,10:11:68-10:15:72", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index fd11c8959..5c5b35676 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,3:5:13-3:9:17", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 26d98f1c7..037f7fab4 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -99,8 +99,7 @@ "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,2:11:22-2:15:26", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } @@ -143,8 +142,7 @@ "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,3:11:38-3:15:42", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index bb04cafce..6d222608e 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16", "value": [ { - "string": "a.y", - "raw_string": "a.y" + "string": "a.y" } ] } diff --git a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json index 178643bd1..df689ac77 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json @@ -75,8 +75,7 @@ "range": "d2/testdata/d2oracle/TestMove/nested_reserved_2.d2,1:9:13-1:15:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json index 6e727d799..f5e278e7e 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json @@ -134,8 +134,7 @@ "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,3:13:31-3:19:37", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 8550114db..a1359a9fa 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -85,7 +85,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,1:3:16-1:5:18", - "value": null + "value": [ + { + "string": "" + } + ] } } } diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index ab093f083..0e5d76161 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -110,8 +110,7 @@ "range": "d2/testdata/d2oracle/TestMove/slice_style.d2,3:8:14-3:63:69", "value": [ { - "string": "https://icons.terrastruct.com/essentials/142-target.svg", - "raw_string": "https://icons.terrastruct.com/essentials/142-target.svg" + "string": "https://icons.terrastruct.com/essentials/142-target.svg" } ] } diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 914e4dc1b..3094f38ca 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,3:5:13-3:9:17", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } @@ -110,8 +109,7 @@ "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,4:5:23-4:11:29", "value": [ { - "string": "what", - "raw_string": "what" + "string": "what" } ] } diff --git a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json index 02ecdaa4f..cef57ffe1 100644 --- a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json @@ -177,8 +177,7 @@ "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:26:37-3:29:40", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json index aef393151..743197677 100644 --- a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json @@ -154,8 +154,7 @@ "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:26:35-2:29:38", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json index 5f52b761f..0d0d769c3 100644 --- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,1:16:26-1:20:30", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -184,8 +183,7 @@ "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,4:16:59-4:19:62", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 1d4593223..b467fb1be 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -437,8 +437,7 @@ "range": "d2/testdata/d2oracle/TestRename/container.d2,3:5:108-3:10:113", "value": [ { - "string": "label", - "raw_string": "label" + "string": "label" } ] } @@ -617,8 +616,7 @@ "range": "d2/testdata/d2oracle/TestRename/container.d2,10:30:181-10:45:196", "value": [ { - "string": "furbling, v.:", - "raw_string": "furbling, v.:" + "string": "furbling, v.:" } ] } @@ -722,8 +720,7 @@ "range": "d2/testdata/d2oracle/TestRename/container.d2,11:22:219-11:37:234", "value": [ { - "string": "furbling, v.:", - "raw_string": "furbling, v.:" + "string": "furbling, v.:" } ] } diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 6e5ab0650..21f125199 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -382,8 +382,7 @@ "range": "d2/testdata/d2oracle/TestRename/edges.d2,3:7:66-3:12:71", "value": [ { - "string": "label", - "raw_string": "label" + "string": "label" } ] } diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 7c7ddf563..e1cf9bfb6 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestRename/near.d2,1:8:13-1:9:14", "value": [ { - "string": "z", - "raw_string": "z" + "string": "z" } ] } diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json index a99073d1f..a7a808ade 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -89,8 +89,7 @@ "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,2:16:34-2:19:37", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -143,8 +142,7 @@ "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,5:9:53-5:10:54", "value": [ { - "string": "a", - "raw_string": "a" + "string": "a" } ] } @@ -198,8 +196,7 @@ "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,6:14:69-6:19:74", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json index 9c74249a8..ec26cc69e 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -89,8 +89,7 @@ "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,2:16:34-2:19:37", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -143,8 +142,7 @@ "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,5:9:53-5:10:54", "value": [ { - "string": "a", - "raw_string": "a" + "string": "a" } ] } @@ -198,8 +196,7 @@ "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,6:14:69-6:19:74", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index f9568af91..1da9d1df9 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -53,8 +53,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:8:8-0:11:11", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index e36df946d..88c2c9847 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -114,8 +114,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:15:23-1:19:27", "value": [ { - "string": "wsup", - "raw_string": "wsup" + "string": "wsup" } ] } @@ -175,8 +174,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:15:43-2:62:90", "value": [ { - "string": "QOTD:\n \"It's been Monday all week today.\"", - "raw_string": "QOTD:\\n \\\"It's been Monday all week today.\\\"" + "string": "QOTD:\n \"It's been Monday all week today.\"" } ] } diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 3bd0f42a8..f39d6e68e 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -114,8 +114,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:15:23-1:19:27", "value": [ { - "string": "wsup", - "raw_string": "wsup" + "string": "wsup" } ] } diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json index fe8208050..d6b04d13d 100644 --- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json @@ -168,8 +168,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:36:48-1:42:54", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index d1eb8f9c3..8ae066c10 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:22:32-1:25:35", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 1abf22a57..a18a8da4d 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:10:18-1:14:22", "value": [ { - "string": "QOTD", - "raw_string": "QOTD" + "string": "QOTD" } ] } diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index e647ebf85..f7ffe8821 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -130,8 +130,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,3:11:56-3:18:63", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 64f975592..53237d909 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:10:18-1:12:20", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index 88538296c..c9064aac6 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:33:33-0:40:40", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json index 7b3b4168a..a852056d4 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json @@ -131,8 +131,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:36:43-1:43:50", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index 4a3477968..f34c30d72 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:33:33-0:40:40", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index ab79c0a72..08156af78 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:13:13-0:66:66", "value": [ { - "string": "https://icons.terrastruct.com/essentials/087-menu.svg", - "raw_string": "https://icons.terrastruct.com/essentials/087-menu.svg" + "string": "https://icons.terrastruct.com/essentials/087-menu.svg" } ] } diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 032b0654e..f66fd2cda 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -105,8 +105,7 @@ "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,2:14:45-2:17:48", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index b091d0d7e..601a69cfe 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2oracle/TestSet/label.d2,0:8:8-0:87:87", "value": [ { - "string": "Always try to do things in chronological order; it's less confusing that way.", - "raw_string": "Always try to do things in chronological order; it's less confusing that way." + "string": "Always try to do things in chronological order; it's less confusing that way." } ] } diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 976aa222f..57815ab6f 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2oracle/TestSet/label_replace.d2,0:8:8-0:87:87", "value": [ { - "string": "Always try to do things in chronological order; it's less confusing that way.", - "raw_string": "Always try to do things in chronological order; it's less confusing that way." + "string": "Always try to do things in chronological order; it's less confusing that way." } ] } diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index e26a74490..3fa422118 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -76,8 +76,7 @@ "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:11:11-0:82:82", "value": [ { - "string": "Never offend people with style when you can offend them with substance.", - "raw_string": "Never offend people with style when you can offend them with substance." + "string": "Never offend people with style when you can offend them with substance." } ] } diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index 97bb445e0..46c65b1e3 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,1:9:17-1:11:19", "value": [ { - "string": "do", - "raw_string": "do" + "string": "do" } ] } @@ -110,8 +109,7 @@ "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:16:36-2:20:40", "value": [ { - "string": "asdf", - "raw_string": "asdf" + "string": "asdf" } ] } @@ -143,8 +141,7 @@ "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,3:8:49-3:158:199", "value": [ { - "string": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing", - "raw_string": "How much of their influence on you is a result of your influence on them?\\nA conference is a gathering of important people who singly can do nothing" + "string": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing" } ] } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index 9870e4e34..ae74ac3ba 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,1:26:36-1:32:42", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 2c26e580a..5b4e8547a 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -101,8 +101,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,2:11:43-2:17:49", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json index e85fb417b..ed61d736f 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -65,8 +65,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_fill_pattern.d2,1:22:32-1:27:37", "value": [ { - "string": "grain", - "raw_string": "grain" + "string": "grain" } ] } diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json index e6ac31625..b8e5e01e0 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,1:8:18-1:25:35", "value": [ { - "string": "https://apple.com", - "raw_string": "https://apple.com" + "string": "https://apple.com" } ] } diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 9fa391b04..7d3024894 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -41,8 +41,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_shape.d2,0:14:14-0:20:20", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 197c9461b..66bbecebf 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -52,8 +52,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_style_edgecase.d2,0:19:19-0:25:25", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json index c1490dc89..18a8a85a6 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,1:11:21-1:12:22", "value": [ { - "string": "y", - "raw_string": "y" + "string": "y" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json index 168961d59..e25834dfd 100644 --- a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,1:26:36-1:34:44", "value": [ { - "string": "triangle", - "raw_string": "triangle" + "string": "triangle" } ] } @@ -283,8 +282,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,8:30:124-8:37:131", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } @@ -869,8 +867,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,8:30:124-8:37:131", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json index 9dd6fd8f1..e6e289764 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json @@ -170,8 +170,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:7:62-7:8:63", "value": [ { - "string": "b", - "raw_string": "b" + "string": "b" } ] } @@ -295,8 +294,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:7:62-7:8:63", "value": [ { - "string": "b", - "raw_string": "b" + "string": "b" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json index 10d0c34ab..b7d308ac2 100644 --- a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,1:5:10-1:10:15", "value": [ { - "string": "outer", - "raw_string": "outer" + "string": "outer" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json index 446504d3b..d51f5db66 100644 --- a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,0:3:3-0:8:8", "value": [ { - "string": "outer", - "raw_string": "outer" + "string": "outer" } ] } diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json index 476a81bc1..5552199b8 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -65,8 +65,7 @@ "range": "d2/testdata/d2oracle/TestSet/set_fill_pattern.d2,0:29:29-0:34:34", "value": [ { - "string": "grain", - "raw_string": "grain" + "string": "grain" } ] } diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json index a832f994d..e08e95d17 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:18:18-0:19:19", "value": [ { - "string": "y", - "raw_string": "y" + "string": "y" } ] } diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index bd4bedb40..fc4a57469 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:16:16-0:22:22", "value": [ { - "string": "square", - "raw_string": "square" + "string": "square" } ] } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json index fce9058ea..ef7596fba 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -89,8 +89,7 @@ "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,2:16:34-2:19:37", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -167,8 +166,7 @@ "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,5:16:60-5:21:65", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json index b7ac7a166..971db84a9 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -89,8 +89,7 @@ "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,2:16:34-2:19:37", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -154,8 +153,7 @@ "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,5:14:58-5:19:63", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } From 78e9e4565e93ceb8aa75398fe4a70fec3f76c535 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 13:52:29 -0700 Subject: [PATCH 013/138] only coalesce if subbed --- d2ir/compile.go | 11 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 80096 -> 80096 bytes .../TestCompile/array-classes.exp.json | 15 +- .../TestCompile/basic_icon.exp.json | 3 +- .../TestCompile/basic_sequence.exp.json | 3 +- .../TestCompile/basic_shape.exp.json | 3 +- .../TestCompile/class-shape-class.exp.json | 9 +- .../TestCompile/class_paren.exp.json | 9 +- .../TestCompile/class_style.exp.json | 6 +- .../d2compiler/TestCompile/classes.exp.json | 33 ++- .../dimensions_on_containers.exp.json | 24 +- .../dimensions_on_nonimage.exp.json | 3 +- .../edge_arrowhead_fields.exp.json | 6 +- .../edge_arrowhead_primary.exp.json | 3 +- .../TestCompile/edge_chain.exp.json | 3 +- .../TestCompile/edge_chain_map.exp.json | 3 +- .../TestCompile/edge_column_index.exp.json | 18 +- .../TestCompile/edge_flat_arrowhead.exp.json | 3 +- .../edge_flat_label_arrowhead.exp.json | 3 +- .../TestCompile/edge_index.exp.json | 6 +- .../TestCompile/edge_index_map.exp.json | 3 +- .../TestCompile/edge_index_nested.exp.json | 6 +- .../edge_index_nested_cross_scope.exp.json | 6 +- .../d2compiler/TestCompile/edge_map.exp.json | 3 +- .../TestCompile/edge_map_arrowhead.exp.json | 3 +- .../TestCompile/edge_mixed_arrowhead.exp.json | 6 +- .../edge_non_shape_arrowhead.exp.json | 3 +- .../edge_semiflat_arrowhead.exp.json | 3 +- .../TestCompile/fill-pattern.exp.json | 3 +- .../icon-near-composite-together.exp.json | 3 +- .../TestCompile/image_style.exp.json | 9 +- .../label-near-composite-separate.exp.json | 6 +- .../label-near-composite-together.exp.json | 3 +- .../TestCompile/label-near-parent.exp.json | 3 +- .../TestCompile/link-board-mixed.exp.json | 18 +- .../TestCompile/missing-class.exp.json | 3 +- .../TestCompile/near_constant.exp.json | 3 +- .../TestCompile/nested-array-classes.exp.json | 3 +- .../TestCompile/nested_sql.exp.json | 9 +- .../d2compiler/TestCompile/path_link.exp.json | 3 +- .../TestCompile/reordered-classes.exp.json | 9 +- .../reserved_icon_near_style.exp.json | 12 +- .../TestCompile/root_direction.exp.json | 3 +- .../TestCompile/root_sequence.exp.json | 3 +- .../TestCompile/sequence-timestamp.exp.json | 3 +- .../TestCompile/sequence_container.exp.json | 3 +- .../TestCompile/sequence_container_2.exp.json | 3 +- .../sequence_grouped_note.exp.json | 3 +- .../TestCompile/sequence_scoping.exp.json | 3 +- .../TestCompile/set_direction.exp.json | 3 +- .../single_dimension_on_circle.exp.json | 3 +- .../TestCompile/sql-constraints.exp.json | 6 +- .../TestCompile/sql-regression.exp.json | 6 +- .../d2compiler/TestCompile/sql_paren.exp.json | 9 +- .../table_connection_attr.exp.json | 6 +- .../TestCompile/table_style.exp.json | 6 +- .../TestCompile/table_style_map.exp.json | 9 +- .../TestCompile/text-transform.exp.json | 12 +- .../underscore_edge_existing.exp.json | 6 +- .../underscore_edge_index.exp.json | 6 +- .../underscore_parent_preference_1.exp.json | 6 +- .../underscore_parent_preference_2.exp.json | 6 +- .../d2compiler/TestCompile/url_link.exp.json | 3 +- ..._and_not_url_tooltip_concurrently.exp.json | 6 +- .../url_link_non_url_tooltip_ok.exp.json | 6 +- .../TestCompile/url_tooltip.exp.json | 3 +- .../TestCompile/wrong_column_index.exp.json | 33 ++- .../TestCompile2/boards/isFolderOnly.exp.json | 9 +- .../TestCompile2/vars/basic/combined.exp.json | 3 +- .../vars/basic/double-quoted.exp.json | 3 +- .../vars/basic/edge_label.exp.json | 3 +- .../TestCompile2/vars/basic/label.exp.json | 3 +- .../TestCompile2/vars/basic/nested.exp.json | 3 +- .../vars/basic/single-quoted.exp.json | 3 +- .../TestCompile2/vars/basic/style.exp.json | 3 +- .../TestCompile2/vars/boards/layer.exp.json | 6 +- .../TestCompile2/vars/boards/overlay.exp.json | 21 +- .../TestCompile2/vars/boards/replace.exp.json | 9 +- .../vars/boards/scenario.exp.json | 6 +- .../TestCompile2/vars/override/label.exp.json | 6 +- .../d2ir/TestCompile/classes/basic.exp.json | 15 +- .../TestCompile/classes/inherited.exp.json | 240 ++++++++++++------ .../TestCompile/classes/layer-modify.exp.json | 48 ++-- .../d2ir/TestCompile/classes/merge.exp.json | 30 ++- .../d2ir/TestCompile/classes/nested.exp.json | 45 ++-- .../d2ir/TestCompile/fields/label.exp.json | 6 +- .../d2ir/TestCompile/fields/nested.exp.json | 9 +- .../TestCompile/imports/nested/map.exp.json | 12 +- .../imports/nested/scalar.exp.json | 3 +- .../d2ir/TestCompile/imports/spread.exp.json | 6 +- .../d2ir/TestCompile/imports/value.exp.json | 12 +- .../d2ir/TestCompile/imports/vars/1.exp.json | 9 +- .../TestCreate/make_scope_multiline.exp.json | 3 +- .../make_scope_multiline_spacing_1.exp.json | 3 +- .../make_scope_multiline_spacing_2.exp.json | 3 +- .../TestDelete/arrowhead_label.exp.json | 3 +- testdata/d2oracle/TestDelete/chaos_1.exp.json | 9 +- .../children_edge_conflicts.exp.json | 3 +- .../children_edges_flat_conflicts.exp.json | 6 +- .../children_flat_conflicts.exp.json | 3 +- .../children_multiple_conflicts.exp.json | 3 +- ...ldren_nested_referenced_conflicts.exp.json | 6 +- .../children_referenced_conflicts.exp.json | 3 +- .../TestDelete/container_near.exp.json | 6 +- .../delete_container_of_near.exp.json | 6 +- .../d2oracle/TestDelete/delete_icon.exp.json | 3 +- .../TestDelete/edge_decrement.exp.json | 12 +- .../d2oracle/TestDelete/multi_near.exp.json | 6 +- .../only_delete_edge_reserved.exp.json | 3 +- .../only_delete_obj_reserved.exp.json | 3 +- .../d2oracle/TestDelete/save_map.exp.json | 3 +- .../TestDelete/save_map_with_primary.exp.json | 3 +- .../TestDelete/shape_sql_table.exp.json | 6 +- .../d2oracle/TestDelete/table_refs.exp.json | 3 +- .../TestMove/append_multiple_styles.exp.json | 3 +- .../container_conflicts_generated.exp.json | 18 +- .../d2oracle/TestMove/container_near.exp.json | 3 +- testdata/d2oracle/TestMove/duplicate.exp.json | 3 +- .../d2oracle/TestMove/flat_merge.exp.json | 3 +- testdata/d2oracle/TestMove/flat_near.exp.json | 3 +- .../flat_reparent_with_map_value.exp.json | 3 +- ...lat_reparent_with_mixed_map_value.exp.json | 3 +- .../flat_reparent_with_value.exp.json | 3 +- .../d2oracle/TestMove/flat_style.exp.json | 3 +- testdata/d2oracle/TestMove/gnarly_1.exp.json | 6 +- .../include_descendants_near.exp.json | 3 +- ...ude_descendants_nested_reserved_2.exp.json | 3 +- ...ude_descendants_nested_reserved_3.exp.json | 3 +- .../TestMove/include_descendants_sql.exp.json | 6 +- .../into_container_with_flat_keys.exp.json | 6 +- .../d2oracle/TestMove/map_transplant.exp.json | 3 +- .../d2oracle/TestMove/map_with_label.exp.json | 3 +- .../d2oracle/TestMove/merge_reserved.exp.json | 6 +- testdata/d2oracle/TestMove/near.exp.json | 3 +- .../TestMove/nested_reserved_2.exp.json | 3 +- .../TestMove/nested_reserved_3.exp.json | 3 +- .../d2oracle/TestMove/parentheses.exp.json | 6 +- .../d2oracle/TestMove/slice_style.exp.json | 3 +- .../TestMove/underscore_merge.exp.json | 6 +- .../TestReconnectEdge/indexed_ref.exp.json | 3 +- .../preserve_old_obj.exp.json | 3 +- .../TestReconnectEdge/second_index.exp.json | 6 +- .../d2oracle/TestRename/container.exp.json | 9 +- testdata/d2oracle/TestRename/edges.exp.json | 3 +- testdata/d2oracle/TestRename/near.exp.json | 3 +- .../d2oracle/TestSet/classes-style.exp.json | 9 +- .../TestSet/dupe-classes-style.exp.json | 9 +- testdata/d2oracle/TestSet/edge.exp.json | 3 +- testdata/d2oracle/TestSet/edge_chain.exp.json | 6 +- .../TestSet/edge_chain_nested_set.exp.json | 3 +- .../edge_flat_merge_arrowhead.exp.json | 3 +- .../d2oracle/TestSet/edge_index_case.exp.json | 3 +- .../TestSet/edge_index_nested.exp.json | 3 +- .../TestSet/edge_merge_arrowhead.exp.json | 3 +- .../TestSet/edge_nested_label_set.exp.json | 3 +- .../TestSet/edge_replace_arrowhead.exp.json | 3 +- .../edge_replace_arrowhead_indexed.exp.json | 3 +- .../TestSet/edge_set_arrowhead.exp.json | 3 +- testdata/d2oracle/TestSet/icon.exp.json | 3 +- .../d2oracle/TestSet/inline_style.exp.json | 3 +- testdata/d2oracle/TestSet/label.exp.json | 3 +- .../d2oracle/TestSet/label_replace.exp.json | 3 +- .../d2oracle/TestSet/map_key_missing.exp.json | 3 +- .../d2oracle/TestSet/nested_alex.exp.json | 9 +- .../TestSet/replace_arrowhead.exp.json | 3 +- .../TestSet/replace_arrowhead_map.exp.json | 3 +- .../TestSet/replace_fill_pattern.exp.json | 3 +- .../d2oracle/TestSet/replace_link.exp.json | 3 +- .../d2oracle/TestSet/replace_shape.exp.json | 3 +- .../TestSet/replace_style_edgecase.exp.json | 3 +- .../d2oracle/TestSet/replace_tooltip.exp.json | 3 +- .../TestSet/scenarios-arrowhead.exp.json | 9 +- .../scenarios-label-primary-missing.exp.json | 6 +- ...scenarios-nested-usable-ref-style.exp.json | 3 +- .../scenarios-usable-ref-style.exp.json | 3 +- .../TestSet/set_fill_pattern.exp.json | 3 +- .../d2oracle/TestSet/set_tooltip.exp.json | 3 +- testdata/d2oracle/TestSet/shape.exp.json | 3 +- .../unapplied-classes-style-2.exp.json | 6 +- .../TestSet/unapplied-classes-style.exp.json | 6 +- 180 files changed, 869 insertions(+), 459 deletions(-) diff --git a/d2ir/compile.go b/d2ir/compile.go index 9b880b767..90c21d060 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -108,6 +108,7 @@ func (c *compiler) resolveSubstitutions(refctx *RefContext) { varsMap = vars.Map() } + subbed := false switch { case refctx.Key.Value.UnquotedString != nil: for i, box := range refctx.Key.Value.UnquotedString.Value { @@ -115,20 +116,26 @@ func (c *compiler) resolveSubstitutions(refctx *RefContext) { resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution) if resolvedField != nil { refctx.Key.Value.UnquotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + subbed = true } } } - refctx.Key.Value.UnquotedString.Coalesce() + if subbed { + refctx.Key.Value.UnquotedString.Coalesce() + } case refctx.Key.Value.DoubleQuotedString != nil: for i, box := range refctx.Key.Value.DoubleQuotedString.Value { if box.Substitution != nil { resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution) if resolvedField != nil { refctx.Key.Value.DoubleQuotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + subbed = true } } } - refctx.Key.Value.DoubleQuotedString.Coalesce() + if subbed { + refctx.Key.Value.DoubleQuotedString.Coalesce() + } } } 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 c3f44895dd54e116e5a1400d3a6fee089be81b9d..7f3e137b3e86af39639573844a36ae259461e050 100644 GIT binary patch delta 50 zcmaFxk>$ZhmWC~iPfZm}4NNUHx%7SWQ(O{DQWZ2@tc(ndj19~U4GoP!a@$$W7;iHH E0LMZPN&o-= delta 50 zcmaFxk>$ZhmWC~iPfZm}OpMGlx%7SWQ(O{DQWZ2@tc(ndj19~U4GoP!a@$$W7;iHH E0LI7 Date: Tue, 11 Jul 2023 14:01:35 -0700 Subject: [PATCH 014/138] cleanup --- d2compiler/compile_test.go | 13 +++++++++++++ d2ir/compile.go | 10 +++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 1912a9258..e9a59d6cc 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3473,6 +3473,19 @@ hi: ${z} `, `d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable "z"`) }, }, + { + name: "nested-missing", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: { + y: hey + } +} +hi: ${x.z} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.d2:7:1: could not resolve variable "x.z"`) + }, + }, { name: "edge", run: func(t *testing.T) { diff --git a/d2ir/compile.go b/d2ir/compile.go index 90c21d060..3fa8f3edb 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -98,11 +98,12 @@ func (c *compiler) overlayClasses(m *Map) { } func (c *compiler) resolveSubstitutions(refctx *RefContext) { - varsMap := &Map{} boardScope := refctx.ScopeMap if NodeBoardKind(refctx.ScopeMap) == "" { boardScope = ParentBoard(refctx.ScopeMap).Map() } + + varsMap := &Map{} vars := boardScope.GetField("vars") if vars != nil { varsMap = vars.Map() @@ -154,13 +155,12 @@ func (c *compiler) resolveSubstitution(vars *Map, mk *d2ast.Key, substitution *d vars = r.Map() resolved = r } + if resolved == nil { c.errorf(mk, `could not resolve variable "%s"`, strings.Join(substitution.IDA(), ".")) + } else if resolved.Composite != nil { + c.errorf(mk, `cannot reference map variable "%s"`, strings.Join(substitution.IDA(), ".")) } else { - if resolved.Composite != nil { - c.errorf(mk, `cannot reference map variable "%s"`, strings.Join(substitution.IDA(), ".")) - return nil - } return resolved } return nil From 85cf491d74cba05c9d06830ebe26eba22f540e77 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 14:56:09 -0700 Subject: [PATCH 015/138] quotes --- d2compiler/compile_test.go | 35 ++ d2graph/d2graph.go | 1 + d2ir/compile.go | 9 +- .../vars/basic/edge_label.exp.json | 5 +- .../TestCompile2/vars/basic/label.exp.json | 5 +- .../TestCompile2/vars/basic/nested.exp.json | 5 +- .../TestCompile2/vars/basic/number.exp.json | 11 +- .../vars/basic/quoted-var-quoted-sub.exp.json | 177 ++++++++++ .../vars/basic/quoted-var.exp.json | 330 ++++++++++++++++++ .../TestCompile2/vars/basic/style.exp.json | 5 +- .../TestCompile2/vars/boards/layer.exp.json | 10 +- .../TestCompile2/vars/boards/overlay.exp.json | 40 ++- .../TestCompile2/vars/boards/replace.exp.json | 10 +- .../vars/boards/scenario.exp.json | 10 +- .../vars/errors/nested-missing.exp.json | 11 + .../TestCompile2/vars/override/label.exp.json | 5 +- 16 files changed, 622 insertions(+), 47 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/nested-missing.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index e9a59d6cc..d64283335 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3290,6 +3290,41 @@ a -> b: ${x} assert.Equal(t, "im a var", g.Edges[0].Label.Value) }, }, + { + name: "quoted-var", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + primaryColors: { + button: { + active: "#4baae5" + } + } +} + +button: { + style: { + border-radius: 5 + fill: ${primaryColors.button.active} + } +} +`, "") + assert.Equal(t, `#4baae5`, g.Objects[0].Style.Fill.Value) + }, + }, + { + name: "quoted-var-quoted-sub", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: "hi" +} + +y: "hey ${x}" +`, "") + assert.Equal(t, `hey "hi"`, g.Objects[0].Label.Value) + }, + }, } for _, tc := range tca { diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 26413dcb3..f7aa7ec2b 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1651,6 +1651,7 @@ var SimpleReservedKeywords = map[string]struct{}{ "vertical-gap": {}, "horizontal-gap": {}, "class": {}, + "vars": {}, } // ReservedKeywordHolders are reserved keywords that are meaningless on its own and must hold composites diff --git a/d2ir/compile.go b/d2ir/compile.go index 3fa8f3edb..bcfabb346 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -116,8 +116,13 @@ func (c *compiler) resolveSubstitutions(refctx *RefContext) { if box.Substitution != nil { resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution) if resolvedField != nil { - refctx.Key.Value.UnquotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String()) - subbed = true + // If lone and unquoted, replace with value of sub + if len(refctx.Key.Value.UnquotedString.Value) == 1 { + refctx.Key.Value = d2ast.MakeValueBox(resolvedField.Primary().Value) + } else { + refctx.Key.Value.UnquotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + subbed = true + } } } } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json index f7d87362c..77d0d380f 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json @@ -112,10 +112,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:8:33-4:9:34", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var" + "string": "im a var", + "raw_string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json index 5a0acd806..723fae322 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json @@ -89,10 +89,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:4:29-4:5:30", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var" + "string": "im a var", + "raw_string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json index d32d26e50..759360078 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json @@ -182,10 +182,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:14:85-9:15:86", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:14:49-4:17:52", "value": [ { - "string": "red" + "string": "red", + "raw_string": "red" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json index 37d67c845..a7a5fb0e5 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json @@ -108,13 +108,10 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:15:44-5:16:45", - "value": [ - { - "string": "2" - } - ] + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,2:10:19-2:11:20", + "raw": "2", + "value": "2" } } } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json new file mode 100644 index 000000000..1004100aa --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json @@ -0,0 +1,177 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,0:0:0-6:0:36", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,1:0:1-3:1:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,1:6:7-3:1:20", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,2:2:11-2:9:18", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,2:5:14-2:9:18", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,5:0:22-5:13:35", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,5:0:22-5:1:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,5:0:22-5:1:23", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,5:3:25-5:13:35", + "value": [ + { + "string": "hey \"hi\"" + } + ] + } + } + } + } + ] + }, + "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": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,5:0:22-5:1:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,5:0:22-5:1:23", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hey \"hi\"" + }, + "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/TestCompile2/vars/basic/quoted-var.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json new file mode 100644 index 000000000..4b4d56a32 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json @@ -0,0 +1,330 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,0:0:0-15:0:168", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,1:0:1-7:1:77", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,1:6:7-7:1:77", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,2:2:11-6:3:75", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,2:2:11-2:15:24", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,2:2:11-2:15:24", + "value": [ + { + "string": "primaryColors", + "raw_string": "primaryColors" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,2:17:26-6:3:75", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,3:4:32-5:5:71", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,3:4:32-3:10:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,3:4:32-3:10:38", + "value": [ + { + "string": "button", + "raw_string": "button" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,3:12:40-5:5:71", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,4:6:48-4:23:65", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,4:6:48-4:12:54", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,4:6:48-4:12:54", + "value": [ + { + "string": "active", + "raw_string": "active" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,4:14:56-4:23:65", + "value": [ + { + "string": "#4baae5", + "raw_string": "#4baae5" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,9:0:79-14:1:167", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,9:0:79-9:6:85", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,9:0:79-9:6:85", + "value": [ + { + "string": "button", + "raw_string": "button" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,9:8:87-14:1:167", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,10:2:91-13:3:165", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,10:2:91-10:7:96", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,10:2:91-10:7:96", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,10:9:98-13:3:165", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,11:4:104-11:20:120", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,11:4:104-11:17:117", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,11:4:104-11:17:117", + "value": [ + { + "string": "border-radius", + "raw_string": "border-radius" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,11:19:119-11:20:120", + "raw": "5", + "value": "5" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:4:125-12:40:161", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:4:125-12:8:129", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:4:125-12:8:129", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,4:14:56-4:23:65", + "value": [ + { + "string": "#4baae5", + "raw_string": "#4baae5" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": "button", + "id_val": "button", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,9:0:79-9:6:85", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,9:0:79-9:6:85", + "value": [ + { + "string": "button", + "raw_string": "button" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "button" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "#4baae5" + }, + "borderRadius": { + "value": "5" + } + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json index 11ae2fe4d..c5a5ae699 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json @@ -124,10 +124,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:14:52-5:15:53", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:17:26-2:20:29", "value": [ { - "string": "red" + "string": "red", + "raw_string": "red" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index 7f3f693b1..6ca33821b 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -137,10 +137,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:9:52", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var" + "string": "im a var", + "raw_string": "im a var" } ] } @@ -271,10 +272,11 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:9:52", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var" + "string": "im a var", + "raw_string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index 23431936c..06ce2bc1c 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -199,10 +199,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:8:90", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var" + "string": "im x var", + "raw_string": "im x var" } ] } @@ -231,10 +232,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:8:102", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", "value": [ { - "string": "im y var" + "string": "im y var", + "raw_string": "im y var" } ] } @@ -383,10 +385,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:8:174", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var" + "string": "im x var", + "raw_string": "im x var" } ] } @@ -415,10 +418,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:8:186", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", "value": [ { - "string": "im y var" + "string": "im y var", + "raw_string": "im y var" } ] } @@ -581,10 +585,11 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:8:174", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var" + "string": "im x var", + "raw_string": "im x var" } ] } @@ -612,10 +617,11 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:8:186", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", "value": [ { - "string": "im y var" + "string": "im y var", + "raw_string": "im y var" } ] } @@ -862,10 +868,11 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:8:90", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", "value": [ { - "string": "im x var" + "string": "im x var", + "raw_string": "im x var" } ] } @@ -893,10 +900,11 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:8:102", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", "value": [ { - "string": "im y var" + "string": "im y var", + "raw_string": "im y var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index fc75006dd..0637551ac 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -199,10 +199,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:8:99", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", "value": [ { - "string": "im replaced x var" + "string": "im replaced x var", + "raw_string": "im replaced x var" } ] } @@ -333,10 +334,11 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:8:99", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", "value": [ { - "string": "im replaced x var" + "string": "im replaced x var", + "raw_string": "im replaced x var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index 571e94ad8..aed67f583 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -137,10 +137,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:9:55", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var" + "string": "im a var", + "raw_string": "im a var" } ] } @@ -271,10 +272,11 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:9:55", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var" + "string": "im a var", + "raw_string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.exp.json new file mode 100644 index 000000000..96bef919a --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.d2,6:0:33-6:10:43", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.d2:7:1: could not resolve variable \"x.z\"" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json index 9040dfa59..f1a1cb4be 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json @@ -89,10 +89,11 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:4:29-4:5:30", + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:5:14-2:13:22", "value": [ { - "string": "im a var" + "string": "im a var", + "raw_string": "im a var" } ] } From 4a9327e102f284125bc3abf57ff1bf0369069551 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 15:05:16 -0700 Subject: [PATCH 016/138] non-root err check --- d2compiler/compile.go | 3 +++ d2compiler/compile_test.go | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index c1800e571..c1bed291b 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -283,6 +283,9 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { c.errorf(f.Map().Edges[0].LastRef().AST(), "vars cannot contain an edge") } } + if d2ir.NodeBoardKind(d2ir.ParentMap(f)) == "" { + c.errorf(f.LastRef().AST(), "vars must be defined at the root of a board") + } return } else if isReserved { c.compileReserved(&obj.Attributes, f) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index d64283335..878199312 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3545,6 +3545,18 @@ hi: ${colors} `, `d2/testdata/d2compiler/TestCompile2/vars/errors/map.d2:7:1: cannot reference map variable "colors"`) }, }, + { + name: "non-root", + run: func(t *testing.T) { + assertCompile(t, ` +x: { + vars: { + x: hey + } +} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/non-root.d2:3:3: vars must be defined at the root of a board`) + }, + }, } for _, tc := range tca { From 92d87b553f43748419c7c4c823b66727171c119a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 17:19:34 -0700 Subject: [PATCH 017/138] new implementation --- d2compiler/compile.go | 3 - d2compiler/compile_test.go | 33 +- d2ir/compile.go | 78 ++--- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 80096 -> 80096 bytes lib/urlenc/testdata/TestChanges.exp.txt | 2 +- .../vars/basic/edge-label.exp.json | 292 ++++++++++++++++ .../vars/basic/edge_label.exp.json | 23 +- .../TestCompile2/vars/basic/label.exp.json | 23 +- .../TestCompile2/vars/basic/nested.exp.json | 43 ++- .../TestCompile2/vars/basic/number.exp.json | 27 +- .../vars/basic/quoted-var.exp.json | 45 ++- .../vars/basic/shape-label.exp.json | 193 ++++++++++ .../TestCompile2/vars/basic/style.exp.json | 21 +- .../TestCompile2/vars/boards/layer.exp.json | 21 +- .../TestCompile2/vars/boards/overlay.exp.json | 84 ++++- .../TestCompile2/vars/boards/replace.exp.json | 21 +- .../vars/boards/scenario.exp.json | 21 +- .../TestCompile2/vars/errors/map.exp.json | 2 +- .../TestCompile2/vars/errors/missing.exp.json | 2 +- .../vars/errors/nested-missing.exp.json | 2 +- .../TestCompile2/vars/override/label.exp.json | 21 +- .../TestCompile2/vars/override/map.exp.json | 329 ++++++++++++++++++ .../d2ir/TestCompile/imports/vars/1.exp.json | 161 ++------- 23 files changed, 1195 insertions(+), 252 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/override/map.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index c1bed291b..c1800e571 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -283,9 +283,6 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { c.errorf(f.Map().Edges[0].LastRef().AST(), "vars cannot contain an edge") } } - if d2ir.NodeBoardKind(d2ir.ParentMap(f)) == "" { - c.errorf(f.LastRef().AST(), "vars must be defined at the root of a board") - } return } else if isReserved { c.compileReserved(&obj.Attributes, f) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 878199312..b401bb4f5 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3181,7 +3181,7 @@ func testVars(t *testing.T) { run func(t *testing.T) }{ { - name: "label", + name: "shape-label", run: func(t *testing.T) { g := assertCompile(t, ` vars: { @@ -3278,7 +3278,7 @@ hi: '1 ${x} 2' }, }, { - name: "edge label", + name: "edge-label", run: func(t *testing.T) { g := assertCompile(t, ` vars: { @@ -3361,6 +3361,23 @@ hi: not a var assert.Equal(t, "not a var", g.Objects[0].Label.Value) }, }, + { + name: "map", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im root var +} +a: { + vars: { + x: im nested var + } + hi: ${x} +} +`, "") + assert.Equal(t, "im nested var", g.Objects[1].Label.Value) + }, + }, } for _, tc := range tca { @@ -3545,18 +3562,6 @@ hi: ${colors} `, `d2/testdata/d2compiler/TestCompile2/vars/errors/map.d2:7:1: cannot reference map variable "colors"`) }, }, - { - name: "non-root", - run: func(t *testing.T) { - assertCompile(t, ` -x: { - vars: { - x: hey - } -} -`, `d2/testdata/d2compiler/TestCompile2/vars/errors/non-root.d2:3:3: vars must be defined at the root of a board`) - }, - }, } for _, tc := range tca { diff --git a/d2ir/compile.go b/d2ir/compile.go index bcfabb346..c8fae9c02 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -53,6 +53,7 @@ func Compile(ast *d2ast.Map, opts *CompileOptions) (*Map, error) { defer c.popImportStack() c.compileMap(m, ast, ast) + c.compileSubstitutions(m, nil) c.overlayClasses(m) if !c.err.Empty() { return nil, c.err @@ -97,55 +98,63 @@ func (c *compiler) overlayClasses(m *Map) { } } -func (c *compiler) resolveSubstitutions(refctx *RefContext) { - boardScope := refctx.ScopeMap - if NodeBoardKind(refctx.ScopeMap) == "" { - boardScope = ParentBoard(refctx.ScopeMap).Map() +func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { + for _, f := range m.Fields { + if f.Name == "vars" && f.Map() != nil { + varsStack = append([]*Map{f.Map()}, varsStack...) + } + if f.Primary() != nil { + c.resolveSubstitutions(varsStack, f.LastRef().AST(), f.Primary()) + } + if f.Map() != nil { + c.compileSubstitutions(f.Map(), varsStack) + } } - - varsMap := &Map{} - vars := boardScope.GetField("vars") - if vars != nil { - varsMap = vars.Map() + for _, e := range m.Edges { + if e.Primary() != nil { + c.resolveSubstitutions(varsStack, e.LastRef().AST(), e.Primary()) + } } +} +func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scalar *Scalar) { subbed := false - switch { - case refctx.Key.Value.UnquotedString != nil: - for i, box := range refctx.Key.Value.UnquotedString.Value { + switch s := scalar.Value.(type) { + case *d2ast.UnquotedString: + for i, box := range s.Value { if box.Substitution != nil { - resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution) + resolvedField := c.resolveSubstitution(varsStack[0], node, box.Substitution) if resolvedField != nil { // If lone and unquoted, replace with value of sub - if len(refctx.Key.Value.UnquotedString.Value) == 1 { - refctx.Key.Value = d2ast.MakeValueBox(resolvedField.Primary().Value) + if len(s.Value) == 1 { + scalar.Value = resolvedField.Primary().Value } else { - refctx.Key.Value.UnquotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) subbed = true } } } } if subbed { - refctx.Key.Value.UnquotedString.Coalesce() + s.Coalesce() } - case refctx.Key.Value.DoubleQuotedString != nil: - for i, box := range refctx.Key.Value.DoubleQuotedString.Value { + case *d2ast.DoubleQuotedString: + for i, box := range s.Value { if box.Substitution != nil { - resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution) + resolvedField := c.resolveSubstitution(varsStack[0], node, box.Substitution) if resolvedField != nil { - refctx.Key.Value.DoubleQuotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) subbed = true } } } if subbed { - refctx.Key.Value.DoubleQuotedString.Coalesce() + s.Coalesce() } } } -func (c *compiler) resolveSubstitution(vars *Map, mk *d2ast.Key, substitution *d2ast.Substitution) *Field { +func (c *compiler) resolveSubstitution(vars *Map, node d2ast.Node, substitution *d2ast.Substitution) *Field { var resolved *Field for _, p := range substitution.Path { if vars == nil { @@ -162,29 +171,15 @@ func (c *compiler) resolveSubstitution(vars *Map, mk *d2ast.Key, substitution *d } if resolved == nil { - c.errorf(mk, `could not resolve variable "%s"`, strings.Join(substitution.IDA(), ".")) + c.errorf(node, `could not resolve variable "%s"`, strings.Join(substitution.IDA(), ".")) } else if resolved.Composite != nil { - c.errorf(mk, `cannot reference map variable "%s"`, strings.Join(substitution.IDA(), ".")) + c.errorf(node, `cannot reference map variable "%s"`, strings.Join(substitution.IDA(), ".")) } else { return resolved } return nil } -func (c *compiler) compileVars(m *Map, ast *d2ast.Map) { - for _, n := range ast.Nodes { - if n.MapKey != nil && n.MapKey.Key != nil && len(n.MapKey.Key.Path) == 1 && strings.EqualFold(n.MapKey.Key.Path[0].Unbox().ScalarString(), "vars") { - c.compileKey(&RefContext{ - Key: n.MapKey, - Scope: ast, - ScopeMap: m, - ScopeAST: ast, - }) - break - } - } -} - func (c *compiler) overlayVars(base, overlay *Map) { vars := overlay.GetField("vars") if vars == nil { @@ -215,10 +210,6 @@ func (c *compiler) overlay(base *Map, f *Field) { } func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { - // When compiling a new board, compile vars before all else, as it might be referenced - if NodeBoardKind(dst) != "" { - c.compileVars(dst, ast) - } for _, n := range ast.Nodes { switch { case n.MapKey != nil: @@ -252,7 +243,6 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { } func (c *compiler) compileKey(refctx *RefContext) { - c.resolveSubstitutions(refctx) if len(refctx.Key.Edges) == 0 { c.compileField(refctx.ScopeMap, refctx.Key.Key, refctx) } else { 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 7f3e137b3e86af39639573844a36ae259461e050..763c539b9822b93b1cc157155275f42bdc34ae08 100644 GIT binary patch delta 66 zcmaFxk>$ZhmWC~iYfPr!HDNTEzRHBra5}Fk<8?)ILkk0QO)h=k{1lhOl2io^7b_zJ TBVz+|LqkKb+;&zo#@kE)9}g6F delta 66 zcmaFxk>$ZhmWC~iYfPr!Ghx)9zRHBrXgaSc<8?)2Qv*{=O)h=k{1lhOl2io^7b_zJ TBVz+|LqkKb+;&zo#@kE)9{3b? diff --git a/lib/urlenc/testdata/TestChanges.exp.txt b/lib/urlenc/testdata/TestChanges.exp.txt index c8aeb9aed..0ab14ee94 100644 --- a/lib/urlenc/testdata/TestChanges.exp.txt +++ b/lib/urlenc/testdata/TestChanges.exp.txt @@ -1 +1 @@ -vFdtb9s4Ev6uXzFwWvQuiN5sN0mFwx1yadMUaLHe2rv9UmBBiyOZrUSqJGUn3ea_L4aSbFl2usUusPkQkzPkzMNnXkhZUSIpoBR3qBMYjeB3DwDvqoJJRkwm8K3kHgDAyQmcni72NpyeOo0Pb-QnTC0wbs5gs1K-VX6mikJtzkDJpWKaC5m3a6-VXKM2zjqUitcFdppaG6WFzM8qlovGf6tabJBZ4MjrqhBpXzNHvUYOnFkGhcrzxtE378GboaoKBC5Mqtao7xMYDUXwURrUa5HiyGO8JeGKN6dzVDiiA0qZBEYnaczG2WTkPXje7lzQmkhg9NNO2LO8zzL4_4UhjiNLDu0fWdRi9lJKRyFRR9sY5ppVqy-FB5CqskRpPQBbGFYJ76G3PmjXJfCaBj-__ShvkKOmyoO51cwquHbl0NBB6ZqAKFlOUaPkT2BlbWWSMKyrQjEebMRnUSIXLFA6D2lW0SwkHEqa0K7qchnGYXwRtj5_e6tyFZh1HsbjKKru_KE8qGS-D7s9VJeeJyeUImjD2qAGWofSwuqea5crZ7AWRixFIew9ZKKwSGnmfetbbMhJYPF27l_N3sC_lkjkc6w0pkTHv4_QRkHYD8swSv_x4cCJZzeCWhFklDSLdnKjHWwOTQD3uaWZCSxqzYzVdWqJgdCoVLAijOKJ35r0Y-JrGKmHnkeCfCz-YrZSEmGDy8cXdxzdLhYzuJJcK8G9DS4T-IDLH0bNvtYaww-4fDqO5k1uPx1H19SHw6uq2pO-VCUT0hw_lPemIsxJz_OzzrUxF8H668Y5FCZ0W8Jf0bXuD0JjgcaErKoK9IWz4sdj_3yaL_2q1iR9PoniC7_8JONJUfjsf084Eia_yJ88O4TSkpEcISHlchqQKBPUiB0ialcNO6Epmba-g2B8i-lKqkLlAk34PB6HrLHb6F0ZHLKwwaXLw23UdjloUqVdY-8a90c5d6LRke6WZRyzmLrbSpUImsnPtPeWJu_dxOtZ7pre9kqYP9qmDuAsVlpkFt7Pro-s3nO-Q9m7CROYDsQEP4qiV5OXBP97CFqQzknb8G-3Y-fu5NGmf7z--6b-EtydgSNkDbR_n5zHvLXElEyumLVMwjiBd93Ey8VXuqvTzwm87oZe034cFQnM3aS5dzxLzfi-EpQfbggzgQPXPU8DzdbZQN7zNzxG569tCYN6aKtzIK00cuHei93pxwnMdsI2of_84ku59F0x-5XMg6xglmau0KmGz6fnsft3Gb9obzKHvqsGl39NWX63KreE9QNTYpmydIUJvGtHR1oQj7-cZxHD4i6qlA7SQtU8o-smkGjDShPZ1i9UrkzIMZrGz6OpH3G-9KeT7NxfXr5AP8NoOo0macouud955e15vAxtukrghn56h-gewAlYXeOOR3rhNtuYrTXSRjf48a1EnpB54oiji_qHdzqolAqt8w6Ey7DGmHckN_6p1GghEJpDEDvw2140DlLdvDz6WbVXYPQoPNRuE2c0GuqOVEb_Ttg2on6L2qkOoSVwzSQXnFlsUmTXSsfbF-tjLeuwIOiP5Dvr-t22fQ-X31zcXN68ouUP9GnDdHG_FJon8IqG_xea3o-1ZXkCv1jm7teKUbjn9NO-n2sprECTwPVu4j14aNMEgiBAmx7w63RdWt92L1Gvn23bAO0J27j0Zc7WjsLme9F4fwQAAP__ \ No newline at end of file +vFdtb9s4Ev6uXzFwWvQuiN5sN0mFwx1yadMUaLHe2rv9UmBBiyOZrUSqJGUn3ea_L4aSbFl2usUusPkQkzPkzMNnXkhZUSIpoRR3qBMYjeB3DwDvqoJJRmwm8K3kHgDAyQmcni72NpyeOo0Pb-QnTC0wbs5gs1K-VX6mikJtzkDJpWKaC5m3a6-VXKM2zjqUitcFdppaG6WFzM8qlovGf6tabJBZ4MjrqhBpXzNHvUYOnFkGhcrzxtE378GboaoKBC5Mqtao7xMYDUXwURrUa5HiyGO8JeGKN6dzVDiyA0qbBEYnaczG2WTkPXje7lzQmkhg9NNO2LO8zzL4_4UhjiNLDu0fWdRi9lJKSSFRR9sY5ppVqy-FB5CqskRpPQBbGFYJ76G3PmjXJfCaBj-__ShvkKOm6oO51cwquHYl0dBBKZuAKFlOUaMCSGBlbWWSMKyrQjEebMRnUSIXLFA6D2lW0SwkHEqa0K7qchnGYXwRtj5_e6tyFZh1HsbjKKru_KE8qGS-D7s9VJeeJyeUImjD2qAGWofSwuqea5crZ7AWRixFIew9ZKKwSGnmfetbbMhJYPF27l_N3sC_lkjkc6w0pkTHv4_QRkHYD8swSv_x4cCJZzeC2hFklDSLdnKjHWwOTQD3uaWZCSxqzYzVdWqJgdCoVLAijOKJ35r0Y-JrGKmHnkeCfCz-YrZSEmGDy8cXdxzdLhYzuJJcK8G9DS4T-IDLH0bNvtYaww-4fDqO5k1uPx1H19SLw6uq2pO-VCUT0hw_lPemIsxJz_OzzrUxF8H668Y5FCZ0W8Jf0bXvD0JjgcaErKoK9IWz4sdj_3yaL_2q1iR9PoniC7_8JONJUfjsf084Eia_yJ88O4TSkpEcISHlchqQKBPUjB0ialcNO6Epmba-g2B8i-lKqkLlAk34PB6HrLHb6F0ZHLKwwaXLw23UdjloUqVdY-8a90c5d6LRke6WZRyzmLrbSpUImsnPtPeWJu_dxOtZ7pre9kqYP9qmDuAsVlpkFt7Pro-s3nO-Q9m7DROYDsQEP4qiV5OXBP97CFqQzknb8G-3Y-fu5NGmf7z--6b-EtydgSNkDbR_n5zHvLXElEyumLVMwjiBd93Ey8VXuqvTzwm87oZe034cFQnM3aS5dzxLzfi-EpQfbggzgQPXPU8DzdbZQN7zNzxG569tCYN6aKtzIK00cuHejN3pxwnMdsI2of_84ku59F0x-5XMg6xglmau0KmGz6fnsft3Gb9obzKHvqsGl39NWX63KreE9QNTYpmydIUJvGtHR1oQj7-cZxHD4i6qlA7SQtU8o-smkGjDShPZ1i9UrkzIMZrGz6OpH3G-9KeT7NxfXr5AP8NoOo0macouud955e15vAxtukrghn56h-gewQlYXeOOR3rlNtuYrTXSRjf48a1EnpB54oiji_qHdzqolAqt8w6Ey7DGmHckN_6p1GghEJpDEDvw2140DlLdvDz6WbVXYPQoPNRuE2c0GuqOVEb_Ttg2on6L2qkOoSVwzSQXnFlsUmTXSsfbF-tjLeuwIOiP5Dvr-t22fQ-X31zcXN68ouUP9GnDdHG_FJon8IqG_xea3o-1ZXkCv1jm7teKUbjn9NO-n2sprECTwPVu4j14aNMEgiBAmx7w63RdWt92L1Gvn23bAO0J27j0Zc7WjsLmm9F4fwQAAP__ \ No newline at end of file diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json new file mode 100644 index 000000000..87391a571 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json @@ -0,0 +1,292 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,0:0:0-5:0:38", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:0:25-4:12:37", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:0:25-4:6:31", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:0:25-4:1:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:0:25-4:1:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:5:30-4:6:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:5:30-4:6:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:8:33-4:9:34", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:8:33-4:12:37", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:10:35-4:11:36", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "im a var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:0:25-4:1:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:0:25-4:1:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:5:30-4:6:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:5:30-4:6:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json index 77d0d380f..b5d58ba79 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json @@ -112,11 +112,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:8:33-4:9:34", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:8:33-4:12:37", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,4:10:35-4:11:36", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } } ] } @@ -161,7 +176,7 @@ ], "attributes": { "label": { - "value": "im a var" + "value": "" }, "labelDimensions": { "width": 0, diff --git a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json index 723fae322..7c20031a3 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json @@ -89,11 +89,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:4:29-4:5:30", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:4:29-4:8:33", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,4:6:31-4:7:32", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } } ] } @@ -154,7 +169,7 @@ ], "attributes": { "label": { - "value": "im a var" + "value": "" }, "labelDimensions": { "width": 0, diff --git a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json index 759360078..2b5c53b82 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json @@ -182,11 +182,48 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:14:49-4:17:52", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:14:85-9:15:86", "value": [ { - "string": "red", - "raw_string": "red" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:14:85-9:38:109", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:16:87-9:22:93", + "value": [ + { + "string": "colors", + "raw_string": "colors" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:23:94-9:30:101", + "value": [ + { + "string": "primary", + "raw_string": "primary" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:31:102-9:37:108", + "value": [ + { + "string": "button", + "raw_string": "button" + } + ] + } + } + ] + } } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json index a7a5fb0e5..a27ca9ad5 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json @@ -108,10 +108,29 @@ }, "primary": {}, "value": { - "number": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,2:10:19-2:11:20", - "raw": "2", - "value": "2" + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:15:44-5:16:45", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:15:44-5:25:54", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:17:46-5:24:53", + "value": [ + { + "string": "columns", + "raw_string": "columns" + } + ] + } + } + ] + } + } + ] } } } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json index 4b4d56a32..ec1525372 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json @@ -223,12 +223,49 @@ }, "primary": {}, "value": { - "double_quoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,4:14:56-4:23:65", + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:10:131-12:11:132", "value": [ { - "string": "#4baae5", - "raw_string": "#4baae5" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:10:131-12:40:161", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:12:133-12:25:146", + "value": [ + { + "string": "primaryColors", + "raw_string": "primaryColors" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:26:147-12:32:153", + "value": [ + { + "string": "button", + "raw_string": "button" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:33:154-12:39:160", + "value": [ + { + "string": "active", + "raw_string": "active" + } + ] + } + } + ] + } } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json new file mode 100644 index 000000000..faf48d651 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json @@ -0,0 +1,193 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,0:0:0-5:0:34", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:0:25-4:8:33", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:4:29-4:5:30", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:4:29-4:8:33", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:6:31-4:7:32", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:0:25-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:0:25-4:2:27", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im a var" + }, + "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/TestCompile2/vars/basic/style.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json index c5a5ae699..9cd133ce4 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json @@ -124,11 +124,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:17:26-2:20:29", + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:14:52-5:15:53", "value": [ { - "string": "red", - "raw_string": "red" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:14:52-5:30:68", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:16:54-5:29:67", + "value": [ + { + "string": "primary-color", + "raw_string": "primary-color" + } + ] + } + } + ] + } } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index 6ca33821b..2f2a237c8 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -137,11 +137,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:9:52", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:12:55", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:10:53-7:11:54", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index 06ce2bc1c..b2557d9b0 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -199,11 +199,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:8:90", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:11:93", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:9:91-10:10:92", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } } ] } @@ -232,11 +247,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:8:102", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:11:105", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:9:103-11:10:104", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } } ] } @@ -385,11 +415,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:8:174", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:11:177", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:9:175-19:10:176", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } } ] } @@ -418,11 +463,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:8:186", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:11:189", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:9:187-20:10:188", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index 0637551ac..86ad2c0cb 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -199,11 +199,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:8:99", "value": [ { - "string": "im replaced x var", - "raw_string": "im replaced x var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:11:102", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:9:100-10:10:101", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index aed67f583..1da21aa14 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -137,11 +137,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:9:55", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:12:58", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:10:56-7:11:57", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/errors/map.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/map.exp.json index 0d8156660..ca00beed9 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/map.exp.json @@ -3,7 +3,7 @@ "err": { "errs": [ { - "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/map.d2,6:0:43-6:13:56", + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/map.d2,6:0:43-6:2:45", "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/map.d2:7:1: cannot reference map variable \"colors\"" } ] diff --git a/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json index bf2e45fed..c87799688 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/missing.exp.json @@ -3,7 +3,7 @@ "err": { "errs": [ { - "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2,4:0:20-4:8:28", + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2,4:0:20-4:2:22", "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable \"z\"" } ] diff --git a/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.exp.json index 96bef919a..e105b1ef0 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.exp.json @@ -3,7 +3,7 @@ "err": { "errs": [ { - "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.d2,6:0:33-6:10:43", + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.d2,6:0:33-6:2:35", "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.d2:7:1: could not resolve variable \"x.z\"" } ] diff --git a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json index f1a1cb4be..7101e2e4f 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json @@ -89,11 +89,26 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:4:29-4:5:30", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:4:29-4:8:33", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,4:6:31-4:7:32", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/override/map.exp.json b/testdata/d2compiler/TestCompile2/vars/override/map.exp.json new file mode 100644 index 000000000..11208a29b --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/override/map.exp.json @@ -0,0 +1,329 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,0:0:0-10:0:81", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,1:0:1-3:1:27", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,1:6:7-3:1:27", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,2:2:11-2:16:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,2:5:14-2:16:25", + "value": [ + { + "string": "im root var", + "raw_string": "im root var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,4:0:28-9:1:80", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,4:0:28-4:1:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,4:0:28-4:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,4:3:31-9:1:80", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,5:2:35-7:3:67", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,5:2:35-5:6:39", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,5:2:35-5:6:39", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,5:8:41-7:3:67", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,6:4:47-6:20:63", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,6:4:47-6:5:48", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,6:4:47-6:5:48", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,6:7:50-6:20:63", + "value": [ + { + "string": "im nested var", + "raw_string": "im nested var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:2:70-8:10:78", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:2:70-8:4:72", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:2:70-8:4:72", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:6:74-8:7:75", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:6:74-8:10:78", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:8:76-8:9:77", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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/TestCompile2/vars/override/map.d2,4:0:28-4:1:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,4:0:28-4:1:29", + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:2:70-8:4:72", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:2:70-8:4:72", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im nested var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json index bd5c4b97e..9d278fd74 100644 --- a/testdata/d2ir/TestCompile/imports/vars/1.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json @@ -18,67 +18,6 @@ } }, "references": [ - { - "string": { - "range": "x.d2,0:0:0-0:4:4", - "value": [ - { - "string": "meow", - "raw_string": "meow" - } - ] - }, - "key_path": { - "range": "x.d2,0:0:0-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "x.d2,0:0:0-0:4:4", - "value": [ - { - "string": "meow", - "raw_string": "meow" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "x.d2,0:0:0-0:18:18", - "key": { - "range": "x.d2,0:0:0-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "x.d2,0:0:0-0:4:4", - "value": [ - { - "string": "meow", - "raw_string": "meow" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "x.d2,0:6:6-0:18:18", - "value": [ - { - "string": "var replaced", - "raw_string": "var replaced" - } - ] - } - } - } - } - }, { "string": { "range": "x.d2,0:0:0-0:4:4", @@ -146,83 +85,6 @@ "edges": null }, "references": [ - { - "string": { - "range": "index.d2,0:0:0-0:4:4", - "value": [ - { - "string": "vars", - "raw_string": "vars" - } - ] - }, - "key_path": { - "range": "index.d2,0:0:0-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "index.d2,0:0:0-0:4:4", - "value": [ - { - "string": "vars", - "raw_string": "vars" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "index.d2,0:0:0-0:15:15", - "key": { - "range": "index.d2,0:0:0-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "index.d2,0:0:0-0:4:4", - "value": [ - { - "string": "vars", - "raw_string": "vars" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "index.d2,0:6:6-0:15:15", - "nodes": [ - { - "import": { - "range": "index.d2,0:8:8-0:14:14", - "spread": true, - "pre": "", - "path": [ - { - "unquoted_string": { - "range": "index.d2,0:12:12-0:13:13", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } - } - ] - } - } - } - } - }, { "string": { "range": "index.d2,0:0:0-0:4:4", @@ -306,10 +168,11 @@ "name": "q", "primary": { "value": { - "range": "index.d2,0:20:20-0:21:21", + "range": "x.d2,0:6:6-0:18:18", "value": [ { - "string": "var replaced" + "string": "var replaced", + "raw_string": "var replaced" } ] } @@ -367,7 +230,23 @@ "range": "index.d2,0:20:20-0:21:21", "value": [ { - "string": "var replaced" + "substitution": { + "range": "index.d2,0:20:20-0:27:27", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:22:22-0:26:26", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + } } ] } From af69e6f62646aea709a3a9e200a1960d5d36c77d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 17:33:01 -0700 Subject: [PATCH 018/138] edge cases --- d2compiler/compile_test.go | 45 +++ d2ir/compile.go | 46 ++- .../TestCompile2/vars/basic/edge-map.exp.json | 350 ++++++++++++++++++ .../vars/basic/parent-scope.exp.json | 329 ++++++++++++++++ .../vars/errors/out-of-scope.exp.json | 11 + 5 files changed, 769 insertions(+), 12 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/out-of-scope.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index b401bb4f5..fdaf33951 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3290,6 +3290,21 @@ a -> b: ${x} assert.Equal(t, "im a var", g.Edges[0].Label.Value) }, }, + { + name: "edge-map", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im a var +} +a -> b: { + target-arrowhead.label: ${x} +} +`, "") + assert.Equal(t, 1, len(g.Edges)) + assert.Equal(t, "im a var", g.Edges[0].DstArrowhead.Label.Value) + }, + }, { name: "quoted-var", run: func(t *testing.T) { @@ -3325,6 +3340,23 @@ y: "hey ${x}" assert.Equal(t, `hey "hi"`, g.Objects[0].Label.Value) }, }, + { + name: "parent-scope", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: im root var +} +a: { + vars: { + b: im nested var + } + hi: ${x} +} +`, "") + assert.Equal(t, "im root var", g.Objects[1].Label.Value) + }, + }, } for _, tc := range tca { @@ -3538,6 +3570,19 @@ hi: ${x.z} `, `d2/testdata/d2compiler/TestCompile2/vars/errors/nested-missing.d2:7:1: could not resolve variable "x.z"`) }, }, + { + name: "out-of-scope", + run: func(t *testing.T) { + assertCompile(t, ` +a: { + vars: { + x: hey + } +} +hi: ${x} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/out-of-scope.d2:7:1: could not resolve variable "x"`) + }, + }, { name: "edge", run: func(t *testing.T) { diff --git a/d2ir/compile.go b/d2ir/compile.go index c8fae9c02..7495ea2c4 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -114,17 +114,31 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { if e.Primary() != nil { c.resolveSubstitutions(varsStack, e.LastRef().AST(), e.Primary()) } + if e.Map() != nil { + c.compileSubstitutions(e.Map(), varsStack) + } } } func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scalar *Scalar) { - subbed := false + var subbed bool + var resolvedField *Field + switch s := scalar.Value.(type) { case *d2ast.UnquotedString: for i, box := range s.Value { if box.Substitution != nil { - resolvedField := c.resolveSubstitution(varsStack[0], node, box.Substitution) + for _, vars := range varsStack { + resolvedField = c.resolveSubstitution(vars, box.Substitution) + if resolvedField != nil { + break + } + } if resolvedField != nil { + if resolvedField.Composite != nil { + c.errorf(node, `cannot reference map variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) + return + } // If lone and unquoted, replace with value of sub if len(s.Value) == 1 { scalar.Value = resolvedField.Primary().Value @@ -132,6 +146,9 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) subbed = true } + } else { + c.errorf(node, `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) + return } } } @@ -141,10 +158,22 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala case *d2ast.DoubleQuotedString: for i, box := range s.Value { if box.Substitution != nil { - resolvedField := c.resolveSubstitution(varsStack[0], node, box.Substitution) + for _, vars := range varsStack { + resolvedField = c.resolveSubstitution(vars, box.Substitution) + if resolvedField != nil { + break + } + } if resolvedField != nil { + if resolvedField.Composite != nil { + c.errorf(node, `cannot reference map variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) + return + } s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) subbed = true + } else { + c.errorf(node, `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) + return } } } @@ -154,7 +183,7 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala } } -func (c *compiler) resolveSubstitution(vars *Map, node d2ast.Node, substitution *d2ast.Substitution) *Field { +func (c *compiler) resolveSubstitution(vars *Map, substitution *d2ast.Substitution) *Field { var resolved *Field for _, p := range substitution.Path { if vars == nil { @@ -170,14 +199,7 @@ func (c *compiler) resolveSubstitution(vars *Map, node d2ast.Node, substitution resolved = r } - if resolved == nil { - c.errorf(node, `could not resolve variable "%s"`, strings.Join(substitution.IDA(), ".")) - } else if resolved.Composite != nil { - c.errorf(node, `cannot reference map variable "%s"`, strings.Join(substitution.IDA(), ".")) - } else { - return resolved - } - return nil + return resolved } func (c *compiler) overlayVars(base, overlay *Map) { diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json new file mode 100644 index 000000000..cb64534ff --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json @@ -0,0 +1,350 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,0:0:0-7:0:68", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,1:0:1-3:1:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,1:6:7-3:1:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,2:2:11-2:13:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,2:5:14-2:13:22", + "value": [ + { + "string": "im a var", + "raw_string": "im a var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:0:25-6:1:67", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:0:25-4:6:31", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:0:25-4:1:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:0:25-4:1:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:5:30-4:6:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:5:30-4:6:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:8:33-6:1:67", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:2:37-5:30:65", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:2:37-5:24:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:2:37-5:18:53", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:19:54-5:24:59", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:26:61-5:27:62", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:26:61-5:30:65", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:28:63-5:29:64", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "dstArrowhead": { + "label": { + "value": "im a var" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:0:25-4:1:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:0:25-4:1:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:5:30-4:6:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,4:5:30-4:6:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json new file mode 100644 index 000000000..b9d8924d5 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json @@ -0,0 +1,329 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,0:0:0-10:0:81", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,1:0:1-3:1:27", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,1:6:7-3:1:27", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,2:2:11-2:16:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,2:5:14-2:16:25", + "value": [ + { + "string": "im root var", + "raw_string": "im root var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,4:0:28-9:1:80", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,4:0:28-4:1:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,4:0:28-4:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,4:3:31-9:1:80", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,5:2:35-7:3:67", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,5:2:35-5:6:39", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,5:2:35-5:6:39", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,5:8:41-7:3:67", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,6:4:47-6:20:63", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,6:4:47-6:5:48", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,6:4:47-6:5:48", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,6:7:50-6:20:63", + "value": [ + { + "string": "im nested var", + "raw_string": "im nested var" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:2:70-8:10:78", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:2:70-8:4:72", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:2:70-8:4:72", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:6:74-8:7:75", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:6:74-8:10:78", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:8:76-8:9:77", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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/TestCompile2/vars/basic/parent-scope.d2,4:0:28-4:1:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,4:0:28-4:1:29", + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:2:70-8:4:72", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:2:70-8:4:72", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "im root var" + }, + "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/TestCompile2/vars/errors/out-of-scope.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/out-of-scope.exp.json new file mode 100644 index 000000000..c9251b81e --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/out-of-scope.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/out-of-scope.d2,6:0:33-6:2:35", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/out-of-scope.d2:7:1: could not resolve variable \"x\"" + } + ] + } +} From 5d4d9c5c17c4a3d457fec48a22febafbd162fee6 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 17:37:39 -0700 Subject: [PATCH 019/138] import tests --- d2ir/import_test.go | 22 + .../d2ir/TestCompile/imports/vars/2.exp.json | 401 ++++++++++++++++++ .../d2ir/TestCompile/imports/vars/3.exp.json | 401 ++++++++++++++++++ 3 files changed, 824 insertions(+) create mode 100644 testdata/d2ir/TestCompile/imports/vars/2.exp.json create mode 100644 testdata/d2ir/TestCompile/imports/vars/3.exp.json diff --git a/d2ir/import_test.go b/d2ir/import_test.go index c04cb6a25..0b9497abe 100644 --- a/d2ir/import_test.go +++ b/d2ir/import_test.go @@ -149,6 +149,28 @@ label: meow`, assertQuery(t, m, 0, 0, "var replaced", "q") }, }, + { + name: "vars/2", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "vars: { x: 1 }; ...@a", + "a.d2": "vars: { x: 2 }; hi: ${x}", + }) + assert.Success(t, err) + assertQuery(t, m, 0, 0, 2, "hi") + }, + }, + { + name: "vars/3", + run: func(t testing.TB) { + m, err := compileFS(t, "index.d2", map[string]string{ + "index.d2": "...@a; vars: { x: 1 }; hi: ${x}", + "a.d2": "vars: { x: 2 }", + }) + assert.Success(t, err) + assertQuery(t, m, 0, 0, 1, "hi") + }, + }, } runa(t, tca) diff --git a/testdata/d2ir/TestCompile/imports/vars/2.exp.json b/testdata/d2ir/TestCompile/imports/vars/2.exp.json new file mode 100644 index 000000000..3107e5c6e --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/vars/2.exp.json @@ -0,0 +1,401 @@ +{ + "fields": [ + { + "name": "vars", + "composite": { + "fields": [ + { + "name": "x", + "primary": { + "value": { + "range": "a.d2,0:11:11-0:12:12", + "raw": "2", + "value": "2" + } + }, + "references": [ + { + "string": { + "range": "index.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:8:8-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:8:8-0:13:13", + "key": { + "range": "index.d2,0:8:8-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "index.d2,0:11:11-0:12:12", + "raw": "1", + "value": "1" + } + } + } + } + }, + { + "string": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "a.d2,0:8:8-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "a.d2,0:8:8-0:13:13", + "key": { + "range": "a.d2,0:8:8-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "a.d2,0:11:11-0:12:12", + "raw": "2", + "value": "2" + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:14:14", + "key": { + "range": "index.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:6:6-0:14:14", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:8:8-0:13:13", + "key": { + "range": "index.d2,0:8:8-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "index.d2,0:11:11-0:12:12", + "raw": "1", + "value": "1" + } + } + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "a.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, + "key_path": { + "range": "a.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "a.d2,0:0:0-0:14:14", + "key": { + "range": "a.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "a.d2,0:6:6-0:14:14", + "nodes": [ + { + "map_key": { + "range": "a.d2,0:8:8-0:13:13", + "key": { + "range": "a.d2,0:8:8-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "a.d2,0:11:11-0:12:12", + "raw": "2", + "value": "2" + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "hi", + "primary": { + "value": { + "range": "a.d2,0:11:11-0:12:12", + "raw": "2", + "value": "2" + } + }, + "references": [ + { + "string": { + "range": "a.d2,0:16:16-0:18:18", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, + "key_path": { + "range": "a.d2,0:16:16-0:18:18", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:16:16-0:18:18", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "a.d2,0:16:16-0:24:24", + "key": { + "range": "a.d2,0:16:16-0:18:18", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:16:16-0:18:18", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "a.d2,0:20:20-0:21:21", + "value": [ + { + "substitution": { + "range": "a.d2,0:20:20-0:24:24", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:22:22-0:23:23", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/imports/vars/3.exp.json b/testdata/d2ir/TestCompile/imports/vars/3.exp.json new file mode 100644 index 000000000..e2ddd2094 --- /dev/null +++ b/testdata/d2ir/TestCompile/imports/vars/3.exp.json @@ -0,0 +1,401 @@ +{ + "fields": [ + { + "name": "vars", + "composite": { + "fields": [ + { + "name": "x", + "primary": { + "value": { + "range": "index.d2,0:18:18-0:19:19", + "raw": "1", + "value": "1" + } + }, + "references": [ + { + "string": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "a.d2,0:8:8-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "a.d2,0:8:8-0:13:13", + "key": { + "range": "a.d2,0:8:8-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "a.d2,0:11:11-0:12:12", + "raw": "2", + "value": "2" + } + } + } + } + }, + { + "string": { + "range": "index.d2,0:15:15-0:16:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:15:15-0:16:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:15:15-0:20:20", + "key": { + "range": "index.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:15:15-0:16:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "index.d2,0:18:18-0:19:19", + "raw": "1", + "value": "1" + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "a.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, + "key_path": { + "range": "a.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "a.d2,0:0:0-0:14:14", + "key": { + "range": "a.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "a.d2,0:6:6-0:14:14", + "nodes": [ + { + "map_key": { + "range": "a.d2,0:8:8-0:13:13", + "key": { + "range": "a.d2,0:8:8-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "a.d2,0:11:11-0:12:12", + "raw": "2", + "value": "2" + } + } + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "index.d2,0:7:7-0:11:11", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, + "key_path": { + "range": "index.d2,0:7:7-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:7:7-0:11:11", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:7:7-0:21:21", + "key": { + "range": "index.d2,0:7:7-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:7:7-0:11:11", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:13:13-0:21:21", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:15:15-0:20:20", + "key": { + "range": "index.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:15:15-0:16:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "index.d2,0:18:18-0:19:19", + "raw": "1", + "value": "1" + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "hi", + "primary": { + "value": { + "range": "index.d2,0:18:18-0:19:19", + "raw": "1", + "value": "1" + } + }, + "references": [ + { + "string": { + "range": "index.d2,0:23:23-0:25:25", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, + "key_path": { + "range": "index.d2,0:23:23-0:25:25", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:23:23-0:25:25", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:23:23-0:31:31", + "key": { + "range": "index.d2,0:23:23-0:25:25", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:23:23-0:25:25", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "index.d2,0:27:27-0:28:28", + "value": [ + { + "substitution": { + "range": "index.d2,0:27:27-0:31:31", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:29:29-0:30:30", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} From 67a06b65579374c6e4409500394ba747afa61885 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 18:05:03 -0700 Subject: [PATCH 020/138] var-in-var --- d2compiler/compile_test.go | 18 + d2ir/compile.go | 2 +- .../vars/override/var-in-var.exp.json | 360 ++++++++++++++++++ 3 files changed, 379 insertions(+), 1 deletion(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index fdaf33951..bc485af31 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3410,6 +3410,24 @@ a: { assert.Equal(t, "im nested var", g.Objects[1].Label.Value) }, }, + { + name: "var-in-var", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + surname: Smith +} +a: { + vars: { + trade1: Black${surname} + trade2: Metal${surname} + } + hi: ${trade1} +} +`, "") + assert.Equal(t, "BlackSmith", g.Objects[1].Label.Value) + }, + }, } for _, tc := range tca { diff --git a/d2ir/compile.go b/d2ir/compile.go index 7495ea2c4..3dbe65e0c 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -154,6 +154,7 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala } if subbed { s.Coalesce() + scalar.Value = d2ast.RawString(s.ScalarString(), false) } case *d2ast.DoubleQuotedString: for i, box := range s.Value { @@ -198,7 +199,6 @@ func (c *compiler) resolveSubstitution(vars *Map, substitution *d2ast.Substituti vars = r.Map() resolved = r } - return resolved } diff --git a/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json new file mode 100644 index 000000000..6f41e1fad --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json @@ -0,0 +1,360 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,0:0:0-11:0:116", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,1:0:1-3:1:26", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,1:6:7-3:1:26", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,2:1:10-2:15:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,2:1:10-2:8:17", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,2:1:10-2:8:17", + "value": [ + { + "string": "surname", + "raw_string": "surname" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,2:10:19-2:15:24", + "value": [ + { + "string": "Smith", + "raw_string": "Smith" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:0:27-10:1:115", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:0:27-4:1:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:0:27-4:1:28", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:3:30-10:1:115", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,5:2:34-8:3:97", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,5:2:34-5:6:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,5:2:34-5:6:38", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,5:8:40-8:3:97", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,6:2:44-6:25:67", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,6:2:44-6:8:50", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,6:2:44-6:8:50", + "value": [ + { + "string": "trade1", + "raw_string": "trade1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,6:10:52-6:16:58", + "value": [ + { + "string": "BlackSmith" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,7:2:70-7:25:93", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,7:2:70-7:8:76", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,7:2:70-7:8:76", + "value": [ + { + "string": "trade2", + "raw_string": "trade2" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,7:10:78-7:16:84", + "value": [ + { + "string": "MetalSmith" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:15:113", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:4:102", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:4:102", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:6:104-9:7:105", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:6:104-9:15:113", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:8:106-9:14:112", + "value": [ + { + "string": "trade1", + "raw_string": "trade1" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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/TestCompile2/vars/override/var-in-var.d2,4:0:27-4:1:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:0:27-4:1:28", + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:4:102", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:4:102", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "BlackSmith" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} From 7091c580ef6c5034b5bee49f086975816935127a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 19:16:10 -0700 Subject: [PATCH 021/138] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 69969d43e..5a915f6c5 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,5 +1,6 @@ #### Features 🚀 +- Variables and substitutions are implemented. See [docs](https://d2lang.com/tour/vars). [#1473](https://github.com/terrastruct/d2/pull/1473) - Configure timeout value with D2_TIMEOUT env var [#1392](https://github.com/terrastruct/d2/pull/1392) - Scale renders and disable fit to screen with `--scale` flag [#1413](https://github.com/terrastruct/d2/pull/1413) - `null` keyword can be used to un-declare. See [docs](https://d2lang.com/tour/TODO) [#1446](https://github.com/terrastruct/d2/pull/1446) From 63dbaf093587413580bf45ed259e7f1268cb1a1c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 23:26:06 -0700 Subject: [PATCH 022/138] pr changes --- d2compiler/compile_test.go | 28 ++ d2ir/compile.go | 87 ++--- .../vars/errors/recursive-var.exp.json | 11 + .../vars/override/recursive-var.exp.json | 328 ++++++++++++++++++ 4 files changed, 412 insertions(+), 42 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/recursive-var.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index bc485af31..54c2feba4 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3428,6 +3428,23 @@ a: { assert.Equal(t, "BlackSmith", g.Objects[1].Label.Value) }, }, + { + name: "recursive-var", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: a +} +hi: { + vars: { + x: ${x}-b + } + yo: ${x} +} +`, "") + assert.Equal(t, "a-b", g.Objects[1].Label.Value) + }, + }, } for _, tc := range tca { @@ -3601,6 +3618,17 @@ hi: ${x} `, `d2/testdata/d2compiler/TestCompile2/vars/errors/out-of-scope.d2:7:1: could not resolve variable "x"`) }, }, + { + name: "recursive-var", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: ${x} +} +hi: ${x} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/recursive-var.d2:3:3: could not resolve variable "x"`) + }, + }, { name: "edge", run: func(t *testing.T) { diff --git a/d2ir/compile.go b/d2ir/compile.go index 3dbe65e0c..49d2ab43b 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -107,7 +107,13 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { c.resolveSubstitutions(varsStack, f.LastRef().AST(), f.Primary()) } if f.Map() != nil { - c.compileSubstitutions(f.Map(), varsStack) + // this map could be the "vars" + // and if it is, then its already been compiled, so the varsStack can be truncated + if f.Name == "vars" { + c.compileSubstitutions(f.Map(), varsStack[1:]) + } else { + c.compileSubstitutions(f.Map(), varsStack) + } } } for _, e := range m.Edges { @@ -134,27 +140,25 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala break } } - if resolvedField != nil { - if resolvedField.Composite != nil { - c.errorf(node, `cannot reference map variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) - return - } - // If lone and unquoted, replace with value of sub - if len(s.Value) == 1 { - scalar.Value = resolvedField.Primary().Value - } else { - s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) - subbed = true - } - } else { + if resolvedField == nil { c.errorf(node, `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) return } + if resolvedField.Composite != nil { + c.errorf(node, `cannot reference map variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) + return + } + // If lone and unquoted, replace with value of sub + if len(s.Value) == 1 { + scalar.Value = resolvedField.Primary().Value + } else { + s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + subbed = true + } } } if subbed { s.Coalesce() - scalar.Value = d2ast.RawString(s.ScalarString(), false) } case *d2ast.DoubleQuotedString: for i, box := range s.Value { @@ -165,17 +169,16 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala break } } - if resolvedField != nil { - if resolvedField.Composite != nil { - c.errorf(node, `cannot reference map variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) - return - } - s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) - subbed = true - } else { + if resolvedField == nil { c.errorf(node, `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) return } + if resolvedField.Composite != nil { + c.errorf(node, `cannot reference map variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) + return + } + s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + subbed = true } } if subbed { @@ -185,21 +188,21 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala } func (c *compiler) resolveSubstitution(vars *Map, substitution *d2ast.Substitution) *Field { - var resolved *Field - for _, p := range substitution.Path { - if vars == nil { - resolved = nil - break - } - r := vars.GetField(p.Unbox().ScalarString()) - if r == nil { - resolved = nil - break - } - vars = r.Map() - resolved = r + if vars == nil { + return nil } - return resolved + + for i, p := range substitution.Path { + f := vars.GetField(p.Unbox().ScalarString()) + if f == nil { + return nil + } + if i == len(substitution.Path)-1 { + return f + } + vars = f.Map() + } + return nil } func (c *compiler) overlayVars(base, overlay *Map) { @@ -208,14 +211,14 @@ func (c *compiler) overlayVars(base, overlay *Map) { return } - lVars := base.GetField("vars") + baseVars := base.GetField("vars") - if lVars == nil { - lVars = vars.Copy(base).(*Field) - base.Fields = append(base.Fields, lVars) + if baseVars == nil { + baseVars = vars.Copy(base).(*Field) + base.Fields = append(base.Fields, baseVars) } else { overlayed := vars.Copy(base).(*Field) - OverlayMap(overlayed.Map(), lVars.Map()) + OverlayMap(overlayed.Map(), baseVars.Map()) base.DeleteField("vars") base.Fields = append(base.Fields, overlayed) } diff --git a/testdata/d2compiler/TestCompile2/vars/errors/recursive-var.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/recursive-var.exp.json new file mode 100644 index 000000000..d00db4c64 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/recursive-var.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/recursive-var.d2,2:2:11-2:3:12", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/recursive-var.d2:3:3: could not resolve variable \"x\"" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json b/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json new file mode 100644 index 000000000..19277bee2 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json @@ -0,0 +1,328 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,0:0:0-10:0:65", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,1:0:1-3:1:17", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,1:6:7-3:1:17", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,2:2:11-2:6:15", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,2:5:14-2:6:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,4:0:18-9:1:64", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,4:0:18-4:2:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,4:0:18-4:2:20", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,4:4:22-9:1:64", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,5:2:26-7:3:51", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,5:2:26-5:6:30", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,5:2:26-5:6:30", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,5:8:32-7:3:51", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,6:4:38-6:13:47", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,6:4:38-6:5:39", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,6:4:38-6:5:39", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,6:7:41-6:13:47", + "value": [ + { + "string": "a-b" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:2:54-8:10:62", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:2:54-8:4:56", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:2:54-8:4:56", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:6:58-8:7:59", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:6:58-8:10:62", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:8:60-8:9:61", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,4:0:18-4:2:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,4:0:18-4:2:20", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "yo", + "id_val": "yo", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:2:54-8:4:56", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:2:54-8:4:56", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a-b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} From d06e395e8d10a200fdbad92076a005930ec9dc79 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 12 Jul 2023 10:27:32 -0700 Subject: [PATCH 023/138] overlayVars refactor --- d2ir/compile.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/d2ir/compile.go b/d2ir/compile.go index 49d2ab43b..f908d9b38 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -210,18 +210,15 @@ func (c *compiler) overlayVars(base, overlay *Map) { if vars == nil { return } + vars = vars.Copy(base).(*Field) baseVars := base.GetField("vars") - - if baseVars == nil { - baseVars = vars.Copy(base).(*Field) - base.Fields = append(base.Fields, baseVars) - } else { - overlayed := vars.Copy(base).(*Field) - OverlayMap(overlayed.Map(), baseVars.Map()) + if baseVars != nil { + OverlayMap(vars.Map(), baseVars.Map()) base.DeleteField("vars") - base.Fields = append(base.Fields, overlayed) } + + base.Fields = append(base.Fields, vars) } func (c *compiler) overlay(base *Map, f *Field) { From 85bfad19a6cb1455a242e4d08bddbad73ba5a01c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 12 Jul 2023 11:55:58 -0700 Subject: [PATCH 024/138] compile composites --- d2compiler/compile.go | 6 + d2compiler/compile_test.go | 85 ++- d2ir/compile.go | 50 +- .../TestCompile2/vars/basic/map.exp.json | 531 ++++++++++++++++++ .../vars/basic/primary-and-composite.exp.json | 323 +++++++++++ .../TestCompile2/vars/errors/bad-var.exp.json | 11 + .../vars/errors/multi-part-map.exp.json | 11 + .../vars/errors/quoted-map.exp.json | 11 + 8 files changed, 997 insertions(+), 31 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/map.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/bad-var.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/quoted-map.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index c1800e571..29927ca57 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -281,6 +281,12 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { if f.Map() != nil { if len(f.Map().Edges) > 0 { c.errorf(f.Map().Edges[0].LastRef().AST(), "vars cannot contain an edge") + } else { + for _, f := range f.Map().Fields { + if f.Primary() == nil && f.Composite == nil { + c.errorf(f.LastRef().AST(), "invalid var with no value") + } + } } } return diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 54c2feba4..75871506d 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3357,6 +3357,41 @@ a: { assert.Equal(t, "im root var", g.Objects[1].Label.Value) }, }, + { + name: "map", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + cool-style: { + fill: red + } + arrows: { + target-arrowhead.label: yay + } +} +hi.style: ${cool-style} +a -> b: ${arrows} +`, "") + assert.Equal(t, "red", g.Objects[0].Style.Fill.Value) + assert.Equal(t, "yay", g.Edges[0].DstArrowhead.Label.Value) + }, + }, + { + name: "primary-and-composite", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: all { + a: b + } +} +z: ${x} +`, "") + assert.Equal(t, "z", g.Objects[1].ID) + assert.Equal(t, "all", g.Objects[1].Label.Value) + assert.Equal(t, 1, len(g.Objects[1].Children)) + }, + }, } for _, tc := range tca { @@ -3592,6 +3627,43 @@ hi: ${z} `, `d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable "z"`) }, }, + { + name: "bad-var", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x +} +hi: ${x} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/bad-var.d2:3:3: invalid var with no value`) + }, + }, + { + name: "multi-part-map", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: { + a: b + } +} +hi: 1 ${x} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.d2:7:1: cannot substitute map variable "x" as part of a string`) + }, + }, + { + name: "quoted-map", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: { + a: b + } +} +hi: "${x}" +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/quoted-map.d2:7:1: cannot substitute map variable "x" in quotes`) + }, + }, { name: "nested-missing", run: func(t *testing.T) { @@ -3640,19 +3712,6 @@ hi `, "d2/testdata/d2compiler/TestCompile2/vars/errors/edge.d2:3:3: vars cannot contain an edge") }, }, - { - name: "map", - run: func(t *testing.T) { - assertCompile(t, ` -vars: { - colors: { - button: red - } -} -hi: ${colors} -`, `d2/testdata/d2compiler/TestCompile2/vars/errors/map.d2:7:1: cannot reference map variable "colors"`) - }, - }, } for _, tc := range tca { diff --git a/d2ir/compile.go b/d2ir/compile.go index f908d9b38..2c93b6ef4 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -104,11 +104,10 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { varsStack = append([]*Map{f.Map()}, varsStack...) } if f.Primary() != nil { - c.resolveSubstitutions(varsStack, f.LastRef().AST(), f.Primary()) + c.resolveSubstitutions(varsStack, f) } if f.Map() != nil { - // this map could be the "vars" - // and if it is, then its already been compiled, so the varsStack can be truncated + // don't resolve substitutions in vars with the current scope of vars if f.Name == "vars" { c.compileSubstitutions(f.Map(), varsStack[1:]) } else { @@ -118,7 +117,7 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { } for _, e := range m.Edges { if e.Primary() != nil { - c.resolveSubstitutions(varsStack, e.LastRef().AST(), e.Primary()) + c.resolveSubstitutions(varsStack, e) } if e.Map() != nil { c.compileSubstitutions(e.Map(), varsStack) @@ -126,11 +125,11 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { } } -func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scalar *Scalar) { +func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { var subbed bool var resolvedField *Field - switch s := scalar.Value.(type) { + switch s := node.Primary().Value.(type) { case *d2ast.UnquotedString: for i, box := range s.Value { if box.Substitution != nil { @@ -141,19 +140,34 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala } } if resolvedField == nil { - c.errorf(node, `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) + c.errorf(node.LastRef().AST(), `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) return } + if resolvedField.Primary() == nil { + if len(s.Value) > 1 { + c.errorf(node.LastRef().AST(), `cannot substitute map variable "%s" as part of a string`, strings.Join(box.Substitution.IDA(), ".")) + return + } + } else { + // If lone and unquoted, replace with value of sub + if len(s.Value) == 1 { + node.Primary().Value = resolvedField.Primary().Value + } else { + s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + subbed = true + } + } if resolvedField.Composite != nil { - c.errorf(node, `cannot reference map variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) - return - } - // If lone and unquoted, replace with value of sub - if len(s.Value) == 1 { - scalar.Value = resolvedField.Primary().Value - } else { - s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) - subbed = true + switch n := node.(type) { + case *Field: + n.Composite = resolvedField.Composite + case *Edge: + if resolvedField.Composite.Map() == nil { + c.errorf(node.LastRef().AST(), `cannot substitute array variable "%s" to an edge`, strings.Join(box.Substitution.IDA(), ".")) + return + } + n.Map_ = resolvedField.Composite.Map() + } } } } @@ -170,11 +184,11 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala } } if resolvedField == nil { - c.errorf(node, `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) + c.errorf(node.LastRef().AST(), `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) return } if resolvedField.Composite != nil { - c.errorf(node, `cannot reference map variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) + c.errorf(node.LastRef().AST(), `cannot substitute map variable "%s" in quotes`, strings.Join(box.Substitution.IDA(), ".")) return } s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) diff --git a/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json new file mode 100644 index 000000000..e04804d69 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json @@ -0,0 +1,531 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,0:0:0-11:0:133", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,1:0:1-8:1:90", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,1:6:7-8:1:90", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,2:2:11-4:3:40", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,2:2:11-2:12:21", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,2:2:11-2:12:21", + "value": [ + { + "string": "cool-style", + "raw_string": "cool-style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,2:14:23-4:3:40", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,3:2:27-3:11:36", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,3:2:27-3:6:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,3:2:27-3:6:31", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,3:8:33-3:11:36", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,5:2:43-7:3:88", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,5:2:43-5:8:49", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,5:2:43-5:8:49", + "value": [ + { + "string": "arrows", + "raw_string": "arrows" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,5:10:51-7:3:88", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,6:4:57-6:31:84", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,6:4:57-6:26:79", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,6:4:57-6:20:73", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,6:21:74-6:26:79", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,6:28:81-6:31:84", + "value": [ + { + "string": "yay", + "raw_string": "yay" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:0:91-9:23:114", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:0:91-9:8:99", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:0:91-9:2:93", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:3:94-9:8:99", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:10:101-9:11:102", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:10:101-9:23:114", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:12:103-9:22:113", + "value": [ + { + "string": "cool-style", + "raw_string": "cool-style" + } + ] + } + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:0:115-10:17:132", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:0:115-10:6:121", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:0:115-10:1:116", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:0:115-10:1:116", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:5:120-10:6:121", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:5:120-10:6:121", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:8:123-10:9:124", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:8:123-10:17:132", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:10:125-10:16:131", + "value": [ + { + "string": "arrows", + "raw_string": "arrows" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "dstArrowhead": { + "label": { + "value": "yay" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:0:91-9:8:99", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:0:91-9:2:93", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,9:3:94-9:8:99", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:0:115-10:1:116", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:0:115-10:1:116", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:5:120-10:6:121", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/map.d2,10:5:120-10:6:121", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json new file mode 100644 index 000000000..f7ddb1d5c --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json @@ -0,0 +1,323 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,0:0:0-7:0:40", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,1:0:1-5:1:31", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,1:6:7-5:1:31", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,2:1:10-4:3:29", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,2:1:10-2:2:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,2:1:10-2:2:11", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,2:4:13-2:7:16", + "value": [ + { + "string": "all", + "raw_string": "all" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,2:8:17-4:3:29", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,3:2:21-3:6:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,3:2:21-3:3:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,3:2:21-3:3:22", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,3:5:24-3:6:25", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:0:32-6:7:39", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:0:32-6:1:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:0:32-6:1:33", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:3:35-6:4:36", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:3:35-6:7:39", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:5:37-6:6:38", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + }, + "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/TestCompile2/vars/basic/primary-and-composite.d2,3:2:21-3:3:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,3:2:21-3:3:22", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:0:32-6:1:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:0:32-6:1:33", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "all" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "vars", + "id_val": "vars", + "attributes": { + "label": { + "value": "vars" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "attributes": { + "label": { + "value": "x" + }, + "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/TestCompile2/vars/errors/bad-var.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/bad-var.exp.json new file mode 100644 index 000000000..c079e0f3c --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/bad-var.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/bad-var.d2,2:2:11-2:3:12", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/bad-var.d2:3:3: invalid var with no value" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.exp.json new file mode 100644 index 000000000..70c263dfa --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.d2,6:0:31-6:2:33", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.d2:7:1: cannot substitute map variable \"x\" as part of a string" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/errors/quoted-map.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/quoted-map.exp.json new file mode 100644 index 000000000..f5610c5de --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/quoted-map.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/quoted-map.d2,6:0:31-6:2:33", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/quoted-map.d2:7:1: cannot substitute map variable \"x\" in quotes" + } + ] + } +} From 4b7b636657a73808bee00006d150e55b54a94b74 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 12 Jul 2023 14:53:28 -0700 Subject: [PATCH 025/138] spread --- d2compiler/compile_test.go | 50 ++ d2ir/compile.go | 37 +- .../TestCompile2/vars/basic/spread.exp.json | 469 +++++++++++++++++ .../TestCompile2/vars/basic/variadic.exp.json | 492 ++++++++++++++++++ .../vars/errors/spread-non-map.exp.json | 11 + 5 files changed, 1058 insertions(+), 1 deletion(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/variadic.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 75871506d..36e502a68 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3392,6 +3392,25 @@ z: ${x} assert.Equal(t, 1, len(g.Objects[1].Children)) }, }, + { + name: "spread", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: all { + a: b + b: c + } +} +z: { + ...${x} + c +} +`, "") + assert.Equal(t, "z", g.Objects[1].ID) + assert.Equal(t, 3, len(g.Objects[1].Children)) + }, + }, } for _, tc := range tca { @@ -3712,6 +3731,37 @@ hi `, "d2/testdata/d2compiler/TestCompile2/vars/errors/edge.d2:3:3: vars cannot contain an edge") }, }, + { + name: "spread-non-map", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: all +} +z: { + ...${x} + c +} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-map into map`) + }, + }, + { + name: "spread-non-solo", + // NOTE: this doesn't get parsed correctly and so the error message isn't exactly right, but the important thing is that it errors + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: { + a: b + } +} +z: { + d: ...${x} + c +} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.d2:8:2: cannot substitute map variable "x" as part of a string`) + }, + }, } for _, tc := range tca { diff --git a/d2ir/compile.go b/d2ir/compile.go index 2c93b6ef4..db1e8ec5c 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -143,14 +143,33 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { c.errorf(node.LastRef().AST(), `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) return } + if box.Substitution.Spread { + if resolvedField.Composite == nil { + c.errorf(box.Substitution, "cannot spread non-map into map") + continue + } + // TODO arrays + if resolvedField.Map() != nil { + OverlayMap(ParentMap(node), resolvedField.Map()) + } + // Remove the placeholder field + f := node.(*Field) + m := f.parent.(*Map) + for i, f2 := range m.Fields { + if f == f2 { + m.Fields = append(m.Fields[:i], m.Fields[i+1:]...) + break + } + } + } if resolvedField.Primary() == nil { if len(s.Value) > 1 { c.errorf(node.LastRef().AST(), `cannot substitute map variable "%s" as part of a string`, strings.Join(box.Substitution.IDA(), ".")) return } } else { - // If lone and unquoted, replace with value of sub if len(s.Value) == 1 { + // If lone and unquoted, replace with value of sub node.Primary().Value = resolvedField.Primary().Value } else { s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) @@ -255,6 +274,21 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { ScopeMap: dst, ScopeAST: scopeAST, }) + case n.Substitution != nil: + if !n.Substitution.Spread { + c.errorf(n.Import, "invalid non-spread substitution in map") + continue + } + // placeholder field to be resolved at the end + f := &Field{ + parent: dst, + Primary_: &Scalar{ + Value: &d2ast.UnquotedString{ + Value: []d2ast.InterpolationBox{{Substitution: n.Substitution}}, + }, + }, + } + dst.Fields = append(dst.Fields, f) case n.Import != nil: impn, ok := c._import(n.Import) if !ok { @@ -619,6 +653,7 @@ func (c *compiler) compileArray(dst *Array, a *d2ast.Array, scopeAST *d2ast.Map) irv = n } case *d2ast.Substitution: + // TODO // panic("TODO") } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json new file mode 100644 index 000000000..9dbadf0d4 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json @@ -0,0 +1,469 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,0:0:0-11:0:62", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,1:0:1-6:1:40", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,1:6:7-6:1:40", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,2:1:10-5:3:38", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,2:1:10-2:2:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,2:1:10-2:2:11", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,2:4:13-2:7:16", + "value": [ + { + "string": "all", + "raw_string": "all" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,2:8:17-5:3:38", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,3:2:21-3:6:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,3:2:21-3:3:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,3:2:21-3:3:22", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,3:5:24-3:6:25", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:4:30-4:8:34", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:4:30-4:5:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:4:30-4:5:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:7:33-4:8:34", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,7:0:41-10:1:61", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,7:0:41-7:1:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,7:0:41-7:1:42", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,7:3:44-10:1:61", + "nodes": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,8:2:48-8:9:55", + "spread": true, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,8:7:53-8:8:54", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,9:2:58-9:3:59", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,9:2:58-9:3:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,9:2:58-9:3:59", + "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/TestCompile2/vars/basic/spread.d2,3:2:21-3:3:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,3:2:21-3:3:22", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,7:0:41-7:1:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,7:0:41-7:1:42", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "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/TestCompile2/vars/basic/spread.d2,9:2:58-9:3:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,9:2:58-9:3:59", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "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": "vars", + "id_val": "vars", + "attributes": { + "label": { + "value": "vars" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:4:30-4:5:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:4:30-4:5:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "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 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/variadic.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/variadic.exp.json new file mode 100644 index 000000000..424de2d0f --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/variadic.exp.json @@ -0,0 +1,492 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,0:0:0-11:0:62", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,1:0:1-6:1:40", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,1:6:7-6:1:40", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,2:1:10-5:3:38", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,2:1:10-2:2:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,2:1:10-2:2:11", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,2:4:13-2:7:16", + "value": [ + { + "string": "all", + "raw_string": "all" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,2:8:17-5:3:38", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,3:2:21-3:6:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,3:2:21-3:3:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,3:2:21-3:3:22", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,3:5:24-3:6:25", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,4:4:30-4:8:34", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,4:4:30-4:5:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,4:4:30-4:5:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,4:7:33-4:8:34", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,7:0:41-10:1:61", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,7:0:41-7:1:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,7:0:41-7:1:42", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,7:3:44-10:1:61", + "nodes": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,8:2:48-8:9:55", + "spread": true, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,8:7:53-8:8:54", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,9:2:58-9:3:59", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,9:2:58-9:3:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,9:2:58-9:3:59", + "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": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,7:0:41-7:1:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,7:0:41-7:1:42", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "\"\"", + "id_val": "", + "attributes": { + "label": { + "value": "all" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,3:2:21-3:3:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,3:2:21-3:3:22", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "vars", + "id_val": "vars", + "attributes": { + "label": { + "value": "vars" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,4:4:30-4:5:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,4:4:30-4:5:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "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": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,9:2:58-9:3:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/variadic.d2,9:2:58-9:3:59", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "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 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json new file mode 100644 index 000000000..02e2b3eb6 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2,5:2:26-5:9:33", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-map into map" + } + ] + } +} From c4d9a6231f71997470dfed333d6500ab080e4f6b Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 23 Jun 2023 13:58:14 -0700 Subject: [PATCH 026/138] adjust elk layout for outside labels --- d2layouts/d2elklayout/layout.go | 56 +++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 5ece1c0dc..a596c3a69 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -222,6 +222,24 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } width = go2.Max(width, float64(obj.LabelDimensions.Width)) } + + // reserve spacing for outside labels + if obj.HasLabel() && obj.LabelPosition != nil && !obj.HasOutsideBottomLabel() { + position := label.Position(*obj.LabelPosition) + if position.IsShapePosition() { + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + height += float64(obj.LabelDimensions.Height) + label.PADDING + } + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + width += float64(obj.LabelDimensions.Width) + label.PADDING + } + } + } + // reserve extra space for 3d/multiple by providing elk the larger dimensions dx, dy := obj.GetModifierElementAdjustments() width += dx @@ -433,6 +451,44 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err byID[obj.AbsID()] = obj }) + for _, obj := range g.Objects { + // adjust size and position to account for space reserved for labels + if obj.HasLabel() && obj.LabelPosition != nil && !obj.HasOutsideBottomLabel() { + position := label.Position(*obj.LabelPosition) + if position.IsShapePosition() { + var dx, dy float64 + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + dy = float64(obj.LabelDimensions.Height) + label.PADDING + obj.Height -= dy + } + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + dx = float64(obj.LabelDimensions.Width) + label.PADDING + obj.Width -= dx + } + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + obj.TopLeft.X += dx / 2 + obj.MoveWithDescendants(dx/2, 0) + case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + obj.TopLeft.X += dx / 2 + obj.MoveWithDescendants(-dx/2, 0) + } + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + obj.TopLeft.Y += dy / 2 + obj.MoveWithDescendants(0, dy/2) + case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + obj.TopLeft.Y += dy / 2 + obj.MoveWithDescendants(0, -dy/2) + } + } + } + } + for _, edge := range g.Edges { e := elkEdges[edge] From 1926ec1be9a49e6fd8ac3a31d30f252bd91435ef Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 23 Jun 2023 14:33:17 -0700 Subject: [PATCH 027/138] elk adjust padding for inner labels --- d2layouts/d2elklayout/layout.go | 99 +++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index a596c3a69..50fc2feb8 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -11,6 +11,8 @@ import ( "errors" "fmt" "math" + "regexp" + "strconv" "strings" "github.com/dop251/goja" @@ -223,6 +225,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err width = go2.Max(width, float64(obj.LabelDimensions.Width)) } + padTop, padLeft, padBottom, padRight, err := parsePadding(opts.Padding) + if err != nil { + panic(err) + } + // reserve spacing for outside labels if obj.HasLabel() && obj.LabelPosition != nil && !obj.HasOutsideBottomLabel() { position := label.Position(*obj.LabelPosition) @@ -237,6 +244,57 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: width += float64(obj.LabelDimensions.Width) + label.PADDING } + + // Inside padding + paddingX := obj.LabelDimensions.Width + 2*label.PADDING + paddingY := obj.LabelDimensions.Height + 2*label.PADDING + switch position { + case label.InsideTopLeft: + // TODO: consider only adding Y padding for labels in corners, and just ensure the total width fits + if paddingY > padTop { + padTop = paddingY + } + if paddingX > padLeft { + padLeft = paddingX + } + case label.InsideTopCenter: + if paddingY > padTop { + padTop = paddingY + } + case label.InsideTopRight: + if paddingY > padTop { + padTop = paddingY + } + if paddingX > padRight { + padRight = paddingX + } + case label.InsideBottomLeft: + if paddingY > padBottom { + padBottom = paddingY + } + if paddingX > padLeft { + padLeft = paddingX + } + case label.InsideBottomCenter: + if paddingY > padBottom { + padBottom = paddingY + } + case label.InsideBottomRight: + if paddingY > padBottom { + padBottom = paddingY + } + if paddingX > padRight { + padRight = paddingX + } + case label.InsideMiddleLeft: + if paddingX > padLeft { + padLeft = paddingX + } + case label.InsideMiddleRight: + if paddingX > padRight { + padRight = paddingX + } + } } } @@ -304,10 +362,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err paddingTop += float64(go2.Max(labelHeight, iconHeight)) - n.LayoutOptions.Padding = fmt.Sprintf("[top=%d,left=50,bottom=50,right=50]", - // Default padding - go2.Max(int(math.Ceil(paddingTop)), 50), - ) + padTop = go2.Max(int(math.Ceil(paddingTop)), padTop) } } else { n.LayoutOptions = &elkOpts{ @@ -315,6 +370,9 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } + n.LayoutOptions.Padding = fmt.Sprintf("[top=%d,left=%d,bottom=%d,right=%d]", + padTop, padLeft, padBottom, padRight) + if obj.HasLabel() { n.Labels = append(n.Labels, &ELKLabel{ Text: obj.Label.Value, @@ -864,3 +922,36 @@ func childrenMaxSelfLoop(parent *d2graph.Object, isWidth bool) int { return max } + +// parse out values from elk padding string. e.g. "[top=50,left=50,bottom=50,right=50]" +func parsePadding(padding string) (top, left, bottom, right int, err error) { + r := regexp.MustCompile(`top=(\d+),left=(\d+),bottom=(\d+),right=(\d+)`) + submatches := r.FindStringSubmatch(padding) + + var i int64 + i, err = strconv.ParseInt(submatches[1], 10, 64) + if err != nil { + return + } + top = int(i) + + i, err = strconv.ParseInt(submatches[2], 10, 64) + if err != nil { + return + } + left = int(i) + + i, err = strconv.ParseInt(submatches[3], 10, 64) + bottom = int(i) + if err != nil { + return + } + + i, err = strconv.ParseInt(submatches[4], 10, 64) + if err != nil { + return + } + right = int(i) + + return +} From c7701d93d2324bf66ac747217cbc65329ac779e0 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 26 Jun 2023 17:51:15 -0700 Subject: [PATCH 028/138] fix icon_positions test --- e2etests/testdata/files/icon_positions.d2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2etests/testdata/files/icon_positions.d2 b/e2etests/testdata/files/icon_positions.d2 index 77a3ee84a..fc020e7dd 100644 --- a/e2etests/testdata/files/icon_positions.d2 +++ b/e2etests/testdata/files/icon_positions.d2 @@ -31,7 +31,8 @@ non container: { } container: { - Default.Default.class: icon + Default.class: icon + Default.Default OutsideTopLeft.class: [icon; OutsideTopLeft] OutsideTopCenter.class: [icon; OutsideTopCenter] From 95156063d26bb14c83856641db05e0cf560290f5 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 26 Jun 2023 11:21:11 -0700 Subject: [PATCH 029/138] update, refactor, cleanup --- d2layouts/d2elklayout/layout.go | 401 +++++++++++++++++--------------- 1 file changed, 217 insertions(+), 184 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 50fc2feb8..b806c830d 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -216,92 +216,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - height := obj.Height - width := obj.Width - if obj.HasLabel() { - if obj.HasOutsideBottomLabel() || obj.Icon != nil { - height += float64(obj.LabelDimensions.Height) + label.PADDING - } - width = go2.Max(width, float64(obj.LabelDimensions.Width)) - } - - padTop, padLeft, padBottom, padRight, err := parsePadding(opts.Padding) - if err != nil { - panic(err) - } - - // reserve spacing for outside labels - if obj.HasLabel() && obj.LabelPosition != nil && !obj.HasOutsideBottomLabel() { - position := label.Position(*obj.LabelPosition) - if position.IsShapePosition() { - switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - height += float64(obj.LabelDimensions.Height) + label.PADDING - } - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - width += float64(obj.LabelDimensions.Width) + label.PADDING - } - - // Inside padding - paddingX := obj.LabelDimensions.Width + 2*label.PADDING - paddingY := obj.LabelDimensions.Height + 2*label.PADDING - switch position { - case label.InsideTopLeft: - // TODO: consider only adding Y padding for labels in corners, and just ensure the total width fits - if paddingY > padTop { - padTop = paddingY - } - if paddingX > padLeft { - padLeft = paddingX - } - case label.InsideTopCenter: - if paddingY > padTop { - padTop = paddingY - } - case label.InsideTopRight: - if paddingY > padTop { - padTop = paddingY - } - if paddingX > padRight { - padRight = paddingX - } - case label.InsideBottomLeft: - if paddingY > padBottom { - padBottom = paddingY - } - if paddingX > padLeft { - padLeft = paddingX - } - case label.InsideBottomCenter: - if paddingY > padBottom { - padBottom = paddingY - } - case label.InsideBottomRight: - if paddingY > padBottom { - padBottom = paddingY - } - if paddingX > padRight { - padRight = paddingX - } - case label.InsideMiddleLeft: - if paddingX > padLeft { - padLeft = paddingX - } - case label.InsideMiddleRight: - if paddingX > padRight { - padRight = paddingX - } - } - } - } - - // reserve extra space for 3d/multiple by providing elk the larger dimensions - dx, dy := obj.GetModifierElementAdjustments() - width += dx - height += dy + width, height := adjustDimensions(obj) n := &ELKNode{ ID: obj.AbsID(), @@ -338,38 +253,22 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err case "RIGHT", "LEFT": n.LayoutOptions.NodeSizeMinimum = fmt.Sprintf("(%d, %d)", int(math.Ceil(width)), int(math.Ceil(height))) } - - if n.LayoutOptions.Padding == DefaultOpts.Padding { - labelHeight := 0 - if obj.HasLabel() { - labelHeight = obj.LabelDimensions.Height + label.PADDING - } - - n.Height += 100 + float64(labelHeight) - n.Width += 100 - contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(n.Width), float64(n.Height)) - shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] - s := shape.NewShape(shapeType, contentBox) - - paddingTop := n.Height - s.GetInnerBox().Height - n.Height -= (100 + float64(labelHeight)) - n.Width -= 100 - - iconHeight := 0 - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - iconHeight = d2target.GetIconSize(s.GetInnerBox(), string(label.InsideTopLeft)) + label.PADDING*2 - } - - paddingTop += float64(go2.Max(labelHeight, iconHeight)) - - padTop = go2.Max(int(math.Ceil(paddingTop)), padTop) - } } else { n.LayoutOptions = &elkOpts{ SelfLoopDistribution: "EQUALLY", } } + padTop, padLeft, padBottom, padRight, err := parsePadding(opts.Padding) + if err != nil { + // TODO + panic(err) + } + + if len(obj.ChildrenArray) > 0 && opts.Padding == DefaultOpts.Padding { + padTop, padLeft, padBottom, padRight = adjustPadding(obj, width, height, padTop, padLeft, padBottom, padRight) + } + n.LayoutOptions.Padding = fmt.Sprintf("[top=%d,left=%d,bottom=%d,right=%d]", padTop, padLeft, padBottom, padRight) @@ -483,70 +382,9 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.Width = math.Ceil(n.Width) obj.Height = math.Ceil(n.Height) - if obj.Icon != nil && obj.IconPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.IconPosition = go2.Pointer(string(label.InsideTopLeft)) - if obj.LabelPosition == nil { - obj.LabelPosition = go2.Pointer(string(label.InsideTopRight)) - } - } else { - obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) - } - } - if obj.HasLabel() && obj.LabelPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) - } else if obj.HasOutsideBottomLabel() { - obj.LabelPosition = go2.Pointer(string(label.OutsideBottomCenter)) - obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING - } else if obj.Icon != nil { - obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) - } else { - obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) - } - } - byID[obj.AbsID()] = obj }) - for _, obj := range g.Objects { - // adjust size and position to account for space reserved for labels - if obj.HasLabel() && obj.LabelPosition != nil && !obj.HasOutsideBottomLabel() { - position := label.Position(*obj.LabelPosition) - if position.IsShapePosition() { - var dx, dy float64 - switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - dy = float64(obj.LabelDimensions.Height) + label.PADDING - obj.Height -= dy - } - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - dx = float64(obj.LabelDimensions.Width) + label.PADDING - obj.Width -= dx - } - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: - obj.TopLeft.X += dx / 2 - obj.MoveWithDescendants(dx/2, 0) - case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - obj.TopLeft.X += dx / 2 - obj.MoveWithDescendants(-dx/2, 0) - } - switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: - obj.TopLeft.Y += dy / 2 - obj.MoveWithDescendants(0, dy/2) - case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - obj.TopLeft.Y += dy / 2 - obj.MoveWithDescendants(0, -dy/2) - } - } - } - } - for _, edge := range g.Edges { e := elkEdges[edge] @@ -577,18 +415,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } - // remove the extra width/height we added for 3d/multiple after all objects/connections are placed - // and shift the shapes down accordingly for _, obj := range g.Objects { - dx, dy := obj.GetModifierElementAdjustments() - if dx != 0 || dy != 0 { - obj.TopLeft.Y += dy - obj.ShiftDescendants(0, dy) - if !obj.IsContainer() { - obj.Width -= dx - obj.Height -= dy - } - } + positionLabelsIcons(obj) + } + for _, obj := range g.Objects { + cleanupAdjustment(obj) } for _, edge := range g.Edges { @@ -955,3 +786,205 @@ func parsePadding(padding string) (top, left, bottom, right int, err error) { return } + +func adjustPadding(obj *d2graph.Object, width, height float64, defaultTop, defaultLeft, defaultBottom, defaultRight int) (top, left, bottom, right int) { + padTop, padLeft, padBottom, padRight := defaultTop, defaultLeft, defaultBottom, defaultRight + + if obj.IsContainer() || obj.Icon != nil { + labelHeight := 0 + if obj.HasLabel() { + labelHeight = obj.LabelDimensions.Height + label.PADDING + } + + // TODO why 100? + height += 100 + float64(labelHeight) + width += 100 + contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(width), float64(height)) + shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] + s := shape.NewShape(shapeType, contentBox) + + paddingTop := height - s.GetInnerBox().Height + + iconHeight := 0 + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + iconHeight = d2target.GetIconSize(s.GetInnerBox(), string(label.InsideTopLeft)) + label.PADDING*2 + } + + paddingTop += float64(go2.Max(labelHeight, iconHeight)) + + // TODO not just outside top + padTop = go2.Max(padTop, int(math.Ceil(paddingTop))) + } + + if obj.HasLabel() && obj.LabelPosition != nil { + position := label.Position(*obj.LabelPosition) + if !position.IsOutside() { + // Inside padding + paddingX := obj.LabelDimensions.Width + 2*label.PADDING + paddingY := obj.LabelDimensions.Height + 2*label.PADDING + switch position { + case label.InsideTopLeft: + // TODO: consider only adding Y padding for labels in corners, and just ensure the total width fits + if paddingY > padTop { + padTop = paddingY + } + if paddingX > padLeft { + padLeft = paddingX + } + case label.InsideTopCenter: + if paddingY > padTop { + padTop = paddingY + } + case label.InsideTopRight: + if paddingY > padTop { + padTop = paddingY + } + if paddingX > padRight { + padRight = paddingX + } + case label.InsideBottomLeft: + if paddingY > padBottom { + padBottom = paddingY + } + if paddingX > padLeft { + padLeft = paddingX + } + case label.InsideBottomCenter: + if paddingY > padBottom { + padBottom = paddingY + } + case label.InsideBottomRight: + if paddingY > padBottom { + padBottom = paddingY + } + if paddingX > padRight { + padRight = paddingX + } + case label.InsideMiddleLeft: + if paddingX > padLeft { + padLeft = paddingX + } + case label.InsideMiddleRight: + if paddingX > padRight { + padRight = paddingX + } + } + } + } + + return padTop, padLeft, padBottom, padRight +} + +func adjustDimensions(obj *d2graph.Object) (width, height float64) { + width = obj.Width + height = obj.Height + + // reserve spacing for labels + if obj.HasLabel() { + var position label.Position + if obj.LabelPosition != nil { + position = label.Position(*obj.LabelPosition) + } else if len(obj.ChildrenArray) == 0 && obj.HasOutsideBottomLabel() { + position = label.OutsideBottomCenter + } + + if position.IsShapePosition() { + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + height += float64(obj.LabelDimensions.Height) + label.PADDING + // TODO labelWidth+2*label.PADDING + width = go2.Max(width, float64(obj.LabelDimensions.Width)) + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + width += float64(obj.LabelDimensions.Width) + label.PADDING + } + } + + // reserve extra if there's also an icon + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + height += float64(obj.LabelDimensions.Height) + label.PADDING + } + } + + // reserve extra space for 3d/multiple by providing elk the larger dimensions + dx, dy := obj.GetModifierElementAdjustments() + width += dx + height += dy + + return +} + +func cleanupAdjustment(obj *d2graph.Object) { + // adjust size and position to account for space reserved for labels + if obj.HasLabel() { + position := label.Position(*obj.LabelPosition) + if position.IsShapePosition() { + var dx, dy float64 + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + dy = float64(obj.LabelDimensions.Height) + label.PADDING + obj.Height -= dy + } + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + dx = float64(obj.LabelDimensions.Width) + label.PADDING + obj.Width -= dx + } + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + obj.TopLeft.X += dx + obj.ShiftDescendants(dx/2, 0) + case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + obj.ShiftDescendants(-dx/2, 0) + } + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + obj.TopLeft.Y += dy / 2 + case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + // TODO remove, just avoiding behavior change for now + if !obj.HasOutsideBottomLabel() { + obj.TopLeft.Y += dy / 2 + } + } + } + } + + // remove the extra width/height we added for 3d/multiple after all objects/connections are placed + // and shift the shapes down accordingly + dx, dy := obj.GetModifierElementAdjustments() + if dx != 0 || dy != 0 { + obj.TopLeft.Y += dy + obj.ShiftDescendants(0, dy) + if !obj.IsContainer() { + obj.Width -= dx + obj.Height -= dy + } + } +} + +func positionLabelsIcons(obj *d2graph.Object) { + if obj.Icon != nil && obj.IconPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.IconPosition = go2.Pointer(string(label.InsideTopLeft)) + if obj.LabelPosition == nil { + obj.LabelPosition = go2.Pointer(string(label.InsideTopRight)) + } + } else { + obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } + } + if obj.HasLabel() && obj.LabelPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + } else if obj.HasOutsideBottomLabel() { + obj.LabelPosition = go2.Pointer(string(label.OutsideBottomCenter)) + } else if obj.Icon != nil { + obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + } else { + obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } + } +} From 5979628a177c83d19ddc805c1ac8113e4db5459f Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 26 Jun 2023 16:27:23 -0700 Subject: [PATCH 030/138] update --- d2layouts/d2elklayout/layout.go | 246 +++++++++++++++++++------------- 1 file changed, 150 insertions(+), 96 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index b806c830d..e234cfb59 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -182,6 +182,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err elkGraph.LayoutOptions.Direction = "DOWN" } + // set label and icon positions for ELK + for _, obj := range g.Objects { + positionLabelsIcons(obj) + } + elkNodes := make(map[*d2graph.Object]*ELKNode) elkEdges := make(map[*d2graph.Edge]*ELKEdge) @@ -259,18 +264,17 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - padTop, padLeft, padBottom, padRight, err := parsePadding(opts.Padding) + padding, err := parsePadding(opts.Padding) if err != nil { // TODO panic(err) } if len(obj.ChildrenArray) > 0 && opts.Padding == DefaultOpts.Padding { - padTop, padLeft, padBottom, padRight = adjustPadding(obj, width, height, padTop, padLeft, padBottom, padRight) + padding = adjustPadding(obj, width, height, padding) } - n.LayoutOptions.Padding = fmt.Sprintf("[top=%d,left=%d,bottom=%d,right=%d]", - padTop, padLeft, padBottom, padRight) + n.LayoutOptions.Padding = padding.String() if obj.HasLabel() { n.Labels = append(n.Labels, &ELKLabel{ @@ -415,9 +419,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } - for _, obj := range g.Objects { - positionLabelsIcons(obj) - } for _, obj := range g.Objects { cleanupAdjustment(obj) } @@ -754,26 +755,32 @@ func childrenMaxSelfLoop(parent *d2graph.Object, isWidth bool) int { return max } +type shapePadding struct { + top, left, bottom, right int +} + // parse out values from elk padding string. e.g. "[top=50,left=50,bottom=50,right=50]" -func parsePadding(padding string) (top, left, bottom, right int, err error) { +func parsePadding(in string) (padding shapePadding, err error) { r := regexp.MustCompile(`top=(\d+),left=(\d+),bottom=(\d+),right=(\d+)`) - submatches := r.FindStringSubmatch(padding) + submatches := r.FindStringSubmatch(in) + + padding = shapePadding{top: 50, left: 50, right: 50, bottom: 50} var i int64 i, err = strconv.ParseInt(submatches[1], 10, 64) if err != nil { return } - top = int(i) + padding.top = int(i) i, err = strconv.ParseInt(submatches[2], 10, 64) if err != nil { return } - left = int(i) + padding.left = int(i) i, err = strconv.ParseInt(submatches[3], 10, 64) - bottom = int(i) + padding.bottom = int(i) if err != nil { return } @@ -782,28 +789,83 @@ func parsePadding(padding string) (top, left, bottom, right int, err error) { if err != nil { return } - right = int(i) + padding.right = int(i) - return + return padding, nil } -func adjustPadding(obj *d2graph.Object, width, height float64, defaultTop, defaultLeft, defaultBottom, defaultRight int) (top, left, bottom, right int) { - padTop, padLeft, padBottom, padRight := defaultTop, defaultLeft, defaultBottom, defaultRight +func (padding shapePadding) String() string { + return fmt.Sprintf("[top=%d,left=%d,bottom=%d,right=%d]", padding.top, padding.left, padding.bottom, padding.right) +} +func (padding shapePadding) mergePadding(position label.Position, width, height int) shapePadding { + switch position { + case label.InsideTopLeft: + // TODO: consider only adding Y padding for labels in corners, and just ensure the total width fits + if height > padding.top { + padding.top = height + } + if width > padding.left { + padding.left = width + } + case label.InsideTopCenter: + if height > padding.top { + padding.top = height + } + case label.InsideTopRight: + if height > padding.top { + padding.top = height + } + if width > padding.right { + padding.right = width + } + case label.InsideBottomLeft: + if height > padding.bottom { + padding.bottom = height + } + if width > padding.left { + padding.left = width + } + case label.InsideBottomCenter: + if height > padding.bottom { + padding.bottom = height + } + case label.InsideBottomRight: + if height > padding.bottom { + padding.bottom = height + } + if width > padding.right { + padding.right = width + } + case label.InsideMiddleLeft: + if width > padding.left { + padding.left = width + } + case label.InsideMiddleRight: + if width > padding.right { + padding.right = width + } + } + + return padding +} + +func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadding) shapePadding { if obj.IsContainer() || obj.Icon != nil { labelHeight := 0 if obj.HasLabel() { - labelHeight = obj.LabelDimensions.Height + label.PADDING + labelHeight = obj.LabelDimensions.Height + 2*label.PADDING } - // TODO why 100? - height += 100 + float64(labelHeight) - width += 100 contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(width), float64(height)) shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] s := shape.NewShape(shapeType, contentBox) - paddingTop := height - s.GetInnerBox().Height + innerBox := s.GetInnerBox() + paddingTop := innerBox.TopLeft.Y + paddingBottom := height - (innerBox.TopLeft.Y + innerBox.Height) + paddingLeft := innerBox.TopLeft.X + paddingRight := width - (innerBox.TopLeft.X + innerBox.Width) iconHeight := 0 if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { @@ -812,67 +874,38 @@ func adjustPadding(obj *d2graph.Object, width, height float64, defaultTop, defau paddingTop += float64(go2.Max(labelHeight, iconHeight)) - // TODO not just outside top - padTop = go2.Max(padTop, int(math.Ceil(paddingTop))) + padding.top = go2.Max(padding.top, int(math.Ceil(paddingTop))) + padding.bottom = go2.Max(padding.bottom, int(math.Ceil(paddingBottom))) + + padding.left = go2.Max(padding.left, int(math.Ceil(paddingLeft))) + padding.right = go2.Max(padding.right, int(math.Ceil(paddingRight))) } - if obj.HasLabel() && obj.LabelPosition != nil { + if obj.HasLabel() { position := label.Position(*obj.LabelPosition) if !position.IsOutside() { // Inside padding - paddingX := obj.LabelDimensions.Width + 2*label.PADDING - paddingY := obj.LabelDimensions.Height + 2*label.PADDING - switch position { - case label.InsideTopLeft: - // TODO: consider only adding Y padding for labels in corners, and just ensure the total width fits - if paddingY > padTop { - padTop = paddingY - } - if paddingX > padLeft { - padLeft = paddingX - } - case label.InsideTopCenter: - if paddingY > padTop { - padTop = paddingY - } - case label.InsideTopRight: - if paddingY > padTop { - padTop = paddingY - } - if paddingX > padRight { - padRight = paddingX - } - case label.InsideBottomLeft: - if paddingY > padBottom { - padBottom = paddingY - } - if paddingX > padLeft { - padLeft = paddingX - } - case label.InsideBottomCenter: - if paddingY > padBottom { - padBottom = paddingY - } - case label.InsideBottomRight: - if paddingY > padBottom { - padBottom = paddingY - } - if paddingX > padRight { - padRight = paddingX - } - case label.InsideMiddleLeft: - if paddingX > padLeft { - padLeft = paddingX - } - case label.InsideMiddleRight: - if paddingX > padRight { - padRight = paddingX - } - } + padding = padding.mergePadding( + position, + obj.LabelDimensions.Width+2*label.PADDING, + obj.LabelDimensions.Height+2*label.PADDING, + ) } } - return padTop, padLeft, padBottom, padRight + if obj.Icon != nil { + position := label.Position(*obj.IconPosition) + if !position.IsOutside() { + // Inside padding + padding = padding.mergePadding( + position, + d2target.MAX_ICON_SIZE+2*label.PADDING, + d2target.MAX_ICON_SIZE+2*label.PADDING, + ) + } + } + + return padding } func adjustDimensions(obj *d2graph.Object) (width, height float64) { @@ -892,7 +925,6 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { switch position { case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - height += float64(obj.LabelDimensions.Height) + label.PADDING // TODO labelWidth+2*label.PADDING width = go2.Max(width, float64(obj.LabelDimensions.Width)) case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, @@ -907,6 +939,24 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { } } + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + var position label.Position + if obj.IconPosition != nil { + position = label.Position(*obj.IconPosition) + } + + if position.IsShapePosition() { + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + width += d2target.MAX_ICON_SIZE + label.PADDING + } + } + } + // reserve extra space for 3d/multiple by providing elk the larger dimensions dx, dy := obj.GetModifierElementAdjustments() width += dx @@ -920,34 +970,38 @@ func cleanupAdjustment(obj *d2graph.Object) { if obj.HasLabel() { position := label.Position(*obj.LabelPosition) if position.IsShapePosition() { - var dx, dy float64 - switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - dy = float64(obj.LabelDimensions.Height) + label.PADDING - obj.Height -= dy - } + var labelWidth float64 switch position { case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - dx = float64(obj.LabelDimensions.Width) + label.PADDING - obj.Width -= dx + labelWidth = float64(obj.LabelDimensions.Width) + label.PADDING + obj.Width -= labelWidth } switch position { case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: - obj.TopLeft.X += dx - obj.ShiftDescendants(dx/2, 0) + obj.TopLeft.X += labelWidth + obj.ShiftDescendants(labelWidth/2, 0) case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - obj.ShiftDescendants(-dx/2, 0) + obj.ShiftDescendants(-labelWidth/2, 0) + } + } + } + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + position := label.Position(*obj.IconPosition) + if position.IsShapePosition() { + var iconWidth float64 + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + iconWidth = d2target.MAX_ICON_SIZE + label.PADDING + obj.Width -= iconWidth } switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: - obj.TopLeft.Y += dy / 2 - case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - // TODO remove, just avoiding behavior change for now - if !obj.HasOutsideBottomLabel() { - obj.TopLeft.Y += dy / 2 - } + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + obj.TopLeft.X += iconWidth + obj.ShiftDescendants(iconWidth/2, 0) + case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + obj.ShiftDescendants(-iconWidth/2, 0) } } } @@ -966,7 +1020,7 @@ func cleanupAdjustment(obj *d2graph.Object) { } func positionLabelsIcons(obj *d2graph.Object) { - if obj.Icon != nil && obj.IconPosition == nil { + if obj.Icon != nil && obj.Attributes.IconPosition == nil { if len(obj.ChildrenArray) > 0 { obj.IconPosition = go2.Pointer(string(label.InsideTopLeft)) if obj.LabelPosition == nil { @@ -976,7 +1030,7 @@ func positionLabelsIcons(obj *d2graph.Object) { obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) } } - if obj.HasLabel() && obj.LabelPosition == nil { + if obj.HasLabel() && obj.Attributes.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) } else if obj.HasOutsideBottomLabel() { From 3431c70c303c72cc26825662d000ac6d4118126a Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 26 Jun 2023 19:04:15 -0700 Subject: [PATCH 031/138] adjust parent padding for child outside icons --- d2layouts/d2elklayout/layout.go | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index e234cfb59..91bce95df 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -292,6 +292,47 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err elkNodes[obj] = n }) + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + + var hasTop, hasBottom bool + + for _, child := range obj.ChildrenArray { + if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { + continue + } + + position := label.Position(*child.IconPosition) + + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + hasTop = true + case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + hasBottom = true + } + } + + if hasTop || hasBottom { + padding, err := parsePadding(elkNodes[obj].LayoutOptions.Padding) + if err != nil { + // TODO add validation to plugin option + panic(err) + } + + if hasTop { + padding.top = go2.Max(padding.top, d2target.MAX_ICON_SIZE+2*label.PADDING) + } + if hasBottom { + padding.bottom = go2.Max(padding.bottom, d2target.MAX_ICON_SIZE+2*label.PADDING) + } + + elkNodes[obj].LayoutOptions.Padding = padding.String() + } + + } + for _, edge := range g.Edges { e := &ELKEdge{ ID: edge.AbsID(), From 42988d5f9018d7d49fea6974f4147a40a109f0a8 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 26 Jun 2023 19:36:22 -0700 Subject: [PATCH 032/138] update padding for label and icons --- d2layouts/d2elklayout/layout.go | 58 ++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 16 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 91bce95df..4f8503d4c 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -893,33 +893,59 @@ func (padding shapePadding) mergePadding(position label.Position, width, height func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadding) shapePadding { if obj.IsContainer() || obj.Icon != nil { - labelHeight := 0 - if obj.HasLabel() { - labelHeight = obj.LabelDimensions.Height + 2*label.PADDING - } - contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(width), float64(height)) shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] s := shape.NewShape(shapeType, contentBox) innerBox := s.GetInnerBox() - paddingTop := innerBox.TopLeft.Y - paddingBottom := height - (innerBox.TopLeft.Y + innerBox.Height) - paddingLeft := innerBox.TopLeft.X - paddingRight := width - (innerBox.TopLeft.X + innerBox.Width) + // base padding + padding.top = go2.Max(padding.top, + int(math.Ceil(innerBox.TopLeft.Y)), + ) + padding.bottom = go2.Max(padding.bottom, + int(math.Ceil(height-(innerBox.TopLeft.Y+innerBox.Height))), + ) + padding.left = go2.Max(padding.left, + int(math.Ceil(innerBox.TopLeft.X)), + ) + padding.right = go2.Max(padding.right, + int(math.Ceil(width-(innerBox.TopLeft.X+innerBox.Width))), + ) + // additional padding for label/icon + labelHeight := 0 + if obj.HasLabel() { + labelHeight = obj.LabelDimensions.Height + 2*label.PADDING + } iconHeight := 0 if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - iconHeight = d2target.GetIconSize(s.GetInnerBox(), string(label.InsideTopLeft)) + label.PADDING*2 + iconHeight = d2target.GetIconSize(innerBox, string(label.InsideTopLeft)) + 2*label.PADDING } - paddingTop += float64(go2.Max(labelHeight, iconHeight)) + var extraTop, extraBottom int + if obj.LabelPosition != nil { + switch label.Position(*obj.LabelPosition) { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + extraTop = labelHeight + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + extraBottom = labelHeight + } + } + if obj.IconPosition != nil { + switch label.Position(*obj.IconPosition) { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + extraTop = go2.Max(extraTop, iconHeight) + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + extraBottom = go2.Max(extraBottom, iconHeight) + } + } + padding.top += extraTop + padding.bottom += extraBottom - padding.top = go2.Max(padding.top, int(math.Ceil(paddingTop))) - padding.bottom = go2.Max(padding.bottom, int(math.Ceil(paddingBottom))) - - padding.left = go2.Max(padding.left, int(math.Ceil(paddingLeft))) - padding.right = go2.Max(padding.right, int(math.Ceil(paddingRight))) + // TODO find better solution to handle attempts to adjust diamond inner box with padding + if shapeType == shape.DIAMOND_TYPE { + padding.top += go2.Max(labelHeight/2, iconHeight/2) + } } if obj.HasLabel() { From b3713d1fa7836afc3026631ec4bd95f78f6a858d Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 27 Jun 2023 12:15:28 -0700 Subject: [PATCH 033/138] fix --- d2layouts/d2elklayout/layout.go | 139 +++++++++++++++----------------- 1 file changed, 66 insertions(+), 73 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 4f8503d4c..a686456fd 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -892,85 +892,78 @@ func (padding shapePadding) mergePadding(position label.Position, width, height } func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadding) shapePadding { - if obj.IsContainer() || obj.Icon != nil { - contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(width), float64(height)) - shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] - s := shape.NewShape(shapeType, contentBox) - - innerBox := s.GetInnerBox() - // base padding - padding.top = go2.Max(padding.top, - int(math.Ceil(innerBox.TopLeft.Y)), - ) - padding.bottom = go2.Max(padding.bottom, - int(math.Ceil(height-(innerBox.TopLeft.Y+innerBox.Height))), - ) - padding.left = go2.Max(padding.left, - int(math.Ceil(innerBox.TopLeft.X)), - ) - padding.right = go2.Max(padding.right, - int(math.Ceil(width-(innerBox.TopLeft.X+innerBox.Width))), - ) - - // additional padding for label/icon - labelHeight := 0 - if obj.HasLabel() { - labelHeight = obj.LabelDimensions.Height + 2*label.PADDING - } - iconHeight := 0 - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - iconHeight = d2target.GetIconSize(innerBox, string(label.InsideTopLeft)) + 2*label.PADDING - } - - var extraTop, extraBottom int - if obj.LabelPosition != nil { - switch label.Position(*obj.LabelPosition) { - case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: - extraTop = labelHeight - case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: - extraBottom = labelHeight - } - } - if obj.IconPosition != nil { - switch label.Position(*obj.IconPosition) { - case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: - extraTop = go2.Max(extraTop, iconHeight) - case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: - extraBottom = go2.Max(extraBottom, iconHeight) - } - } - padding.top += extraTop - padding.bottom += extraBottom - - // TODO find better solution to handle attempts to adjust diamond inner box with padding - if shapeType == shape.DIAMOND_TYPE { - padding.top += go2.Max(labelHeight/2, iconHeight/2) - } + // TODO don't need to check Icon? + if !obj.IsContainer() && obj.Icon == nil { + return padding } + contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(width), float64(height)) + shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] + s := shape.NewShape(shapeType, contentBox) + innerBox := s.GetInnerBox() + // If the shape inner box + label/icon height becomes greater than the default padding, we want to use that + // + // ┌OUTER───────────────────────────┬────────────────────────────────────────────┐ + // │ │ │ + // │ ┌INNER──────── ┬ ─────────────│───────────────────────────────────────┐ │ + // │ │ │Label Padding │ │ │ + // │ │ ┌LABEL─ ┴ ─────────────│───────┐┬ ┌ICON── ┬ ────┐ │ │ + // │ │ │ │ ││ │ │ │ │ │ + // │ │ │ │ ││Label Height │ Icon│ │ │ │ + // │ │ │ │ ││ │ Height│ │ │ │ + // │ │ └──────────────────────│───────┘┴ │ │ │ │ │ + // │ │ │ └────── ┴ ────┘ │ │ + // │ │ │ │ │ + // │ │ ┴Default ELK Padding │ │ + // │ │ ┌CHILD────────────────────────────────────────────────────────┐ │ │ + // │ │ │ │ │ │ + // │ │ │ │ │ │ + // │ │ │ │ │ │ + // │ │ └─────────────────────────────────────────────────────────────┘ │ │ + // │ │ │ │ + // │ └─────────────────────────────────────────────────────────────────────┘ │ + // │ │ + // └─────────────────────────────────────────────────────────────────────────────┘ + + // base padding + innerTop := int(math.Ceil(innerBox.TopLeft.Y)) + innerBottom := int(math.Ceil(height - (innerBox.TopLeft.Y + innerBox.Height))) + innerLeft := int(math.Ceil(innerBox.TopLeft.X)) + innerRight := int(math.Ceil(width - (innerBox.TopLeft.X + innerBox.Width))) + + // additional padding for label/icon + labelHeight := 0 if obj.HasLabel() { - position := label.Position(*obj.LabelPosition) - if !position.IsOutside() { - // Inside padding - padding = padding.mergePadding( - position, - obj.LabelDimensions.Width+2*label.PADDING, - obj.LabelDimensions.Height+2*label.PADDING, - ) + labelHeight = obj.LabelDimensions.Height + 2*label.PADDING + } + iconHeight := 0 + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + iconHeight = d2target.GetIconSize(innerBox, string(label.InsideTopLeft)) + 2*label.PADDING + } + + var extraTop, extraBottom int + // TODO left right + if obj.LabelPosition != nil { + switch label.Position(*obj.LabelPosition) { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + extraTop = labelHeight + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + extraBottom = labelHeight + } + } + if obj.IconPosition != nil { + switch label.Position(*obj.IconPosition) { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + extraTop = go2.Max(extraTop, iconHeight) + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + extraBottom = go2.Max(extraBottom, iconHeight) } } - if obj.Icon != nil { - position := label.Position(*obj.IconPosition) - if !position.IsOutside() { - // Inside padding - padding = padding.mergePadding( - position, - d2target.MAX_ICON_SIZE+2*label.PADDING, - d2target.MAX_ICON_SIZE+2*label.PADDING, - ) - } - } + padding.top = go2.Max(padding.top, innerTop+extraTop) + padding.bottom = go2.Max(padding.bottom, innerBottom+extraBottom) + padding.left = go2.Max(padding.left, innerLeft) + padding.right = go2.Max(padding.right, innerRight) return padding } From b6263a49558bab854366efe10e240746d5061d1d Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 27 Jun 2023 12:19:41 -0700 Subject: [PATCH 034/138] left right --- d2layouts/d2elklayout/layout.go | 37 ++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index a686456fd..813f0c7f5 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -932,38 +932,41 @@ func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadd innerRight := int(math.Ceil(width - (innerBox.TopLeft.X + innerBox.Width))) // additional padding for label/icon - labelHeight := 0 - if obj.HasLabel() { - labelHeight = obj.LabelDimensions.Height + 2*label.PADDING - } - iconHeight := 0 - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - iconHeight = d2target.GetIconSize(innerBox, string(label.InsideTopLeft)) + 2*label.PADDING - } - - var extraTop, extraBottom int - // TODO left right - if obj.LabelPosition != nil { + var extraTop, extraBottom, extraLeft, extraRight int + if obj.HasLabel() && obj.LabelPosition != nil { + labelHeight := obj.LabelDimensions.Height + 2*label.PADDING + labelWidth := obj.LabelDimensions.Width + 2*label.PADDING switch label.Position(*obj.LabelPosition) { case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + // TODO for corners we only add height, but need to confirm there is enough width extraTop = labelHeight case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: extraBottom = labelHeight + case label.InsideMiddleLeft: + extraLeft = labelWidth + case label.InsideMiddleRight: + extraRight = labelWidth } } - if obj.IconPosition != nil { + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage && obj.IconPosition != nil { + iconSize := d2target.GetIconSize(innerBox, string(label.InsideTopLeft)) + 2*label.PADDING + switch label.Position(*obj.IconPosition) { case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: - extraTop = go2.Max(extraTop, iconHeight) + extraTop = go2.Max(extraTop, iconSize) case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: - extraBottom = go2.Max(extraBottom, iconHeight) + extraBottom = go2.Max(extraBottom, iconSize) + case label.InsideMiddleLeft: + extraLeft = go2.Max(extraLeft, iconSize) + case label.InsideMiddleRight: + extraRight = go2.Max(extraRight, iconSize) } } padding.top = go2.Max(padding.top, innerTop+extraTop) padding.bottom = go2.Max(padding.bottom, innerBottom+extraBottom) - padding.left = go2.Max(padding.left, innerLeft) - padding.right = go2.Max(padding.right, innerRight) + padding.left = go2.Max(padding.left, innerLeft+extraLeft) + padding.right = go2.Max(padding.right, innerRight+extraRight) return padding } From 8dd87c8747d84eec7fdff7004f4744ea2c8c8ac3 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 27 Jun 2023 12:28:13 -0700 Subject: [PATCH 035/138] add nested_shape_labels test --- e2etests/stable_test.go | 1 + .../testdata/files/nested_shape_labels.d2 | 9 + .../nested_shape_labels/dagre/board.exp.json | 212 ++++++++++++++++++ .../nested_shape_labels/dagre/sketch.exp.svg | 105 +++++++++ .../nested_shape_labels/elk/board.exp.json | 212 ++++++++++++++++++ .../nested_shape_labels/elk/sketch.exp.svg | 105 +++++++++ 6 files changed, 644 insertions(+) create mode 100644 e2etests/testdata/files/nested_shape_labels.d2 create mode 100644 e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json create mode 100644 e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 706fbf612..95ddde4a3 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2782,6 +2782,7 @@ scenarios: { loadFromFile(t, "label_positions"), loadFromFile(t, "icon_positions"), loadFromFile(t, "all_shapes_link"), + loadFromFile(t, "nested_shape_labels"), } runa(t, tcs) diff --git a/e2etests/testdata/files/nested_shape_labels.d2 b/e2etests/testdata/files/nested_shape_labels.d2 new file mode 100644 index 000000000..d74f3b88c --- /dev/null +++ b/e2etests/testdata/files/nested_shape_labels.d2 @@ -0,0 +1,9 @@ +aa: { + shape: package + bb.shape: diamond +} + +cc: { + shape: diamond + dd.shape: circle +} diff --git a/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json new file mode 100644 index 000000000..e3002fd3e --- /dev/null +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json @@ -0,0 +1,212 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "aa", + "type": "package", + "pos": { + "x": 0, + "y": 41 + }, + "width": 146, + "height": 151, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "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": "aa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 27, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "aa.bb", + "type": "diamond", + "pos": { + "x": 40, + "y": 70 + }, + "width": 66, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N4", + "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": "bb", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 18, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "cc", + "type": "diamond", + "pos": { + "x": 166, + "y": 41 + }, + "width": 156, + "height": 151, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N4", + "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": "cc", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 25, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "cc.dd", + "type": "oval", + "pos": { + "x": 206, + "y": 78 + }, + "width": 76, + "height": 76, + "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": "dd", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 19, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg new file mode 100644 index 000000000..22ec7c748 --- /dev/null +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg @@ -0,0 +1,105 @@ +aaccbbdd + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json b/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json new file mode 100644 index 000000000..2cb277438 --- /dev/null +++ b/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json @@ -0,0 +1,212 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "aa", + "type": "package", + "pos": { + "x": 12, + "y": 12 + }, + "width": 166, + "height": 207, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "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": "aa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 27, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "aa.bb", + "type": "diamond", + "pos": { + "x": 62, + "y": 77 + }, + "width": 66, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N4", + "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": "bb", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 18, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "cc", + "type": "diamond", + "pos": { + "x": 198, + "y": 14 + }, + "width": 176, + "height": 203, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N4", + "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": "cc", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 25, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "cc.dd", + "type": "oval", + "pos": { + "x": 248, + "y": 91 + }, + "width": 76, + "height": 76, + "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": "dd", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 19, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg new file mode 100644 index 000000000..08e3fdf79 --- /dev/null +++ b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg @@ -0,0 +1,105 @@ +aaccbbdd + + + + + + \ No newline at end of file From e2289fb13f17fdcc49976c6c7e1cd68a34c95bf9 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 27 Jun 2023 13:21:11 -0700 Subject: [PATCH 036/138] account for shape growth --- d2layouts/d2elklayout/layout.go | 81 +++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 34 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 813f0c7f5..3e5963181 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -896,7 +896,52 @@ func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadd if !obj.IsContainer() && obj.Icon == nil { return padding } - contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(width), float64(height)) + + // compute extra space padding for label/icon + var extraTop, extraBottom, extraLeft, extraRight int + if obj.HasLabel() && obj.LabelPosition != nil { + labelHeight := obj.LabelDimensions.Height + 2*label.PADDING + labelWidth := obj.LabelDimensions.Width + 2*label.PADDING + switch label.Position(*obj.LabelPosition) { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + // TODO for corners we only add height, but need to confirm there is enough width + extraTop = labelHeight + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + extraBottom = labelHeight + case label.InsideMiddleLeft: + extraLeft = labelWidth + case label.InsideMiddleRight: + extraRight = labelWidth + } + } + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage && obj.IconPosition != nil { + iconSize := d2target.MAX_ICON_SIZE + 2*label.PADDING + switch label.Position(*obj.IconPosition) { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + extraTop = go2.Max(extraTop, iconSize) + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + extraBottom = go2.Max(extraBottom, iconSize) + case label.InsideMiddleLeft: + extraLeft = go2.Max(extraLeft, iconSize) + case label.InsideMiddleRight: + extraRight = go2.Max(extraRight, iconSize) + } + } + + maxChildWidth, maxChildHeight := math.Inf(-1), math.Inf(-1) + for _, c := range obj.ChildrenArray { + if c.Width > maxChildWidth { + maxChildWidth = c.Width + } + if c.Height > maxChildHeight { + maxChildHeight = c.Height + } + } + // We don't know exactly what the shape dimensions will be after layout, but for more accurate innerBox dimensions, + // we add the maxChildWidth and maxChildHeight with computed additions for the innerBox calculation + width += maxChildWidth + float64(extraLeft+extraRight) + height += maxChildHeight + float64(extraTop+extraBottom) + contentBox := geo.NewBox(geo.NewPoint(0, 0), width, height) shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] s := shape.NewShape(shapeType, contentBox) innerBox := s.GetInnerBox() @@ -925,44 +970,12 @@ func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadd // │ │ // └─────────────────────────────────────────────────────────────────────────────┘ - // base padding + // estimated shape innerBox padding innerTop := int(math.Ceil(innerBox.TopLeft.Y)) innerBottom := int(math.Ceil(height - (innerBox.TopLeft.Y + innerBox.Height))) innerLeft := int(math.Ceil(innerBox.TopLeft.X)) innerRight := int(math.Ceil(width - (innerBox.TopLeft.X + innerBox.Width))) - // additional padding for label/icon - var extraTop, extraBottom, extraLeft, extraRight int - if obj.HasLabel() && obj.LabelPosition != nil { - labelHeight := obj.LabelDimensions.Height + 2*label.PADDING - labelWidth := obj.LabelDimensions.Width + 2*label.PADDING - switch label.Position(*obj.LabelPosition) { - case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: - // TODO for corners we only add height, but need to confirm there is enough width - extraTop = labelHeight - case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: - extraBottom = labelHeight - case label.InsideMiddleLeft: - extraLeft = labelWidth - case label.InsideMiddleRight: - extraRight = labelWidth - } - } - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage && obj.IconPosition != nil { - iconSize := d2target.GetIconSize(innerBox, string(label.InsideTopLeft)) + 2*label.PADDING - - switch label.Position(*obj.IconPosition) { - case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: - extraTop = go2.Max(extraTop, iconSize) - case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: - extraBottom = go2.Max(extraBottom, iconSize) - case label.InsideMiddleLeft: - extraLeft = go2.Max(extraLeft, iconSize) - case label.InsideMiddleRight: - extraRight = go2.Max(extraRight, iconSize) - } - } - padding.top = go2.Max(padding.top, innerTop+extraTop) padding.bottom = go2.Max(padding.bottom, innerBottom+extraBottom) padding.left = go2.Max(padding.left, innerLeft+extraLeft) From d85c1e9f3bea7755ec4bbaca5d7710039ae4765b Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 27 Jun 2023 13:40:04 -0700 Subject: [PATCH 037/138] fix --- d2layouts/d2elklayout/layout.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 3e5963181..0c3c04d96 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -1009,8 +1009,8 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { } } - // reserve extra if there's also an icon - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + // special handling + if obj.HasOutsideBottomLabel() || obj.Icon != nil { height += float64(obj.LabelDimensions.Height) + label.PADDING } } @@ -1082,6 +1082,11 @@ func cleanupAdjustment(obj *d2graph.Object) { } } + // special handling to start/end connections below label + if obj.HasOutsideBottomLabel() { + obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING + } + // remove the extra width/height we added for 3d/multiple after all objects/connections are placed // and shift the shapes down accordingly dx, dy := obj.GetModifierElementAdjustments() @@ -1096,17 +1101,18 @@ func cleanupAdjustment(obj *d2graph.Object) { } func positionLabelsIcons(obj *d2graph.Object) { - if obj.Icon != nil && obj.Attributes.IconPosition == nil { + if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { obj.IconPosition = go2.Pointer(string(label.InsideTopLeft)) if obj.LabelPosition == nil { obj.LabelPosition = go2.Pointer(string(label.InsideTopRight)) + return } } else { obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) } } - if obj.HasLabel() && obj.Attributes.LabelPosition == nil { + if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) } else if obj.HasOutsideBottomLabel() { From 3ebc557ee8aaa9aea1a24e68679691b776189e33 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 27 Jun 2023 14:29:19 -0700 Subject: [PATCH 038/138] cleanup --- d2layouts/d2elklayout/layout.go | 158 ++++++++++---------------------- 1 file changed, 50 insertions(+), 108 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 0c3c04d96..95bb3305c 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -264,18 +264,12 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - padding, err := parsePadding(opts.Padding) - if err != nil { - // TODO - panic(err) - } - - if len(obj.ChildrenArray) > 0 && opts.Padding == DefaultOpts.Padding { + if obj.IsContainer() { + padding := parsePadding(opts.Padding) padding = adjustPadding(obj, width, height, padding) + n.LayoutOptions.Padding = padding.String() } - n.LayoutOptions.Padding = padding.String() - if obj.HasLabel() { n.Labels = append(n.Labels, &ELKLabel{ Text: obj.Label.Value, @@ -292,45 +286,39 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err elkNodes[obj] = n }) + // adjust parent padding for children with outside positioned icons for _, obj := range g.Objects { if !obj.IsContainer() { continue } var hasTop, hasBottom bool - for _, child := range obj.ChildrenArray { if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { continue } - position := label.Position(*child.IconPosition) - - switch position { + switch label.Position(*child.IconPosition) { case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: hasTop = true case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: hasBottom = true } + if hasTop && hasBottom { + break + } } if hasTop || hasBottom { - padding, err := parsePadding(elkNodes[obj].LayoutOptions.Padding) - if err != nil { - // TODO add validation to plugin option - panic(err) - } - + padding := parsePadding(elkNodes[obj].LayoutOptions.Padding) if hasTop { padding.top = go2.Max(padding.top, d2target.MAX_ICON_SIZE+2*label.PADDING) } if hasBottom { padding.bottom = go2.Max(padding.bottom, d2target.MAX_ICON_SIZE+2*label.PADDING) } - elkNodes[obj].LayoutOptions.Padding = padding.String() } - } for _, edge := range g.Edges { @@ -801,99 +789,55 @@ type shapePadding struct { } // parse out values from elk padding string. e.g. "[top=50,left=50,bottom=50,right=50]" -func parsePadding(in string) (padding shapePadding, err error) { - r := regexp.MustCompile(`top=(\d+),left=(\d+),bottom=(\d+),right=(\d+)`) - submatches := r.FindStringSubmatch(in) +func parsePadding(in string) shapePadding { + reTop := regexp.MustCompile(`top=(\d+)`) + reLeft := regexp.MustCompile(`left=(\d+)`) + reBottom := regexp.MustCompile(`bottom=(\d+)`) + reRight := regexp.MustCompile(`right=(\d+)`) - padding = shapePadding{top: 50, left: 50, right: 50, bottom: 50} + padding := shapePadding{} - var i int64 - i, err = strconv.ParseInt(submatches[1], 10, 64) - if err != nil { - return - } - padding.top = int(i) - - i, err = strconv.ParseInt(submatches[2], 10, 64) - if err != nil { - return - } - padding.left = int(i) - - i, err = strconv.ParseInt(submatches[3], 10, 64) - padding.bottom = int(i) - if err != nil { - return + submatches := reTop.FindStringSubmatch(in) + if len(submatches) == 2 { + i, err := strconv.ParseInt(submatches[1], 10, 64) + if err == nil { + padding.top = int(i) + } } - i, err = strconv.ParseInt(submatches[4], 10, 64) - if err != nil { - return + submatches = reLeft.FindStringSubmatch(in) + if len(submatches) == 2 { + i, err := strconv.ParseInt(submatches[1], 10, 64) + if err == nil { + padding.left = int(i) + } } - padding.right = int(i) - return padding, nil -} + submatches = reBottom.FindStringSubmatch(in) + if len(submatches) == 2 { + i, err := strconv.ParseInt(submatches[1], 10, 64) + if err == nil { + padding.bottom = int(i) + } + } -func (padding shapePadding) String() string { - return fmt.Sprintf("[top=%d,left=%d,bottom=%d,right=%d]", padding.top, padding.left, padding.bottom, padding.right) -} - -func (padding shapePadding) mergePadding(position label.Position, width, height int) shapePadding { - switch position { - case label.InsideTopLeft: - // TODO: consider only adding Y padding for labels in corners, and just ensure the total width fits - if height > padding.top { - padding.top = height - } - if width > padding.left { - padding.left = width - } - case label.InsideTopCenter: - if height > padding.top { - padding.top = height - } - case label.InsideTopRight: - if height > padding.top { - padding.top = height - } - if width > padding.right { - padding.right = width - } - case label.InsideBottomLeft: - if height > padding.bottom { - padding.bottom = height - } - if width > padding.left { - padding.left = width - } - case label.InsideBottomCenter: - if height > padding.bottom { - padding.bottom = height - } - case label.InsideBottomRight: - if height > padding.bottom { - padding.bottom = height - } - if width > padding.right { - padding.right = width - } - case label.InsideMiddleLeft: - if width > padding.left { - padding.left = width - } - case label.InsideMiddleRight: - if width > padding.right { - padding.right = width + submatches = reRight.FindStringSubmatch(in) + i, err := strconv.ParseInt(submatches[1], 10, 64) + if len(submatches) == 2 { + if err == nil { + padding.right = int(i) } } return padding } +func (padding shapePadding) String() string { + return fmt.Sprintf("[top=%d,left=%d,bottom=%d,right=%d]", padding.top, padding.left, padding.bottom, padding.right) +} + func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadding) shapePadding { - // TODO don't need to check Icon? - if !obj.IsContainer() && obj.Icon == nil { + if !obj.IsContainer() { return padding } @@ -904,7 +848,7 @@ func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadd labelWidth := obj.LabelDimensions.Width + 2*label.PADDING switch label.Position(*obj.LabelPosition) { case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: - // TODO for corners we only add height, but need to confirm there is enough width + // Note: for corners we only add height extraTop = labelHeight case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: extraBottom = labelHeight @@ -999,13 +943,12 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { if position.IsShapePosition() { switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - // TODO labelWidth+2*label.PADDING - width = go2.Max(width, float64(obj.LabelDimensions.Width)) case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: width += float64(obj.LabelDimensions.Width) + label.PADDING + default: + // TODO labelWidth+2*label.PADDING + width = go2.Max(width, float64(obj.LabelDimensions.Width)) } } @@ -1023,12 +966,11 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { if position.IsShapePosition() { switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: width += d2target.MAX_ICON_SIZE + label.PADDING + default: + width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) } } } From 7fe2f11c4a783dbb21b9e0bc4e7650e6db1687a9 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 27 Jun 2023 14:00:52 -0700 Subject: [PATCH 039/138] update tests --- .../elk/board.exp.json | 2 +- .../elk/sketch.exp.svg | 148 ++--- .../testdata/stable/chaos2/elk/board.exp.json | 86 +-- .../testdata/stable/chaos2/elk/sketch.exp.svg | 592 ++++++++--------- .../elk_container_height/elk/board.exp.json | 4 +- .../elk_container_height/elk/sketch.exp.svg | 162 ++--- .../elk/board.exp.json | 14 +- .../elk/sketch.exp.svg | 168 ++--- .../elk/board.exp.json | 14 +- .../elk/sketch.exp.svg | 168 ++--- .../icon_positions/dagre/board.exp.json | 430 ++++++------- .../icon_positions/dagre/sketch.exp.svg | 342 +++++----- .../stable/icon_positions/elk/board.exp.json | 520 +++++++-------- .../stable/icon_positions/elk/sketch.exp.svg | 342 +++++----- .../stable/investigate/elk/board.exp.json | 20 +- .../stable/investigate/elk/sketch.exp.svg | 176 ++--- .../stable/label_positions/elk/board.exp.json | 306 ++++----- .../stable/label_positions/elk/sketch.exp.svg | 416 ++++++------ .../nested_shape_labels/elk/board.exp.json | 12 +- .../nested_shape_labels/elk/sketch.exp.svg | 168 ++--- .../elk/board.exp.json | 18 +- .../elk/sketch.exp.svg | 166 ++--- .../shape_set_width_height/elk/board.exp.json | 62 +- .../shape_set_width_height/elk/sketch.exp.svg | 606 +++++++++--------- 24 files changed, 2471 insertions(+), 2471 deletions(-) diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json index 15b658c79..f4fb7592e 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 128, - "height": 128, + "height": 123, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg index 0959d98a3..029267e42 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg @@ -1,4 +1,4 @@ - - + .d2-802809420 .fill-N1{fill:#0A0F25;} + .d2-802809420 .fill-N2{fill:#676C7E;} + .d2-802809420 .fill-N3{fill:#9499AB;} + .d2-802809420 .fill-N4{fill:#CFD2DD;} + .d2-802809420 .fill-N5{fill:#DEE1EB;} + .d2-802809420 .fill-N6{fill:#EEF1F8;} + .d2-802809420 .fill-N7{fill:#FFFFFF;} + .d2-802809420 .fill-B1{fill:#0D32B2;} + .d2-802809420 .fill-B2{fill:#0D32B2;} + .d2-802809420 .fill-B3{fill:#E3E9FD;} + .d2-802809420 .fill-B4{fill:#E3E9FD;} + .d2-802809420 .fill-B5{fill:#EDF0FD;} + .d2-802809420 .fill-B6{fill:#F7F8FE;} + .d2-802809420 .fill-AA2{fill:#4A6FF3;} + .d2-802809420 .fill-AA4{fill:#EDF0FD;} + .d2-802809420 .fill-AA5{fill:#F7F8FE;} + .d2-802809420 .fill-AB4{fill:#EDF0FD;} + .d2-802809420 .fill-AB5{fill:#F7F8FE;} + .d2-802809420 .stroke-N1{stroke:#0A0F25;} + .d2-802809420 .stroke-N2{stroke:#676C7E;} + .d2-802809420 .stroke-N3{stroke:#9499AB;} + .d2-802809420 .stroke-N4{stroke:#CFD2DD;} + .d2-802809420 .stroke-N5{stroke:#DEE1EB;} + .d2-802809420 .stroke-N6{stroke:#EEF1F8;} + .d2-802809420 .stroke-N7{stroke:#FFFFFF;} + .d2-802809420 .stroke-B1{stroke:#0D32B2;} + .d2-802809420 .stroke-B2{stroke:#0D32B2;} + .d2-802809420 .stroke-B3{stroke:#E3E9FD;} + .d2-802809420 .stroke-B4{stroke:#E3E9FD;} + .d2-802809420 .stroke-B5{stroke:#EDF0FD;} + .d2-802809420 .stroke-B6{stroke:#F7F8FE;} + .d2-802809420 .stroke-AA2{stroke:#4A6FF3;} + .d2-802809420 .stroke-AA4{stroke:#EDF0FD;} + .d2-802809420 .stroke-AA5{stroke:#F7F8FE;} + .d2-802809420 .stroke-AB4{stroke:#EDF0FD;} + .d2-802809420 .stroke-AB5{stroke:#F7F8FE;} + .d2-802809420 .background-color-N1{background-color:#0A0F25;} + .d2-802809420 .background-color-N2{background-color:#676C7E;} + .d2-802809420 .background-color-N3{background-color:#9499AB;} + .d2-802809420 .background-color-N4{background-color:#CFD2DD;} + .d2-802809420 .background-color-N5{background-color:#DEE1EB;} + .d2-802809420 .background-color-N6{background-color:#EEF1F8;} + .d2-802809420 .background-color-N7{background-color:#FFFFFF;} + .d2-802809420 .background-color-B1{background-color:#0D32B2;} + .d2-802809420 .background-color-B2{background-color:#0D32B2;} + .d2-802809420 .background-color-B3{background-color:#E3E9FD;} + .d2-802809420 .background-color-B4{background-color:#E3E9FD;} + .d2-802809420 .background-color-B5{background-color:#EDF0FD;} + .d2-802809420 .background-color-B6{background-color:#F7F8FE;} + .d2-802809420 .background-color-AA2{background-color:#4A6FF3;} + .d2-802809420 .background-color-AA4{background-color:#EDF0FD;} + .d2-802809420 .background-color-AA5{background-color:#F7F8FE;} + .d2-802809420 .background-color-AB4{background-color:#EDF0FD;} + .d2-802809420 .background-color-AB5{background-color:#F7F8FE;} + .d2-802809420 .color-N1{color:#0A0F25;} + .d2-802809420 .color-N2{color:#676C7E;} + .d2-802809420 .color-N3{color:#9499AB;} + .d2-802809420 .color-N4{color:#CFD2DD;} + .d2-802809420 .color-N5{color:#DEE1EB;} + .d2-802809420 .color-N6{color:#EEF1F8;} + .d2-802809420 .color-N7{color:#FFFFFF;} + .d2-802809420 .color-B1{color:#0D32B2;} + .d2-802809420 .color-B2{color:#0D32B2;} + .d2-802809420 .color-B3{color:#E3E9FD;} + .d2-802809420 .color-B4{color:#E3E9FD;} + .d2-802809420 .color-B5{color:#EDF0FD;} + .d2-802809420 .color-B6{color:#F7F8FE;} + .d2-802809420 .color-AA2{color:#4A6FF3;} + .d2-802809420 .color-AA4{color:#EDF0FD;} + .d2-802809420 .color-AA5{color:#F7F8FE;} + .d2-802809420 .color-AB4{color:#EDF0FD;} + .d2-802809420 .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}]]> + \ No newline at end of file diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index f6c711b04..fe2d77e90 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 720, - "height": 1946, + "height": 1951, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,7 +52,7 @@ "y": 466 }, "width": 525, - "height": 1090, + "height": 1095, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 241, - "y": 816 + "y": 821 }, "width": 334, "height": 690, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 291, - "y": 866 + "y": 871 }, "width": 193, "height": 166, @@ -172,7 +172,7 @@ "type": "text", "pos": { "x": 341, - "y": 961 + "y": 966 }, "width": 16, "height": 21, @@ -212,7 +212,7 @@ "type": "rectangle", "pos": { "x": 377, - "y": 916 + "y": 921 }, "width": 57, "height": 66, @@ -253,7 +253,7 @@ "type": "text", "pos": { "x": 396, - "y": 1208 + "y": 1213 }, "width": 80, "height": 21, @@ -293,7 +293,7 @@ "type": "rectangle", "pos": { "x": 405, - "y": 1390 + "y": 1395 }, "width": 63, "height": 66, @@ -337,7 +337,7 @@ "y": 516 }, "width": 150, - "height": 215, + "height": 220, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -375,7 +375,7 @@ "type": "diamond", "pos": { "x": 200, - "y": 589 + "y": 594 }, "width": 50, "height": 92, @@ -416,7 +416,7 @@ "type": "oval", "pos": { "x": 323, - "y": 586 + "y": 589 }, "width": 74, "height": 74, @@ -457,7 +457,7 @@ "type": "rectangle", "pos": { "x": 259, - "y": 1842 + "y": 1847 }, "width": 120, "height": 66, @@ -643,19 +643,19 @@ "route": [ { "x": 349, - "y": 982 + "y": 987 }, { "x": 349, - "y": 1168 + "y": 1173 }, { "x": 423.1659851074219, - "y": 1168 + "y": 1173 }, { "x": 423.1659851074219, - "y": 1208 + "y": 1213 } ], "animated": false, @@ -689,11 +689,11 @@ "route": [ { "x": 436.5, - "y": 1229 + "y": 1234 }, { "x": 436.5, - "y": 1390 + "y": 1395 } ], "animated": false, @@ -727,19 +727,19 @@ "route": [ { "x": 250, - "y": 731 + "y": 736 }, { "x": 250, - "y": 771 + "y": 776 }, { "x": 359, - "y": 771 + "y": 776 }, { "x": 359, - "y": 866 + "y": 871 } ], "animated": false, @@ -773,15 +773,15 @@ "route": [ { "x": 279.8330078125, - "y": 1842 + "y": 1847 }, { "x": 279.8330078125, - "y": 1802 + "y": 1807 }, { "x": 70.5, - "y": 1802 + "y": 1807 }, { "x": 70.5, @@ -839,7 +839,7 @@ }, { "x": 447.25, - "y": 816 + "y": 821 } ], "animated": false, @@ -885,15 +885,15 @@ }, { "x": 680.5, - "y": 1752 + "y": 1757 }, { "x": 359.8330078125, - "y": 1752 + "y": 1757 }, { "x": 359.8330078125, - "y": 1842 + "y": 1847 } ], "animated": false, @@ -965,15 +965,15 @@ "route": [ { "x": 339.8330078125, - "y": 1842 + "y": 1847 }, { "x": 339.8330078125, - "y": 1702 + "y": 1707 }, { "x": 665, - "y": 1702 + "y": 1707 }, { "x": 665, @@ -985,15 +985,15 @@ }, { "x": 524, - "y": 1168 + "y": 1173 }, { "x": 449.8330078125, - "y": 1168 + "y": 1173 }, { "x": 449.8330078125, - "y": 1208 + "y": 1213 } ], "animated": false, @@ -1073,19 +1073,19 @@ "route": [ { "x": 309.6659851074219, - "y": 1506 + "y": 1511 }, { "x": 309.6659851074219, - "y": 1702 + "y": 1707 }, { "x": 319.8330078125, - "y": 1702 + "y": 1707 }, { "x": 319.8330078125, - "y": 1842 + "y": 1847 } ], "animated": false, @@ -1119,19 +1119,19 @@ "route": [ { "x": 200, - "y": 731 + "y": 736 }, { "x": 200, - "y": 1752 + "y": 1757 }, { "x": 299.8330078125, - "y": 1752 + "y": 1757 }, { "x": 299.8330078125, - "y": 1842 + "y": 1847 } ], "animated": false, diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index f5ac51868..585a668aa 100644 --- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_container_height/elk/board.exp.json b/e2etests/testdata/stable/elk_container_height/elk/board.exp.json index 2e9e53561..d13aaf328 100644 --- a/e2etests/testdata/stable/elk_container_height/elk/board.exp.json +++ b/e2etests/testdata/stable/elk_container_height/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 286, - "height": 229, + "height": 210, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 128, - "y": 125 + "y": 106 }, "width": 53, "height": 66, 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 c97859b14..fb764b898 100644 --- a/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -i can not see the titlex - + .d2-1866833890 .fill-N1{fill:#0A0F25;} + .d2-1866833890 .fill-N2{fill:#676C7E;} + .d2-1866833890 .fill-N3{fill:#9499AB;} + .d2-1866833890 .fill-N4{fill:#CFD2DD;} + .d2-1866833890 .fill-N5{fill:#DEE1EB;} + .d2-1866833890 .fill-N6{fill:#EEF1F8;} + .d2-1866833890 .fill-N7{fill:#FFFFFF;} + .d2-1866833890 .fill-B1{fill:#0D32B2;} + .d2-1866833890 .fill-B2{fill:#0D32B2;} + .d2-1866833890 .fill-B3{fill:#E3E9FD;} + .d2-1866833890 .fill-B4{fill:#E3E9FD;} + .d2-1866833890 .fill-B5{fill:#EDF0FD;} + .d2-1866833890 .fill-B6{fill:#F7F8FE;} + .d2-1866833890 .fill-AA2{fill:#4A6FF3;} + .d2-1866833890 .fill-AA4{fill:#EDF0FD;} + .d2-1866833890 .fill-AA5{fill:#F7F8FE;} + .d2-1866833890 .fill-AB4{fill:#EDF0FD;} + .d2-1866833890 .fill-AB5{fill:#F7F8FE;} + .d2-1866833890 .stroke-N1{stroke:#0A0F25;} + .d2-1866833890 .stroke-N2{stroke:#676C7E;} + .d2-1866833890 .stroke-N3{stroke:#9499AB;} + .d2-1866833890 .stroke-N4{stroke:#CFD2DD;} + .d2-1866833890 .stroke-N5{stroke:#DEE1EB;} + .d2-1866833890 .stroke-N6{stroke:#EEF1F8;} + .d2-1866833890 .stroke-N7{stroke:#FFFFFF;} + .d2-1866833890 .stroke-B1{stroke:#0D32B2;} + .d2-1866833890 .stroke-B2{stroke:#0D32B2;} + .d2-1866833890 .stroke-B3{stroke:#E3E9FD;} + .d2-1866833890 .stroke-B4{stroke:#E3E9FD;} + .d2-1866833890 .stroke-B5{stroke:#EDF0FD;} + .d2-1866833890 .stroke-B6{stroke:#F7F8FE;} + .d2-1866833890 .stroke-AA2{stroke:#4A6FF3;} + .d2-1866833890 .stroke-AA4{stroke:#EDF0FD;} + .d2-1866833890 .stroke-AA5{stroke:#F7F8FE;} + .d2-1866833890 .stroke-AB4{stroke:#EDF0FD;} + .d2-1866833890 .stroke-AB5{stroke:#F7F8FE;} + .d2-1866833890 .background-color-N1{background-color:#0A0F25;} + .d2-1866833890 .background-color-N2{background-color:#676C7E;} + .d2-1866833890 .background-color-N3{background-color:#9499AB;} + .d2-1866833890 .background-color-N4{background-color:#CFD2DD;} + .d2-1866833890 .background-color-N5{background-color:#DEE1EB;} + .d2-1866833890 .background-color-N6{background-color:#EEF1F8;} + .d2-1866833890 .background-color-N7{background-color:#FFFFFF;} + .d2-1866833890 .background-color-B1{background-color:#0D32B2;} + .d2-1866833890 .background-color-B2{background-color:#0D32B2;} + .d2-1866833890 .background-color-B3{background-color:#E3E9FD;} + .d2-1866833890 .background-color-B4{background-color:#E3E9FD;} + .d2-1866833890 .background-color-B5{background-color:#EDF0FD;} + .d2-1866833890 .background-color-B6{background-color:#F7F8FE;} + .d2-1866833890 .background-color-AA2{background-color:#4A6FF3;} + .d2-1866833890 .background-color-AA4{background-color:#EDF0FD;} + .d2-1866833890 .background-color-AA5{background-color:#F7F8FE;} + .d2-1866833890 .background-color-AB4{background-color:#EDF0FD;} + .d2-1866833890 .background-color-AB5{background-color:#F7F8FE;} + .d2-1866833890 .color-N1{color:#0A0F25;} + .d2-1866833890 .color-N2{color:#676C7E;} + .d2-1866833890 .color-N3{color:#9499AB;} + .d2-1866833890 .color-N4{color:#CFD2DD;} + .d2-1866833890 .color-N5{color:#DEE1EB;} + .d2-1866833890 .color-N6{color:#EEF1F8;} + .d2-1866833890 .color-N7{color:#FFFFFF;} + .d2-1866833890 .color-B1{color:#0D32B2;} + .d2-1866833890 .color-B2{color:#0D32B2;} + .d2-1866833890 .color-B3{color:#E3E9FD;} + .d2-1866833890 .color-B4{color:#E3E9FD;} + .d2-1866833890 .color-B5{color:#EDF0FD;} + .d2-1866833890 .color-B6{color:#F7F8FE;} + .d2-1866833890 .color-AA2{color:#4A6FF3;} + .d2-1866833890 .color-AA4{color:#EDF0FD;} + .d2-1866833890 .color-AA5{color:#F7F8FE;} + .d2-1866833890 .color-AB4{color:#EDF0FD;} + .d2-1866833890 .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}]]>i can not see the titlex + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json index afc33fcc2..9f21c148b 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 497, - "height": 572, + "height": 583, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 78, - "y": 142 + "y": 147 }, "width": 364, - "height": 392, + "height": 398, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,10 +90,10 @@ "type": "rectangle", "pos": { "x": 128, - "y": 228 + "y": 238 }, "width": 264, - "height": 256, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 178, - "y": 278 + "y": 289 }, "width": 164, "height": 156, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 228, - "y": 328 + "y": 339 }, "width": 64, "height": 56, 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 312852604..4e1be2dad 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,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight - + .d2-1286233434 .fill-N1{fill:#0A0F25;} + .d2-1286233434 .fill-N2{fill:#676C7E;} + .d2-1286233434 .fill-N3{fill:#9499AB;} + .d2-1286233434 .fill-N4{fill:#CFD2DD;} + .d2-1286233434 .fill-N5{fill:#DEE1EB;} + .d2-1286233434 .fill-N6{fill:#EEF1F8;} + .d2-1286233434 .fill-N7{fill:#FFFFFF;} + .d2-1286233434 .fill-B1{fill:#0D32B2;} + .d2-1286233434 .fill-B2{fill:#0D32B2;} + .d2-1286233434 .fill-B3{fill:#E3E9FD;} + .d2-1286233434 .fill-B4{fill:#E3E9FD;} + .d2-1286233434 .fill-B5{fill:#EDF0FD;} + .d2-1286233434 .fill-B6{fill:#F7F8FE;} + .d2-1286233434 .fill-AA2{fill:#4A6FF3;} + .d2-1286233434 .fill-AA4{fill:#EDF0FD;} + .d2-1286233434 .fill-AA5{fill:#F7F8FE;} + .d2-1286233434 .fill-AB4{fill:#EDF0FD;} + .d2-1286233434 .fill-AB5{fill:#F7F8FE;} + .d2-1286233434 .stroke-N1{stroke:#0A0F25;} + .d2-1286233434 .stroke-N2{stroke:#676C7E;} + .d2-1286233434 .stroke-N3{stroke:#9499AB;} + .d2-1286233434 .stroke-N4{stroke:#CFD2DD;} + .d2-1286233434 .stroke-N5{stroke:#DEE1EB;} + .d2-1286233434 .stroke-N6{stroke:#EEF1F8;} + .d2-1286233434 .stroke-N7{stroke:#FFFFFF;} + .d2-1286233434 .stroke-B1{stroke:#0D32B2;} + .d2-1286233434 .stroke-B2{stroke:#0D32B2;} + .d2-1286233434 .stroke-B3{stroke:#E3E9FD;} + .d2-1286233434 .stroke-B4{stroke:#E3E9FD;} + .d2-1286233434 .stroke-B5{stroke:#EDF0FD;} + .d2-1286233434 .stroke-B6{stroke:#F7F8FE;} + .d2-1286233434 .stroke-AA2{stroke:#4A6FF3;} + .d2-1286233434 .stroke-AA4{stroke:#EDF0FD;} + .d2-1286233434 .stroke-AA5{stroke:#F7F8FE;} + .d2-1286233434 .stroke-AB4{stroke:#EDF0FD;} + .d2-1286233434 .stroke-AB5{stroke:#F7F8FE;} + .d2-1286233434 .background-color-N1{background-color:#0A0F25;} + .d2-1286233434 .background-color-N2{background-color:#676C7E;} + .d2-1286233434 .background-color-N3{background-color:#9499AB;} + .d2-1286233434 .background-color-N4{background-color:#CFD2DD;} + .d2-1286233434 .background-color-N5{background-color:#DEE1EB;} + .d2-1286233434 .background-color-N6{background-color:#EEF1F8;} + .d2-1286233434 .background-color-N7{background-color:#FFFFFF;} + .d2-1286233434 .background-color-B1{background-color:#0D32B2;} + .d2-1286233434 .background-color-B2{background-color:#0D32B2;} + .d2-1286233434 .background-color-B3{background-color:#E3E9FD;} + .d2-1286233434 .background-color-B4{background-color:#E3E9FD;} + .d2-1286233434 .background-color-B5{background-color:#EDF0FD;} + .d2-1286233434 .background-color-B6{background-color:#F7F8FE;} + .d2-1286233434 .background-color-AA2{background-color:#4A6FF3;} + .d2-1286233434 .background-color-AA4{background-color:#EDF0FD;} + .d2-1286233434 .background-color-AA5{background-color:#F7F8FE;} + .d2-1286233434 .background-color-AB4{background-color:#EDF0FD;} + .d2-1286233434 .background-color-AB5{background-color:#F7F8FE;} + .d2-1286233434 .color-N1{color:#0A0F25;} + .d2-1286233434 .color-N2{color:#676C7E;} + .d2-1286233434 .color-N3{color:#9499AB;} + .d2-1286233434 .color-N4{color:#CFD2DD;} + .d2-1286233434 .color-N5{color:#DEE1EB;} + .d2-1286233434 .color-N6{color:#EEF1F8;} + .d2-1286233434 .color-N7{color:#FFFFFF;} + .d2-1286233434 .color-B1{color:#0D32B2;} + .d2-1286233434 .color-B2{color:#0D32B2;} + .d2-1286233434 .color-B3{color:#E3E9FD;} + .d2-1286233434 .color-B4{color:#E3E9FD;} + .d2-1286233434 .color-B5{color:#EDF0FD;} + .d2-1286233434 .color-B6{color:#F7F8FE;} + .d2-1286233434 .color-AA2{color:#4A6FF3;} + .d2-1286233434 .color-AA4{color:#EDF0FD;} + .d2-1286233434 .color-AA5{color:#F7F8FE;} + .d2-1286233434 .color-AB4{color:#EDF0FD;} + .d2-1286233434 .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}]]>ninety ninesixty fourthirty twosixteeneight + - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json index afc33fcc2..9f21c148b 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 497, - "height": 572, + "height": 583, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 78, - "y": 142 + "y": 147 }, "width": 364, - "height": 392, + "height": 398, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,10 +90,10 @@ "type": "rectangle", "pos": { "x": 128, - "y": 228 + "y": 238 }, "width": 264, - "height": 256, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 178, - "y": 278 + "y": 289 }, "width": 164, "height": 156, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 228, - "y": 328 + "y": 339 }, "width": 64, "height": 56, 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 312852604..4e1be2dad 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,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight - + .d2-1286233434 .fill-N1{fill:#0A0F25;} + .d2-1286233434 .fill-N2{fill:#676C7E;} + .d2-1286233434 .fill-N3{fill:#9499AB;} + .d2-1286233434 .fill-N4{fill:#CFD2DD;} + .d2-1286233434 .fill-N5{fill:#DEE1EB;} + .d2-1286233434 .fill-N6{fill:#EEF1F8;} + .d2-1286233434 .fill-N7{fill:#FFFFFF;} + .d2-1286233434 .fill-B1{fill:#0D32B2;} + .d2-1286233434 .fill-B2{fill:#0D32B2;} + .d2-1286233434 .fill-B3{fill:#E3E9FD;} + .d2-1286233434 .fill-B4{fill:#E3E9FD;} + .d2-1286233434 .fill-B5{fill:#EDF0FD;} + .d2-1286233434 .fill-B6{fill:#F7F8FE;} + .d2-1286233434 .fill-AA2{fill:#4A6FF3;} + .d2-1286233434 .fill-AA4{fill:#EDF0FD;} + .d2-1286233434 .fill-AA5{fill:#F7F8FE;} + .d2-1286233434 .fill-AB4{fill:#EDF0FD;} + .d2-1286233434 .fill-AB5{fill:#F7F8FE;} + .d2-1286233434 .stroke-N1{stroke:#0A0F25;} + .d2-1286233434 .stroke-N2{stroke:#676C7E;} + .d2-1286233434 .stroke-N3{stroke:#9499AB;} + .d2-1286233434 .stroke-N4{stroke:#CFD2DD;} + .d2-1286233434 .stroke-N5{stroke:#DEE1EB;} + .d2-1286233434 .stroke-N6{stroke:#EEF1F8;} + .d2-1286233434 .stroke-N7{stroke:#FFFFFF;} + .d2-1286233434 .stroke-B1{stroke:#0D32B2;} + .d2-1286233434 .stroke-B2{stroke:#0D32B2;} + .d2-1286233434 .stroke-B3{stroke:#E3E9FD;} + .d2-1286233434 .stroke-B4{stroke:#E3E9FD;} + .d2-1286233434 .stroke-B5{stroke:#EDF0FD;} + .d2-1286233434 .stroke-B6{stroke:#F7F8FE;} + .d2-1286233434 .stroke-AA2{stroke:#4A6FF3;} + .d2-1286233434 .stroke-AA4{stroke:#EDF0FD;} + .d2-1286233434 .stroke-AA5{stroke:#F7F8FE;} + .d2-1286233434 .stroke-AB4{stroke:#EDF0FD;} + .d2-1286233434 .stroke-AB5{stroke:#F7F8FE;} + .d2-1286233434 .background-color-N1{background-color:#0A0F25;} + .d2-1286233434 .background-color-N2{background-color:#676C7E;} + .d2-1286233434 .background-color-N3{background-color:#9499AB;} + .d2-1286233434 .background-color-N4{background-color:#CFD2DD;} + .d2-1286233434 .background-color-N5{background-color:#DEE1EB;} + .d2-1286233434 .background-color-N6{background-color:#EEF1F8;} + .d2-1286233434 .background-color-N7{background-color:#FFFFFF;} + .d2-1286233434 .background-color-B1{background-color:#0D32B2;} + .d2-1286233434 .background-color-B2{background-color:#0D32B2;} + .d2-1286233434 .background-color-B3{background-color:#E3E9FD;} + .d2-1286233434 .background-color-B4{background-color:#E3E9FD;} + .d2-1286233434 .background-color-B5{background-color:#EDF0FD;} + .d2-1286233434 .background-color-B6{background-color:#F7F8FE;} + .d2-1286233434 .background-color-AA2{background-color:#4A6FF3;} + .d2-1286233434 .background-color-AA4{background-color:#EDF0FD;} + .d2-1286233434 .background-color-AA5{background-color:#F7F8FE;} + .d2-1286233434 .background-color-AB4{background-color:#EDF0FD;} + .d2-1286233434 .background-color-AB5{background-color:#F7F8FE;} + .d2-1286233434 .color-N1{color:#0A0F25;} + .d2-1286233434 .color-N2{color:#676C7E;} + .d2-1286233434 .color-N3{color:#9499AB;} + .d2-1286233434 .color-N4{color:#CFD2DD;} + .d2-1286233434 .color-N5{color:#DEE1EB;} + .d2-1286233434 .color-N6{color:#EEF1F8;} + .d2-1286233434 .color-N7{color:#FFFFFF;} + .d2-1286233434 .color-B1{color:#0D32B2;} + .d2-1286233434 .color-B2{color:#0D32B2;} + .d2-1286233434 .color-B3{color:#E3E9FD;} + .d2-1286233434 .color-B4{color:#E3E9FD;} + .d2-1286233434 .color-B5{color:#EDF0FD;} + .d2-1286233434 .color-B6{color:#F7F8FE;} + .d2-1286233434 .color-AA2{color:#4A6FF3;} + .d2-1286233434 .color-AA4{color:#EDF0FD;} + .d2-1286233434 .color-AA5{color:#F7F8FE;} + .d2-1286233434 .color-AB4{color:#EDF0FD;} + .d2-1286233434 .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}]]>ninety ninesixty fourthirty twosixteeneight + - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon_positions/dagre/board.exp.json b/e2etests/testdata/stable/icon_positions/dagre/board.exp.json index 5c7dc0eb5..818345637 100644 --- a/e2etests/testdata/stable/icon_positions/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon_positions/dagre/board.exp.json @@ -7,7 +7,7 @@ "id": "non container", "type": "rectangle", "pos": { - "x": 187, + "x": 161, "y": 41 }, "width": 5649, @@ -51,7 +51,7 @@ "icon" ], "pos": { - "x": 227, + "x": 201, "y": 86 }, "width": 122, @@ -108,7 +108,7 @@ "OutsideTopLeft" ], "pos": { - "x": 409, + "x": 383, "y": 86 }, "width": 182, @@ -165,7 +165,7 @@ "OutsideTopCenter" ], "pos": { - "x": 651, + "x": 625, "y": 86 }, "width": 202, @@ -222,7 +222,7 @@ "OutsideTopRight" ], "pos": { - "x": 913, + "x": 887, "y": 86 }, "width": 191, @@ -279,7 +279,7 @@ "OutsideLeftTop" ], "pos": { - "x": 1164, + "x": 1138, "y": 86 }, "width": 182, @@ -336,7 +336,7 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1406, + "x": 1380, "y": 86 }, "width": 202, @@ -393,7 +393,7 @@ "OutsideLeftBottom" ], "pos": { - "x": 1668, + "x": 1642, "y": 86 }, "width": 207, @@ -450,7 +450,7 @@ "OutsideRightTop" ], "pos": { - "x": 1935, + "x": 1909, "y": 86 }, "width": 191, @@ -507,7 +507,7 @@ "OutsideRightMiddle" ], "pos": { - "x": 2186, + "x": 2160, "y": 86 }, "width": 212, @@ -564,7 +564,7 @@ "OutsideRightBottom" ], "pos": { - "x": 2458, + "x": 2432, "y": 86 }, "width": 217, @@ -621,7 +621,7 @@ "OutsideBottomLeft" ], "pos": { - "x": 2735, + "x": 2709, "y": 86 }, "width": 208, @@ -678,7 +678,7 @@ "OutsideBottomCenter" ], "pos": { - "x": 3003, + "x": 2977, "y": 86 }, "width": 228, @@ -735,7 +735,7 @@ "OutsideBottomRight" ], "pos": { - "x": 3291, + "x": 3265, "y": 86 }, "width": 218, @@ -792,7 +792,7 @@ "InsideTopLeft" ], "pos": { - "x": 3569, + "x": 3543, "y": 86 }, "width": 168, @@ -849,7 +849,7 @@ "InsideTopCenter" ], "pos": { - "x": 3797, + "x": 3771, "y": 86 }, "width": 189, @@ -906,7 +906,7 @@ "InsideTopRight" ], "pos": { - "x": 4046, + "x": 4020, "y": 86 }, "width": 178, @@ -963,7 +963,7 @@ "InsideMiddleLeft" ], "pos": { - "x": 4284, + "x": 4258, "y": 86 }, "width": 189, @@ -1020,7 +1020,7 @@ "InsideMiddleCenter" ], "pos": { - "x": 4533, + "x": 4507, "y": 86 }, "width": 209, @@ -1077,7 +1077,7 @@ "InsideMiddleRight" ], "pos": { - "x": 4802, + "x": 4776, "y": 86 }, "width": 199, @@ -1134,7 +1134,7 @@ "InsideBottomLeft" ], "pos": { - "x": 5061, + "x": 5035, "y": 86 }, "width": 195, @@ -1191,7 +1191,7 @@ "InsideBottomCenter" ], "pos": { - "x": 5316, + "x": 5290, "y": 86 }, "width": 215, @@ -1248,7 +1248,7 @@ "InsideBottomRight" ], "pos": { - "x": 5591, + "x": 5565, "y": 86 }, "width": 205, @@ -1304,8 +1304,8 @@ "x": 0, "y": 423 }, - "width": 5983, - "height": 341, + "width": 5957, + "height": 289, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1341,12 +1341,15 @@ { "id": "container.Default", "type": "rectangle", + "classes": [ + "icon" + ], "pos": { "x": 20, "y": 504 }, - "width": 202, - "height": 214, + "width": 176, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1359,50 +1362,6 @@ "double-border": false, "tooltip": "", "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "Default", - "fontSize": 24, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 71, - "labelHeight": 31, - "labelPosition": "OUTSIDE_TOP_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "container.Default.Default", - "type": "rectangle", - "classes": [ - "icon" - ], - "pos": { - "x": 60, - "y": 552 - }, - "width": 122, - "height": 118, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", "icon": { "Scheme": "https", "Opaque": "", @@ -1416,7 +1375,48 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "OUTSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Default", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 71, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "container.Default.Default", + "type": "rectangle", + "pos": { + "x": 60, + "y": 552 + }, + "width": 96, + "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, @@ -1431,7 +1431,7 @@ "underline": false, "labelWidth": 51, "labelHeight": 21, - "labelPosition": "INSIDE_TOP_CENTER", + "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 3 }, @@ -1443,11 +1443,11 @@ "OutsideTopLeft" ], "pos": { - "x": 242, + "x": 216, "y": 504 }, "width": 236, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1500,11 +1500,11 @@ "OutsideTopCenter" ], "pos": { - "x": 498, + "x": 472, "y": 504 }, "width": 256, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1557,11 +1557,11 @@ "OutsideTopRight" ], "pos": { - "x": 774, + "x": 748, "y": 504 }, "width": 245, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1614,11 +1614,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1039, + "x": 1013, "y": 504 }, "width": 236, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1671,11 +1671,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1295, + "x": 1269, "y": 504 }, "width": 256, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1728,11 +1728,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1571, + "x": 1545, "y": 504 }, "width": 261, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1785,11 +1785,11 @@ "OutsideRightTop" ], "pos": { - "x": 1852, + "x": 1826, "y": 504 }, "width": 245, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1842,11 +1842,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2117, + "x": 2091, "y": 504 }, "width": 266, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1899,11 +1899,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2403, + "x": 2377, "y": 504 }, "width": 271, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1956,11 +1956,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2694, + "x": 2668, "y": 504 }, "width": 262, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2013,11 +2013,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2976, + "x": 2950, "y": 504 }, "width": 282, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2070,11 +2070,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3278, + "x": 3252, "y": 504 }, "width": 272, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2127,11 +2127,11 @@ "InsideTopLeft" ], "pos": { - "x": 3570, + "x": 3544, "y": 504 }, "width": 222, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2184,11 +2184,11 @@ "InsideTopCenter" ], "pos": { - "x": 3812, + "x": 3786, "y": 504 }, "width": 243, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2241,11 +2241,11 @@ "InsideTopRight" ], "pos": { - "x": 4075, + "x": 4049, "y": 504 }, "width": 232, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2298,11 +2298,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4327, + "x": 4301, "y": 504 }, "width": 243, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2355,11 +2355,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4590, + "x": 4564, "y": 504 }, "width": 263, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2412,11 +2412,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4873, + "x": 4847, "y": 504 }, "width": 253, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2469,11 +2469,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5146, + "x": 5120, "y": 504 }, "width": 249, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2526,11 +2526,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5415, + "x": 5389, "y": 504 }, "width": 269, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2583,11 +2583,11 @@ "InsideBottomRight" ], "pos": { - "x": 5704, + "x": 5678, "y": 504 }, "width": 259, - "height": 214, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2636,8 +2636,8 @@ "id": "container.OutsideTopLeft.OutsideTopLeft", "type": "rectangle", "pos": { - "x": 282, - "y": 578 + "x": 256, + "y": 552 }, "width": 156, "height": 66, @@ -2677,8 +2677,8 @@ "id": "container.OutsideTopCenter.OutsideTopCenter", "type": "rectangle", "pos": { - "x": 538, - "y": 578 + "x": 512, + "y": 552 }, "width": 176, "height": 66, @@ -2718,8 +2718,8 @@ "id": "container.OutsideTopRight.OutsideTopRight", "type": "rectangle", "pos": { - "x": 814, - "y": 578 + "x": 788, + "y": 552 }, "width": 165, "height": 66, @@ -2759,8 +2759,8 @@ "id": "container.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1079, - "y": 578 + "x": 1053, + "y": 552 }, "width": 156, "height": 66, @@ -2800,8 +2800,8 @@ "id": "container.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1335, - "y": 578 + "x": 1309, + "y": 552 }, "width": 176, "height": 66, @@ -2841,8 +2841,8 @@ "id": "container.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1611, - "y": 578 + "x": 1585, + "y": 552 }, "width": 181, "height": 66, @@ -2882,8 +2882,8 @@ "id": "container.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 1892, - "y": 578 + "x": 1866, + "y": 552 }, "width": 165, "height": 66, @@ -2923,8 +2923,8 @@ "id": "container.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2157, - "y": 578 + "x": 2131, + "y": 552 }, "width": 186, "height": 66, @@ -2964,8 +2964,8 @@ "id": "container.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2443, - "y": 578 + "x": 2417, + "y": 552 }, "width": 191, "height": 66, @@ -3005,8 +3005,8 @@ "id": "container.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2734, - "y": 578 + "x": 2708, + "y": 552 }, "width": 182, "height": 66, @@ -3046,8 +3046,8 @@ "id": "container.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 3016, - "y": 578 + "x": 2990, + "y": 552 }, "width": 202, "height": 66, @@ -3087,8 +3087,8 @@ "id": "container.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3318, - "y": 578 + "x": 3292, + "y": 552 }, "width": 192, "height": 66, @@ -3128,8 +3128,8 @@ "id": "container.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3610, - "y": 578 + "x": 3584, + "y": 552 }, "width": 142, "height": 66, @@ -3169,8 +3169,8 @@ "id": "container.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 3852, - "y": 578 + "x": 3826, + "y": 552 }, "width": 163, "height": 66, @@ -3210,8 +3210,8 @@ "id": "container.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4115, - "y": 578 + "x": 4089, + "y": 552 }, "width": 152, "height": 66, @@ -3251,8 +3251,8 @@ "id": "container.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4367, - "y": 578 + "x": 4341, + "y": 552 }, "width": 163, "height": 66, @@ -3292,8 +3292,8 @@ "id": "container.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 4630, - "y": 578 + "x": 4604, + "y": 552 }, "width": 183, "height": 66, @@ -3333,8 +3333,8 @@ "id": "container.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 4913, - "y": 578 + "x": 4887, + "y": 552 }, "width": 173, "height": 66, @@ -3374,8 +3374,8 @@ "id": "container.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5186, - "y": 578 + "x": 5160, + "y": 552 }, "width": 169, "height": 66, @@ -3415,8 +3415,8 @@ "id": "container.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5455, - "y": 578 + "x": 5429, + "y": 552 }, "width": 189, "height": 66, @@ -3456,8 +3456,8 @@ "id": "container.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 5744, - "y": 578 + "x": 5718, + "y": 552 }, "width": 179, "height": 66, @@ -3497,8 +3497,8 @@ "id": "image", "type": "rectangle", "pos": { - "x": 945, - "y": 937 + "x": 919, + "y": 885 }, "width": 4156, "height": 245, @@ -3542,8 +3542,8 @@ "image" ], "pos": { - "x": 985, - "y": 982 + "x": 959, + "y": 930 }, "width": 128, "height": 128, @@ -3600,8 +3600,8 @@ "OutsideTopLeft" ], "pos": { - "x": 1173, - "y": 982 + "x": 1147, + "y": 930 }, "width": 128, "height": 128, @@ -3658,8 +3658,8 @@ "OutsideTopCenter" ], "pos": { - "x": 1361, - "y": 982 + "x": 1335, + "y": 930 }, "width": 128, "height": 128, @@ -3716,8 +3716,8 @@ "OutsideTopRight" ], "pos": { - "x": 1549, - "y": 982 + "x": 1523, + "y": 930 }, "width": 128, "height": 128, @@ -3774,8 +3774,8 @@ "OutsideLeftTop" ], "pos": { - "x": 1737, - "y": 982 + "x": 1711, + "y": 930 }, "width": 128, "height": 128, @@ -3832,8 +3832,8 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1925, - "y": 982 + "x": 1899, + "y": 930 }, "width": 128, "height": 128, @@ -3890,8 +3890,8 @@ "OutsideLeftBottom" ], "pos": { - "x": 2113, - "y": 982 + "x": 2087, + "y": 930 }, "width": 128, "height": 128, @@ -3948,8 +3948,8 @@ "OutsideRightTop" ], "pos": { - "x": 2301, - "y": 982 + "x": 2275, + "y": 930 }, "width": 128, "height": 128, @@ -4006,8 +4006,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 2489, - "y": 982 + "x": 2463, + "y": 930 }, "width": 128, "height": 128, @@ -4064,8 +4064,8 @@ "OutsideRightBottom" ], "pos": { - "x": 2677, - "y": 982 + "x": 2651, + "y": 930 }, "width": 128, "height": 128, @@ -4122,8 +4122,8 @@ "OutsideBottomLeft" ], "pos": { - "x": 2865, - "y": 982 + "x": 2839, + "y": 930 }, "width": 128, "height": 128, @@ -4180,8 +4180,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 3053, - "y": 982 + "x": 3027, + "y": 930 }, "width": 128, "height": 128, @@ -4238,8 +4238,8 @@ "OutsideBottomRight" ], "pos": { - "x": 3241, - "y": 982 + "x": 3215, + "y": 930 }, "width": 128, "height": 128, @@ -4296,8 +4296,8 @@ "InsideTopLeft" ], "pos": { - "x": 3429, - "y": 982 + "x": 3403, + "y": 930 }, "width": 128, "height": 128, @@ -4354,8 +4354,8 @@ "InsideTopCenter" ], "pos": { - "x": 3617, - "y": 982 + "x": 3591, + "y": 930 }, "width": 128, "height": 128, @@ -4412,8 +4412,8 @@ "InsideTopRight" ], "pos": { - "x": 3805, - "y": 982 + "x": 3779, + "y": 930 }, "width": 128, "height": 128, @@ -4470,8 +4470,8 @@ "InsideMiddleLeft" ], "pos": { - "x": 3993, - "y": 982 + "x": 3967, + "y": 930 }, "width": 128, "height": 128, @@ -4528,8 +4528,8 @@ "InsideMiddleCenter" ], "pos": { - "x": 4181, - "y": 982 + "x": 4155, + "y": 930 }, "width": 128, "height": 128, @@ -4586,8 +4586,8 @@ "InsideMiddleRight" ], "pos": { - "x": 4369, - "y": 982 + "x": 4343, + "y": 930 }, "width": 128, "height": 128, @@ -4644,8 +4644,8 @@ "InsideBottomLeft" ], "pos": { - "x": 4557, - "y": 982 + "x": 4531, + "y": 930 }, "width": 128, "height": 128, @@ -4702,8 +4702,8 @@ "InsideBottomCenter" ], "pos": { - "x": 4745, - "y": 982 + "x": 4719, + "y": 930 }, "width": 128, "height": 128, @@ -4760,8 +4760,8 @@ "InsideBottomRight" ], "pos": { - "x": 4933, - "y": 982 + "x": 4907, + "y": 930 }, "width": 128, "height": 128, @@ -4836,19 +4836,19 @@ "labelPercentage": 0, "route": [ { - "x": 3117, + "x": 3091, "y": 250 }, { - "x": 3117, + "x": 3091, "y": 302.79998779296875 }, { - "x": 3117, + "x": 3091, "y": 337.3999938964844 }, { - "x": 3117, + "x": 3091, "y": 423 } ], @@ -4883,20 +4883,20 @@ "labelPercentage": 0, "route": [ { - "x": 3117, - "y": 764 + "x": 3091, + "y": 712 }, { - "x": 3117, - "y": 816.7999877929688 + "x": 3091, + "y": 764.7999877929688 }, { - "x": 3117, - "y": 851.4000244140625 + "x": 3091, + "y": 799.4000244140625 }, { - "x": 3117, - "y": 937 + "x": 3091, + "y": 885 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg index 55fb83111..ce2fbc65e 100644 --- a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-568929630 .fill-N1{fill:#0A0F25;} + .d2-568929630 .fill-N2{fill:#676C7E;} + .d2-568929630 .fill-N3{fill:#9499AB;} + .d2-568929630 .fill-N4{fill:#CFD2DD;} + .d2-568929630 .fill-N5{fill:#DEE1EB;} + .d2-568929630 .fill-N6{fill:#EEF1F8;} + .d2-568929630 .fill-N7{fill:#FFFFFF;} + .d2-568929630 .fill-B1{fill:#0D32B2;} + .d2-568929630 .fill-B2{fill:#0D32B2;} + .d2-568929630 .fill-B3{fill:#E3E9FD;} + .d2-568929630 .fill-B4{fill:#E3E9FD;} + .d2-568929630 .fill-B5{fill:#EDF0FD;} + .d2-568929630 .fill-B6{fill:#F7F8FE;} + .d2-568929630 .fill-AA2{fill:#4A6FF3;} + .d2-568929630 .fill-AA4{fill:#EDF0FD;} + .d2-568929630 .fill-AA5{fill:#F7F8FE;} + .d2-568929630 .fill-AB4{fill:#EDF0FD;} + .d2-568929630 .fill-AB5{fill:#F7F8FE;} + .d2-568929630 .stroke-N1{stroke:#0A0F25;} + .d2-568929630 .stroke-N2{stroke:#676C7E;} + .d2-568929630 .stroke-N3{stroke:#9499AB;} + .d2-568929630 .stroke-N4{stroke:#CFD2DD;} + .d2-568929630 .stroke-N5{stroke:#DEE1EB;} + .d2-568929630 .stroke-N6{stroke:#EEF1F8;} + .d2-568929630 .stroke-N7{stroke:#FFFFFF;} + .d2-568929630 .stroke-B1{stroke:#0D32B2;} + .d2-568929630 .stroke-B2{stroke:#0D32B2;} + .d2-568929630 .stroke-B3{stroke:#E3E9FD;} + .d2-568929630 .stroke-B4{stroke:#E3E9FD;} + .d2-568929630 .stroke-B5{stroke:#EDF0FD;} + .d2-568929630 .stroke-B6{stroke:#F7F8FE;} + .d2-568929630 .stroke-AA2{stroke:#4A6FF3;} + .d2-568929630 .stroke-AA4{stroke:#EDF0FD;} + .d2-568929630 .stroke-AA5{stroke:#F7F8FE;} + .d2-568929630 .stroke-AB4{stroke:#EDF0FD;} + .d2-568929630 .stroke-AB5{stroke:#F7F8FE;} + .d2-568929630 .background-color-N1{background-color:#0A0F25;} + .d2-568929630 .background-color-N2{background-color:#676C7E;} + .d2-568929630 .background-color-N3{background-color:#9499AB;} + .d2-568929630 .background-color-N4{background-color:#CFD2DD;} + .d2-568929630 .background-color-N5{background-color:#DEE1EB;} + .d2-568929630 .background-color-N6{background-color:#EEF1F8;} + .d2-568929630 .background-color-N7{background-color:#FFFFFF;} + .d2-568929630 .background-color-B1{background-color:#0D32B2;} + .d2-568929630 .background-color-B2{background-color:#0D32B2;} + .d2-568929630 .background-color-B3{background-color:#E3E9FD;} + .d2-568929630 .background-color-B4{background-color:#E3E9FD;} + .d2-568929630 .background-color-B5{background-color:#EDF0FD;} + .d2-568929630 .background-color-B6{background-color:#F7F8FE;} + .d2-568929630 .background-color-AA2{background-color:#4A6FF3;} + .d2-568929630 .background-color-AA4{background-color:#EDF0FD;} + .d2-568929630 .background-color-AA5{background-color:#F7F8FE;} + .d2-568929630 .background-color-AB4{background-color:#EDF0FD;} + .d2-568929630 .background-color-AB5{background-color:#F7F8FE;} + .d2-568929630 .color-N1{color:#0A0F25;} + .d2-568929630 .color-N2{color:#676C7E;} + .d2-568929630 .color-N3{color:#9499AB;} + .d2-568929630 .color-N4{color:#CFD2DD;} + .d2-568929630 .color-N5{color:#DEE1EB;} + .d2-568929630 .color-N6{color:#EEF1F8;} + .d2-568929630 .color-N7{color:#FFFFFF;} + .d2-568929630 .color-B1{color:#0D32B2;} + .d2-568929630 .color-B2{color:#0D32B2;} + .d2-568929630 .color-B3{color:#E3E9FD;} + .d2-568929630 .color-B4{color:#E3E9FD;} + .d2-568929630 .color-B5{color:#EDF0FD;} + .d2-568929630 .color-B6{color:#F7F8FE;} + .d2-568929630 .color-AA2{color:#4A6FF3;} + .d2-568929630 .color-AA4{color:#EDF0FD;} + .d2-568929630 .color-AA5{color:#F7F8FE;} + .d2-568929630 .color-AB4{color:#EDF0FD;} + .d2-568929630 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon_positions/elk/board.exp.json b/e2etests/testdata/stable/icon_positions/elk/board.exp.json index 734368ce4..46b4d3c17 100644 --- a/e2etests/testdata/stable/icon_positions/elk/board.exp.json +++ b/e2etests/testdata/stable/icon_positions/elk/board.exp.json @@ -7,11 +7,11 @@ "id": "non container", "type": "rectangle", "pos": { - "x": 839, + "x": 818, "y": 12 }, - "width": 4829, - "height": 218, + "width": 5243, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -51,8 +51,8 @@ "icon" ], "pos": { - "x": 889, - "y": 62 + "x": 868, + "y": 86 }, "width": 122, "height": 118, @@ -108,8 +108,8 @@ "OutsideTopLeft" ], "pos": { - "x": 1031, - "y": 62 + "x": 1010, + "y": 86 }, "width": 182, "height": 118, @@ -165,8 +165,8 @@ "OutsideTopCenter" ], "pos": { - "x": 1233, - "y": 62 + "x": 1212, + "y": 86 }, "width": 202, "height": 118, @@ -222,8 +222,8 @@ "OutsideTopRight" ], "pos": { - "x": 1455, - "y": 62 + "x": 1434, + "y": 86 }, "width": 191, "height": 118, @@ -279,8 +279,8 @@ "OutsideLeftTop" ], "pos": { - "x": 1666, - "y": 62 + "x": 1714, + "y": 86 }, "width": 182, "height": 118, @@ -336,8 +336,8 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1868, - "y": 62 + "x": 1985, + "y": 86 }, "width": 202, "height": 118, @@ -393,8 +393,8 @@ "OutsideLeftBottom" ], "pos": { - "x": 2090, - "y": 62 + "x": 2276, + "y": 86 }, "width": 207, "height": 118, @@ -450,8 +450,8 @@ "OutsideRightTop" ], "pos": { - "x": 2317, - "y": 62 + "x": 2503, + "y": 86 }, "width": 191, "height": 118, @@ -507,8 +507,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 2528, - "y": 62 + "x": 2783, + "y": 86 }, "width": 212, "height": 118, @@ -564,8 +564,8 @@ "OutsideRightBottom" ], "pos": { - "x": 2760, - "y": 62 + "x": 3084, + "y": 86 }, "width": 217, "height": 118, @@ -621,8 +621,8 @@ "OutsideBottomLeft" ], "pos": { - "x": 2997, - "y": 62 + "x": 3390, + "y": 86 }, "width": 208, "height": 118, @@ -678,8 +678,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 3225, - "y": 62 + "x": 3618, + "y": 86 }, "width": 228, "height": 118, @@ -735,8 +735,8 @@ "OutsideBottomRight" ], "pos": { - "x": 3473, - "y": 62 + "x": 3866, + "y": 86 }, "width": 218, "height": 118, @@ -792,8 +792,8 @@ "InsideTopLeft" ], "pos": { - "x": 3711, - "y": 62 + "x": 4104, + "y": 86 }, "width": 168, "height": 118, @@ -849,8 +849,8 @@ "InsideTopCenter" ], "pos": { - "x": 3899, - "y": 62 + "x": 4292, + "y": 86 }, "width": 189, "height": 118, @@ -906,8 +906,8 @@ "InsideTopRight" ], "pos": { - "x": 4108, - "y": 62 + "x": 4501, + "y": 86 }, "width": 178, "height": 118, @@ -963,8 +963,8 @@ "InsideMiddleLeft" ], "pos": { - "x": 4306, - "y": 62 + "x": 4699, + "y": 86 }, "width": 189, "height": 118, @@ -1020,8 +1020,8 @@ "InsideMiddleCenter" ], "pos": { - "x": 4515, - "y": 62 + "x": 4908, + "y": 86 }, "width": 209, "height": 118, @@ -1077,8 +1077,8 @@ "InsideMiddleRight" ], "pos": { - "x": 4744, - "y": 62 + "x": 5137, + "y": 86 }, "width": 199, "height": 118, @@ -1134,8 +1134,8 @@ "InsideBottomLeft" ], "pos": { - "x": 4963, - "y": 62 + "x": 5356, + "y": 86 }, "width": 195, "height": 118, @@ -1191,8 +1191,8 @@ "InsideBottomCenter" ], "pos": { - "x": 5178, - "y": 62 + "x": 5571, + "y": 86 }, "width": 215, "height": 118, @@ -1248,8 +1248,8 @@ "InsideBottomRight" ], "pos": { - "x": 5413, - "y": 62 + "x": 5806, + "y": 86 }, "width": 205, "height": 118, @@ -1302,10 +1302,10 @@ "type": "rectangle", "pos": { "x": 12, - "y": 300 + "y": 348 }, - "width": 6484, - "height": 318, + "width": 6855, + "height": 338, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1341,12 +1341,15 @@ { "id": "container.Default", "type": "rectangle", + "classes": [ + "icon" + ], "pos": { "x": 62, - "y": 350 + "y": 422 }, - "width": 222, - "height": 218, + "width": 196, + "height": 190, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1359,50 +1362,6 @@ "double-border": false, "tooltip": "", "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "Default", - "fontSize": 24, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 71, - "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "container.Default.Default", - "type": "rectangle", - "classes": [ - "icon" - ], - "pos": { - "x": 112, - "y": 400 - }, - "width": 122, - "height": 118, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", "icon": { "Scheme": "https", "Opaque": "", @@ -1416,7 +1375,48 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Default", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 71, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "container.Default.Default", + "type": "rectangle", + "pos": { + "x": 112, + "y": 496 + }, + "width": 96, + "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, @@ -1431,7 +1431,7 @@ "underline": false, "labelWidth": 51, "labelHeight": 21, - "labelPosition": "INSIDE_TOP_CENTER", + "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 3 }, @@ -1443,11 +1443,11 @@ "OutsideTopLeft" ], "pos": { - "x": 304, - "y": 364 + "x": 278, + "y": 434 }, "width": 256, - "height": 190, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1500,11 +1500,11 @@ "OutsideTopCenter" ], "pos": { - "x": 580, - "y": 364 + "x": 554, + "y": 434 }, "width": 276, - "height": 190, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1557,11 +1557,11 @@ "OutsideTopRight" ], "pos": { - "x": 876, - "y": 364 + "x": 850, + "y": 434 }, "width": 265, - "height": 190, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1614,11 +1614,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1161, - "y": 364 + "x": 1204, + "y": 434 }, - "width": 256, - "height": 190, + "width": 236, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1671,11 +1671,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1437, - "y": 364 + "x": 1529, + "y": 434 }, - "width": 276, - "height": 190, + "width": 265, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1728,11 +1728,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1733, - "y": 364 + "x": 1883, + "y": 434 }, - "width": 281, - "height": 190, + "width": 273, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1785,11 +1785,11 @@ "OutsideRightTop" ], "pos": { - "x": 2034, - "y": 364 + "x": 2176, + "y": 434 }, - "width": 265, - "height": 190, + "width": 250, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1842,11 +1842,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2319, - "y": 364 + "x": 2515, + "y": 434 }, - "width": 286, - "height": 190, + "width": 279, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1899,11 +1899,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2625, - "y": 364 + "x": 2883, + "y": 434 }, - "width": 291, - "height": 190, + "width": 287, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1956,11 +1956,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2936, - "y": 364 + "x": 3259, + "y": 434 }, "width": 282, - "height": 190, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2013,11 +2013,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 3238, - "y": 364 + "x": 3561, + "y": 434 }, "width": 303, - "height": 190, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2070,11 +2070,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3561, - "y": 364 + "x": 3884, + "y": 434 }, "width": 292, - "height": 190, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2127,8 +2127,8 @@ "InsideTopLeft" ], "pos": { - "x": 3873, - "y": 364 + "x": 4196, + "y": 422 }, "width": 242, "height": 190, @@ -2184,8 +2184,8 @@ "InsideTopCenter" ], "pos": { - "x": 4135, - "y": 364 + "x": 4458, + "y": 422 }, "width": 263, "height": 190, @@ -2241,8 +2241,8 @@ "InsideTopRight" ], "pos": { - "x": 4418, - "y": 364 + "x": 4741, + "y": 422 }, "width": 252, "height": 190, @@ -2298,11 +2298,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4690, - "y": 364 + "x": 5013, + "y": 434 }, - "width": 263, - "height": 190, + "width": 287, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2355,11 +2355,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4973, - "y": 364 + "x": 5320, + "y": 434 }, "width": 283, - "height": 190, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2412,11 +2412,11 @@ "InsideMiddleRight" ], "pos": { - "x": 5276, - "y": 364 + "x": 5623, + "y": 434 }, - "width": 273, - "height": 190, + "width": 297, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2469,8 +2469,8 @@ "InsideBottomLeft" ], "pos": { - "x": 5569, - "y": 364 + "x": 5940, + "y": 422 }, "width": 269, "height": 190, @@ -2526,8 +2526,8 @@ "InsideBottomCenter" ], "pos": { - "x": 5858, - "y": 364 + "x": 6229, + "y": 422 }, "width": 289, "height": 190, @@ -2583,8 +2583,8 @@ "InsideBottomRight" ], "pos": { - "x": 6167, - "y": 364 + "x": 6538, + "y": 422 }, "width": 279, "height": 190, @@ -2636,8 +2636,8 @@ "id": "container.OutsideTopLeft.OutsideTopLeft", "type": "rectangle", "pos": { - "x": 354, - "y": 438 + "x": 328, + "y": 484 }, "width": 156, "height": 66, @@ -2677,8 +2677,8 @@ "id": "container.OutsideTopCenter.OutsideTopCenter", "type": "rectangle", "pos": { - "x": 630, - "y": 438 + "x": 604, + "y": 484 }, "width": 176, "height": 66, @@ -2718,8 +2718,8 @@ "id": "container.OutsideTopRight.OutsideTopRight", "type": "rectangle", "pos": { - "x": 926, - "y": 438 + "x": 900, + "y": 484 }, "width": 165, "height": 66, @@ -2759,8 +2759,8 @@ "id": "container.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1211, - "y": 438 + "x": 1244, + "y": 484 }, "width": 156, "height": 66, @@ -2800,8 +2800,8 @@ "id": "container.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1487, - "y": 438 + "x": 1573, + "y": 484 }, "width": 176, "height": 66, @@ -2841,8 +2841,8 @@ "id": "container.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1783, - "y": 438 + "x": 1929, + "y": 484 }, "width": 181, "height": 66, @@ -2882,8 +2882,8 @@ "id": "container.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 2084, - "y": 438 + "x": 2218, + "y": 484 }, "width": 165, "height": 66, @@ -2923,8 +2923,8 @@ "id": "container.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2369, - "y": 438 + "x": 2561, + "y": 484 }, "width": 186, "height": 66, @@ -2964,8 +2964,8 @@ "id": "container.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2675, - "y": 438 + "x": 2931, + "y": 484 }, "width": 191, "height": 66, @@ -3005,8 +3005,8 @@ "id": "container.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2986, - "y": 438 + "x": 3309, + "y": 484 }, "width": 182, "height": 66, @@ -3046,8 +3046,8 @@ "id": "container.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 3288, - "y": 438 + "x": 3611, + "y": 484 }, "width": 202, "height": 66, @@ -3087,8 +3087,8 @@ "id": "container.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3611, - "y": 438 + "x": 3934, + "y": 484 }, "width": 192, "height": 66, @@ -3128,8 +3128,8 @@ "id": "container.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3923, - "y": 438 + "x": 4246, + "y": 496 }, "width": 142, "height": 66, @@ -3169,8 +3169,8 @@ "id": "container.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 4185, - "y": 438 + "x": 4508, + "y": 496 }, "width": 163, "height": 66, @@ -3210,8 +3210,8 @@ "id": "container.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4468, - "y": 438 + "x": 4791, + "y": 496 }, "width": 152, "height": 66, @@ -3251,8 +3251,8 @@ "id": "container.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4740, - "y": 438 + "x": 5087, + "y": 484 }, "width": 163, "height": 66, @@ -3292,8 +3292,8 @@ "id": "container.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 5023, - "y": 438 + "x": 5370, + "y": 484 }, "width": 183, "height": 66, @@ -3333,8 +3333,8 @@ "id": "container.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 5326, - "y": 438 + "x": 5673, + "y": 484 }, "width": 173, "height": 66, @@ -3374,8 +3374,8 @@ "id": "container.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5619, - "y": 438 + "x": 5990, + "y": 472 }, "width": 169, "height": 66, @@ -3415,8 +3415,8 @@ "id": "container.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5908, - "y": 438 + "x": 6279, + "y": 472 }, "width": 189, "height": 66, @@ -3456,8 +3456,8 @@ "id": "container.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 6217, - "y": 438 + "x": 6588, + "y": 472 }, "width": 179, "height": 66, @@ -3497,8 +3497,8 @@ "id": "image", "type": "rectangle", "pos": { - "x": 1519, - "y": 688 + "x": 1704, + "y": 756 }, "width": 3470, "height": 254, @@ -3542,8 +3542,8 @@ "image" ], "pos": { - "x": 1569, - "y": 738 + "x": 1754, + "y": 806 }, "width": 128, "height": 128, @@ -3600,8 +3600,8 @@ "OutsideTopLeft" ], "pos": { - "x": 1717, - "y": 738 + "x": 1902, + "y": 806 }, "width": 128, "height": 128, @@ -3658,8 +3658,8 @@ "OutsideTopCenter" ], "pos": { - "x": 1865, - "y": 738 + "x": 2050, + "y": 806 }, "width": 131, "height": 128, @@ -3716,8 +3716,8 @@ "OutsideTopRight" ], "pos": { - "x": 2016, - "y": 738 + "x": 2201, + "y": 806 }, "width": 128, "height": 128, @@ -3774,8 +3774,8 @@ "OutsideLeftTop" ], "pos": { - "x": 2164, - "y": 738 + "x": 2349, + "y": 806 }, "width": 128, "height": 128, @@ -3832,8 +3832,8 @@ "OutsideLeftMiddle" ], "pos": { - "x": 2312, - "y": 738 + "x": 2497, + "y": 806 }, "width": 131, "height": 128, @@ -3890,8 +3890,8 @@ "OutsideLeftBottom" ], "pos": { - "x": 2463, - "y": 738 + "x": 2648, + "y": 806 }, "width": 136, "height": 128, @@ -3948,8 +3948,8 @@ "OutsideRightTop" ], "pos": { - "x": 2619, - "y": 738 + "x": 2804, + "y": 806 }, "width": 128, "height": 128, @@ -4006,8 +4006,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 2767, - "y": 738 + "x": 2952, + "y": 806 }, "width": 141, "height": 128, @@ -4064,8 +4064,8 @@ "OutsideRightBottom" ], "pos": { - "x": 2928, - "y": 738 + "x": 3113, + "y": 806 }, "width": 146, "height": 128, @@ -4122,8 +4122,8 @@ "OutsideBottomLeft" ], "pos": { - "x": 3094, - "y": 738 + "x": 3279, + "y": 806 }, "width": 137, "height": 128, @@ -4180,8 +4180,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 3251, - "y": 738 + "x": 3436, + "y": 806 }, "width": 157, "height": 128, @@ -4238,8 +4238,8 @@ "OutsideBottomRight" ], "pos": { - "x": 3428, - "y": 738 + "x": 3613, + "y": 806 }, "width": 147, "height": 128, @@ -4296,8 +4296,8 @@ "InsideTopLeft" ], "pos": { - "x": 3595, - "y": 738 + "x": 3780, + "y": 806 }, "width": 128, "height": 128, @@ -4354,8 +4354,8 @@ "InsideTopCenter" ], "pos": { - "x": 3743, - "y": 738 + "x": 3928, + "y": 806 }, "width": 128, "height": 128, @@ -4412,8 +4412,8 @@ "InsideTopRight" ], "pos": { - "x": 3891, - "y": 738 + "x": 4076, + "y": 806 }, "width": 128, "height": 128, @@ -4470,8 +4470,8 @@ "InsideMiddleLeft" ], "pos": { - "x": 4039, - "y": 738 + "x": 4224, + "y": 806 }, "width": 128, "height": 128, @@ -4528,8 +4528,8 @@ "InsideMiddleCenter" ], "pos": { - "x": 4187, - "y": 738 + "x": 4372, + "y": 806 }, "width": 138, "height": 128, @@ -4586,8 +4586,8 @@ "InsideMiddleRight" ], "pos": { - "x": 4345, - "y": 738 + "x": 4530, + "y": 806 }, "width": 128, "height": 128, @@ -4644,8 +4644,8 @@ "InsideBottomLeft" ], "pos": { - "x": 4493, - "y": 738 + "x": 4678, + "y": 806 }, "width": 128, "height": 128, @@ -4702,8 +4702,8 @@ "InsideBottomCenter" ], "pos": { - "x": 4641, - "y": 738 + "x": 4826, + "y": 806 }, "width": 144, "height": 128, @@ -4760,8 +4760,8 @@ "InsideBottomRight" ], "pos": { - "x": 4805, - "y": 738 + "x": 4990, + "y": 806 }, "width": 134, "height": 128, @@ -4836,12 +4836,12 @@ "labelPercentage": 0, "route": [ { - "x": 3254, - "y": 230 + "x": 3439.5, + "y": 278 }, { - "x": 3254, - "y": 300 + "x": 3439.5, + "y": 348 } ], "animated": false, @@ -4874,12 +4874,12 @@ "labelPercentage": 0, "route": [ { - "x": 3254, - "y": 618 + "x": 3439.5, + "y": 686 }, { - "x": 3254, - "y": 688 + "x": 3439.5, + "y": 756 } ], "animated": false, diff --git a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg index 54953dc46..9fedff0e6 100644 --- a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-5594258 .fill-N1{fill:#0A0F25;} + .d2-5594258 .fill-N2{fill:#676C7E;} + .d2-5594258 .fill-N3{fill:#9499AB;} + .d2-5594258 .fill-N4{fill:#CFD2DD;} + .d2-5594258 .fill-N5{fill:#DEE1EB;} + .d2-5594258 .fill-N6{fill:#EEF1F8;} + .d2-5594258 .fill-N7{fill:#FFFFFF;} + .d2-5594258 .fill-B1{fill:#0D32B2;} + .d2-5594258 .fill-B2{fill:#0D32B2;} + .d2-5594258 .fill-B3{fill:#E3E9FD;} + .d2-5594258 .fill-B4{fill:#E3E9FD;} + .d2-5594258 .fill-B5{fill:#EDF0FD;} + .d2-5594258 .fill-B6{fill:#F7F8FE;} + .d2-5594258 .fill-AA2{fill:#4A6FF3;} + .d2-5594258 .fill-AA4{fill:#EDF0FD;} + .d2-5594258 .fill-AA5{fill:#F7F8FE;} + .d2-5594258 .fill-AB4{fill:#EDF0FD;} + .d2-5594258 .fill-AB5{fill:#F7F8FE;} + .d2-5594258 .stroke-N1{stroke:#0A0F25;} + .d2-5594258 .stroke-N2{stroke:#676C7E;} + .d2-5594258 .stroke-N3{stroke:#9499AB;} + .d2-5594258 .stroke-N4{stroke:#CFD2DD;} + .d2-5594258 .stroke-N5{stroke:#DEE1EB;} + .d2-5594258 .stroke-N6{stroke:#EEF1F8;} + .d2-5594258 .stroke-N7{stroke:#FFFFFF;} + .d2-5594258 .stroke-B1{stroke:#0D32B2;} + .d2-5594258 .stroke-B2{stroke:#0D32B2;} + .d2-5594258 .stroke-B3{stroke:#E3E9FD;} + .d2-5594258 .stroke-B4{stroke:#E3E9FD;} + .d2-5594258 .stroke-B5{stroke:#EDF0FD;} + .d2-5594258 .stroke-B6{stroke:#F7F8FE;} + .d2-5594258 .stroke-AA2{stroke:#4A6FF3;} + .d2-5594258 .stroke-AA4{stroke:#EDF0FD;} + .d2-5594258 .stroke-AA5{stroke:#F7F8FE;} + .d2-5594258 .stroke-AB4{stroke:#EDF0FD;} + .d2-5594258 .stroke-AB5{stroke:#F7F8FE;} + .d2-5594258 .background-color-N1{background-color:#0A0F25;} + .d2-5594258 .background-color-N2{background-color:#676C7E;} + .d2-5594258 .background-color-N3{background-color:#9499AB;} + .d2-5594258 .background-color-N4{background-color:#CFD2DD;} + .d2-5594258 .background-color-N5{background-color:#DEE1EB;} + .d2-5594258 .background-color-N6{background-color:#EEF1F8;} + .d2-5594258 .background-color-N7{background-color:#FFFFFF;} + .d2-5594258 .background-color-B1{background-color:#0D32B2;} + .d2-5594258 .background-color-B2{background-color:#0D32B2;} + .d2-5594258 .background-color-B3{background-color:#E3E9FD;} + .d2-5594258 .background-color-B4{background-color:#E3E9FD;} + .d2-5594258 .background-color-B5{background-color:#EDF0FD;} + .d2-5594258 .background-color-B6{background-color:#F7F8FE;} + .d2-5594258 .background-color-AA2{background-color:#4A6FF3;} + .d2-5594258 .background-color-AA4{background-color:#EDF0FD;} + .d2-5594258 .background-color-AA5{background-color:#F7F8FE;} + .d2-5594258 .background-color-AB4{background-color:#EDF0FD;} + .d2-5594258 .background-color-AB5{background-color:#F7F8FE;} + .d2-5594258 .color-N1{color:#0A0F25;} + .d2-5594258 .color-N2{color:#676C7E;} + .d2-5594258 .color-N3{color:#9499AB;} + .d2-5594258 .color-N4{color:#CFD2DD;} + .d2-5594258 .color-N5{color:#DEE1EB;} + .d2-5594258 .color-N6{color:#EEF1F8;} + .d2-5594258 .color-N7{color:#FFFFFF;} + .d2-5594258 .color-B1{color:#0D32B2;} + .d2-5594258 .color-B2{color:#0D32B2;} + .d2-5594258 .color-B3{color:#E3E9FD;} + .d2-5594258 .color-B4{color:#E3E9FD;} + .d2-5594258 .color-B5{color:#EDF0FD;} + .d2-5594258 .color-B6{color:#F7F8FE;} + .d2-5594258 .color-AA2{color:#4A6FF3;} + .d2-5594258 .color-AA4{color:#EDF0FD;} + .d2-5594258 .color-AA5{color:#F7F8FE;} + .d2-5594258 .color-AB4{color:#EDF0FD;} + .d2-5594258 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index b0794985d..7b1a53c12 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -585,7 +585,7 @@ "y": 3469 }, "width": 327, - "height": 229, + "height": 210, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 129, - "y": 3582 + "y": 3563 }, "width": 63, "height": 66, @@ -1045,7 +1045,7 @@ "type": "rectangle", "pos": { "x": 212, - "y": 3582 + "y": 3563 }, "width": 62, "height": 66, @@ -1221,7 +1221,7 @@ "type": "rectangle", "pos": { "x": 294, - "y": 3582 + "y": 3563 }, "width": 62, "height": 66, @@ -1262,7 +1262,7 @@ "type": "parallelogram", "pos": { "x": 267, - "y": 3773 + "y": 3754 }, "width": 115, "height": 66, @@ -1774,7 +1774,7 @@ }, { "x": 160.58299255371094, - "y": 3582 + "y": 3563 } ], "animated": false, @@ -2148,7 +2148,7 @@ }, { "x": 243.08299255371094, - "y": 3582 + "y": 3563 } ], "animated": false, @@ -2316,7 +2316,7 @@ }, { "x": 325.0830078125, - "y": 3582 + "y": 3563 } ], "animated": false, @@ -2350,11 +2350,11 @@ "route": [ { "x": 325.0830078125, - "y": 3648 + "y": 3629 }, { "x": 325, - "y": 3773 + "y": 3754 } ], "animated": false, diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index c9c316a89..c6cf1b4af 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 - + .d2-54324565 .fill-N1{fill:#0A0F25;} + .d2-54324565 .fill-N2{fill:#676C7E;} + .d2-54324565 .fill-N3{fill:#9499AB;} + .d2-54324565 .fill-N4{fill:#CFD2DD;} + .d2-54324565 .fill-N5{fill:#DEE1EB;} + .d2-54324565 .fill-N6{fill:#EEF1F8;} + .d2-54324565 .fill-N7{fill:#FFFFFF;} + .d2-54324565 .fill-B1{fill:#0D32B2;} + .d2-54324565 .fill-B2{fill:#0D32B2;} + .d2-54324565 .fill-B3{fill:#E3E9FD;} + .d2-54324565 .fill-B4{fill:#E3E9FD;} + .d2-54324565 .fill-B5{fill:#EDF0FD;} + .d2-54324565 .fill-B6{fill:#F7F8FE;} + .d2-54324565 .fill-AA2{fill:#4A6FF3;} + .d2-54324565 .fill-AA4{fill:#EDF0FD;} + .d2-54324565 .fill-AA5{fill:#F7F8FE;} + .d2-54324565 .fill-AB4{fill:#EDF0FD;} + .d2-54324565 .fill-AB5{fill:#F7F8FE;} + .d2-54324565 .stroke-N1{stroke:#0A0F25;} + .d2-54324565 .stroke-N2{stroke:#676C7E;} + .d2-54324565 .stroke-N3{stroke:#9499AB;} + .d2-54324565 .stroke-N4{stroke:#CFD2DD;} + .d2-54324565 .stroke-N5{stroke:#DEE1EB;} + .d2-54324565 .stroke-N6{stroke:#EEF1F8;} + .d2-54324565 .stroke-N7{stroke:#FFFFFF;} + .d2-54324565 .stroke-B1{stroke:#0D32B2;} + .d2-54324565 .stroke-B2{stroke:#0D32B2;} + .d2-54324565 .stroke-B3{stroke:#E3E9FD;} + .d2-54324565 .stroke-B4{stroke:#E3E9FD;} + .d2-54324565 .stroke-B5{stroke:#EDF0FD;} + .d2-54324565 .stroke-B6{stroke:#F7F8FE;} + .d2-54324565 .stroke-AA2{stroke:#4A6FF3;} + .d2-54324565 .stroke-AA4{stroke:#EDF0FD;} + .d2-54324565 .stroke-AA5{stroke:#F7F8FE;} + .d2-54324565 .stroke-AB4{stroke:#EDF0FD;} + .d2-54324565 .stroke-AB5{stroke:#F7F8FE;} + .d2-54324565 .background-color-N1{background-color:#0A0F25;} + .d2-54324565 .background-color-N2{background-color:#676C7E;} + .d2-54324565 .background-color-N3{background-color:#9499AB;} + .d2-54324565 .background-color-N4{background-color:#CFD2DD;} + .d2-54324565 .background-color-N5{background-color:#DEE1EB;} + .d2-54324565 .background-color-N6{background-color:#EEF1F8;} + .d2-54324565 .background-color-N7{background-color:#FFFFFF;} + .d2-54324565 .background-color-B1{background-color:#0D32B2;} + .d2-54324565 .background-color-B2{background-color:#0D32B2;} + .d2-54324565 .background-color-B3{background-color:#E3E9FD;} + .d2-54324565 .background-color-B4{background-color:#E3E9FD;} + .d2-54324565 .background-color-B5{background-color:#EDF0FD;} + .d2-54324565 .background-color-B6{background-color:#F7F8FE;} + .d2-54324565 .background-color-AA2{background-color:#4A6FF3;} + .d2-54324565 .background-color-AA4{background-color:#EDF0FD;} + .d2-54324565 .background-color-AA5{background-color:#F7F8FE;} + .d2-54324565 .background-color-AB4{background-color:#EDF0FD;} + .d2-54324565 .background-color-AB5{background-color:#F7F8FE;} + .d2-54324565 .color-N1{color:#0A0F25;} + .d2-54324565 .color-N2{color:#676C7E;} + .d2-54324565 .color-N3{color:#9499AB;} + .d2-54324565 .color-N4{color:#CFD2DD;} + .d2-54324565 .color-N5{color:#DEE1EB;} + .d2-54324565 .color-N6{color:#EEF1F8;} + .d2-54324565 .color-N7{color:#FFFFFF;} + .d2-54324565 .color-B1{color:#0D32B2;} + .d2-54324565 .color-B2{color:#0D32B2;} + .d2-54324565 .color-B3{color:#E3E9FD;} + .d2-54324565 .color-B4{color:#E3E9FD;} + .d2-54324565 .color-B5{color:#EDF0FD;} + .d2-54324565 .color-B6{color:#F7F8FE;} + .d2-54324565 .color-AA2{color:#4A6FF3;} + .d2-54324565 .color-AA4{color:#EDF0FD;} + .d2-54324565 .color-AA5{color:#F7F8FE;} + .d2-54324565 .color-AB4{color:#EDF0FD;} + .d2-54324565 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + @@ -120,26 +120,26 @@ - + - + - + - + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/label_positions/elk/board.exp.json b/e2etests/testdata/stable/label_positions/elk/board.exp.json index 1a749b8b5..a90f1e2e4 100644 --- a/e2etests/testdata/stable/label_positions/elk/board.exp.json +++ b/e2etests/testdata/stable/label_positions/elk/board.exp.json @@ -7,10 +7,10 @@ "id": "non container", "type": "rectangle", "pos": { - "x": 1112, + "x": 1372, "y": 12 }, - "width": 4257, + "width": 5072, "height": 166, "opacity": 1, "strokeDash": 0, @@ -48,7 +48,7 @@ "id": "non container.Default", "type": "rectangle", "pos": { - "x": 1162, + "x": 1422, "y": 62 }, "width": 96, @@ -92,7 +92,7 @@ "OutsideTopLeft" ], "pos": { - "x": 1278, + "x": 1538, "y": 62 }, "width": 156, @@ -136,7 +136,7 @@ "OutsideTopCenter" ], "pos": { - "x": 1454, + "x": 1714, "y": 62 }, "width": 176, @@ -180,7 +180,7 @@ "OutsideTopRight" ], "pos": { - "x": 1650, + "x": 1910, "y": 62 }, "width": 165, @@ -224,7 +224,7 @@ "OutsideLeftTop" ], "pos": { - "x": 1835, + "x": 2211, "y": 62 }, "width": 156, @@ -268,7 +268,7 @@ "OutsideLeftMiddle" ], "pos": { - "x": 2011, + "x": 2523, "y": 62 }, "width": 176, @@ -312,7 +312,7 @@ "OutsideLeftBottom" ], "pos": { - "x": 2207, + "x": 2860, "y": 62 }, "width": 181, @@ -356,7 +356,7 @@ "OutsideRightTop" ], "pos": { - "x": 2408, + "x": 3061, "y": 62 }, "width": 165, @@ -400,7 +400,7 @@ "OutsideRightMiddle" ], "pos": { - "x": 2593, + "x": 3371, "y": 62 }, "width": 186, @@ -444,7 +444,7 @@ "OutsideRightBottom" ], "pos": { - "x": 2799, + "x": 3723, "y": 62 }, "width": 191, @@ -488,7 +488,7 @@ "OutsideBottomLeft" ], "pos": { - "x": 3010, + "x": 4085, "y": 62 }, "width": 182, @@ -532,7 +532,7 @@ "OutsideBottomCenter" ], "pos": { - "x": 3212, + "x": 4287, "y": 62 }, "width": 202, @@ -576,7 +576,7 @@ "OutsideBottomRight" ], "pos": { - "x": 3434, + "x": 4509, "y": 62 }, "width": 192, @@ -620,7 +620,7 @@ "InsideTopLeft" ], "pos": { - "x": 3646, + "x": 4721, "y": 62 }, "width": 142, @@ -664,7 +664,7 @@ "InsideTopCenter" ], "pos": { - "x": 3808, + "x": 4883, "y": 62 }, "width": 163, @@ -708,7 +708,7 @@ "InsideTopRight" ], "pos": { - "x": 3991, + "x": 5066, "y": 62 }, "width": 152, @@ -752,7 +752,7 @@ "InsideMiddleLeft" ], "pos": { - "x": 4163, + "x": 5238, "y": 62 }, "width": 163, @@ -796,7 +796,7 @@ "InsideMiddleCenter" ], "pos": { - "x": 4346, + "x": 5421, "y": 62 }, "width": 183, @@ -840,7 +840,7 @@ "InsideMiddleRight" ], "pos": { - "x": 4549, + "x": 5624, "y": 62 }, "width": 173, @@ -884,7 +884,7 @@ "InsideBottomLeft" ], "pos": { - "x": 4742, + "x": 5817, "y": 62 }, "width": 169, @@ -928,7 +928,7 @@ "InsideBottomCenter" ], "pos": { - "x": 4931, + "x": 6006, "y": 62 }, "width": 189, @@ -972,7 +972,7 @@ "InsideBottomRight" ], "pos": { - "x": 5140, + "x": 6215, "y": 62 }, "width": 179, @@ -1013,10 +1013,10 @@ "id": "container", "type": "rectangle", "pos": { - "x": 12, + "x": 120, "y": 248 }, - "width": 6457, + "width": 7576, "height": 266, "opacity": 1, "strokeDash": 0, @@ -1054,7 +1054,7 @@ "id": "container.Default", "type": "rectangle", "pos": { - "x": 62, + "x": 170, "y": 298 }, "width": 196, @@ -1095,7 +1095,7 @@ "id": "container.Default.Default", "type": "rectangle", "pos": { - "x": 112, + "x": 220, "y": 348 }, "width": 96, @@ -1139,7 +1139,7 @@ "OutsideTopLeft" ], "pos": { - "x": 278, + "x": 386, "y": 298 }, "width": 256, @@ -1183,7 +1183,7 @@ "OutsideTopCenter" ], "pos": { - "x": 554, + "x": 662, "y": 298 }, "width": 276, @@ -1227,7 +1227,7 @@ "OutsideTopRight" ], "pos": { - "x": 850, + "x": 958, "y": 298 }, "width": 265, @@ -1271,10 +1271,10 @@ "OutsideLeftTop" ], "pos": { - "x": 1135, + "x": 1403, "y": 298 }, - "width": 256, + "width": 200, "height": 166, "opacity": 1, "strokeDash": 0, @@ -1315,10 +1315,10 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1411, + "x": 1812, "y": 298 }, - "width": 276, + "width": 229, "height": 166, "opacity": 1, "strokeDash": 0, @@ -1359,10 +1359,10 @@ "OutsideLeftBottom" ], "pos": { - "x": 1707, + "x": 2258, "y": 298 }, - "width": 281, + "width": 237, "height": 166, "opacity": 1, "strokeDash": 0, @@ -1403,10 +1403,10 @@ "OutsideRightTop" ], "pos": { - "x": 2008, + "x": 2515, "y": 298 }, - "width": 265, + "width": 214, "height": 166, "opacity": 1, "strokeDash": 0, @@ -1447,10 +1447,10 @@ "OutsideRightMiddle" ], "pos": { - "x": 2293, + "x": 2923, "y": 298 }, - "width": 286, + "width": 243, "height": 166, "opacity": 1, "strokeDash": 0, @@ -1491,10 +1491,10 @@ "OutsideRightBottom" ], "pos": { - "x": 2599, + "x": 3389, "y": 298 }, - "width": 291, + "width": 251, "height": 166, "opacity": 1, "strokeDash": 0, @@ -1535,7 +1535,7 @@ "OutsideBottomLeft" ], "pos": { - "x": 2910, + "x": 3871, "y": 298 }, "width": 282, @@ -1579,7 +1579,7 @@ "OutsideBottomCenter" ], "pos": { - "x": 3212, + "x": 4173, "y": 298 }, "width": 302, @@ -1623,7 +1623,7 @@ "OutsideBottomRight" ], "pos": { - "x": 3534, + "x": 4495, "y": 298 }, "width": 292, @@ -1667,7 +1667,7 @@ "InsideTopLeft" ], "pos": { - "x": 3846, + "x": 4807, "y": 298 }, "width": 242, @@ -1711,7 +1711,7 @@ "InsideTopCenter" ], "pos": { - "x": 4108, + "x": 5069, "y": 298 }, "width": 263, @@ -1755,7 +1755,7 @@ "InsideTopRight" ], "pos": { - "x": 4391, + "x": 5352, "y": 298 }, "width": 252, @@ -1799,10 +1799,10 @@ "InsideMiddleLeft" ], "pos": { - "x": 4663, + "x": 5624, "y": 298 }, - "width": 263, + "width": 389, "height": 166, "opacity": 1, "strokeDash": 0, @@ -1843,7 +1843,7 @@ "InsideMiddleCenter" ], "pos": { - "x": 4946, + "x": 6033, "y": 298 }, "width": 283, @@ -1887,10 +1887,10 @@ "InsideMiddleRight" ], "pos": { - "x": 5249, + "x": 6336, "y": 298 }, - "width": 273, + "width": 413, "height": 166, "opacity": 1, "strokeDash": 0, @@ -1931,7 +1931,7 @@ "InsideBottomLeft" ], "pos": { - "x": 5542, + "x": 6769, "y": 298 }, "width": 269, @@ -1975,7 +1975,7 @@ "InsideBottomCenter" ], "pos": { - "x": 5831, + "x": 7058, "y": 298 }, "width": 289, @@ -2019,7 +2019,7 @@ "InsideBottomRight" ], "pos": { - "x": 6140, + "x": 7367, "y": 298 }, "width": 279, @@ -2060,7 +2060,7 @@ "id": "container.OutsideTopLeft.OutsideTopLeft", "type": "rectangle", "pos": { - "x": 328, + "x": 436, "y": 348 }, "width": 156, @@ -2101,7 +2101,7 @@ "id": "container.OutsideTopCenter.OutsideTopCenter", "type": "rectangle", "pos": { - "x": 604, + "x": 712, "y": 348 }, "width": 176, @@ -2142,7 +2142,7 @@ "id": "container.OutsideTopRight.OutsideTopRight", "type": "rectangle", "pos": { - "x": 900, + "x": 1008, "y": 348 }, "width": 165, @@ -2183,7 +2183,7 @@ "id": "container.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1185, + "x": 1425, "y": 348 }, "width": 156, @@ -2224,7 +2224,7 @@ "id": "container.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1461, + "x": 1839, "y": 348 }, "width": 176, @@ -2265,7 +2265,7 @@ "id": "container.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1757, + "x": 2286, "y": 348 }, "width": 181, @@ -2306,7 +2306,7 @@ "id": "container.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 2058, + "x": 2540, "y": 348 }, "width": 165, @@ -2347,7 +2347,7 @@ "id": "container.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2343, + "x": 2952, "y": 348 }, "width": 186, @@ -2388,7 +2388,7 @@ "id": "container.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2649, + "x": 3419, "y": 348 }, "width": 191, @@ -2429,7 +2429,7 @@ "id": "container.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2960, + "x": 3921, "y": 348 }, "width": 182, @@ -2470,7 +2470,7 @@ "id": "container.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 3262, + "x": 4223, "y": 348 }, "width": 202, @@ -2511,7 +2511,7 @@ "id": "container.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3584, + "x": 4545, "y": 348 }, "width": 192, @@ -2552,7 +2552,7 @@ "id": "container.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3896, + "x": 4857, "y": 348 }, "width": 142, @@ -2593,7 +2593,7 @@ "id": "container.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 4158, + "x": 5119, "y": 348 }, "width": 163, @@ -2634,7 +2634,7 @@ "id": "container.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4441, + "x": 5402, "y": 348 }, "width": 152, @@ -2675,7 +2675,7 @@ "id": "container.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4713, + "x": 5800, "y": 348 }, "width": 163, @@ -2716,7 +2716,7 @@ "id": "container.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 4996, + "x": 6083, "y": 348 }, "width": 183, @@ -2757,7 +2757,7 @@ "id": "container.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 5299, + "x": 6386, "y": 348 }, "width": 173, @@ -2798,7 +2798,7 @@ "id": "container.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5592, + "x": 6819, "y": 348 }, "width": 169, @@ -2839,7 +2839,7 @@ "id": "container.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5881, + "x": 7108, "y": 348 }, "width": 189, @@ -2880,7 +2880,7 @@ "id": "container.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 6190, + "x": 7417, "y": 348 }, "width": 179, @@ -2921,10 +2921,10 @@ "id": "with icon", "type": "rectangle", "pos": { - "x": 826, + "x": 1086, "y": 584 }, - "width": 4829, + "width": 5644, "height": 218, "opacity": 1, "strokeDash": 0, @@ -2965,7 +2965,7 @@ "icon" ], "pos": { - "x": 876, + "x": 1136, "y": 634 }, "width": 122, @@ -3022,7 +3022,7 @@ "OutsideTopLeft" ], "pos": { - "x": 1018, + "x": 1278, "y": 634 }, "width": 182, @@ -3079,7 +3079,7 @@ "OutsideTopCenter" ], "pos": { - "x": 1220, + "x": 1480, "y": 634 }, "width": 202, @@ -3136,7 +3136,7 @@ "OutsideTopRight" ], "pos": { - "x": 1442, + "x": 1702, "y": 634 }, "width": 191, @@ -3193,7 +3193,7 @@ "OutsideLeftTop" ], "pos": { - "x": 1653, + "x": 2029, "y": 634 }, "width": 182, @@ -3250,7 +3250,7 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1855, + "x": 2367, "y": 634 }, "width": 202, @@ -3307,7 +3307,7 @@ "OutsideLeftBottom" ], "pos": { - "x": 2077, + "x": 2730, "y": 634 }, "width": 207, @@ -3364,7 +3364,7 @@ "OutsideRightTop" ], "pos": { - "x": 2304, + "x": 2957, "y": 634 }, "width": 191, @@ -3421,7 +3421,7 @@ "OutsideRightMiddle" ], "pos": { - "x": 2515, + "x": 3293, "y": 634 }, "width": 212, @@ -3478,7 +3478,7 @@ "OutsideRightBottom" ], "pos": { - "x": 2747, + "x": 3671, "y": 634 }, "width": 217, @@ -3535,7 +3535,7 @@ "OutsideBottomLeft" ], "pos": { - "x": 2984, + "x": 4059, "y": 634 }, "width": 208, @@ -3592,7 +3592,7 @@ "OutsideBottomCenter" ], "pos": { - "x": 3212, + "x": 4287, "y": 634 }, "width": 228, @@ -3649,7 +3649,7 @@ "OutsideBottomRight" ], "pos": { - "x": 3460, + "x": 4535, "y": 634 }, "width": 218, @@ -3706,7 +3706,7 @@ "InsideTopLeft" ], "pos": { - "x": 3698, + "x": 4773, "y": 634 }, "width": 168, @@ -3763,7 +3763,7 @@ "InsideTopCenter" ], "pos": { - "x": 3886, + "x": 4961, "y": 634 }, "width": 189, @@ -3820,7 +3820,7 @@ "InsideTopRight" ], "pos": { - "x": 4095, + "x": 5170, "y": 634 }, "width": 178, @@ -3877,7 +3877,7 @@ "InsideMiddleLeft" ], "pos": { - "x": 4293, + "x": 5368, "y": 634 }, "width": 189, @@ -3934,7 +3934,7 @@ "InsideMiddleCenter" ], "pos": { - "x": 4502, + "x": 5577, "y": 634 }, "width": 209, @@ -3991,7 +3991,7 @@ "InsideMiddleRight" ], "pos": { - "x": 4731, + "x": 5806, "y": 634 }, "width": 199, @@ -4048,7 +4048,7 @@ "InsideBottomLeft" ], "pos": { - "x": 4950, + "x": 6025, "y": 634 }, "width": 195, @@ -4105,7 +4105,7 @@ "InsideBottomCenter" ], "pos": { - "x": 5165, + "x": 6240, "y": 634 }, "width": 215, @@ -4162,7 +4162,7 @@ "InsideBottomRight" ], "pos": { - "x": 5400, + "x": 6475, "y": 634 }, "width": 205, @@ -4218,7 +4218,7 @@ "x": 12, "y": 872 }, - "width": 6458, + "width": 7793, "height": 290, "opacity": 1, "strokeDash": 0, @@ -4651,10 +4651,10 @@ "OutsideLeftTop" ], "pos": { - "x": 1135, + "x": 1295, "y": 922 }, - "width": 256, + "width": 236, "height": 190, "opacity": 1, "strokeDash": 0, @@ -4704,7 +4704,7 @@ "id": "container with icon.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1185, + "x": 1335, "y": 996 }, "width": 156, @@ -4749,10 +4749,10 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1411, + "x": 1740, "y": 922 }, - "width": 276, + "width": 265, "height": 190, "opacity": 1, "strokeDash": 0, @@ -4802,7 +4802,7 @@ "id": "container with icon.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1461, + "x": 1784, "y": 996 }, "width": 176, @@ -4847,10 +4847,10 @@ "OutsideLeftBottom" ], "pos": { - "x": 1707, + "x": 2222, "y": 922 }, - "width": 281, + "width": 273, "height": 190, "opacity": 1, "strokeDash": 0, @@ -4900,7 +4900,7 @@ "id": "container with icon.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1757, + "x": 2268, "y": 996 }, "width": 181, @@ -4945,10 +4945,10 @@ "OutsideRightTop" ], "pos": { - "x": 2008, + "x": 2515, "y": 922 }, - "width": 265, + "width": 250, "height": 190, "opacity": 1, "strokeDash": 0, @@ -4998,7 +4998,7 @@ "id": "container with icon.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 2058, + "x": 2557, "y": 996 }, "width": 165, @@ -5043,10 +5043,10 @@ "OutsideRightMiddle" ], "pos": { - "x": 2293, + "x": 2959, "y": 922 }, - "width": 286, + "width": 279, "height": 190, "opacity": 1, "strokeDash": 0, @@ -5096,7 +5096,7 @@ "id": "container with icon.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2343, + "x": 3005, "y": 996 }, "width": 186, @@ -5141,10 +5141,10 @@ "OutsideRightBottom" ], "pos": { - "x": 2599, + "x": 3461, "y": 922 }, - "width": 291, + "width": 287, "height": 190, "opacity": 1, "strokeDash": 0, @@ -5194,7 +5194,7 @@ "id": "container with icon.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2649, + "x": 3509, "y": 996 }, "width": 191, @@ -5239,7 +5239,7 @@ "OutsideBottomLeft" ], "pos": { - "x": 2910, + "x": 3979, "y": 922 }, "width": 282, @@ -5292,7 +5292,7 @@ "id": "container with icon.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2960, + "x": 4029, "y": 996 }, "width": 182, @@ -5337,7 +5337,7 @@ "OutsideBottomCenter" ], "pos": { - "x": 3212, + "x": 4281, "y": 922 }, "width": 303, @@ -5390,7 +5390,7 @@ "id": "container with icon.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 3262, + "x": 4331, "y": 996 }, "width": 202, @@ -5435,7 +5435,7 @@ "OutsideBottomRight" ], "pos": { - "x": 3535, + "x": 4604, "y": 922 }, "width": 292, @@ -5488,7 +5488,7 @@ "id": "container with icon.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3585, + "x": 4654, "y": 996 }, "width": 192, @@ -5533,7 +5533,7 @@ "InsideTopLeft" ], "pos": { - "x": 3847, + "x": 4916, "y": 922 }, "width": 242, @@ -5586,7 +5586,7 @@ "id": "container with icon.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3897, + "x": 4966, "y": 996 }, "width": 142, @@ -5631,7 +5631,7 @@ "InsideTopCenter" ], "pos": { - "x": 4109, + "x": 5178, "y": 922 }, "width": 263, @@ -5684,7 +5684,7 @@ "id": "container with icon.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 4159, + "x": 5228, "y": 996 }, "width": 163, @@ -5729,7 +5729,7 @@ "InsideTopRight" ], "pos": { - "x": 4392, + "x": 5461, "y": 922 }, "width": 252, @@ -5782,7 +5782,7 @@ "id": "container with icon.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4442, + "x": 5511, "y": 996 }, "width": 152, @@ -5827,10 +5827,10 @@ "InsideMiddleLeft" ], "pos": { - "x": 4664, + "x": 5733, "y": 922 }, - "width": 263, + "width": 389, "height": 190, "opacity": 1, "strokeDash": 0, @@ -5880,7 +5880,7 @@ "id": "container with icon.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4714, + "x": 5909, "y": 996 }, "width": 163, @@ -5925,7 +5925,7 @@ "InsideMiddleCenter" ], "pos": { - "x": 4947, + "x": 6142, "y": 922 }, "width": 283, @@ -5978,7 +5978,7 @@ "id": "container with icon.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 4997, + "x": 6192, "y": 996 }, "width": 183, @@ -6023,10 +6023,10 @@ "InsideMiddleRight" ], "pos": { - "x": 5250, + "x": 6445, "y": 922 }, - "width": 273, + "width": 413, "height": 190, "opacity": 1, "strokeDash": 0, @@ -6076,7 +6076,7 @@ "id": "container with icon.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 5300, + "x": 6495, "y": 996 }, "width": 173, @@ -6121,7 +6121,7 @@ "InsideBottomLeft" ], "pos": { - "x": 5543, + "x": 6878, "y": 922 }, "width": 269, @@ -6174,7 +6174,7 @@ "id": "container with icon.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5593, + "x": 6928, "y": 996 }, "width": 169, @@ -6219,7 +6219,7 @@ "InsideBottomCenter" ], "pos": { - "x": 5832, + "x": 7167, "y": 922 }, "width": 289, @@ -6272,7 +6272,7 @@ "id": "container with icon.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5882, + "x": 7217, "y": 996 }, "width": 189, @@ -6317,7 +6317,7 @@ "InsideBottomRight" ], "pos": { - "x": 6141, + "x": 7476, "y": 922 }, "width": 279, @@ -6370,7 +6370,7 @@ "id": "container with icon.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 6191, + "x": 7526, "y": 996 }, "width": 179, @@ -6434,11 +6434,11 @@ "labelPercentage": 0, "route": [ { - "x": 3241, + "x": 3908.5, "y": 178 }, { - "x": 3241, + "x": 3908.5, "y": 248 } ], @@ -6472,11 +6472,11 @@ "labelPercentage": 0, "route": [ { - "x": 3241, + "x": 3908.5, "y": 514 }, { - "x": 3241, + "x": 3908.5, "y": 584 } ], @@ -6510,11 +6510,11 @@ "labelPercentage": 0, "route": [ { - "x": 3241, + "x": 3908.5, "y": 802 }, { - "x": 3241, + "x": 3908.5, "y": 872 } ], diff --git a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg index 760f60f04..4a3cccc8c 100644 --- a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-354817555 .fill-N1{fill:#0A0F25;} + .d2-354817555 .fill-N2{fill:#676C7E;} + .d2-354817555 .fill-N3{fill:#9499AB;} + .d2-354817555 .fill-N4{fill:#CFD2DD;} + .d2-354817555 .fill-N5{fill:#DEE1EB;} + .d2-354817555 .fill-N6{fill:#EEF1F8;} + .d2-354817555 .fill-N7{fill:#FFFFFF;} + .d2-354817555 .fill-B1{fill:#0D32B2;} + .d2-354817555 .fill-B2{fill:#0D32B2;} + .d2-354817555 .fill-B3{fill:#E3E9FD;} + .d2-354817555 .fill-B4{fill:#E3E9FD;} + .d2-354817555 .fill-B5{fill:#EDF0FD;} + .d2-354817555 .fill-B6{fill:#F7F8FE;} + .d2-354817555 .fill-AA2{fill:#4A6FF3;} + .d2-354817555 .fill-AA4{fill:#EDF0FD;} + .d2-354817555 .fill-AA5{fill:#F7F8FE;} + .d2-354817555 .fill-AB4{fill:#EDF0FD;} + .d2-354817555 .fill-AB5{fill:#F7F8FE;} + .d2-354817555 .stroke-N1{stroke:#0A0F25;} + .d2-354817555 .stroke-N2{stroke:#676C7E;} + .d2-354817555 .stroke-N3{stroke:#9499AB;} + .d2-354817555 .stroke-N4{stroke:#CFD2DD;} + .d2-354817555 .stroke-N5{stroke:#DEE1EB;} + .d2-354817555 .stroke-N6{stroke:#EEF1F8;} + .d2-354817555 .stroke-N7{stroke:#FFFFFF;} + .d2-354817555 .stroke-B1{stroke:#0D32B2;} + .d2-354817555 .stroke-B2{stroke:#0D32B2;} + .d2-354817555 .stroke-B3{stroke:#E3E9FD;} + .d2-354817555 .stroke-B4{stroke:#E3E9FD;} + .d2-354817555 .stroke-B5{stroke:#EDF0FD;} + .d2-354817555 .stroke-B6{stroke:#F7F8FE;} + .d2-354817555 .stroke-AA2{stroke:#4A6FF3;} + .d2-354817555 .stroke-AA4{stroke:#EDF0FD;} + .d2-354817555 .stroke-AA5{stroke:#F7F8FE;} + .d2-354817555 .stroke-AB4{stroke:#EDF0FD;} + .d2-354817555 .stroke-AB5{stroke:#F7F8FE;} + .d2-354817555 .background-color-N1{background-color:#0A0F25;} + .d2-354817555 .background-color-N2{background-color:#676C7E;} + .d2-354817555 .background-color-N3{background-color:#9499AB;} + .d2-354817555 .background-color-N4{background-color:#CFD2DD;} + .d2-354817555 .background-color-N5{background-color:#DEE1EB;} + .d2-354817555 .background-color-N6{background-color:#EEF1F8;} + .d2-354817555 .background-color-N7{background-color:#FFFFFF;} + .d2-354817555 .background-color-B1{background-color:#0D32B2;} + .d2-354817555 .background-color-B2{background-color:#0D32B2;} + .d2-354817555 .background-color-B3{background-color:#E3E9FD;} + .d2-354817555 .background-color-B4{background-color:#E3E9FD;} + .d2-354817555 .background-color-B5{background-color:#EDF0FD;} + .d2-354817555 .background-color-B6{background-color:#F7F8FE;} + .d2-354817555 .background-color-AA2{background-color:#4A6FF3;} + .d2-354817555 .background-color-AA4{background-color:#EDF0FD;} + .d2-354817555 .background-color-AA5{background-color:#F7F8FE;} + .d2-354817555 .background-color-AB4{background-color:#EDF0FD;} + .d2-354817555 .background-color-AB5{background-color:#F7F8FE;} + .d2-354817555 .color-N1{color:#0A0F25;} + .d2-354817555 .color-N2{color:#676C7E;} + .d2-354817555 .color-N3{color:#9499AB;} + .d2-354817555 .color-N4{color:#CFD2DD;} + .d2-354817555 .color-N5{color:#DEE1EB;} + .d2-354817555 .color-N6{color:#EEF1F8;} + .d2-354817555 .color-N7{color:#FFFFFF;} + .d2-354817555 .color-B1{color:#0D32B2;} + .d2-354817555 .color-B2{color:#0D32B2;} + .d2-354817555 .color-B3{color:#E3E9FD;} + .d2-354817555 .color-B4{color:#E3E9FD;} + .d2-354817555 .color-B5{color:#EDF0FD;} + .d2-354817555 .color-B6{color:#F7F8FE;} + .d2-354817555 .color-AA2{color:#4A6FF3;} + .d2-354817555 .color-AA4{color:#EDF0FD;} + .d2-354817555 .color-AA5{color:#F7F8FE;} + .d2-354817555 .color-AB4{color:#EDF0FD;} + .d2-354817555 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json b/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json index 2cb277438..89fb2b14c 100644 --- a/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json @@ -8,10 +8,10 @@ "type": "package", "pos": { "x": 12, - "y": 12 + "y": 17 }, "width": 166, - "height": 207, + "height": 234, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "diamond", "pos": { "x": 62, - "y": 77 + "y": 109 }, "width": 66, "height": 92, @@ -90,10 +90,10 @@ "type": "diamond", "pos": { "x": 198, - "y": 14 + "y": 12 }, "width": 176, - "height": 203, + "height": 244, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "oval", "pos": { "x": 248, - "y": 91 + "y": 119 }, "width": 76, "height": 76, diff --git a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg index 08e3fdf79..e65a9830e 100644 --- a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aaccbbdd - - - - - + .d2-4125869403 .fill-N1{fill:#0A0F25;} + .d2-4125869403 .fill-N2{fill:#676C7E;} + .d2-4125869403 .fill-N3{fill:#9499AB;} + .d2-4125869403 .fill-N4{fill:#CFD2DD;} + .d2-4125869403 .fill-N5{fill:#DEE1EB;} + .d2-4125869403 .fill-N6{fill:#EEF1F8;} + .d2-4125869403 .fill-N7{fill:#FFFFFF;} + .d2-4125869403 .fill-B1{fill:#0D32B2;} + .d2-4125869403 .fill-B2{fill:#0D32B2;} + .d2-4125869403 .fill-B3{fill:#E3E9FD;} + .d2-4125869403 .fill-B4{fill:#E3E9FD;} + .d2-4125869403 .fill-B5{fill:#EDF0FD;} + .d2-4125869403 .fill-B6{fill:#F7F8FE;} + .d2-4125869403 .fill-AA2{fill:#4A6FF3;} + .d2-4125869403 .fill-AA4{fill:#EDF0FD;} + .d2-4125869403 .fill-AA5{fill:#F7F8FE;} + .d2-4125869403 .fill-AB4{fill:#EDF0FD;} + .d2-4125869403 .fill-AB5{fill:#F7F8FE;} + .d2-4125869403 .stroke-N1{stroke:#0A0F25;} + .d2-4125869403 .stroke-N2{stroke:#676C7E;} + .d2-4125869403 .stroke-N3{stroke:#9499AB;} + .d2-4125869403 .stroke-N4{stroke:#CFD2DD;} + .d2-4125869403 .stroke-N5{stroke:#DEE1EB;} + .d2-4125869403 .stroke-N6{stroke:#EEF1F8;} + .d2-4125869403 .stroke-N7{stroke:#FFFFFF;} + .d2-4125869403 .stroke-B1{stroke:#0D32B2;} + .d2-4125869403 .stroke-B2{stroke:#0D32B2;} + .d2-4125869403 .stroke-B3{stroke:#E3E9FD;} + .d2-4125869403 .stroke-B4{stroke:#E3E9FD;} + .d2-4125869403 .stroke-B5{stroke:#EDF0FD;} + .d2-4125869403 .stroke-B6{stroke:#F7F8FE;} + .d2-4125869403 .stroke-AA2{stroke:#4A6FF3;} + .d2-4125869403 .stroke-AA4{stroke:#EDF0FD;} + .d2-4125869403 .stroke-AA5{stroke:#F7F8FE;} + .d2-4125869403 .stroke-AB4{stroke:#EDF0FD;} + .d2-4125869403 .stroke-AB5{stroke:#F7F8FE;} + .d2-4125869403 .background-color-N1{background-color:#0A0F25;} + .d2-4125869403 .background-color-N2{background-color:#676C7E;} + .d2-4125869403 .background-color-N3{background-color:#9499AB;} + .d2-4125869403 .background-color-N4{background-color:#CFD2DD;} + .d2-4125869403 .background-color-N5{background-color:#DEE1EB;} + .d2-4125869403 .background-color-N6{background-color:#EEF1F8;} + .d2-4125869403 .background-color-N7{background-color:#FFFFFF;} + .d2-4125869403 .background-color-B1{background-color:#0D32B2;} + .d2-4125869403 .background-color-B2{background-color:#0D32B2;} + .d2-4125869403 .background-color-B3{background-color:#E3E9FD;} + .d2-4125869403 .background-color-B4{background-color:#E3E9FD;} + .d2-4125869403 .background-color-B5{background-color:#EDF0FD;} + .d2-4125869403 .background-color-B6{background-color:#F7F8FE;} + .d2-4125869403 .background-color-AA2{background-color:#4A6FF3;} + .d2-4125869403 .background-color-AA4{background-color:#EDF0FD;} + .d2-4125869403 .background-color-AA5{background-color:#F7F8FE;} + .d2-4125869403 .background-color-AB4{background-color:#EDF0FD;} + .d2-4125869403 .background-color-AB5{background-color:#F7F8FE;} + .d2-4125869403 .color-N1{color:#0A0F25;} + .d2-4125869403 .color-N2{color:#676C7E;} + .d2-4125869403 .color-N3{color:#9499AB;} + .d2-4125869403 .color-N4{color:#CFD2DD;} + .d2-4125869403 .color-N5{color:#DEE1EB;} + .d2-4125869403 .color-N6{color:#EEF1F8;} + .d2-4125869403 .color-N7{color:#FFFFFF;} + .d2-4125869403 .color-B1{color:#0D32B2;} + .d2-4125869403 .color-B2{color:#0D32B2;} + .d2-4125869403 .color-B3{color:#E3E9FD;} + .d2-4125869403 .color-B4{color:#E3E9FD;} + .d2-4125869403 .color-B5{color:#EDF0FD;} + .d2-4125869403 .color-B6{color:#F7F8FE;} + .d2-4125869403 .color-AA2{color:#4A6FF3;} + .d2-4125869403 .color-AA4{color:#EDF0FD;} + .d2-4125869403 .color-AA5{color:#F7F8FE;} + .d2-4125869403 .color-AB4{color:#EDF0FD;} + .d2-4125869403 .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}]]>aaccbbdd + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json index edddf08d6..639bb3611 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json @@ -52,7 +52,7 @@ "y": 213 }, "width": 294, - "height": 272, + "height": 254, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 119, - "y": 369 + "y": 351 }, "width": 80, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 132, - "y": 560 + "y": 542 }, "width": 54, "height": 66, @@ -330,7 +330,7 @@ }, { "x": 145.66600036621094, - "y": 369 + "y": 351 } ], "animated": false, @@ -364,11 +364,11 @@ "route": [ { "x": 159, - "y": 435 + "y": 417 }, { "x": 159, - "y": 560 + "y": 542 } ], "animated": false, @@ -414,7 +414,7 @@ }, { "x": 172.33299255371094, - "y": 369 + "y": 351 } ], "animated": false, @@ -460,7 +460,7 @@ }, { "x": 182, - "y": 213 + "y": 214 } ], "animated": false, @@ -498,7 +498,7 @@ }, { "x": 286, - "y": 326 + "y": 318 } ], "animated": false, 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 763056b6a..2d44a88fd 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,16 +1,16 @@ -aa container labeldefgc - + .d2-3956670052 .fill-N1{fill:#0A0F25;} + .d2-3956670052 .fill-N2{fill:#676C7E;} + .d2-3956670052 .fill-N3{fill:#9499AB;} + .d2-3956670052 .fill-N4{fill:#CFD2DD;} + .d2-3956670052 .fill-N5{fill:#DEE1EB;} + .d2-3956670052 .fill-N6{fill:#EEF1F8;} + .d2-3956670052 .fill-N7{fill:#FFFFFF;} + .d2-3956670052 .fill-B1{fill:#0D32B2;} + .d2-3956670052 .fill-B2{fill:#0D32B2;} + .d2-3956670052 .fill-B3{fill:#E3E9FD;} + .d2-3956670052 .fill-B4{fill:#E3E9FD;} + .d2-3956670052 .fill-B5{fill:#EDF0FD;} + .d2-3956670052 .fill-B6{fill:#F7F8FE;} + .d2-3956670052 .fill-AA2{fill:#4A6FF3;} + .d2-3956670052 .fill-AA4{fill:#EDF0FD;} + .d2-3956670052 .fill-AA5{fill:#F7F8FE;} + .d2-3956670052 .fill-AB4{fill:#EDF0FD;} + .d2-3956670052 .fill-AB5{fill:#F7F8FE;} + .d2-3956670052 .stroke-N1{stroke:#0A0F25;} + .d2-3956670052 .stroke-N2{stroke:#676C7E;} + .d2-3956670052 .stroke-N3{stroke:#9499AB;} + .d2-3956670052 .stroke-N4{stroke:#CFD2DD;} + .d2-3956670052 .stroke-N5{stroke:#DEE1EB;} + .d2-3956670052 .stroke-N6{stroke:#EEF1F8;} + .d2-3956670052 .stroke-N7{stroke:#FFFFFF;} + .d2-3956670052 .stroke-B1{stroke:#0D32B2;} + .d2-3956670052 .stroke-B2{stroke:#0D32B2;} + .d2-3956670052 .stroke-B3{stroke:#E3E9FD;} + .d2-3956670052 .stroke-B4{stroke:#E3E9FD;} + .d2-3956670052 .stroke-B5{stroke:#EDF0FD;} + .d2-3956670052 .stroke-B6{stroke:#F7F8FE;} + .d2-3956670052 .stroke-AA2{stroke:#4A6FF3;} + .d2-3956670052 .stroke-AA4{stroke:#EDF0FD;} + .d2-3956670052 .stroke-AA5{stroke:#F7F8FE;} + .d2-3956670052 .stroke-AB4{stroke:#EDF0FD;} + .d2-3956670052 .stroke-AB5{stroke:#F7F8FE;} + .d2-3956670052 .background-color-N1{background-color:#0A0F25;} + .d2-3956670052 .background-color-N2{background-color:#676C7E;} + .d2-3956670052 .background-color-N3{background-color:#9499AB;} + .d2-3956670052 .background-color-N4{background-color:#CFD2DD;} + .d2-3956670052 .background-color-N5{background-color:#DEE1EB;} + .d2-3956670052 .background-color-N6{background-color:#EEF1F8;} + .d2-3956670052 .background-color-N7{background-color:#FFFFFF;} + .d2-3956670052 .background-color-B1{background-color:#0D32B2;} + .d2-3956670052 .background-color-B2{background-color:#0D32B2;} + .d2-3956670052 .background-color-B3{background-color:#E3E9FD;} + .d2-3956670052 .background-color-B4{background-color:#E3E9FD;} + .d2-3956670052 .background-color-B5{background-color:#EDF0FD;} + .d2-3956670052 .background-color-B6{background-color:#F7F8FE;} + .d2-3956670052 .background-color-AA2{background-color:#4A6FF3;} + .d2-3956670052 .background-color-AA4{background-color:#EDF0FD;} + .d2-3956670052 .background-color-AA5{background-color:#F7F8FE;} + .d2-3956670052 .background-color-AB4{background-color:#EDF0FD;} + .d2-3956670052 .background-color-AB5{background-color:#F7F8FE;} + .d2-3956670052 .color-N1{color:#0A0F25;} + .d2-3956670052 .color-N2{color:#676C7E;} + .d2-3956670052 .color-N3{color:#9499AB;} + .d2-3956670052 .color-N4{color:#CFD2DD;} + .d2-3956670052 .color-N5{color:#DEE1EB;} + .d2-3956670052 .color-N6{color:#EEF1F8;} + .d2-3956670052 .color-N7{color:#FFFFFF;} + .d2-3956670052 .color-B1{color:#0D32B2;} + .d2-3956670052 .color-B2{color:#0D32B2;} + .d2-3956670052 .color-B3{color:#E3E9FD;} + .d2-3956670052 .color-B4{color:#E3E9FD;} + .d2-3956670052 .color-B5{color:#EDF0FD;} + .d2-3956670052 .color-B6{color:#F7F8FE;} + .d2-3956670052 .color-AA2{color:#4A6FF3;} + .d2-3956670052 .color-AA4{color:#EDF0FD;} + .d2-3956670052 .color-AA5{color:#F7F8FE;} + .d2-3956670052 .color-AB4{color:#EDF0FD;} + .d2-3956670052 .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}]]>aa container labeldefgc + - - + + - + \ 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 702ac2fd4..b60ca9bd9 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 @@ -11,7 +11,7 @@ "y": 12 }, "width": 1388, - "height": 438, + "height": 411, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "oval", "pos": { "x": 62, - "y": 131 + "y": 117 }, "width": 228, "height": 200, @@ -90,7 +90,7 @@ "type": "diamond", "pos": { "x": 112, - "y": 199 + "y": 185 }, "width": 128, "height": 64, @@ -134,7 +134,7 @@ "y": 62 }, "width": 414, - "height": 338, + "height": 311, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "oval", "pos": { "x": 453, - "y": 222 + "y": 174 }, "width": 128, "height": 128, @@ -213,10 +213,10 @@ "type": "oval", "pos": { "x": 744, - "y": 123 + "y": 125 }, "width": 266, - "height": 216, + "height": 184, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -254,7 +254,7 @@ "type": "hexagon", "pos": { "x": 813, - "y": 225 + "y": 195 }, "width": 128, "height": 64, @@ -295,10 +295,10 @@ "type": "hexagon", "pos": { "x": 1030, - "y": 119 + "y": 124 }, "width": 320, - "height": 224, + "height": 187, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,7 +336,7 @@ "type": "oval", "pos": { "x": 1126, - "y": 229 + "y": 197 }, "width": 128, "height": 64, @@ -377,7 +377,7 @@ "type": "cloud", "pos": { "x": 1420, - "y": 194 + "y": 167 }, "width": 512, "height": 256, @@ -418,7 +418,7 @@ "type": "cylinder", "pos": { "x": 1548, - "y": 1390 + "y": 1363 }, "width": 256, "height": 512, @@ -459,7 +459,7 @@ "type": "class", "pos": { "x": 1276, - "y": 720 + "y": 693 }, "width": 800, "height": 400, @@ -534,7 +534,7 @@ "type": "sql_table", "pos": { "x": 1276, - "y": 1972 + "y": 1945 }, "width": 800, "height": 400, @@ -718,7 +718,7 @@ "type": "rectangle", "pos": { "x": 2239, - "y": 384 + "y": 357 }, "width": 114, "height": 66, @@ -759,7 +759,7 @@ "type": "text", "pos": { "x": 2096, - "y": 520 + "y": 493 }, "width": 400, "height": 800, @@ -799,7 +799,7 @@ "type": "code", "pos": { "x": 2096, - "y": 1496 + "y": 1469 }, "width": 400, "height": 300, @@ -839,7 +839,7 @@ "type": "code", "pos": { "x": 2196, - "y": 1972 + "y": 1945 }, "width": 199, "height": 78, @@ -902,11 +902,11 @@ "route": [ { "x": 1676, - "y": 449 + "y": 422 }, { "x": 1676, - "y": 720 + "y": 693 } ], "animated": false, @@ -940,11 +940,11 @@ "route": [ { "x": 1676, - "y": 1120 + "y": 1093 }, { "x": 1676, - "y": 1390 + "y": 1363 } ], "animated": false, @@ -978,11 +978,11 @@ "route": [ { "x": 1676, - "y": 1902 + "y": 1875 }, { "x": 1676, - "y": 1972 + "y": 1945 } ], "animated": false, @@ -1016,11 +1016,11 @@ "route": [ { "x": 2296, - "y": 450 + "y": 423 }, { "x": 2296, - "y": 520 + "y": 493 } ], "animated": false, @@ -1054,11 +1054,11 @@ "route": [ { "x": 2296, - "y": 1320 + "y": 1293 }, { "x": 2296, - "y": 1496 + "y": 1469 } ], "animated": false, @@ -1092,11 +1092,11 @@ "route": [ { "x": 2296, - "y": 1796 + "y": 1769 }, { "x": 2296, - "y": 1972 + "y": 1945 } ], "animated": false, 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 af9f86845..e20773d2e 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

-
a := 5 +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 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +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 From 98f79e2ba5e20e8d13acda4d2dc9b58b677c23cc Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 12 Jul 2023 22:20:55 -0700 Subject: [PATCH 040/138] arrays --- d2compiler/compile_test.go | 88 ++++- d2ir/compile.go | 63 ++- d2parser/parse.go | 3 +- .../TestCompile2/vars/basic/array.exp.json | 347 +++++++++++++++++ .../vars/basic/multi-part-array.exp.json | 221 +++++++++++ .../vars/basic/spread-array.exp.json | 359 ++++++++++++++++++ .../vars/basic/sub-array.exp.json | 237 ++++++++++++ .../vars/errors/missing-array.exp.json | 11 + .../vars/errors/spread-non-array.exp.json | 11 + .../vars/errors/spread-non-map.exp.json | 2 +- .../vars/errors/spread-non-solo.exp.json | 11 + 11 files changed, 1335 insertions(+), 18 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/array.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/missing-array.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/spread-non-array.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 36e502a68..ac43dcc6d 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3411,6 +3411,64 @@ z: { assert.Equal(t, 3, len(g.Objects[1].Children)) }, }, + { + name: "array", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + base-constraints: [UNQ; NOT NULL] +} +a: { + shape: sql_table + b: int {constraint: ${base-constraints}} +} +`, "") + assert.Equal(t, "a", g.Objects[0].ID) + assert.Equal(t, 2, len(g.Objects[0].SQLTable.Columns[0].Constraint)) + }, + }, + { + name: "spread-array", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + base-constraints: [UNQ; NOT NULL] +} +a: { + shape: sql_table + b: int {constraint: [PK; ...${base-constraints}]} +} +`, "") + assert.Equal(t, "a", g.Objects[0].ID) + assert.Equal(t, 3, len(g.Objects[0].SQLTable.Columns[0].Constraint)) + }, + }, + { + name: "sub-array", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: all +} +z.class: [a; ${x}] +`, "") + assert.Equal(t, "z", g.Objects[0].ID) + assert.Equal(t, "all", g.Objects[0].Attributes.Classes[1]) + }, + }, + { + name: "multi-part-array", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: all +} +z.class: [a; ${x}together] +`, "") + assert.Equal(t, "z", g.Objects[0].ID) + assert.Equal(t, "alltogether", g.Objects[0].Attributes.Classes[1]) + }, + }, } for _, tc := range tca { @@ -3742,7 +3800,35 @@ z: { ...${x} c } -`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-map into map`) +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite into composite`) + }, + }, + { + name: "missing-array", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: b +} +z: { + class: [...${a}] +} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/missing-array.d2:6:3: could not resolve variable "a"`) + }, + }, + { + name: "spread-non-array", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + x: { + a: b + } +} +z: { + class: [...${x}] +} +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-array.d2:8:11: cannot spread non-array into array`) }, }, { diff --git a/d2ir/compile.go b/d2ir/compile.go index db1e8ec5c..f4f0e7d4c 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -106,6 +106,13 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { if f.Primary() != nil { c.resolveSubstitutions(varsStack, f) } + if arr, ok := f.Composite.(*Array); ok { + for _, val := range arr.Values { + if scalar, ok := val.(*Scalar); ok { + c.resolveSubstitutions(varsStack, scalar) + } + } + } if f.Map() != nil { // don't resolve substitutions in vars with the current scope of vars if f.Name == "vars" { @@ -145,20 +152,34 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { } if box.Substitution.Spread { if resolvedField.Composite == nil { - c.errorf(box.Substitution, "cannot spread non-map into map") + c.errorf(box.Substitution, "cannot spread non-composite into composite") continue } - // TODO arrays - if resolvedField.Map() != nil { - OverlayMap(ParentMap(node), resolvedField.Map()) - } - // Remove the placeholder field - f := node.(*Field) - m := f.parent.(*Map) - for i, f2 := range m.Fields { - if f == f2 { - m.Fields = append(m.Fields[:i], m.Fields[i+1:]...) - break + switch n := node.(type) { + case *Scalar: // Array value + resolvedArr, ok := resolvedField.Composite.(*Array) + if !ok { + c.errorf(box.Substitution, "cannot spread non-array into array") + continue + } + arr := n.parent.(*Array) + for i, s := range arr.Values { + if s == n { + arr.Values = append(append(arr.Values[:i], resolvedArr.Values...), arr.Values[i+1:]...) + break + } + } + case *Field: + if resolvedField.Map() != nil { + OverlayMap(ParentMap(n), resolvedField.Map()) + } + // Remove the placeholder field + m := n.parent.(*Map) + for i, f2 := range m.Fields { + if n == f2 { + m.Fields = append(m.Fields[:i], m.Fields[i+1:]...) + break + } } } } @@ -167,6 +188,12 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { c.errorf(node.LastRef().AST(), `cannot substitute map variable "%s" as part of a string`, strings.Join(box.Substitution.IDA(), ".")) return } + switch n := node.(type) { + case *Field: + n.Primary_ = nil + case *Edge: + n.Primary_ = nil + } } else { if len(s.Value) == 1 { // If lone and unquoted, replace with value of sub @@ -276,7 +303,9 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { }) case n.Substitution != nil: if !n.Substitution.Spread { - c.errorf(n.Import, "invalid non-spread substitution in map") + // TODO parser parses ${x} as a field with name "$" and map of child x + // So this is never reached. But that parser behavior could change + c.errorf(n.Substitution, "invalid non-spread substitution in map") continue } // placeholder field to be resolved at the end @@ -653,8 +682,12 @@ func (c *compiler) compileArray(dst *Array, a *d2ast.Array, scopeAST *d2ast.Map) irv = n } case *d2ast.Substitution: - // TODO - // panic("TODO") + irv = &Scalar{ + parent: dst, + Value: &d2ast.UnquotedString{ + Value: []d2ast.InterpolationBox{{Substitution: an.Substitution}}, + }, + } } dst.Values = append(dst.Values, irv) diff --git a/d2parser/parse.go b/d2parser/parse.go index fa64531a3..bb460da82 100644 --- a/d2parser/parse.go +++ b/d2parser/parse.go @@ -1560,7 +1560,8 @@ func (p *parser) parseArrayNode(r rune) d2ast.ArrayNodeBox { p.replay(r) vbox := p.parseValue() - if vbox.UnquotedString != nil && vbox.UnquotedString.ScalarString() == "" { + if vbox.UnquotedString != nil && vbox.UnquotedString.ScalarString() == "" && + !(len(vbox.UnquotedString.Value) > 0 && vbox.UnquotedString.Value[0].Substitution != nil) { p.errorf(p.pos, p.pos.Advance(r, p.utf16), "unquoted strings cannot start on %q", r) } box.Null = vbox.Null diff --git a/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json new file mode 100644 index 000000000..73c5d4b33 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json @@ -0,0 +1,347 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,0:0:0-8:0:114", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,1:0:1-3:1:45", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,1:6:7-3:1:45", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,2:1:10-2:34:43", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,2:1:10-2:17:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,2:1:10-2:17:26", + "value": [ + { + "string": "base-constraints", + "raw_string": "base-constraints" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,2:19:28-2:33:42", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,2:20:29-2:23:32", + "value": [ + { + "string": "UNQ", + "raw_string": "UNQ" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,2:25:34-2:33:42", + "value": [ + { + "string": "NOT NULL", + "raw_string": "NOT NULL" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,4:0:46-7:1:113", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,4:0:46-4:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,4:0:46-4:1:47", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,4:3:49-7:1:113", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,5:2:53-5:18:69", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,5:2:53-5:7:58", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,5:2:53-5:7:58", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,5:9:60-5:18:69", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:1:71-6:41:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:1:71-6:2:72", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:1:71-6:2:72", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:4:74-6:7:77", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:8:78-6:41:111", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:9:79-6:40:110", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:9:79-6:19:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:9:79-6:19:89", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:21:91-6:22:92", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:21:91-6:40:110", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,6:23:93-6:39:109", + "value": [ + { + "string": "base-constraints", + "raw_string": "base-constraints" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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/TestCompile2/vars/basic/array.d2,4:0:46-4:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/array.d2,4:0:46-4:1:47", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "sql_table": { + "columns": [ + { + "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": [ + "UNQ", + "NOT NULL" + ], + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "a" + }, + "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/TestCompile2/vars/basic/multi-part-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json new file mode 100644 index 000000000..f6b14f864 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json @@ -0,0 +1,221 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,0:0:0-5:0:46", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,1:0:1-3:1:18", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,1:6:7-3:1:18", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,2:1:10-2:7:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,2:1:10-2:2:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,2:1:10-2:2:11", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,2:4:13-2:7:16", + "value": [ + { + "string": "all", + "raw_string": "all" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:0:19-4:26:45", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:0:19-4:7:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:0:19-4:1:20", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:2:21-4:7:26", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:9:28-4:25:44", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:10:29-4:11:30", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:13:32-4:25:44", + "value": [ + { + "string": "alltogether" + } + ] + } + } + ] + } + } + } + } + ] + }, + "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": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:0:19-4:7:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:0:19-4:1:20", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.d2,4:2:21-4:7:26", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null, + "classes": [ + "a", + "alltogether" + ] + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json new file mode 100644 index 000000000..f83c5490d --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json @@ -0,0 +1,359 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,0:0:0-8:0:123", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,1:0:1-3:1:45", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,1:6:7-3:1:45", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,2:1:10-2:34:43", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,2:1:10-2:17:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,2:1:10-2:17:26", + "value": [ + { + "string": "base-constraints", + "raw_string": "base-constraints" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,2:19:28-2:33:42", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,2:20:29-2:23:32", + "value": [ + { + "string": "UNQ", + "raw_string": "UNQ" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,2:25:34-2:33:42", + "value": [ + { + "string": "NOT NULL", + "raw_string": "NOT NULL" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,4:0:46-7:1:122", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,4:0:46-4:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,4:0:46-4:1:47", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,4:3:49-7:1:122", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,5:2:53-5:18:69", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,5:2:53-5:7:58", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,5:2:53-5:7:58", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,5:9:60-5:18:69", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:1:71-6:50:120", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:1:71-6:2:72", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:1:71-6:2:72", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:4:74-6:7:77", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:8:78-6:50:120", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:9:79-6:49:119", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:9:79-6:19:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:9:79-6:19:89", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:21:91-6:48:118", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:22:92-6:24:94", + "value": [ + { + "string": "PK", + "raw_string": "PK" + } + ] + } + }, + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:26:96-6:48:118", + "spread": true, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,6:31:101-6:47:117", + "value": [ + { + "string": "base-constraints", + "raw_string": "base-constraints" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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/TestCompile2/vars/basic/spread-array.d2,4:0:46-4:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-array.d2,4:0:46-4:1:47", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "sql_table": { + "columns": [ + { + "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": [ + "PK", + "UNQ", + "NOT NULL" + ], + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "a" + }, + "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/TestCompile2/vars/basic/sub-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json new file mode 100644 index 000000000..0c182f344 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json @@ -0,0 +1,237 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,0:0:0-5:0:38", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,1:0:1-3:1:18", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,1:6:7-3:1:18", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,2:1:10-2:7:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,2:1:10-2:2:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,2:1:10-2:2:11", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,2:4:13-2:7:16", + "value": [ + { + "string": "all", + "raw_string": "all" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:0:19-4:18:37", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:0:19-4:7:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:0:19-4:1:20", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:2:21-4:7:26", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:9:28-4:18:37", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:10:29-4:11:30", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:13:32-4:14:33", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:13:32-4:17:36", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:15:34-4:16:35", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + }, + "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": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:0:19-4:7:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:0:19-4:1:20", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:2:21-4:7:26", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null, + "classes": [ + "a", + "all" + ] + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/errors/missing-array.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/missing-array.exp.json new file mode 100644 index 000000000..a0790a2f0 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/missing-array.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing-array.d2,5:2:24-5:7:29", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/missing-array.d2:6:3: could not resolve variable \"a\"" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-array.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-array.exp.json new file mode 100644 index 000000000..2ffbdf15c --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-array.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-array.d2,7:10:45-7:17:52", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-array.d2:8:11: cannot spread non-array into array" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json index 02e2b3eb6..b713c683f 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json @@ -4,7 +4,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2,5:2:26-5:9:33", - "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-map into map" + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite into composite" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.exp.json new file mode 100644 index 000000000..296f35954 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.d2,7:1:36-7:2:37", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.d2:8:2: cannot substitute map variable \"x\" as part of a string" + } + ] + } +} From 301bc8ddfbd789549af58e16add68a80d9ce84cb Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 12 Jul 2023 23:01:11 -0700 Subject: [PATCH 041/138] add precedent test --- d2compiler/compile_test.go | 25 + .../TestCompile2/vars/boards/layer-2.exp.json | 631 ++++++++++++++++++ 2 files changed, 656 insertions(+) create mode 100644 testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index ac43dcc6d..457b442a7 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3597,6 +3597,31 @@ layers: { assert.Equal(t, "im a var", g.Layers[0].Objects[0].Label.Value) }, }, + { + name: "layer-2", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: root var x + y: root var y +} + +layers: { + l: { + vars: { + x: layer var x + } + hi: ${x} + hello: ${y} + } +} +`, "") + assert.Equal(t, "hi", g.Layers[0].Objects[0].ID) + assert.Equal(t, "layer var x", g.Layers[0].Objects[0].Label.Value) + assert.Equal(t, "hello", g.Layers[0].Objects[1].ID) + assert.Equal(t, "root var y", g.Layers[0].Objects[1].Label.Value) + }, + }, { name: "scenario", run: func(t *testing.T) { diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json new file mode 100644 index 000000000..1edf3e182 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json @@ -0,0 +1,631 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,0:0:0-15:0:135", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,1:0:1-4:1:42", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,1:6:7-4:1:42", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,2:2:11-2:15:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,2:2:11-2:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,2:2:11-2:3:12", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,2:5:14-2:15:24", + "value": [ + { + "string": "root var x", + "raw_string": "root var x" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,3:2:27-3:15:40", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,3:2:27-3:3:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,3:2:27-3:3:28", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,3:5:30-3:15:40", + "value": [ + { + "string": "root var y", + "raw_string": "root var y" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,6:0:44-14:1:134", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,6:0:44-6:6:50", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,6:0:44-6:6:50", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,6:8:52-14:1:134", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,7:2:56-13:3:132", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,7:2:56-7:3:57", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,7:2:56-7:3:57", + "value": [ + { + "string": "l", + "raw_string": "l" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,7:5:59-13:3:132", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,8:4:65-10:5:99", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,8:4:65-8:8:69", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,8:4:65-8:8:69", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,8:10:71-10:5:99", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,9:6:79-9:20:93", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,9:6:79-9:7:80", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,9:6:79-9:7:80", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,9:9:82-9:20:93", + "value": [ + { + "string": "layer var x", + "raw_string": "layer var x" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:4:104-11:12:112", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:4:104-11:6:106", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:4:104-11:6:106", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:8:108-11:9:109", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:8:108-11:12:112", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:10:110-11:11:111", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:4:117-12:15:128", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:4:117-12:9:122", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:4:117-12:9:122", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:11:124-12:12:125", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:11:124-12:15:128", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:13:126-12:14:127", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": null, + "layers": [ + { + "name": "l", + "isFolderOnly": false, + "ast": { + "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": "vars" + } + ] + } + } + ] + }, + "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": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,9:9:82-9:20:93", + "value": [ + { + "string": "layer var x", + "raw_string": "layer var 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": "y" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,3:5:30-3:15:40", + "value": [ + { + "string": "root var y", + "raw_string": "root var y" + } + ] + } + }, + "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": "hi" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,9:9:82-9:20:93", + "value": [ + { + "string": "layer var x", + "raw_string": "layer var 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": "hello" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,3:5:30-3:15:40", + "value": [ + { + "string": "root var y", + "raw_string": "root var y" + } + ] + } + }, + "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": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:4:104-11:6:106", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:4:104-11:6:106", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "layer var x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "hello", + "id_val": "hello", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:4:117-12:9:122", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:4:117-12:9:122", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "root var y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} From ef11d47fc8208259ffee227edb63903fe337fa3a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 08:35:16 -0700 Subject: [PATCH 042/138] null --- d2compiler/compile_test.go | 16 ++++++++++++++++ d2ir/compile.go | 14 ++++++++++++-- .../TestCompile2/vars/boards/null.exp.json | 11 +++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/boards/null.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 457b442a7..15ed52962 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3696,6 +3696,22 @@ scenarios: { assert.Equal(t, "im replaced x var", g.Scenarios[0].Objects[0].Label.Value) }, }, + { + name: "null", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + surname: Smith +} +a: { + vars: { + surname: null + } + hi: John ${surname} +} +`, `d2/testdata/d2compiler/TestCompile2/vars/boards/null.d2:9:3: could not resolve variable "surname"`) + }, + }, } for _, tc := range tca { diff --git a/d2ir/compile.go b/d2ir/compile.go index f4f0e7d4c..f4fc7775b 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -143,6 +143,11 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { for _, vars := range varsStack { resolvedField = c.resolveSubstitution(vars, box.Substitution) if resolvedField != nil { + if resolvedField.Primary() != nil { + if _, ok := resolvedField.Primary().Value.(*d2ast.Null); ok { + resolvedField = nil + } + } break } } @@ -257,6 +262,7 @@ func (c *compiler) resolveSubstitution(vars *Map, substitution *d2ast.Substituti if f == nil { return nil } + if i == len(substitution.Path)-1 { return f } @@ -351,8 +357,12 @@ func (c *compiler) compileKey(refctx *RefContext) { func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) { if refctx.Key != nil && len(refctx.Key.Edges) == 0 && refctx.Key.Value.Null != nil { - dst.DeleteField(kp.IDA()...) - return + // For vars, if we delete the field, it may just resolve to an outer scope var of the same name + // Instead we keep it around, so that resolveSubstitutions can find it + if ParentField(dst) == nil || ParentField(dst).Name != "vars" { + dst.DeleteField(kp.IDA()...) + return + } } f, err := dst.EnsureField(kp, refctx) if err != nil { diff --git a/testdata/d2compiler/TestCompile2/vars/boards/null.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/null.exp.json new file mode 100644 index 000000000..b96afe0dd --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/boards/null.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/null.d2,8:2:64-8:4:66", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/boards/null.d2:9:3: could not resolve variable \"surname\"" + } + ] + } +} From 06ed41ecaedeaf220e7da83287b8ded48d8552bd Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 08:36:28 -0700 Subject: [PATCH 043/138] remove dead code --- d2ir/compile.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/d2ir/compile.go b/d2ir/compile.go index f4fc7775b..fb9ca598e 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -308,12 +308,6 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { ScopeAST: scopeAST, }) case n.Substitution != nil: - if !n.Substitution.Spread { - // TODO parser parses ${x} as a field with name "$" and map of child x - // So this is never reached. But that parser behavior could change - c.errorf(n.Substitution, "invalid non-spread substitution in map") - continue - } // placeholder field to be resolved at the end f := &Field{ parent: dst, From ffdb5121f49e16e4f82f63cb034452881a77a91d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 08:37:22 -0700 Subject: [PATCH 044/138] err msg --- d2compiler/compile_test.go | 2 +- d2ir/compile.go | 2 +- .../d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 15ed52962..33336b247 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3841,7 +3841,7 @@ z: { ...${x} c } -`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite into composite`) +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite`) }, }, { diff --git a/d2ir/compile.go b/d2ir/compile.go index fb9ca598e..2f28ce9b6 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -157,7 +157,7 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { } if box.Substitution.Spread { if resolvedField.Composite == nil { - c.errorf(box.Substitution, "cannot spread non-composite into composite") + c.errorf(box.Substitution, "cannot spread non-composite") continue } switch n := node.(type) { diff --git a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json index b713c683f..85b10a3ce 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json @@ -4,7 +4,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2,5:2:26-5:9:33", - "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite into composite" + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite" } ] } From 780345beeb3e3ad89e70b2f940a5a4f04b684b8a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 10:11:08 -0700 Subject: [PATCH 045/138] fix double quote primary --- d2compiler/compile_test.go | 15 ++ d2ir/compile.go | 5 +- .../vars/basic/double-quote-primary.exp.json | 216 ++++++++++++++++++ 3 files changed, 233 insertions(+), 3 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 33336b247..fdf1cc82f 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3469,6 +3469,21 @@ z.class: [a; ${x}together] assert.Equal(t, "alltogether", g.Objects[0].Attributes.Classes[1]) }, }, + { + name: "double-quote-primary", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + x: always { + a: b + } +} +z: "${x} be my maybe" +`, "") + assert.Equal(t, "z", g.Objects[0].ID) + assert.Equal(t, "always be my maybe", g.Objects[0].Label.Value) + }, + }, } for _, tc := range tca { diff --git a/d2ir/compile.go b/d2ir/compile.go index 2f28ce9b6..0cdbe5c45 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -112,8 +112,7 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { c.resolveSubstitutions(varsStack, scalar) } } - } - if f.Map() != nil { + } else if f.Map() != nil { // don't resolve substitutions in vars with the current scope of vars if f.Name == "vars" { c.compileSubstitutions(f.Map(), varsStack[1:]) @@ -238,7 +237,7 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { c.errorf(node.LastRef().AST(), `could not resolve variable "%s"`, strings.Join(box.Substitution.IDA(), ".")) return } - if resolvedField.Composite != nil { + if resolvedField.Primary() == nil && resolvedField.Composite != nil { c.errorf(node.LastRef().AST(), `cannot substitute map variable "%s" in quotes`, strings.Join(box.Substitution.IDA(), ".")) return } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json new file mode 100644 index 000000000..d23e46259 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json @@ -0,0 +1,216 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,0:0:0-7:0:59", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,1:0:1-5:1:36", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,1:6:7-5:1:36", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,2:1:10-4:3:34", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,2:1:10-2:2:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,2:1:10-2:2:11", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,2:4:13-2:10:19", + "value": [ + { + "string": "always", + "raw_string": "always" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,2:11:20-4:3:34", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,3:4:26-3:8:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,3:4:26-3:5:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,3:4:26-3:5:27", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,3:7:29-3:8:30", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,6:0:37-6:21:58", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,6:0:37-6:1:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,6:0:37-6:1:38", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,6:3:40-6:21:58", + "value": [ + { + "string": "always be my maybe" + } + ] + } + } + } + } + ] + }, + "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": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,6:0:37-6:1:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.d2,6:0:37-6:1:38", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "always be my maybe" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} From eba41af47d101964b31c90f52465cf45ad8a0439 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 10:13:26 -0700 Subject: [PATCH 046/138] use scalarstring --- d2compiler/compile_test.go | 2 +- d2ir/compile.go | 11 +-- .../vars/basic/edge-label.exp.json | 18 +--- .../TestCompile2/vars/basic/edge-map.exp.json | 18 +--- .../TestCompile2/vars/basic/nested.exp.json | 40 +------- .../TestCompile2/vars/basic/number.exp.json | 18 +--- .../vars/basic/parent-scope.exp.json | 18 +--- .../vars/basic/primary-and-composite.exp.json | 18 +--- .../vars/basic/quoted-var-quoted-sub.exp.json | 4 +- .../vars/basic/quoted-var.exp.json | 40 +------- .../vars/basic/shape-label.exp.json | 18 +--- .../TestCompile2/vars/basic/style.exp.json | 18 +--- .../vars/basic/sub-array.exp.json | 18 +--- .../TestCompile2/vars/boards/layer-2.exp.json | 46 ++-------- .../TestCompile2/vars/boards/layer.exp.json | 23 +---- .../TestCompile2/vars/boards/overlay.exp.json | 92 +++---------------- .../TestCompile2/vars/boards/replace.exp.json | 23 +---- .../vars/boards/scenario.exp.json | 23 +---- .../TestCompile2/vars/override/map.exp.json | 18 +--- .../vars/override/recursive-var.exp.json | 18 +--- .../vars/override/var-in-var.exp.json | 18 +--- 21 files changed, 46 insertions(+), 456 deletions(-) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index fdf1cc82f..b99b1a8c9 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3337,7 +3337,7 @@ vars: { y: "hey ${x}" `, "") - assert.Equal(t, `hey "hi"`, g.Objects[0].Label.Value) + assert.Equal(t, `hey hi`, g.Objects[0].Label.Value) }, }, { diff --git a/d2ir/compile.go b/d2ir/compile.go index 0cdbe5c45..1aaa32150 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -199,13 +199,8 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { n.Primary_ = nil } } else { - if len(s.Value) == 1 { - // If lone and unquoted, replace with value of sub - node.Primary().Value = resolvedField.Primary().Value - } else { - s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) - subbed = true - } + s.Value[i].String = go2.Pointer(resolvedField.Primary().Value.ScalarString()) + subbed = true } if resolvedField.Composite != nil { switch n := node.(type) { @@ -241,7 +236,7 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { c.errorf(node.LastRef().AST(), `cannot substitute map variable "%s" in quotes`, strings.Join(box.Substitution.IDA(), ".")) return } - s.Value[i].String = go2.Pointer(resolvedField.Primary().String()) + s.Value[i].String = go2.Pointer(resolvedField.Primary().Value.ScalarString()) subbed = true } } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json index 87391a571..4a85c4603 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json @@ -115,23 +115,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:8:33-4:9:34", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:8:33-4:12:37", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-label.d2,4:10:35-4:11:36", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json index cb64534ff..92d823330 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json @@ -150,23 +150,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:26:61-5:27:62", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:26:61-5:30:65", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge-map.d2,5:28:63-5:29:64", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json index 2b5c53b82..d32d26e50 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json @@ -185,45 +185,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:14:85-9:15:86", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:14:85-9:38:109", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:16:87-9:22:93", - "value": [ - { - "string": "colors", - "raw_string": "colors" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:23:94-9:30:101", - "value": [ - { - "string": "primary", - "raw_string": "primary" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,9:31:102-9:37:108", - "value": [ - { - "string": "button", - "raw_string": "button" - } - ] - } - } - ] - } + "string": "red" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json index a27ca9ad5..37d67c845 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json @@ -112,23 +112,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:15:44-5:16:45", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:15:44-5:25:54", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/number.d2,5:17:46-5:24:53", - "value": [ - { - "string": "columns", - "raw_string": "columns" - } - ] - } - } - ] - } + "string": "2" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json index b9d8924d5..5a3d26c1e 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json @@ -178,23 +178,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:6:74-8:7:75", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:6:74-8:10:78", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.d2,8:8:76-8:9:77", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im root var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json index f7ddb1d5c..bceafd191 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json @@ -131,23 +131,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:3:35-6:4:36", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:3:35-6:7:39", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.d2,6:5:37-6:6:38", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "all" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json index 1004100aa..0ab13c79f 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json @@ -92,7 +92,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.d2,5:3:25-5:13:35", "value": [ { - "string": "hey \"hi\"" + "string": "hey hi" } ] } @@ -153,7 +153,7 @@ ], "attributes": { "label": { - "value": "hey \"hi\"" + "value": "hey hi" }, "labelDimensions": { "width": 0, diff --git a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json index ec1525372..24ca57ef5 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json @@ -227,45 +227,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:10:131-12:11:132", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:10:131-12:40:161", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:12:133-12:25:146", - "value": [ - { - "string": "primaryColors", - "raw_string": "primaryColors" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:26:147-12:32:153", - "value": [ - { - "string": "button", - "raw_string": "button" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.d2,12:33:154-12:39:160", - "value": [ - { - "string": "active", - "raw_string": "active" - } - ] - } - } - ] - } + "string": "#4baae5" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json index faf48d651..29d85cf4e 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json @@ -92,23 +92,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:4:29-4:5:30", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:4:29-4:8:33", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/shape-label.d2,4:6:31-4:7:32", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json index 9cd133ce4..11ae2fe4d 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json @@ -127,23 +127,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:14:52-5:15:53", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:14:52-5:30:68", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,5:16:54-5:29:67", - "value": [ - { - "string": "primary-color", - "raw_string": "primary-color" - } - ] - } - } - ] - } + "string": "red" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json index 0c182f344..0ad0ba9f3 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json @@ -118,23 +118,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:13:32-4:14:33", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:13:32-4:17:36", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/sub-array.d2,4:15:34-4:16:35", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "all" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json index 1edf3e182..bd02109b5 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json @@ -235,23 +235,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:8:108-11:9:109", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:8:108-11:12:112", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:10:110-11:11:111", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "layer var x" } ] } @@ -283,23 +267,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:11:124-12:12:125", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:11:124-12:15:128", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:13:126-12:14:127", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - } + "string": "root var y" } ] } @@ -462,11 +430,10 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,9:9:82-9:20:93", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:8:108-11:9:109", "value": [ { - "string": "layer var x", - "raw_string": "layer var x" + "string": "layer var x" } ] } @@ -494,11 +461,10 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,3:5:30-3:15:40", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:11:124-12:12:125", "value": [ { - "string": "root var y", - "raw_string": "root var y" + "string": "root var y" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index 2f2a237c8..7f3f693b1 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -140,23 +140,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:9:52", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:12:55", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:10:53-7:11:54", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im a var" } ] } @@ -287,11 +271,10 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:8:51-7:9:52", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index b2557d9b0..23431936c 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -202,23 +202,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:8:90", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:11:93", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:9:91-10:10:92", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im x var" } ] } @@ -250,23 +234,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:8:102", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:11:105", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:9:103-11:10:104", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - } + "string": "im y var" } ] } @@ -418,23 +386,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:8:174", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:11:177", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:9:175-19:10:176", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im x var" } ] } @@ -466,23 +418,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:8:186", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:11:189", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:9:187-20:10:188", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - } + "string": "im y var" } ] } @@ -645,11 +581,10 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:7:173-19:8:174", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "string": "im x var" } ] } @@ -677,11 +612,10 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:7:185-20:8:186", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "string": "im y var" } ] } @@ -928,11 +862,10 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:7:89-10:8:90", "value": [ { - "string": "im x var", - "raw_string": "im x var" + "string": "im x var" } ] } @@ -960,11 +893,10 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:7:101-11:8:102", "value": [ { - "string": "im y var", - "raw_string": "im y var" + "string": "im y var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index 86ad2c0cb..fc75006dd 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -202,23 +202,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:8:99", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:11:102", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:9:100-10:10:101", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im replaced x var" } ] } @@ -349,11 +333,10 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:7:98-10:8:99", "value": [ { - "string": "im replaced x var", - "raw_string": "im replaced x var" + "string": "im replaced x var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index 1da21aa14..571e94ad8 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -140,23 +140,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:9:55", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:12:58", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:10:56-7:11:57", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im a var" } ] } @@ -287,11 +271,10 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:8:54-7:9:55", "value": [ { - "string": "im a var", - "raw_string": "im a var" + "string": "im a var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/override/map.exp.json b/testdata/d2compiler/TestCompile2/vars/override/map.exp.json index 11208a29b..cd5169258 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/map.exp.json @@ -178,23 +178,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:6:74-8:7:75", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:6:74-8:10:78", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/map.d2,8:8:76-8:9:77", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "im nested var" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json b/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json index 19277bee2..25f7bf6a0 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json @@ -177,23 +177,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:6:58-8:7:59", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:6:58-8:10:62", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/recursive-var.d2,8:8:60-8:9:61", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "a-b" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json index 6f41e1fad..f6beaba86 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json @@ -209,23 +209,7 @@ "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:6:104-9:7:105", "value": [ { - "substitution": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:6:104-9:15:113", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:8:106-9:14:112", - "value": [ - { - "string": "trade1", - "raw_string": "trade1" - } - ] - } - } - ] - } + "string": "BlackSmith" } ] } From a54907e28a2f3c08ab890afcdf5eb52ae023095d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 10:16:41 -0700 Subject: [PATCH 047/138] remove overlayVars --- d2ir/compile.go | 17 ------ .../TestCompile2/vars/boards/layer-2.exp.json | 32 ---------- .../TestCompile2/vars/boards/layer.exp.json | 60 ------------------- .../TestCompile2/vars/boards/overlay.exp.json | 32 ---------- 4 files changed, 141 deletions(-) diff --git a/d2ir/compile.go b/d2ir/compile.go index 1aaa32150..3efd94dd8 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -265,22 +265,6 @@ func (c *compiler) resolveSubstitution(vars *Map, substitution *d2ast.Substituti return nil } -func (c *compiler) overlayVars(base, overlay *Map) { - vars := overlay.GetField("vars") - if vars == nil { - return - } - vars = vars.Copy(base).(*Field) - - baseVars := base.GetField("vars") - if baseVars != nil { - OverlayMap(vars.Map(), baseVars.Map()) - base.DeleteField("vars") - } - - base.Fields = append(base.Fields, vars) -} - func (c *compiler) overlay(base *Map, f *Field) { if f.Map() == nil || f.Primary() != nil { c.errorf(f.References[0].Context.Key, "invalid %s", NodeBoardKind(f)) @@ -393,7 +377,6 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } } case BoardLayer: - c.overlayVars(f.Map(), ParentBoard(f).Map()) default: // If new board type, use that as the new scope AST, otherwise, carry on scopeAST = refctx.ScopeAST diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json index bd02109b5..891273336 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json @@ -372,38 +372,6 @@ }, "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": "y" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,3:5:30-3:15:40", - "value": [ - { - "string": "root var y", - "raw_string": "root var y" - } - ] - } - }, - "value": {} - } } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index 7f3f693b1..80e36aa1e 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -191,66 +191,6 @@ "ast": { "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": "vars" - } - ] - } - } - ] - }, - "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": "x" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22", - "value": [ - { - "string": "im a var", - "raw_string": "im a var" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - }, { "map_key": { "range": ",0:0:0-0:0:0", diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index 23431936c..5f46293b9 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -492,38 +492,6 @@ "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": "x" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22", - "value": [ - { - "string": "im x var", - "raw_string": "im x var" - } - ] - } - }, - "value": {} - } - }, { "map_key": { "range": ",0:0:0-0:0:0", From fb0c0d20edef91b518db8ff20eb55d5999d67a62 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 10:22:37 -0700 Subject: [PATCH 048/138] nested null --- d2compiler/compile_test.go | 52 +++++++++++++------ d2ir/compile.go | 2 +- d2ir/d2ir.go | 15 ++++++ .../vars/override/nested-null.exp.json | 11 ++++ .../TestCompile2/vars/override/null.exp.json | 11 ++++ 5 files changed, 74 insertions(+), 17 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/override/nested-null.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/override/null.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index b99b1a8c9..767cc9ac0 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3572,6 +3572,42 @@ hi: { assert.Equal(t, "a-b", g.Objects[1].Label.Value) }, }, + { + name: "null", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + surname: Smith +} +a: { + vars: { + surname: null + } + hi: John ${surname} +} +`, `d2/testdata/d2compiler/TestCompile2/vars/override/null.d2:9:3: could not resolve variable "surname"`) + }, + }, + { + name: "nested-null", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + surnames: { + john: smith + } +} +a: { + vars: { + surnames: { + john: null + } + } + hi: John ${surname} +} +`, `d2/testdata/d2compiler/TestCompile2/vars/override/nested-null.d2:13:3: could not resolve variable "surname"`) + }, + }, } for _, tc := range tca { @@ -3711,22 +3747,6 @@ scenarios: { assert.Equal(t, "im replaced x var", g.Scenarios[0].Objects[0].Label.Value) }, }, - { - name: "null", - run: func(t *testing.T) { - assertCompile(t, ` -vars: { - surname: Smith -} -a: { - vars: { - surname: null - } - hi: John ${surname} -} -`, `d2/testdata/d2compiler/TestCompile2/vars/boards/null.d2:9:3: could not resolve variable "surname"`) - }, - }, } for _, tc := range tca { diff --git a/d2ir/compile.go b/d2ir/compile.go index 3efd94dd8..ef88d95a9 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -331,7 +331,7 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) if refctx.Key != nil && len(refctx.Key.Edges) == 0 && refctx.Key.Value.Null != nil { // For vars, if we delete the field, it may just resolve to an outer scope var of the same name // Instead we keep it around, so that resolveSubstitutions can find it - if ParentField(dst) == nil || ParentField(dst).Name != "vars" { + if !IsVar(dst) { dst.DeleteField(kp.IDA()...) return } diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 65ed636b5..1160021f4 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -1026,6 +1026,21 @@ func ParentField(n Node) *Field { } } +func IsVar(n Node) bool { + for { + if n == nil { + return false + } + if NodeBoardKind(n) != "" { + return false + } + if f, ok := n.(*Field); ok && f.Name == "vars" { + return true + } + n = n.Parent() + } +} + func ParentBoard(n Node) Node { for { n = n.Parent() diff --git a/testdata/d2compiler/TestCompile2/vars/override/nested-null.exp.json b/testdata/d2compiler/TestCompile2/vars/override/nested-null.exp.json new file mode 100644 index 000000000..e73ae9f61 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/override/nested-null.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/nested-null.d2,12:2:102-12:4:104", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/override/nested-null.d2:13:3: could not resolve variable \"surname\"" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/override/null.exp.json b/testdata/d2compiler/TestCompile2/vars/override/null.exp.json new file mode 100644 index 000000000..84df5d0e5 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/override/null.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/null.d2,8:2:64-8:4:66", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/override/null.d2:9:3: could not resolve variable \"surname\"" + } + ] + } +} From 91895ae6abaaceeaa30059c0a1774156de80d235 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 19:10:20 -0700 Subject: [PATCH 049/138] add multiple_person_label test --- e2etests/stable_test.go | 1 + .../testdata/files/multiple_person_label.d2 | 4 + .../dagre/board.exp.json | 89 +++++++++++++++++ .../dagre/sketch.exp.svg | 95 +++++++++++++++++++ .../multiple_person_label/elk/board.exp.json | 89 +++++++++++++++++ .../multiple_person_label/elk/sketch.exp.svg | 95 +++++++++++++++++++ 6 files changed, 373 insertions(+) create mode 100644 e2etests/testdata/files/multiple_person_label.d2 create mode 100644 e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/multiple_person_label/elk/board.exp.json create mode 100644 e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 95ddde4a3..d63203e18 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2778,6 +2778,7 @@ scenarios: { loadFromFile(t, "multiple_offset"), loadFromFile(t, "multiple_offset_left"), loadFromFile(t, "multiple_box_selection"), + loadFromFile(t, "multiple_person_label"), loadFromFile(t, "outside_bottom_labels"), loadFromFile(t, "label_positions"), loadFromFile(t, "icon_positions"), diff --git a/e2etests/testdata/files/multiple_person_label.d2 b/e2etests/testdata/files/multiple_person_label.d2 new file mode 100644 index 000000000..b982bb628 --- /dev/null +++ b/e2etests/testdata/files/multiple_person_label.d2 @@ -0,0 +1,4 @@ +?: "あ" { + shape: person + style.multiple: true +} diff --git a/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json b/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json new file mode 100644 index 000000000..b56b4750b --- /dev/null +++ b/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json @@ -0,0 +1,89 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "?", + "type": "person", + "pos": { + "x": 0, + "y": 10 + }, + "width": 44, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "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": "あ", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 19, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "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_person_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg new file mode 100644 index 000000000..f26fef442 --- /dev/null +++ b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg @@ -0,0 +1,95 @@ +あ + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_person_label/elk/board.exp.json b/e2etests/testdata/stable/multiple_person_label/elk/board.exp.json new file mode 100644 index 000000000..6e11b66cb --- /dev/null +++ b/e2etests/testdata/stable/multiple_person_label/elk/board.exp.json @@ -0,0 +1,89 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "?", + "type": "person", + "pos": { + "x": 12, + "y": 22 + }, + "width": 44, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "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": "あ", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 19, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "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_person_label/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg new file mode 100644 index 000000000..7862d3465 --- /dev/null +++ b/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg @@ -0,0 +1,95 @@ +あ + + + \ No newline at end of file From f53afc485a3585c55829689b04a577c01752415d Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 19:04:42 -0700 Subject: [PATCH 050/138] fix labelbox adustments for multiple/3d shapes --- d2renderers/d2svg/d2svg.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index b0e096065..57b9f61dd 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -1201,9 +1201,11 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape offsetY /= 2 } box.TopLeft.Y -= float64(offsetY) + box.Height += float64(offsetY) box.Width += d2target.THREE_DEE_OFFSET } else if targetShape.Multiple { box.TopLeft.Y -= d2target.MULTIPLE_OFFSET + box.Height += d2target.MULTIPLE_OFFSET box.Width += d2target.MULTIPLE_OFFSET } } else { From d39c22f9a219863e33377c82582d87f26339428f Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 19:09:13 -0700 Subject: [PATCH 051/138] update tests --- d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg | 4 ++-- e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/all_shapes_multiple/elk/sketch.exp.svg | 4 ++-- .../stable/multiple_person_label/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/multiple_person_label/elk/sketch.exp.svg | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg index c76e36921..318eb6da9 100644 --- a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg @@ -130,7 +130,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -143,7 +143,7 @@ - + diff --git a/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg b/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg index e51559668..5f1a4a413 100644 --- a/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg @@ -122,7 +122,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -135,7 +135,7 @@ - + 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 429e5b9bb..766cb4a0d 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-1535485115 .color-AA4{color:#EDF0FD;} .d2-1535485115 .color-AA5{color:#F7F8FE;} .d2-1535485115 .color-AB4{color:#EDF0FD;} - .d2-1535485115 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-1535485115 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -102,7 +102,7 @@ - + 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 76989c9dd..d2124ad22 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-2596587540 .color-AA4{color:#EDF0FD;} .d2-2596587540 .color-AA5{color:#F7F8FE;} .d2-2596587540 .color-AB4{color:#EDF0FD;} - .d2-2596587540 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-2596587540 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -102,7 +102,7 @@ - + diff --git a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg index f26fef442..71ff8fe70 100644 --- a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-862838621 .color-AA4{color:#EDF0FD;} .d2-862838621 .color-AA5{color:#F7F8FE;} .d2-862838621 .color-AB4{color:#EDF0FD;} - .d2-862838621 .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}]]>あ + .d2-862838621 .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}]]>あ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg index 7862d3465..4937541d4 100644 --- a/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-3813377123 .color-AA4{color:#EDF0FD;} .d2-3813377123 .color-AA5{color:#F7F8FE;} .d2-3813377123 .color-AB4{color:#EDF0FD;} - .d2-3813377123 .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}]]>あ + .d2-3813377123 .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}]]>あ - + \ No newline at end of file From b93169062cb8842f0dd4dd6a9cf3b5d524c566c0 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 19:15:37 -0700 Subject: [PATCH 052/138] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 69969d43e..03554a70c 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -19,3 +19,4 @@ - 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) +- Fixes person shape label positioning with `multiple` or `3d` [#1478](https://github.com/terrastruct/d2/pull/1478) From 4847714c3c88507dbcba38ba9e805a486c2dd709 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 12:24:48 -0700 Subject: [PATCH 053/138] fix compiler creating vars --- d2compiler/compile.go | 4 +- d2compiler/compile_test.go | 21 +- .../vars/basic/primary-and-composite.exp.json | 46 --- .../TestCompile2/vars/basic/removed.exp.json | 212 ++++++++++++++ .../vars/basic/spread-nested.exp.json | 267 ++++++++++++++++++ .../TestCompile2/vars/basic/spread.exp.json | 136 +++------ 6 files changed, 545 insertions(+), 141 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/removed.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 29927ca57..e2c8b71bb 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -342,7 +342,7 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { Scope: fr.Context.Scope, ScopeAST: fr.Context.ScopeAST, } - if fr.Context.ScopeMap != nil { + if fr.Context.ScopeMap != nil && !d2ir.IsVar(fr.Context.ScopeMap) { scopeObjIDA := d2graphIDA(d2ir.BoardIDA(fr.Context.ScopeMap)) r.ScopeObj = obj.Graph.Root.EnsureChild(scopeObjIDA) } @@ -738,7 +738,7 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) { Scope: er.Context.Scope, ScopeAST: er.Context.ScopeAST, } - if er.Context.ScopeMap != nil { + if er.Context.ScopeMap != nil && !d2ir.IsVar(er.Context.ScopeMap) { scopeObjIDA := d2graphIDA(d2ir.BoardIDA(er.Context.ScopeMap)) r.ScopeObj = edge.Src.Graph.Root.EnsureChild(scopeObjIDA) } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 767cc9ac0..d716228cf 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3407,8 +3407,9 @@ z: { c } `, "") - assert.Equal(t, "z", g.Objects[1].ID) - assert.Equal(t, 3, len(g.Objects[1].Children)) + assert.Equal(t, "z", g.Objects[2].ID) + assert.Equal(t, 4, len(g.Objects)) + assert.Equal(t, 3, len(g.Objects[2].Children)) }, }, { @@ -3484,6 +3485,22 @@ z: "${x} be my maybe" assert.Equal(t, "always be my maybe", g.Objects[0].Label.Value) }, }, + { + name: "spread-nested", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + disclaimer: { + I am not a lawyer + } +} +custom-disclaimer: DRAFT DISCLAIMER { + ...${disclaimer} +} +`, "") + assert.Equal(t, 2, len(g.Objects)) + }, + }, } for _, tc := range tca { diff --git a/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json index bceafd191..87592f6fc 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json @@ -254,52 +254,6 @@ "constraint": null }, "zIndex": 0 - }, - { - "id": "vars", - "id_val": "vars", - "attributes": { - "label": { - "value": "vars" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 - }, - { - "id": "x", - "id_val": "x", - "attributes": { - "label": { - "value": "x" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile2/vars/basic/removed.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/removed.exp.json new file mode 100644 index 000000000..afa9d9a11 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/removed.exp.json @@ -0,0 +1,212 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,0:0:0-8:0:121", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,1:0:1-7:1:120", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,1:6:7-7:1:120", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,2:2:11-2:35:44", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,2:2:11-2:18:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,2:2:11-2:18:27", + "value": [ + { + "string": "base-constraints", + "raw_string": "base-constraints" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,2:20:29-2:34:43", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,2:21:30-2:29:38", + "value": [ + { + "string": "NOT NULL", + "raw_string": "NOT NULL" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,2:31:40-2:34:43", + "value": [ + { + "string": "UNQ", + "raw_string": "UNQ" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,3:2:47-6:3:118", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,3:2:47-3:12:57", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,3:2:47-3:12:57", + "value": [ + { + "string": "disclaimer", + "raw_string": "disclaimer" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,3:14:59-3:24:69", + "value": [ + { + "string": "DISCLAIMER", + "raw_string": "DISCLAIMER" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,3:25:70-6:3:118", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,4:4:76-4:21:93", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,4:4:76-4:21:93", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,4:4:76-4:21:93", + "value": [ + { + "string": "I am not a lawyer", + "raw_string": "I am not a lawyer" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,5:4:98-5:20:114", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,5:4:98-5:8:102", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,5:4:98-5:8:102", + "value": [ + { + "string": "near", + "raw_string": "near" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/removed.d2,5:10:104-5:20:114", + "value": [ + { + "string": "top-center", + "raw_string": "top-center" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": null + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json new file mode 100644 index 000000000..c8e6699c9 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json @@ -0,0 +1,267 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,0:0:0-9:0:112", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,1:0:1-5:1:52", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,1:6:7-5:1:52", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,2:2:11-4:3:50", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,2:2:11-2:12:21", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,2:2:11-2:12:21", + "value": [ + { + "string": "disclaimer", + "raw_string": "disclaimer" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,2:14:23-4:3:50", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,3:4:29-3:21:46", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,3:4:29-3:21:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,3:4:29-3:21:46", + "value": [ + { + "string": "I am not a lawyer", + "raw_string": "I am not a lawyer" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,6:0:53-8:1:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,6:0:53-6:17:70", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,6:0:53-6:17:70", + "value": [ + { + "string": "custom-disclaimer", + "raw_string": "custom-disclaimer" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,6:19:72-6:35:88", + "value": [ + { + "string": "DRAFT DISCLAIMER", + "raw_string": "DRAFT DISCLAIMER" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,6:36:89-8:1:111", + "nodes": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,7:2:93-7:18:109", + "spread": true, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,7:7:98-7:17:108", + "value": [ + { + "string": "disclaimer", + "raw_string": "disclaimer" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + }, + "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": "I am not a lawyer", + "id_val": "I am not a lawyer", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,3:4:29-3:21:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,3:4:29-3:21:46", + "value": [ + { + "string": "I am not a lawyer", + "raw_string": "I am not a lawyer" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "I am not a lawyer" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "custom-disclaimer", + "id_val": "custom-disclaimer", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,6:0:53-6:17:70", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.d2,6:0:53-6:17:70", + "value": [ + { + "string": "custom-disclaimer", + "raw_string": "custom-disclaimer" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "DRAFT DISCLAIMER" + }, + "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/TestCompile2/vars/basic/spread.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json index 9dbadf0d4..8789c60c7 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json @@ -282,6 +282,51 @@ }, "zIndex": 0 }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:4:30-4:5:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:4:30-4:5:31", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "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": "z", "id_val": "z", @@ -371,97 +416,6 @@ "constraint": null }, "zIndex": 0 - }, - { - "id": "vars", - "id_val": "vars", - "attributes": { - "label": { - "value": "vars" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 - }, - { - "id": "x", - "id_val": "x", - "attributes": { - "label": { - "value": "x" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 - }, - { - "id": "b", - "id_val": "b", - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:4:30-4:5:31", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread.d2,4:4:30-4:5:31", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "key_path_index": 0, - "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 } ] }, From 2a13f21d66db3b38ff2f2f71610f8109cdac7c1e Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 6 Jul 2023 12:17:55 -0700 Subject: [PATCH 054/138] add dagre_spacing test --- e2etests/stable_test.go | 1 + e2etests/testdata/files/dagre_spacing.d2 | 101 + .../stable/dagre_spacing/dagre/board.exp.json | 1798 +++++++++++++++++ .../stable/dagre_spacing/dagre/sketch.exp.svg | 135 ++ .../stable/dagre_spacing/elk/board.exp.json | 1526 ++++++++++++++ .../stable/dagre_spacing/elk/sketch.exp.svg | 135 ++ 6 files changed, 3696 insertions(+) create mode 100644 e2etests/testdata/files/dagre_spacing.d2 create mode 100644 e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/dagre_spacing/elk/board.exp.json create mode 100644 e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index d63203e18..9f3bcda09 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2784,6 +2784,7 @@ scenarios: { loadFromFile(t, "icon_positions"), loadFromFile(t, "all_shapes_link"), loadFromFile(t, "nested_shape_labels"), + loadFromFile(t, "dagre_spacing"), } runa(t, tcs) diff --git a/e2etests/testdata/files/dagre_spacing.d2 b/e2etests/testdata/files/dagre_spacing.d2 new file mode 100644 index 000000000..faa644ae1 --- /dev/null +++ b/e2etests/testdata/files/dagre_spacing.d2 @@ -0,0 +1,101 @@ +a: { + k.t -> f.i + f.g -> _.s.n +} +k +k.s <-> u.o +h.m.s -> a.f.g + +a.f.j -> u.s.j +u: { + c -> _.s.z.c +} + +s: { + n: { + style.stroke: red + f + } +} + +s.n -> y.r: {style.stroke-width: 8; style.stroke: red} +y.r -> a.g.i: 1\n2\n3\n4 + +s.n.class: icon +a.f.i: { + label: i\nii + class: OutsideTopCenter +} +u.s.j.class: OutsideBottomCenter +u.s: { + label: s\ns\ns\ns + class: OutsideBottomCenter +} +a.f.j.class: [icon; IconOutsideLeftTop] +u.c: { + label: cccccccccccccccccccc + class: OutsideRightMiddle +} + +classes: { + icon: { + icon: https://icons.terrastruct.com/essentials/time.svg + } + + OutsideTopLeft.label.near: outside-top-left + OutsideTopCenter.label.near: outside-top-center + OutsideTopRight.label.near: outside-top-right + + OutsideLeftTop.label.near: outside-left-top + OutsideLeftMiddle.label.near: outside-left-center + OutsideLeftBottom.label.near: outside-left-bottom + + OutsideRightTop.label.near: outside-right-top + OutsideRightMiddle.label.near: outside-right-center + OutsideRightBottom.label.near: outside-right-bottom + + OutsideBottomLeft.label.near: outside-bottom-left + OutsideBottomCenter.label.near: outside-bottom-center + OutsideBottomRight.label.near: outside-bottom-right + + InsideTopLeft.label.near: top-left + InsideTopCenter.label.near: top-center + InsideTopRight.label.near: top-right + + InsideMiddleLeft.label.near: center-left + InsideMiddleCenter.label.near: center-center + InsideMiddleRight.label.near: center-right + + InsideBottomLeft.label.near: bottom-left + InsideBottomCenter.label.near: bottom-center + InsideBottomRight.label.near: bottom-right + + # Icon positions + IconOutsideTopLeft.icon.near: outside-top-left + IconOutsideTopCenter.icon.near: outside-top-center + IconOutsideTopRight.icon.near: outside-top-right + + IconOutsideLeftTop.icon.near: outside-left-top + IconOutsideLeftMiddle.icon.near: outside-left-center + IconOutsideLeftBottom.icon.near: outside-left-bottom + + IconOutsideRightTop.icon.near: outside-right-top + IconOutsideRightMiddle.icon.near: outside-right-center + IconOutsideRightBottom.icon.near: outside-right-bottom + + IconOutsideBottomLeft.icon.near: outside-bottom-left + IconOutsideBottomCenter.icon.near: outside-bottom-center + IconOutsideBottomRight.icon.near: outside-bottom-right + + IconInsideTopLeft.icon.near: top-left + IconInsideTopCenter.icon.near: top-center + IconInsideTopRight.icon.near: top-right + + IconInsideMiddleLeft.icon.near: center-left + IconInsideMiddleCenter.icon.near: center-center + IconInsideMiddleRight.icon.near: center-right + + IconInsideBottomLeft.icon.near: bottom-left + IconInsideBottomCenter.icon.near: bottom-center + IconInsideBottomRight.icon.near: bottom-right +} diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json new file mode 100644 index 000000000..e541e6bfb --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json @@ -0,0 +1,1798 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 41 + }, + "width": 424, + "height": 1922, + "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.k", + "type": "rectangle", + "pos": { + "x": 22, + "y": 112 + }, + "width": 131, + "height": 142, + "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": "k", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.k.t", + "type": "rectangle", + "pos": { + "x": 62, + "y": 150 + }, + "width": 51, + "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": "t", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f", + "type": "rectangle", + "pos": { + "x": 20, + "y": 514 + }, + "width": 384, + "height": 194, + "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": "f", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.f.i", + "type": "rectangle", + "classes": [ + "OutsideTopCenter" + ], + "pos": { + "x": 60, + "y": 570 + }, + "width": 54, + "height": 82, + "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": "i\nii", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 37, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.g", + "type": "rectangle", + "pos": { + "x": 174, + "y": 578 + }, + "width": 54, + "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": "g", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s", + "type": "rectangle", + "pos": { + "x": 595, + "y": 897 + }, + "width": 259, + "height": 651, + "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": "s", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "s.n", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 615, + "y": 968 + }, + "width": 131, + "height": 142, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "red", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "n", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "k", + "type": "rectangle", + "pos": { + "x": 1280, + "y": 443 + }, + "width": 132, + "height": 301, + "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": "k", + "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": "k.s", + "type": "rectangle", + "pos": { + "x": 1320, + "y": 560 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u", + "type": "rectangle", + "pos": { + "x": 874, + "y": 897 + }, + "width": 539, + "height": 249, + "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": "u", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "u.o", + "type": "rectangle", + "pos": { + "x": 1319, + "y": 988 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "o", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h", + "type": "rectangle", + "pos": { + "x": 842, + "y": 41 + }, + "width": 172, + "height": 249, + "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": "h", + "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": "h.m", + "type": "rectangle", + "pos": { + "x": 862, + "y": 112 + }, + "width": 132, + "height": 142, + "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": "m", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 18, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h.m.s", + "type": "rectangle", + "pos": { + "x": 902, + "y": 150 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.j", + "type": "rectangle", + "classes": [ + "icon", + "IconOutsideLeftTop" + ], + "pos": { + "x": 288, + "y": 552 + }, + "width": 76, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_TOP", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.s", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 894, + "y": 988 + }, + "width": 130, + "height": 122, + "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": "s\ns\ns\ns", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 103, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u.s.j", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 934, + "y": 1016 + }, + "width": 50, + "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": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.c", + "type": "rectangle", + "classes": [ + "OutsideRightMiddle" + ], + "pos": { + "x": 1064, + "y": 988 + }, + "width": 195, + "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": "cccccccccccccccccccc", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 150, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z", + "type": "rectangle", + "pos": { + "x": 701, + "y": 1370 + }, + "width": 133, + "height": 142, + "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": "z", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z.c", + "type": "rectangle", + "pos": { + "x": 741, + "y": 1408 + }, + "width": 53, + "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": "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": 3 + }, + { + "id": "s.n.f", + "type": "rectangle", + "pos": { + "x": 655, + "y": 1006 + }, + "width": 51, + "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": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 444, + "y": 1299 + }, + "width": 131, + "height": 249, + "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": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.r", + "type": "rectangle", + "pos": { + "x": 484, + "y": 1390 + }, + "width": 51, + "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": "r", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g", + "type": "rectangle", + "pos": { + "x": 148, + "y": 1785 + }, + "width": 129, + "height": 142, + "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": "g", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g.i", + "type": "rectangle", + "pos": { + "x": 188, + "y": 1823 + }, + "width": 49, + "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": "i", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 4, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "a.(k.t -> f.i)[0]", + "src": "a.k.t", + "srcArrow": "none", + "dst": "a.f.i", + "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": 216.5 + }, + { + "x": 87, + "y": 246.89999389648438 + }, + { + "x": 87, + "y": 265.70001220703125 + }, + { + "x": 87, + "y": 282.5 + }, + { + "x": 87, + "y": 299.29998779296875 + }, + { + "x": 87, + "y": 321.70001220703125 + }, + { + "x": 87, + "y": 338.5 + }, + { + "x": 87, + "y": 355.29998779296875 + }, + { + "x": 87, + "y": 377.70001220703125 + }, + { + "x": 87, + "y": 394.5 + }, + { + "x": 87, + "y": 411.29998779296875 + }, + { + "x": 87, + "y": 488.5 + }, + { + "x": 87, + "y": 528.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.g -> s.n)[0]", + "src": "a.f.g", + "srcArrow": "none", + "dst": "s.n", + "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": 201, + "y": 644.5 + }, + { + "x": 201, + "y": 679.2999877929688 + }, + { + "x": 201, + "y": 699.2000122070312 + }, + { + "x": 201, + "y": 716 + }, + { + "x": 201, + "y": 732.7999877929688 + }, + { + "x": 201, + "y": 755.2000122070312 + }, + { + "x": 201, + "y": 772 + }, + { + "x": 201, + "y": 788.7999877929688 + }, + { + "x": 201, + "y": 811.2000122070312 + }, + { + "x": 201, + "y": 828 + }, + { + "x": 201, + "y": 844.7999877929688 + }, + { + "x": 283.79998779296875, + "y": 938.7000122070312 + }, + { + "x": 615, + "y": 1045.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(k.s <-> u.o)[0]", + "src": "k.s", + "srcArrow": "triangle", + "dst": "u.o", + "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": 1345.5, + "y": 626.5 + }, + { + "x": 1345.5, + "y": 675.7000122070312 + }, + { + "x": 1345.5, + "y": 699.2000122070312 + }, + { + "x": 1345.5, + "y": 716 + }, + { + "x": 1345.5, + "y": 732.7999877929688 + }, + { + "x": 1345.5, + "y": 755.2000122070312 + }, + { + "x": 1345.5, + "y": 772 + }, + { + "x": 1345.5, + "y": 788.7999877929688 + }, + { + "x": 1345.5, + "y": 811.2000122070312 + }, + { + "x": 1345.5, + "y": 828 + }, + { + "x": 1345.5, + "y": 844.7999877929688 + }, + { + "x": 1345.5, + "y": 927.2999877929688 + }, + { + "x": 1345.5, + "y": 988.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(h.m.s -> a.f.g)[0]", + "src": "h.m.s", + "srcArrow": "none", + "dst": "a.f.g", + "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": 928.25, + "y": 216.5 + }, + { + "x": 928.25, + "y": 230.5 + }, + { + "x": 928.25, + "y": 245.1999969482422 + }, + { + "x": 928.25, + "y": 262 + }, + { + "x": 928.25, + "y": 278.79998779296875 + }, + { + "x": 782.7999877929688, + "y": 301.20001220703125 + }, + { + "x": 564.625, + "y": 318 + }, + { + "x": 346.4490051269531, + "y": 334.79998779296875 + }, + { + "x": 201, + "y": 357.20001220703125 + }, + { + "x": 201, + "y": 374 + }, + { + "x": 201, + "y": 390.79998779296875 + }, + { + "x": 201, + "y": 482.1000061035156 + }, + { + "x": 201, + "y": 578.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.j -> u.s.j)[0]", + "src": "a.f.j", + "srcArrow": "none", + "dst": "u.s.j", + "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": 326, + "y": 670.5 + }, + { + "x": 326, + "y": 684.5 + }, + { + "x": 326, + "y": 699.2000122070312 + }, + { + "x": 326, + "y": 716 + }, + { + "x": 326, + "y": 732.7999877929688 + }, + { + "x": 326, + "y": 755.2000122070312 + }, + { + "x": 326, + "y": 772 + }, + { + "x": 326, + "y": 788.7999877929688 + }, + { + "x": 326, + "y": 811.2000122070312 + }, + { + "x": 326, + "y": 828 + }, + { + "x": 326, + "y": 844.7999877929688 + }, + { + "x": 447.5, + "y": 938.7960205078125 + }, + { + "x": 933.5, + "y": 1045.9820556640625 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(u.c -> s.z.c)[0]", + "src": "u.c", + "srcArrow": "none", + "dst": "s.z.c", + "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": 1161, + "y": 1054.5 + }, + { + "x": 1161, + "y": 1082.9000244140625 + }, + { + "x": 1161, + "y": 1101.199951171875 + }, + { + "x": 1161, + "y": 1118 + }, + { + "x": 1161, + "y": 1134.800048828125 + }, + { + "x": 1082.199951171875, + "y": 1157.199951171875 + }, + { + "x": 964, + "y": 1174 + }, + { + "x": 845.7999877929688, + "y": 1190.800048828125 + }, + { + "x": 767, + "y": 1213.199951171875 + }, + { + "x": 767, + "y": 1230 + }, + { + "x": 767, + "y": 1246.800048828125 + }, + { + "x": 767, + "y": 1332.9000244140625 + }, + { + "x": 767, + "y": 1408.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(s.n -> y.r)[0]", + "src": "s.n", + "srcArrow": "none", + "dst": "y.r", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "red", + "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": 680.5, + "y": 1110.5 + }, + { + "x": 680.5, + "y": 1138.9000244140625 + }, + { + "x": 680.5, + "y": 1157.199951171875 + }, + { + "x": 680.5, + "y": 1174 + }, + { + "x": 680.5, + "y": 1190.800048828125 + }, + { + "x": 680.5, + "y": 1213.199951171875 + }, + { + "x": 680.5, + "y": 1230 + }, + { + "x": 680.5, + "y": 1246.800048828125 + }, + { + "x": 651.2999877929688, + "y": 1333.300048828125 + }, + { + "x": 534.5, + "y": 1410.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(y.r -> a.g.i)[0]", + "src": "y.r", + "srcArrow": "none", + "dst": "a.g.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "1\n2\n3\n4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 69, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 509.5, + "y": 1456.5 + }, + { + "x": 509.5, + "y": 1484.9000244140625 + }, + { + "x": 509.5, + "y": 1503.199951171875 + }, + { + "x": 509.5, + "y": 1520 + }, + { + "x": 509.5, + "y": 1536.800048828125 + }, + { + "x": 450, + "y": 1566.0999755859375 + }, + { + "x": 360.75, + "y": 1593.25 + }, + { + "x": 271.5, + "y": 1620.4000244140625 + }, + { + "x": 212, + "y": 1747.9000244140625 + }, + { + "x": 212, + "y": 1823.5 + } + ], + "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_spacing/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg new file mode 100644 index 000000000..fa88a0678 --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg @@ -0,0 +1,135 @@ +askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json new file mode 100644 index 000000000..bf4ed86cf --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json @@ -0,0 +1,1526 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 184, + "y": 373 + }, + "width": 513, + "height": 579, + "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.k", + "type": "rectangle", + "pos": { + "x": 234, + "y": 423 + }, + "width": 151, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "k", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.k.t", + "type": "rectangle", + "pos": { + "x": 284, + "y": 473 + }, + "width": 51, + "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": "t", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f", + "type": "rectangle", + "pos": { + "x": 253, + "y": 679 + }, + "width": 393, + "height": 218, + "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": "f", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.f.i", + "type": "rectangle", + "classes": [ + "OutsideTopCenter" + ], + "pos": { + "x": 303, + "y": 729 + }, + "width": 54, + "height": 82, + "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": "i\nii", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 37, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.g", + "type": "rectangle", + "pos": { + "x": 377, + "y": 755 + }, + "width": 54, + "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": "g", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s", + "type": "rectangle", + "pos": { + "x": 387, + "y": 1453 + }, + "width": 424, + "height": 290, + "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": "s", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "s.n", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 437, + "y": 1503 + }, + "width": 151, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "red", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "n", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "k", + "type": "rectangle", + "pos": { + "x": 12, + "y": 786 + }, + "width": 152, + "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": "k", + "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": "k.s", + "type": "rectangle", + "pos": { + "x": 62, + "y": 836 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u", + "type": "rectangle", + "pos": { + "x": 255, + "y": 1092 + }, + "width": 694, + "height": 271, + "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": "u", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "u.o", + "type": "rectangle", + "pos": { + "x": 305, + "y": 1147 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "o", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h", + "type": "rectangle", + "pos": { + "x": 299, + "y": 12 + }, + "width": 252, + "height": 271, + "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": "h", + "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": "h.m", + "type": "rectangle", + "pos": { + "x": 349, + "y": 62 + }, + "width": 152, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "m", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 18, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h.m.s", + "type": "rectangle", + "pos": { + "x": 399, + "y": 112 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.j", + "type": "rectangle", + "classes": [ + "icon", + "IconOutsideLeftTop" + ], + "pos": { + "x": 520, + "y": 729 + }, + "width": 76, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_TOP", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.s", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 379, + "y": 1147 + }, + "width": 150, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "s\ns\ns\ns", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 103, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u.s.j", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 429, + "y": 1197 + }, + "width": 50, + "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": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.c", + "type": "rectangle", + "classes": [ + "OutsideRightMiddle" + ], + "pos": { + "x": 549, + "y": 1247 + }, + "width": 195, + "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": "cccccccccccccccccccc", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 150, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z", + "type": "rectangle", + "pos": { + "x": 608, + "y": 1508 + }, + "width": 153, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "z", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z.c", + "type": "rectangle", + "pos": { + "x": 658, + "y": 1558 + }, + "width": 53, + "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": "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": 3 + }, + { + "id": "s.n.f", + "type": "rectangle", + "pos": { + "x": 487, + "y": 1577 + }, + "width": 51, + "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": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 437, + "y": 1823 + }, + "width": 151, + "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": "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.r", + "type": "rectangle", + "pos": { + "x": 487, + "y": 1873 + }, + "width": 51, + "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": "r", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g", + "type": "rectangle", + "pos": { + "x": 466, + "y": 428 + }, + "width": 149, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "g", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g.i", + "type": "rectangle", + "pos": { + "x": 516, + "y": 478 + }, + "width": 49, + "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": "i", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 4, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "a.(k.t -> f.i)[0]", + "src": "a.k.t", + "srcArrow": "none", + "dst": "a.f.i", + "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": 309.5, + "y": 539 + }, + { + "x": 309.5, + "y": 634 + }, + { + "x": 330.25, + "y": 634 + }, + { + "x": 330.25, + "y": 687 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.g -> s.n)[0]", + "src": "a.f.g", + "srcArrow": "none", + "dst": "s.n", + "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": 404.25, + "y": 821 + }, + { + "x": 404.25, + "y": 997 + }, + { + "x": 214, + "y": 997 + }, + { + "x": 214, + "y": 1408 + }, + { + "x": 513, + "y": 1408 + }, + { + "x": 513, + "y": 1503 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(k.s <-> u.o)[0]", + "src": "k.s", + "srcArrow": "triangle", + "dst": "u.o", + "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": 88, + "y": 902 + }, + { + "x": 88, + "y": 1047 + }, + { + "x": 332, + "y": 1047 + }, + { + "x": 332, + "y": 1147 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(h.m.s -> a.f.g)[0]", + "src": "h.m.s", + "srcArrow": "none", + "dst": "a.f.g", + "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": 425, + "y": 178 + }, + { + "x": 425, + "y": 634 + }, + { + "x": 404.25, + "y": 634 + }, + { + "x": 404.25, + "y": 755 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.j -> u.s.j)[0]", + "src": "a.f.j", + "srcArrow": "none", + "dst": "u.s.j", + "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": 523.75, + "y": 847 + }, + { + "x": 523.75, + "y": 997 + }, + { + "x": 454, + "y": 997 + }, + { + "x": 454, + "y": 1197 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(u.c -> s.z.c)[0]", + "src": "u.c", + "srcArrow": "none", + "dst": "s.z.c", + "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": 685, + "y": 1313 + }, + { + "x": 685, + "y": 1558 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(s.n -> y.r)[0]", + "src": "s.n", + "srcArrow": "none", + "dst": "y.r", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "red", + "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": 513, + "y": 1693 + }, + { + "x": 513, + "y": 1873 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(y.r -> a.g.i)[0]", + "src": "y.r", + "srcArrow": "none", + "dst": "a.g.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "1\n2\n3\n4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 69, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 513, + "y": 1939 + }, + { + "x": 513, + "y": 2034 + }, + { + "x": 973.5, + "y": 2034 + }, + { + "x": 973.5, + "y": 328 + }, + { + "x": 540.5, + "y": 328 + }, + { + "x": 540.5, + "y": 478 + } + ], + "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_spacing/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg new file mode 100644 index 000000000..e135c66ea --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg @@ -0,0 +1,135 @@ +askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8a8db1892ca9434be2d3c476d5df897668b74d78 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 7 Jul 2023 11:29:43 -0700 Subject: [PATCH 055/138] add dagre_spacing_right test --- e2etests/stable_test.go | 1 + .../testdata/files/dagre_spacing_right.d2 | 103 + .../dagre_spacing_right/dagre/board.exp.json | 1798 +++++++++++++++++ .../dagre_spacing_right/dagre/sketch.exp.svg | 135 ++ .../dagre_spacing_right/elk/board.exp.json | 1518 ++++++++++++++ .../dagre_spacing_right/elk/sketch.exp.svg | 135 ++ 6 files changed, 3690 insertions(+) create mode 100644 e2etests/testdata/files/dagre_spacing_right.d2 create mode 100644 e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json create mode 100644 e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 9f3bcda09..853a7b285 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2785,6 +2785,7 @@ scenarios: { loadFromFile(t, "all_shapes_link"), loadFromFile(t, "nested_shape_labels"), loadFromFile(t, "dagre_spacing"), + loadFromFile(t, "dagre_spacing_right"), } runa(t, tcs) diff --git a/e2etests/testdata/files/dagre_spacing_right.d2 b/e2etests/testdata/files/dagre_spacing_right.d2 new file mode 100644 index 000000000..675be5ebd --- /dev/null +++ b/e2etests/testdata/files/dagre_spacing_right.d2 @@ -0,0 +1,103 @@ +direction: right + +a: { + k.t -> f.i + f.g -> _.s.n +} +k +k.s <-> u.o +h.m.s -> a.f.g + +a.f.j -> u.s.j +u: { + c -> _.s.z.c +} + +s: { + n: { + style.stroke: red + f + } +} + +s.n -> y.r: {style.stroke-width: 8; style.stroke: red} +y.r -> a.g.i: 1\n2\n3\n4 + +s.n.class: icon +a.f.i: { + label: i\nii + class: OutsideTopCenter +} +u.s.j.class: OutsideBottomCenter +u.s: { + label: s\ns\ns\ns + class: OutsideBottomCenter +} +a.f.j.class: [icon; IconOutsideLeftTop] +u.c: { + label: cccccccccccccccccccc + class: OutsideRightMiddle +} + +classes: { + icon: { + icon: https://icons.terrastruct.com/essentials/time.svg + } + + OutsideTopLeft.label.near: outside-top-left + OutsideTopCenter.label.near: outside-top-center + OutsideTopRight.label.near: outside-top-right + + OutsideLeftTop.label.near: outside-left-top + OutsideLeftMiddle.label.near: outside-left-center + OutsideLeftBottom.label.near: outside-left-bottom + + OutsideRightTop.label.near: outside-right-top + OutsideRightMiddle.label.near: outside-right-center + OutsideRightBottom.label.near: outside-right-bottom + + OutsideBottomLeft.label.near: outside-bottom-left + OutsideBottomCenter.label.near: outside-bottom-center + OutsideBottomRight.label.near: outside-bottom-right + + InsideTopLeft.label.near: top-left + InsideTopCenter.label.near: top-center + InsideTopRight.label.near: top-right + + InsideMiddleLeft.label.near: center-left + InsideMiddleCenter.label.near: center-center + InsideMiddleRight.label.near: center-right + + InsideBottomLeft.label.near: bottom-left + InsideBottomCenter.label.near: bottom-center + InsideBottomRight.label.near: bottom-right + + # Icon positions + IconOutsideTopLeft.icon.near: outside-top-left + IconOutsideTopCenter.icon.near: outside-top-center + IconOutsideTopRight.icon.near: outside-top-right + + IconOutsideLeftTop.icon.near: outside-left-top + IconOutsideLeftMiddle.icon.near: outside-left-center + IconOutsideLeftBottom.icon.near: outside-left-bottom + + IconOutsideRightTop.icon.near: outside-right-top + IconOutsideRightMiddle.icon.near: outside-right-center + IconOutsideRightBottom.icon.near: outside-right-bottom + + IconOutsideBottomLeft.icon.near: outside-bottom-left + IconOutsideBottomCenter.icon.near: outside-bottom-center + IconOutsideBottomRight.icon.near: outside-bottom-right + + IconInsideTopLeft.icon.near: top-left + IconInsideTopCenter.icon.near: top-center + IconInsideTopRight.icon.near: top-right + + IconInsideMiddleLeft.icon.near: center-left + IconInsideMiddleCenter.icon.near: center-center + IconInsideMiddleRight.icon.near: center-right + + IconInsideBottomLeft.icon.near: bottom-left + IconInsideBottomCenter.icon.near: bottom-center + IconInsideBottomRight.icon.near: bottom-right +} diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json new file mode 100644 index 000000000..1429be57f --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json @@ -0,0 +1,1798 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 41 + }, + "width": 1784, + "height": 756, + "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.k", + "type": "rectangle", + "pos": { + "x": 50, + "y": 168 + }, + "width": 152, + "height": 300, + "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": "k", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.k.t", + "type": "rectangle", + "pos": { + "x": 101, + "y": 341 + }, + "width": 51, + "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": "t", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f", + "type": "rectangle", + "pos": { + "x": 402, + "y": 168 + }, + "width": 176, + "height": 537, + "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": "f", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.f.i", + "type": "rectangle", + "classes": [ + "OutsideTopCenter" + ], + "pos": { + "x": 463, + "y": 333 + }, + "width": 54, + "height": 82, + "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": "i\nii", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 37, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.g", + "type": "rectangle", + "pos": { + "x": 463, + "y": 453 + }, + "width": 54, + "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": "g", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s", + "type": "rectangle", + "pos": { + "x": 728, + "y": 1398 + }, + "width": 748, + "height": 855, + "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": "s", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "s.n", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 778, + "y": 1525 + }, + "width": 295, + "height": 300, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "red", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "n", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "k", + "type": "rectangle", + "pos": { + "x": 352, + "y": 2716 + }, + "width": 276, + "height": 295, + "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": "k", + "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": "k.s", + "type": "rectangle", + "pos": { + "x": 464, + "y": 2886 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u", + "type": "rectangle", + "pos": { + "x": 728, + "y": 2406 + }, + "width": 395, + "height": 605, + "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": "u", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "u.o", + "type": "rectangle", + "pos": { + "x": 899, + "y": 2886 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "o", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h", + "type": "rectangle", + "pos": { + "x": 0, + "y": 1721 + }, + "width": 252, + "height": 519, + "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": "h", + "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": "h.m", + "type": "rectangle", + "pos": { + "x": 50, + "y": 1848 + }, + "width": 152, + "height": 300, + "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": "m", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 18, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h.m.s", + "type": "rectangle", + "pos": { + "x": 100, + "y": 2021 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.j", + "type": "rectangle", + "classes": [ + "icon", + "IconOutsideLeftTop" + ], + "pos": { + "x": 452, + "y": 539 + }, + "width": 76, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_TOP", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.s", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 778, + "y": 2547 + }, + "width": 295, + "height": 174, + "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": "s\ns\ns\ns", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 103, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u.s.j", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 901, + "y": 2601 + }, + "width": 50, + "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": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.c", + "type": "rectangle", + "classes": [ + "OutsideRightMiddle" + ], + "pos": { + "x": 828, + "y": 2800 + }, + "width": 195, + "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": "cccccccccccccccccccc", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 150, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z", + "type": "rectangle", + "pos": { + "x": 1273, + "y": 1861 + }, + "width": 153, + "height": 300, + "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": "z", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z.c", + "type": "rectangle", + "pos": { + "x": 1323, + "y": 2034 + }, + "width": 53, + "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": "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": 3 + }, + { + "id": "s.n.f", + "type": "rectangle", + "pos": { + "x": 900, + "y": 1698 + }, + "width": 51, + "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": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 1223, + "y": 950 + }, + "width": 253, + "height": 295, + "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": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.r", + "type": "rectangle", + "pos": { + "x": 1324, + "y": 1120 + }, + "width": 51, + "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": "r", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g", + "type": "rectangle", + "pos": { + "x": 1585, + "y": 287 + }, + "width": 149, + "height": 300, + "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": "g", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g.i", + "type": "rectangle", + "pos": { + "x": 1635, + "y": 460 + }, + "width": 49, + "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": "i", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 4, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "a.(k.t -> f.i)[0]", + "src": "a.k.t", + "srcArrow": "none", + "dst": "a.f.i", + "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": 152.5, + "y": 374.5 + }, + { + "x": 192.10000610351562, + "y": 374.5 + }, + { + "x": 212, + "y": 374.5 + }, + { + "x": 227, + "y": 374.5 + }, + { + "x": 242, + "y": 374.5 + }, + { + "x": 262, + "y": 374.5 + }, + { + "x": 277, + "y": 374.5 + }, + { + "x": 292, + "y": 374.5 + }, + { + "x": 312, + "y": 374.5 + }, + { + "x": 327, + "y": 374.5 + }, + { + "x": 342, + "y": 374.5 + }, + { + "x": 414.20001220703125, + "y": 374.5 + }, + { + "x": 463, + "y": 374.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.g -> s.n)[0]", + "src": "a.f.g", + "srcArrow": "none", + "dst": "s.n", + "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": 517, + "y": 477.5 + }, + { + "x": 565.7999877929688, + "y": 477.5 + }, + { + "x": 588, + "y": 477.5 + }, + { + "x": 603, + "y": 477.5 + }, + { + "x": 618, + "y": 477.5 + }, + { + "x": 638, + "y": 477.5 + }, + { + "x": 653, + "y": 477.5 + }, + { + "x": 668, + "y": 477.5 + }, + { + "x": 688, + "y": 477.5 + }, + { + "x": 703, + "y": 477.5 + }, + { + "x": 718, + "y": 477.5 + }, + { + "x": 802.2000122070312, + "y": 681.7000122070312 + }, + { + "x": 899, + "y": 1498.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(k.s <-> u.o)[0]", + "src": "k.s", + "srcArrow": "triangle", + "dst": "u.o", + "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": 516, + "y": 2919.5 + }, + { + "x": 565.5999755859375, + "y": 2919.5 + }, + { + "x": 588, + "y": 2919.5 + }, + { + "x": 603, + "y": 2919.5 + }, + { + "x": 618, + "y": 2919.5 + }, + { + "x": 638, + "y": 2919.5 + }, + { + "x": 653, + "y": 2919.5 + }, + { + "x": 668, + "y": 2919.5 + }, + { + "x": 688, + "y": 2919.5 + }, + { + "x": 703, + "y": 2919.5 + }, + { + "x": 718, + "y": 2919.5 + }, + { + "x": 802.0999755859375, + "y": 2919.5 + }, + { + "x": 898.5, + "y": 2919.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(h.m.s -> a.f.g)[0]", + "src": "h.m.s", + "srcArrow": "none", + "dst": "a.f.g", + "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": 152, + "y": 2054.5 + }, + { + "x": 192, + "y": 2054.5 + }, + { + "x": 212, + "y": 2054.5 + }, + { + "x": 227, + "y": 2054.5 + }, + { + "x": 242, + "y": 2054.5 + }, + { + "x": 262, + "y": 1740.9000244140625 + }, + { + "x": 277, + "y": 1270.5 + }, + { + "x": 292, + "y": 800.0989990234375 + }, + { + "x": 312, + "y": 486.5 + }, + { + "x": 327, + "y": 486.5 + }, + { + "x": 342, + "y": 486.5 + }, + { + "x": 414.20001220703125, + "y": 486.5 + }, + { + "x": 463, + "y": 486.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.j -> u.s.j)[0]", + "src": "a.f.j", + "srcArrow": "none", + "dst": "u.s.j", + "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": 528, + "y": 602 + }, + { + "x": 568, + "y": 602 + }, + { + "x": 588, + "y": 602 + }, + { + "x": 603, + "y": 602 + }, + { + "x": 618, + "y": 602 + }, + { + "x": 638, + "y": 602 + }, + { + "x": 653, + "y": 602 + }, + { + "x": 668, + "y": 602 + }, + { + "x": 688, + "y": 602 + }, + { + "x": 703, + "y": 602 + }, + { + "x": 718, + "y": 602 + }, + { + "x": 807, + "y": 1001.2000122070312 + }, + { + "x": 923, + "y": 2598 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(u.c -> s.z.c)[0]", + "src": "u.c", + "srcArrow": "none", + "dst": "s.z.c", + "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": 1023, + "y": 2842.5 + }, + { + "x": 1063, + "y": 2842.5 + }, + { + "x": 1083, + "y": 2842.5 + }, + { + "x": 1098, + "y": 2842.5 + }, + { + "x": 1113, + "y": 2842.5 + }, + { + "x": 1133, + "y": 2685.699951171875 + }, + { + "x": 1148, + "y": 2450.5 + }, + { + "x": 1163, + "y": 2215.300048828125 + }, + { + "x": 1183, + "y": 2058.5 + }, + { + "x": 1198, + "y": 2058.5 + }, + { + "x": 1213, + "y": 2058.5 + }, + { + "x": 1283, + "y": 2058.5 + }, + { + "x": 1323, + "y": 2058.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(s.n -> y.r)[0]", + "src": "s.n", + "srcArrow": "none", + "dst": "y.r", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "red", + "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": 1073, + "y": 1713.5 + }, + { + "x": 1113, + "y": 1713.5 + }, + { + "x": 1133, + "y": 1713.5 + }, + { + "x": 1148, + "y": 1713.5 + }, + { + "x": 1163, + "y": 1713.5 + }, + { + "x": 1183, + "y": 1713.5 + }, + { + "x": 1198, + "y": 1713.5 + }, + { + "x": 1213, + "y": 1713.5 + }, + { + "x": 1287.4000244140625, + "y": 1608.0999755859375 + }, + { + "x": 1345, + "y": 1186.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(y.r -> a.g.i)[0]", + "src": "y.r", + "srcArrow": "none", + "dst": "a.g.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "1\n2\n3\n4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 69, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 1375, + "y": 1162.5 + }, + { + "x": 1415.800048828125, + "y": 1162.5 + }, + { + "x": 1436, + "y": 1162.5 + }, + { + "x": 1451, + "y": 1162.5 + }, + { + "x": 1466, + "y": 1162.5 + }, + { + "x": 1486.9000244140625, + "y": 1026.800048828125 + }, + { + "x": 1503.25, + "y": 823.25 + }, + { + "x": 1519.5999755859375, + "y": 619.698974609375 + }, + { + "x": 1595, + "y": 484 + }, + { + "x": 1635, + "y": 484 + } + ], + "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_spacing_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg new file mode 100644 index 000000000..a78e8ff11 --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg @@ -0,0 +1,135 @@ +askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json new file mode 100644 index 000000000..635647da1 --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json @@ -0,0 +1,1518 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 359, + "y": 198 + }, + "width": 591, + "height": 513, + "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.k", + "type": "rectangle", + "pos": { + "x": 409, + "y": 248 + }, + "width": 151, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "k", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.k.t", + "type": "rectangle", + "pos": { + "x": 459, + "y": 298 + }, + "width": 51, + "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": "t", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f", + "type": "rectangle", + "pos": { + "x": 650, + "y": 254 + }, + "width": 245, + "height": 406, + "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": "f", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.f.i", + "type": "rectangle", + "classes": [ + "OutsideTopCenter" + ], + "pos": { + "x": 700, + "y": 304 + }, + "width": 54, + "height": 82, + "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": "i\nii", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 37, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.g", + "type": "rectangle", + "pos": { + "x": 745, + "y": 406 + }, + "width": 54, + "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": "g", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s", + "type": "rectangle", + "pos": { + "x": 1630, + "y": 319 + }, + "width": 258, + "height": 476, + "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": "s", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "s.n", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 1683, + "y": 369 + }, + "width": 151, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "red", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "n", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "k", + "type": "rectangle", + "pos": { + "x": 798, + "y": 12 + }, + "width": 152, + "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": "k", + "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": "k.s", + "type": "rectangle", + "pos": { + "x": 848, + "y": 62 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u", + "type": "rectangle", + "pos": { + "x": 1090, + "y": 332 + }, + "width": 450, + "height": 438, + "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": "u", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "u.o", + "type": "rectangle", + "pos": { + "x": 1145, + "y": 382 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "o", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h", + "type": "rectangle", + "pos": { + "x": 12, + "y": 321 + }, + "width": 257, + "height": 266, + "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": "h", + "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": "h.m", + "type": "rectangle", + "pos": { + "x": 62, + "y": 371 + }, + "width": 152, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "m", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 18, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h.m.s", + "type": "rectangle", + "pos": { + "x": 112, + "y": 421 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.j", + "type": "rectangle", + "classes": [ + "icon", + "IconOutsideLeftTop" + ], + "pos": { + "x": 769, + "y": 492 + }, + "width": 76, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_TOP", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.s", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 1145, + "y": 468 + }, + "width": 150, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "s\ns\ns\ns", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 103, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u.s.j", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 1195, + "y": 518 + }, + "width": 50, + "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": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.c", + "type": "rectangle", + "classes": [ + "OutsideRightMiddle" + ], + "pos": { + "x": 1140, + "y": 654 + }, + "width": 195, + "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": "cccccccccccccccccccc", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 150, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z", + "type": "rectangle", + "pos": { + "x": 1685, + "y": 579 + }, + "width": 153, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "z", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z.c", + "type": "rectangle", + "pos": { + "x": 1735, + "y": 629 + }, + "width": 53, + "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": "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": 3 + }, + { + "id": "s.n.f", + "type": "rectangle", + "pos": { + "x": 1733, + "y": 443 + }, + "width": 51, + "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": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 1968, + "y": 381 + }, + "width": 151, + "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": "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.r", + "type": "rectangle", + "pos": { + "x": 2018, + "y": 431 + }, + "width": 51, + "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": "r", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g", + "type": "rectangle", + "pos": { + "x": 414, + "y": 495 + }, + "width": 149, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "g", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g.i", + "type": "rectangle", + "pos": { + "x": 464, + "y": 545 + }, + "width": 49, + "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": "i", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 4, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "a.(k.t -> f.i)[0]", + "src": "a.k.t", + "srcArrow": "none", + "dst": "a.f.i", + "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": 510, + "y": 345.5 + }, + { + "x": 700, + "y": 345.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.g -> s.n)[0]", + "src": "a.f.g", + "srcArrow": "none", + "dst": "s.n", + "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": 799.5, + "y": 439.5 + }, + { + "x": 995, + "y": 439.5 + }, + { + "x": 995, + "y": 291.5 + }, + { + "x": 1585, + "y": 291.5 + }, + { + "x": 1585, + "y": 464.5 + }, + { + "x": 1683.5, + "y": 464.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(k.s <-> u.o)[0]", + "src": "k.s", + "srcArrow": "triangle", + "dst": "u.o", + "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": 900, + "y": 95 + }, + { + "x": 1045, + "y": 95 + }, + { + "x": 1045, + "y": 415.5 + }, + { + "x": 1145, + "y": 415.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(h.m.s -> a.f.g)[0]", + "src": "h.m.s", + "srcArrow": "none", + "dst": "a.f.g", + "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": 164, + "y": 454 + }, + { + "x": 605, + "y": 454 + }, + { + "x": 605, + "y": 439.5 + }, + { + "x": 745.5, + "y": 439.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.j -> u.s.j)[0]", + "src": "a.f.j", + "srcArrow": "none", + "dst": "u.s.j", + "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": 845, + "y": 551.5 + }, + { + "x": 1195, + "y": 551.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(u.c -> s.z.c)[0]", + "src": "u.c", + "srcArrow": "none", + "dst": "s.z.c", + "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": 1495, + "y": 687.5 + }, + { + "x": 1585, + "y": 687.5 + }, + { + "x": 1585, + "y": 662.5 + }, + { + "x": 1735, + "y": 662.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(s.n -> y.r)[0]", + "src": "s.n", + "srcArrow": "none", + "dst": "y.r", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "red", + "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": 1834.5, + "y": 464.5 + }, + { + "x": 2018, + "y": 464.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(y.r -> a.g.i)[0]", + "src": "y.r", + "srcArrow": "none", + "dst": "a.g.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "1\n2\n3\n4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 69, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 2069, + "y": 464.5 + }, + { + "x": 2164, + "y": 464.5 + }, + { + "x": 2164, + "y": 898.75 + }, + { + "x": 314, + "y": 898.75 + }, + { + "x": 314, + "y": 578 + }, + { + "x": 464, + "y": 578 + } + ], + "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_spacing_right/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg new file mode 100644 index 000000000..074572c31 --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg @@ -0,0 +1,135 @@ +askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From dd5b5a4ac96d2d77207db4828ea6e4b4fcca14d5 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 13 Jul 2023 11:57:07 -0700 Subject: [PATCH 056/138] add centered_horizontal_connections test --- e2etests/stable_test.go | 1 + .../files/centered_horizontal_connections.d2 | 46 ++++ .../dagre/board.exp.json | 232 ++++++++++++++++++ .../dagre/sketch.exp.svg | 103 ++++++++ .../elk/board.exp.json | 223 +++++++++++++++++ .../elk/sketch.exp.svg | 103 ++++++++ 6 files changed, 708 insertions(+) create mode 100644 e2etests/testdata/files/centered_horizontal_connections.d2 create mode 100644 e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json create mode 100644 e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 853a7b285..4e4da7075 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2782,6 +2782,7 @@ scenarios: { loadFromFile(t, "outside_bottom_labels"), loadFromFile(t, "label_positions"), loadFromFile(t, "icon_positions"), + loadFromFile(t, "centered_horizontal_connections"), loadFromFile(t, "all_shapes_link"), loadFromFile(t, "nested_shape_labels"), loadFromFile(t, "dagre_spacing"), diff --git a/e2etests/testdata/files/centered_horizontal_connections.d2 b/e2etests/testdata/files/centered_horizontal_connections.d2 new file mode 100644 index 000000000..1b4e4f691 --- /dev/null +++ b/e2etests/testdata/files/centered_horizontal_connections.d2 @@ -0,0 +1,46 @@ +direction: right + +style: { + fill: transparent +} + +classes: { + rare: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/rare.svg + width: 32 + height: 32 + } + xrd: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/xrd.svg + width: 32 + height: 32 + } + vr-xrv9k: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/vr-xrv9k.svg + width: 32 + height: 32 + } + linux: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/linux.svg + width: 32 + height: 32 + } + crpd: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/crpd.svg + width: 32 + height: 32 + } +} + +r1.class: rare +r2.class: rare + +r1 <-> r2: { + source-arrowhead.label: eth1 + target-arrowhead.label: eth1 +} diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json new file mode 100644 index 000000000..9209f1046 --- /dev/null +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json @@ -0,0 +1,232 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "r1", + "type": "image", + "classes": [ + "rare" + ], + "pos": { + "x": 0, + "y": 0 + }, + "width": 32, + "height": 32, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "raw.githubusercontent.com", + "Path": "/frederic-loui/RARE-web/automated-update/docs/img/rare.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "r1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 14, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "r2", + "type": "image", + "classes": [ + "rare" + ], + "pos": { + "x": 132, + "y": 0 + }, + "width": 32, + "height": 32, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "raw.githubusercontent.com", + "Path": "/frederic-loui/RARE-web/automated-update/docs/img/rare.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "r2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 14, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(r1 <-> r2)[0]", + "src": "r1", + "srcArrow": "triangle", + "srcLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "dst": "r2", + "dstArrow": "triangle", + "dstLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "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": 32, + "y": 29 + }, + { + "x": 72, + "y": 29 + }, + { + "x": 92, + "y": 29 + }, + { + "x": 132, + "y": 29 + } + ], + "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": "transparent", + "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/centered_horizontal_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg new file mode 100644 index 000000000..cdcc7ed57 --- /dev/null +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg @@ -0,0 +1,103 @@ +r1r2 eth1eth1 + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json b/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json new file mode 100644 index 000000000..fdf65ac74 --- /dev/null +++ b/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json @@ -0,0 +1,223 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "r1", + "type": "image", + "classes": [ + "rare" + ], + "pos": { + "x": 12, + "y": 12 + }, + "width": 32, + "height": 32, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "raw.githubusercontent.com", + "Path": "/frederic-loui/RARE-web/automated-update/docs/img/rare.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "r1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 14, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "r2", + "type": "image", + "classes": [ + "rare" + ], + "pos": { + "x": 114, + "y": 12 + }, + "width": 32, + "height": 32, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "raw.githubusercontent.com", + "Path": "/frederic-loui/RARE-web/automated-update/docs/img/rare.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "r2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 14, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(r1 <-> r2)[0]", + "src": "r1", + "srcArrow": "triangle", + "srcLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "dst": "r2", + "dstArrow": "triangle", + "dstLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "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": 44, + "y": 41 + }, + { + "x": 114, + "y": 41 + } + ], + "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": "transparent", + "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/centered_horizontal_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg new file mode 100644 index 000000000..42992a009 --- /dev/null +++ b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg @@ -0,0 +1,103 @@ +r1r2 eth1eth1 + + + + \ No newline at end of file From de8406d1244ec1ab6feac6a10a566d9bec260b60 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 27 Jun 2023 15:39:41 -0700 Subject: [PATCH 057/138] dagre container label adjustments with phantom node --- d2layouts/d2dagrelayout/layout.go | 275 ++++++++++++++++++++++++------ 1 file changed, 227 insertions(+), 48 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index fa2072896..22175b893 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -106,6 +106,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err rootAttrs.rankdir = "TB" } + // set label and icon positions for dagre + for _, obj := range g.Objects { + positionLabelsIcons(obj) + } + maxContainerLabelHeight := 0 for _, obj := range g.Objects { // TODO count root level container label sizes for ranksep @@ -151,29 +156,75 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err loadScript := "" idToObj := make(map[string]*d2graph.Object) + idToWidth := make(map[string]float64) + idToHeight := make(map[string]float64) for _, obj := range g.Objects { id := obj.AbsID() idToObj[id] = obj - width, height := obj.Width, obj.Height - if obj.HasLabel() { - if obj.HasOutsideBottomLabel() || obj.Icon != nil { - height += float64(obj.LabelDimensions.Height) + label.PADDING - } - if len(obj.ChildrenArray) > 0 { - height += float64(obj.LabelDimensions.Height) + label.PADDING - } - } - // reserve extra space for 3d/multiple by providing dagre the larger dimensions - dx, dy := obj.GetModifierElementAdjustments() - width += dx - height += dy + width, height := adjustDimensions(obj) + + idToWidth[id] = width + idToHeight[id] = height loadScript += generateAddNodeLine(id, int(width), int(height)) if obj.Parent != g.Root { loadScript += generateAddParentLine(id, obj.Parent.AbsID()) } } + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + id := obj.AbsID() + // add phantom children to adjust container dimensions + phantomID := id + "___phantom" + widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) + height := int(math.Ceil(idToHeight[id])) + // when a container has nodes with no connections, the layout will be in a row + // adding a node will add NodeSep width in addition to the node's width + // to add a specific amount of space we need to subtract this from the desired width + // if we add the phantom node at rank 0 it should be at the far right and top + xSpace := rootAttrs.NodeSep + ySpace := rootAttrs.ranksep + + maxChildHeight := math.Inf(-1) + for _, c := range obj.ChildrenArray { + if c.Height > maxChildHeight { + maxChildHeight = c.Height + } + } + + // adjust for children with outside positioned icons + var hasTop, hasBottom bool + for _, child := range obj.ChildrenArray { + if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { + continue + } + + switch label.Position(*child.IconPosition) { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + hasTop = true + case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + hasBottom = true + } + if hasTop && hasBottom { + break + } + } + if hasTop || hasBottom { + // TODO ranksep is already accounting for maxLabelHeight + maxChildHeight += d2target.MAX_ICON_SIZE + 2*label.PADDING + } + + height = go2.Max(height, ySpace+int(maxChildHeight)) + + // TODO after layout remove extra height and shift downwards + + loadScript += generateAddNodeLine(phantomID, widthDelta-xSpace, height-ySpace) + loadScript += generateAddParentLine(phantomID, id) + } + for _, edge := range g.Edges { src, dst := getEdgeEndpoints(g, edge) @@ -235,30 +286,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.TopLeft = geo.NewPoint(math.Round(dn.X-dn.Width/2), math.Round(dn.Y-dn.Height/2)) obj.Width = math.Ceil(dn.Width) obj.Height = math.Ceil(dn.Height) - - if obj.Icon != nil && obj.IconPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.IconPosition = go2.Pointer(string(label.OutsideTopLeft)) - if obj.LabelPosition == nil { - obj.LabelPosition = go2.Pointer(string(label.OutsideTopRight)) - } - } else { - obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) - } - } - if obj.HasLabel() && obj.LabelPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(string(label.OutsideTopCenter)) - } else if obj.HasOutsideBottomLabel() { - obj.LabelPosition = go2.Pointer(string(label.OutsideBottomCenter)) - // remove the extra height we added to the node when passing to dagre - obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING - } else if obj.Icon != nil { - obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) - } else { - obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) - } - } } for i, edge := range g.Edges { @@ -410,18 +437,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - // remove the extra width/height we added for 3d/multiple after all objects/connections are placed - // and shift the shapes down accordingly for _, obj := range g.Objects { - dx, dy := obj.GetModifierElementAdjustments() - if dx != 0 || dy != 0 { - obj.TopLeft.Y += dy - obj.ShiftDescendants(0, dy) - if !obj.IsContainer() { - obj.Width -= dx - obj.Height -= dy - } - } + cleanupAdjustment(obj) } for _, edge := range g.Edges { @@ -727,3 +744,165 @@ func inContainer(obj, container *d2graph.Object) *d2graph.Object { } return inContainer(obj.Parent, container) } + +func adjustDimensions(obj *d2graph.Object) (width, height float64) { + width = obj.Width + height = obj.Height + + // reserve spacing for labels + if obj.HasLabel() { + var position label.Position + if obj.LabelPosition != nil { + position = label.Position(*obj.LabelPosition) + } else if len(obj.ChildrenArray) == 0 && obj.HasOutsideBottomLabel() { + position = label.OutsideBottomCenter + } + + if position.IsShapePosition() { + adjustedWidth := false + if obj.IsContainer() { + switch position { + case label.InsideMiddleLeft, label.InsideMiddleRight: + width += float64(obj.LabelDimensions.Width) + label.PADDING + adjustedWidth = true + } + } + if !adjustedWidth { + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + width += float64(obj.LabelDimensions.Width) + label.PADDING + default: + // TODO labelWidth+2*label.PADDING + width = go2.Max(width, float64(obj.LabelDimensions.Width)) + } + } + } + + // special handling + if obj.HasOutsideBottomLabel() || obj.Icon != nil { + height += float64(obj.LabelDimensions.Height) + label.PADDING + } + } + + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + var position label.Position + if obj.IconPosition != nil { + position = label.Position(*obj.IconPosition) + } + + if position.IsShapePosition() { + adjustedWidth := false + if obj.IsContainer() { + switch position { + case label.InsideMiddleLeft, label.InsideMiddleRight: + width += d2target.MAX_ICON_SIZE + label.PADDING + adjustedWidth = true + } + } + if !adjustedWidth { + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom, + label.InsideMiddleLeft, label.InsideMiddleRight: + width += d2target.MAX_ICON_SIZE + label.PADDING + default: + width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) + } + } + } + } + + // reserve extra space for 3d/multiple by providing dagre the larger dimensions + dx, dy := obj.GetModifierElementAdjustments() + width += dx + height += dy + + return +} + +func cleanupAdjustment(obj *d2graph.Object) { + // adjust size and position to account for space reserved for labels + if obj.HasLabel() { + position := label.Position(*obj.LabelPosition) + if position.IsShapePosition() { + labelWidth := float64(obj.LabelDimensions.Width) + label.PADDING + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + obj.Width -= labelWidth + } + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + obj.TopLeft.X += labelWidth + obj.ShiftDescendants(labelWidth, 0) + case label.InsideMiddleLeft: + if obj.IsContainer() || obj.Icon != nil { + obj.ShiftDescendants(labelWidth, 0) + } + } + } + } + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + position := label.Position(*obj.IconPosition) + if position.IsShapePosition() { + iconWidth := float64(d2target.MAX_ICON_SIZE + label.PADDING) + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + obj.Width -= iconWidth + } + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + obj.TopLeft.X += iconWidth + obj.ShiftDescendants(iconWidth, 0) + case label.InsideMiddleLeft: + if obj.IsContainer() || obj.Icon != nil { + obj.ShiftDescendants(iconWidth, 0) + } + } + } + } + + // special handling to start/end connections below label + if obj.HasOutsideBottomLabel() { + obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING + } + + // remove the extra width/height we added for 3d/multiple after all objects/connections are placed + // and shift the shapes down accordingly + dx, dy := obj.GetModifierElementAdjustments() + if dx != 0 || dy != 0 { + obj.TopLeft.Y += dy + obj.ShiftDescendants(0, dy) + if !obj.IsContainer() { + obj.Width -= dx + obj.Height -= dy + } + } +} + +func positionLabelsIcons(obj *d2graph.Object) { + if obj.Icon != nil && obj.IconPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.IconPosition = go2.Pointer(string(label.OutsideTopLeft)) + if obj.LabelPosition == nil { + obj.LabelPosition = go2.Pointer(string(label.OutsideTopRight)) + return + } + } else { + obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } + } + if obj.HasLabel() && obj.LabelPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(string(label.OutsideTopCenter)) + } else if obj.HasOutsideBottomLabel() { + obj.LabelPosition = go2.Pointer(string(label.OutsideBottomCenter)) + } else if obj.Icon != nil { + obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + } else { + obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } + } +} From 8e18103ffd9d3b53767ee571538acf408f3145bf Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 3 Jul 2023 18:07:31 -0700 Subject: [PATCH 058/138] calculating object ranks adusting spacing for each rank --- d2layouts/d2dagrelayout/layout.go | 274 +++++++++++++++++++++++------- 1 file changed, 217 insertions(+), 57 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 22175b893..200402beb 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -7,6 +7,7 @@ import ( "fmt" "math" "regexp" + "sort" "strings" "cdr.dev/slog" @@ -162,7 +163,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err id := obj.AbsID() idToObj[id] = obj - width, height := adjustDimensions(obj) + // width, height := adjustDimensions(obj) + width, height := obj.Width, obj.Height idToWidth[id] = width idToHeight[id] = height @@ -172,58 +174,68 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err loadScript += generateAddParentLine(id, obj.Parent.AbsID()) } } - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - id := obj.AbsID() - // add phantom children to adjust container dimensions - phantomID := id + "___phantom" - widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) - height := int(math.Ceil(idToHeight[id])) - // when a container has nodes with no connections, the layout will be in a row - // adding a node will add NodeSep width in addition to the node's width - // to add a specific amount of space we need to subtract this from the desired width - // if we add the phantom node at rank 0 it should be at the far right and top - xSpace := rootAttrs.NodeSep - ySpace := rootAttrs.ranksep + // for _, obj := range g.Objects { + // if !obj.IsContainer() { + // continue + // } + // id := obj.AbsID() + // // add phantom children to adjust container dimensions + // // phantomID := id + "___phantom" + // // widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) + // height := int(math.Ceil(idToHeight[id])) + // // when a container has nodes with no connections, the layout will be in a row + // // adding a node will add NodeSep width in addition to the node's width + // // to add a specific amount of space we need to subtract this from the desired width + // // if we add the phantom node at rank 0 it should be at the far right and top + // // xSpace := rootAttrs.NodeSep + // ySpace := rootAttrs.ranksep - maxChildHeight := math.Inf(-1) - for _, c := range obj.ChildrenArray { - if c.Height > maxChildHeight { - maxChildHeight = c.Height - } - } + // if false { - // adjust for children with outside positioned icons - var hasTop, hasBottom bool - for _, child := range obj.ChildrenArray { - if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { - continue - } + // maxChildHeight := math.Inf(-1) + // for _, c := range obj.ChildrenArray { + // if c.Height > maxChildHeight { + // maxChildHeight = c.Height + // } - switch label.Position(*child.IconPosition) { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: - hasTop = true - case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - hasBottom = true - } - if hasTop && hasBottom { - break - } - } - if hasTop || hasBottom { - // TODO ranksep is already accounting for maxLabelHeight - maxChildHeight += d2target.MAX_ICON_SIZE + 2*label.PADDING - } + // if c.Shape.Value == d2target.ShapeImage || c.IconPosition == nil { + // continue + // } + // h := c.Height + // switch label.Position(*c.IconPosition) { + // case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + // label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + // h += d2target.MAX_ICON_SIZE + 2*label.PADDING + // } + // if h > maxChildHeight { + // maxChildHeight = h + // } + // } - height = go2.Max(height, ySpace+int(maxChildHeight)) + // // adjust for children with outside positioned icons + // var hasTop, hasBottom bool + // for _, child := range obj.ChildrenArray { + // if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { + // continue + // } - // TODO after layout remove extra height and shift downwards - - loadScript += generateAddNodeLine(phantomID, widthDelta-xSpace, height-ySpace) - loadScript += generateAddParentLine(phantomID, id) - } + // switch label.Position(*child.IconPosition) { + // case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + // hasTop = true + // case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + // hasBottom = true + // } + // if hasTop && hasBottom { + // break + // } + // } + // if hasTop || hasBottom { + // // TODO ranksep is already accounting for maxLabelHeight + // // maxChildHeight += d2target.MAX_ICON_SIZE + 2*label.PADDING + // } + // height = go2.Max(height, ySpace+int(maxChildHeight)) + // } + // } for _, edge := range g.Edges { src, dst := getEdgeEndpoints(g, edge) @@ -288,6 +300,33 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.Height = math.Ceil(dn.Height) } + ranks, objectRanks := getRanks(g, isHorizontal) + if ranks != nil && objectRanks != nil { + fmt.Printf("got ranks: %v\n", ranks) + } + + tops, centers, bottoms := getPositions(ranks, isHorizontal) + + if tops != nil { + fmt.Printf("got tops: %v\ncenters: %v\nbottoms: %v\n", tops, centers, bottoms) + fmt.Printf("spacing: ") + for i := 1; i < len(tops); i++ { + fmt.Printf("%v, ", tops[i]-bottoms[i-1]) + } + fmt.Printf("\n") + } + fmt.Printf("ranksep %v, nodesep %v\n", rootAttrs.ranksep, rootAttrs.NodeSep) + + // TODO + // 1. Compute all current spacings + // 2. Compute desired spacings + // 3. Apply changes (shifting anything below) + // + // Two kinds of spacing, 1. rank spacing, 2. rank alignment spacing + // all objects at a rank are center aligned, if one is much taller, then the rest will have more spacing to align with the taller node + // if there is extra spacing due to rank alignment, we may not need to increase rank spacing + // for now, just applying spacing increase for whole rank + for i, edge := range g.Edges { val, err := vm.RunString(fmt.Sprintf("JSON.stringify(g.edge(g.edges()[%d]))", i)) if err != nil { @@ -336,7 +375,22 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } - for _, obj := range g.Objects { + // shifting bottom rank down first, then moving up to next rank + for i := len(ranks) - 1; i >= 0; i-- { + objects := ranks[i] + topSpacing := 0. + for _, obj := range objects { + _, adjustedHeight := adjustDimensions(obj) + // TODO width + topSpacing = math.Max(topSpacing, adjustedHeight-obj.Height) + } + fmt.Printf("rank %d topSpacing %v\n", i, topSpacing) + // shiftDown(g, tops[i], topSpacing) + // TODO: Testing + shiftDown(g, tops[i], float64(100)) + } + + for _, obj := range []*d2graph.Object{} { if !obj.HasLabel() || len(obj.ChildrenArray) == 0 { continue } @@ -437,7 +491,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - for _, obj := range g.Objects { + // for _, obj := range g.Objects { + for _, obj := range []*d2graph.Object{} { cleanupAdjustment(obj) } @@ -778,13 +833,9 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { } } } - - // special handling - if obj.HasOutsideBottomLabel() || obj.Icon != nil { - height += float64(obj.LabelDimensions.Height) + label.PADDING - } } + hasIconAboveBelow := false if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { var position label.Position if obj.IconPosition != nil { @@ -810,6 +861,19 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) } } + + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + hasIconAboveBelow = true + } + } + } + + if true { + // special handling + if obj.HasOutsideBottomLabel() || hasIconAboveBelow { + height += float64(obj.LabelDimensions.Height) + label.PADDING } } @@ -843,6 +907,7 @@ func cleanupAdjustment(obj *d2graph.Object) { } } } + hasIconAboveBelow := false if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { position := label.Position(*obj.IconPosition) if position.IsShapePosition() { @@ -861,12 +926,23 @@ func cleanupAdjustment(obj *d2graph.Object) { obj.ShiftDescendants(iconWidth, 0) } } + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + hasIconAboveBelow = true + } } } // special handling to start/end connections below label - if obj.HasOutsideBottomLabel() { - obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING + if true { + if obj.HasOutsideBottomLabel() || hasIconAboveBelow { + dy := float64(obj.LabelDimensions.Height) + label.PADDING + obj.Height -= dy + if obj.IsContainer() { + obj.ShiftDescendants(0, -dy/2) + } + } } // remove the extra width/height we added for 3d/multiple after all objects/connections are placed @@ -906,3 +982,87 @@ func positionLabelsIcons(obj *d2graph.Object) { } } } + +func getRanks(g *d2graph.Graph, isHorizontal bool) ([][]*d2graph.Object, map[*d2graph.Object]int) { + alignedObjects := make(map[float64][]*d2graph.Object) + for _, obj := range g.Objects { + if !obj.IsContainer() { + if !isHorizontal { + y := obj.TopLeft.Y + obj.Height/2 + alignedObjects[y] = append(alignedObjects[y], obj) + } else { + x := obj.TopLeft.X + obj.Width/2 + alignedObjects[x] = append(alignedObjects[x], obj) + } + } + } + + levels := make([]float64, 0, len(alignedObjects)) + for l := range alignedObjects { + levels = append(levels, l) + } + sort.Slice(levels, func(i, j int) bool { + return levels[i] < levels[j] + }) + + ranks := make([][]*d2graph.Object, 0, len(levels)) + objectRanks := make(map[*d2graph.Object]int) + for i, l := range levels { + for _, obj := range alignedObjects[l] { + objectRanks[obj] = i + } + ranks = append(ranks, alignedObjects[l]) + } + for _, obj := range g.Objects { + if rank, has := objectRanks[obj]; has { + fmt.Printf("%v rank: %d\n", obj.AbsID(), rank) + } else { + fmt.Printf("%v rank: none\n", obj.AbsID()) + } + } + + return ranks, objectRanks +} + +func getPositions(ranks [][]*d2graph.Object, isHorizontal bool) (tops, centers, bottoms []float64) { + for _, objects := range ranks { + min := math.Inf(1) + max := math.Inf(-1) + for _, obj := range objects { + if isHorizontal { + min = math.Min(min, obj.TopLeft.X) + max = math.Max(max, obj.TopLeft.X+obj.Width) + } else { + min = math.Min(min, obj.TopLeft.Y) + max = math.Max(max, obj.TopLeft.Y+obj.Height) + } + } + tops = append(tops, min) + if isHorizontal { + centers = append(centers, objects[0].TopLeft.X+objects[0].Width/2.) + } else { + centers = append(centers, objects[0].TopLeft.Y+objects[0].Height/2.) + } + bottoms = append(bottoms, max) + } + return +} + +// shift everything down by distance if it is at or below startY +func shiftDown(g *d2graph.Graph, startY, distance float64) { + for _, obj := range g.Objects { + if obj.TopLeft.Y < startY { + continue + } + obj.TopLeft.Y += distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + if p.Y <= startY { + continue + } + p.Y += distance + } + } +} From 27f66c8d72ca198cd82948c81bb5be22c38dfaa1 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 6 Jul 2023 12:32:51 -0700 Subject: [PATCH 059/138] get parent rank ranges --- d2layouts/d2dagrelayout/layout.go | 80 +++++++++++++++++++------------ 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 200402beb..e77c6c73d 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -300,33 +300,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.Height = math.Ceil(dn.Height) } - ranks, objectRanks := getRanks(g, isHorizontal) - if ranks != nil && objectRanks != nil { - fmt.Printf("got ranks: %v\n", ranks) - } - - tops, centers, bottoms := getPositions(ranks, isHorizontal) - - if tops != nil { - fmt.Printf("got tops: %v\ncenters: %v\nbottoms: %v\n", tops, centers, bottoms) - fmt.Printf("spacing: ") - for i := 1; i < len(tops); i++ { - fmt.Printf("%v, ", tops[i]-bottoms[i-1]) - } - fmt.Printf("\n") - } - fmt.Printf("ranksep %v, nodesep %v\n", rootAttrs.ranksep, rootAttrs.NodeSep) - - // TODO - // 1. Compute all current spacings - // 2. Compute desired spacings - // 3. Apply changes (shifting anything below) - // - // Two kinds of spacing, 1. rank spacing, 2. rank alignment spacing - // all objects at a rank are center aligned, if one is much taller, then the rest will have more spacing to align with the taller node - // if there is extra spacing due to rank alignment, we may not need to increase rank spacing - // for now, just applying spacing increase for whole rank - for i, edge := range g.Edges { val, err := vm.RunString(fmt.Sprintf("JSON.stringify(g.edge(g.edges()[%d]))", i)) if err != nil { @@ -375,6 +348,32 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } + ranks, objectRanks := getRanks(g, isHorizontal) + if ranks != nil && objectRanks != nil { + fmt.Printf("got ranks: %v\n", ranks) + } + + tops, centers, bottoms := getPositions(ranks, isHorizontal) + if tops != nil { + fmt.Printf("got tops: %v\ncenters: %v\nbottoms: %v\n", tops, centers, bottoms) + fmt.Printf("spacing: ") + for i := 1; i < len(tops); i++ { + fmt.Printf("%v, ", tops[i]-bottoms[i-1]) + } + fmt.Printf("\n") + } + fmt.Printf("ranksep %v, nodesep %v\n", rootAttrs.ranksep, rootAttrs.NodeSep) + + // TODO + // 1. Compute all current spacings + // 2. Compute desired spacings + // 3. Apply changes (shifting anything below) + // + // Two kinds of spacing, 1. rank spacing, 2. rank alignment spacing + // all objects at a rank are center aligned, if one is much taller, then the rest will have more spacing to align with the taller node + // if there is extra spacing due to rank alignment, we may not need to increase rank spacing + // for now, just applying spacing increase for whole rank + // shifting bottom rank down first, then moving up to next rank for i := len(ranks) - 1; i >= 0; i-- { objects := ranks[i] @@ -983,7 +982,7 @@ func positionLabelsIcons(obj *d2graph.Object) { } } -func getRanks(g *d2graph.Graph, isHorizontal bool) ([][]*d2graph.Object, map[*d2graph.Object]int) { +func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, objectRanks map[*d2graph.Object]int) { alignedObjects := make(map[float64][]*d2graph.Object) for _, obj := range g.Objects { if !obj.IsContainer() { @@ -1005,8 +1004,8 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) ([][]*d2graph.Object, map[*d2 return levels[i] < levels[j] }) - ranks := make([][]*d2graph.Object, 0, len(levels)) - objectRanks := make(map[*d2graph.Object]int) + ranks = make([][]*d2graph.Object, 0, len(levels)) + objectRanks = make(map[*d2graph.Object]int) for i, l := range levels { for _, obj := range alignedObjects[l] { objectRanks[obj] = i @@ -1021,6 +1020,27 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) ([][]*d2graph.Object, map[*d2 } } + startingParentRanks := make(map[*d2graph.Object]int) + endingParentRanks := make(map[*d2graph.Object]int) + for _, obj := range g.Objects { + if obj.IsContainer() { + continue + } + r := objectRanks[obj] + // update all ancestor's min/max ranks + for parent := obj.Parent; parent != nil && parent != g.Root; parent = parent.Parent { + if start, has := startingParentRanks[parent]; !has || r < start { + startingParentRanks[parent] = r + } + if end, has := endingParentRanks[parent]; !has || r > end { + endingParentRanks[parent] = r + } + } + } + for parent, start := range startingParentRanks { + fmt.Printf("parent %v start %v end %v\n", parent.AbsID(), start, endingParentRanks[parent]) + } + return ranks, objectRanks } From 81db10d67e6a0b1a18dc804f2df0370e18f6f96c Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 6 Jul 2023 13:31:32 -0700 Subject: [PATCH 060/138] adjust parent heights --- d2layouts/d2dagrelayout/layout.go | 1031 ++++++++++++++++++----------- e2etests/e2e_test.go | 2 + 2 files changed, 631 insertions(+), 402 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index e77c6c73d..0bde93782 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -33,6 +33,7 @@ var dagreJS string const ( MIN_RANK_SEP = 60 EDGE_LABEL_GAP = 20 + MIN_MARGIN = 10. ) type ConfigurableOpts struct { @@ -112,24 +113,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err positionLabelsIcons(obj) } - maxContainerLabelHeight := 0 - for _, obj := range g.Objects { - // TODO count root level container label sizes for ranksep - if len(obj.ChildrenArray) == 0 || obj.Parent == g.Root { - continue - } - if obj.HasLabel() { - maxContainerLabelHeight = go2.Max(maxContainerLabelHeight, obj.LabelDimensions.Height+label.PADDING) - } - - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - s := obj.ToShape() - iconSize := d2target.GetIconSize(s.GetInnerBox(), string(label.InsideTopLeft)) - // Since dagre container labels are pushed up, we don't want a child container to collide - maxContainerLabelHeight = go2.Max(maxContainerLabelHeight, (iconSize+label.PADDING*2)*2) - } - } - maxLabelWidth := 0 maxLabelHeight := 0 for _, edge := range g.Edges { @@ -140,13 +123,13 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } if !isHorizontal { - rootAttrs.ranksep = go2.Max(go2.Max(100, maxLabelHeight+40), maxContainerLabelHeight) + rootAttrs.ranksep = go2.Max(100, maxLabelHeight+40) } else { rootAttrs.ranksep = go2.Max(100, maxLabelWidth+40) // use existing config - rootAttrs.NodeSep = rootAttrs.EdgeSep - // configure vertical padding - rootAttrs.EdgeSep = go2.Max(maxLabelHeight+40, maxContainerLabelHeight) + // rootAttrs.NodeSep = rootAttrs.EdgeSep + // // configure vertical padding + // rootAttrs.EdgeSep = maxLabelHeight + 40 // Note: non-containers have both of these as padding (rootAttrs.NodeSep + rootAttrs.EdgeSep) } @@ -163,79 +146,49 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err id := obj.AbsID() idToObj[id] = obj - // width, height := adjustDimensions(obj) + // Note: we handle vertical spacing adjustments separately after layout, + // but for horizontal adjustments we change the width we pass to dagre. + // For containers, we use phantom nodes to adjust container widths width, height := obj.Width, obj.Height - - idToWidth[id] = width - idToHeight[id] = height + // if isHorizontal { + // height = adjustHeight(obj) + // idToHeight[id] = height + // } else { + // width = adjustWidth(obj) + // idToWidth[id] = width + // } + // TODO update to work with direction: right/left (in that case we need to adjust heights here, + // and horizontal spacing will be adjusted separately after layout loadScript += generateAddNodeLine(id, int(width), int(height)) if obj.Parent != g.Root { loadScript += generateAddParentLine(id, obj.Parent.AbsID()) } } - // for _, obj := range g.Objects { - // if !obj.IsContainer() { - // continue - // } - // id := obj.AbsID() - // // add phantom children to adjust container dimensions - // // phantomID := id + "___phantom" - // // widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) - // height := int(math.Ceil(idToHeight[id])) - // // when a container has nodes with no connections, the layout will be in a row - // // adding a node will add NodeSep width in addition to the node's width - // // to add a specific amount of space we need to subtract this from the desired width - // // if we add the phantom node at rank 0 it should be at the far right and top - // // xSpace := rootAttrs.NodeSep - // ySpace := rootAttrs.ranksep - // if false { + for _, obj := range g.Objects { + if !obj.IsContainer() || true { + continue + } + id := obj.AbsID() + phantomWidth, phantomHeight := 1, 1 + // when a container has nodes with no connections, the layout will be in a row + // adding a node will add NodeSep width in addition to the node's width + // to add a specific amount of space we need to subtract this from the desired width + // if we add the phantom node at rank 0 it should be at the far right and top + if isHorizontal { + heightDelta := int(math.Ceil(idToHeight[id] - obj.Height)) + phantomWidth = heightDelta - rootAttrs.NodeSep + } else { + widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) + phantomWidth = widthDelta - rootAttrs.NodeSep + } - // maxChildHeight := math.Inf(-1) - // for _, c := range obj.ChildrenArray { - // if c.Height > maxChildHeight { - // maxChildHeight = c.Height - // } - - // if c.Shape.Value == d2target.ShapeImage || c.IconPosition == nil { - // continue - // } - // h := c.Height - // switch label.Position(*c.IconPosition) { - // case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - // label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - // h += d2target.MAX_ICON_SIZE + 2*label.PADDING - // } - // if h > maxChildHeight { - // maxChildHeight = h - // } - // } - - // // adjust for children with outside positioned icons - // var hasTop, hasBottom bool - // for _, child := range obj.ChildrenArray { - // if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { - // continue - // } - - // switch label.Position(*child.IconPosition) { - // case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: - // hasTop = true - // case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - // hasBottom = true - // } - // if hasTop && hasBottom { - // break - // } - // } - // if hasTop || hasBottom { - // // TODO ranksep is already accounting for maxLabelHeight - // // maxChildHeight += d2target.MAX_ICON_SIZE + 2*label.PADDING - // } - // height = go2.Max(height, ySpace+int(maxChildHeight)) - // } - // } + // add phantom children to adjust container widths + phantomID := id + "___phantom" + loadScript += generateAddNodeLine(phantomID, phantomWidth, phantomHeight) + loadScript += generateAddParentLine(phantomID, id) + } for _, edge := range g.Edges { src, dst := getEdgeEndpoints(g, edge) @@ -348,152 +301,10 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } - ranks, objectRanks := getRanks(g, isHorizontal) - if ranks != nil && objectRanks != nil { - fmt.Printf("got ranks: %v\n", ranks) - } - - tops, centers, bottoms := getPositions(ranks, isHorizontal) - if tops != nil { - fmt.Printf("got tops: %v\ncenters: %v\nbottoms: %v\n", tops, centers, bottoms) - fmt.Printf("spacing: ") - for i := 1; i < len(tops); i++ { - fmt.Printf("%v, ", tops[i]-bottoms[i-1]) - } - fmt.Printf("\n") - } - fmt.Printf("ranksep %v, nodesep %v\n", rootAttrs.ranksep, rootAttrs.NodeSep) - - // TODO - // 1. Compute all current spacings - // 2. Compute desired spacings - // 3. Apply changes (shifting anything below) - // - // Two kinds of spacing, 1. rank spacing, 2. rank alignment spacing - // all objects at a rank are center aligned, if one is much taller, then the rest will have more spacing to align with the taller node - // if there is extra spacing due to rank alignment, we may not need to increase rank spacing - // for now, just applying spacing increase for whole rank - - // shifting bottom rank down first, then moving up to next rank - for i := len(ranks) - 1; i >= 0; i-- { - objects := ranks[i] - topSpacing := 0. - for _, obj := range objects { - _, adjustedHeight := adjustDimensions(obj) - // TODO width - topSpacing = math.Max(topSpacing, adjustedHeight-obj.Height) - } - fmt.Printf("rank %d topSpacing %v\n", i, topSpacing) - // shiftDown(g, tops[i], topSpacing) - // TODO: Testing - shiftDown(g, tops[i], float64(100)) - } - - for _, obj := range []*d2graph.Object{} { - if !obj.HasLabel() || len(obj.ChildrenArray) == 0 { - continue - } - - // usually you don't want to take away here more than what was added, which is the label height - // however, if the label height is more than the ranksep/2, we'll have no padding around children anymore - // so cap the amount taken off at ranksep/2 - subtract := float64(go2.Min(rootAttrs.ranksep/2, obj.LabelDimensions.Height+label.PADDING)) - - obj.Height -= subtract - - // If the edge is connected to two descendants that are about to be downshifted, their whole route gets downshifted - movedEdges := make(map[*d2graph.Edge]struct{}) - for _, e := range g.Edges { - isSrcDesc := e.Src.IsDescendantOf(obj) - isDstDesc := e.Dst.IsDescendantOf(obj) - - if isSrcDesc && isDstDesc { - stepSize := subtract - if e.Src != obj || e.Dst != obj { - stepSize /= 2. - } - movedEdges[e] = struct{}{} - for _, p := range e.Route { - p.Y += stepSize - } - } - } - - q := []*d2graph.Object{obj} - // Downshift descendants and edges that have one endpoint connected to a descendant - for len(q) > 0 { - curr := q[0] - q = q[1:] - - stepSize := subtract - // The object itself needs to move down the height it was just subtracted - // all descendants move half, to maintain vertical padding - if curr != obj { - stepSize /= 2. - } - curr.TopLeft.Y += stepSize - almostEqual := func(a, b float64) bool { - return b-1 <= a && a <= b+1 - } - shouldMove := func(p *geo.Point) bool { - if curr != obj { - return true - } - if isHorizontal { - // Only move horizontal edges if they are connected to the top side of the shrinking container - return almostEqual(p.Y, obj.TopLeft.Y-stepSize) - } else { - // Edge should only move if it's not connected to the bottom side of the shrinking container - return !almostEqual(p.Y, obj.TopLeft.Y+obj.Height) - } - } - for _, e := range g.Edges { - if _, ok := movedEdges[e]; ok { - continue - } - moveWholeEdge := false - if e.Src == curr { - // Don't move src points on side of container - if almostEqual(e.Route[0].X, obj.TopLeft.X) || almostEqual(e.Route[0].X, obj.TopLeft.X+obj.Width) { - // Unless the dst is also on a container - if !e.Dst.HasLabel() || len(e.Dst.ChildrenArray) <= 0 { - continue - } - } - if shouldMove(e.Route[0]) { - if isHorizontal && e.Src.Parent != g.Root && e.Dst.Parent != g.Root { - moveWholeEdge = true - } else { - e.ShiftStart(stepSize, false) - } - } - } - if !moveWholeEdge && e.Dst == curr { - if shouldMove(e.Route[len(e.Route)-1]) { - if isHorizontal && e.Dst.Parent != g.Root && e.Src.Parent != g.Root { - moveWholeEdge = true - } else { - e.ShiftEnd(stepSize, false) - } - } - } - - if moveWholeEdge { - for _, p := range e.Route { - p.Y += stepSize / 2. - } - movedEdges[e] = struct{}{} - } - - } - q = append(q, curr.ChildrenArray...) - } - } - + adjustSpacing(g, float64(rootAttrs.ranksep), isHorizontal) // for _, obj := range g.Objects { - for _, obj := range []*d2graph.Object{} { - cleanupAdjustment(obj) - } + // cleanupAdjustment(obj, isHorizontal) + // } for _, edge := range g.Edges { points := edge.Route @@ -799,10 +610,11 @@ func inContainer(obj, container *d2graph.Object) *d2graph.Object { return inContainer(obj.Parent, container) } -func adjustDimensions(obj *d2graph.Object) (width, height float64) { - width = obj.Width - height = obj.Height +type spacing struct { + top, bottom, left, right float64 +} +func getSpacing(obj *d2graph.Object) (margin, padding spacing) { // reserve spacing for labels if obj.HasLabel() { var position label.Position @@ -812,151 +624,64 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { position = label.OutsideBottomCenter } - if position.IsShapePosition() { - adjustedWidth := false - if obj.IsContainer() { - switch position { - case label.InsideMiddleLeft, label.InsideMiddleRight: - width += float64(obj.LabelDimensions.Width) + label.PADDING - adjustedWidth = true - } - } - if !adjustedWidth { - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - width += float64(obj.LabelDimensions.Width) + label.PADDING - default: - // TODO labelWidth+2*label.PADDING - width = go2.Max(width, float64(obj.LabelDimensions.Width)) - } - } + labelWidth := float64(obj.LabelDimensions.Width) + 2*label.PADDING + labelHeight := float64(obj.LabelDimensions.Height) + 2*label.PADDING + + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + margin.top = labelHeight + case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + margin.bottom = labelHeight + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + margin.left = labelWidth + case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + margin.right = labelWidth + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + padding.top = labelHeight + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + padding.bottom = labelHeight + case label.InsideMiddleLeft: + padding.left = labelWidth + case label.InsideMiddleRight: + padding.right = labelWidth } } - hasIconAboveBelow := false if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { var position label.Position if obj.IconPosition != nil { position = label.Position(*obj.IconPosition) } - if position.IsShapePosition() { - adjustedWidth := false - if obj.IsContainer() { - switch position { - case label.InsideMiddleLeft, label.InsideMiddleRight: - width += d2target.MAX_ICON_SIZE + label.PADDING - adjustedWidth = true - } - } - if !adjustedWidth { - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom, - label.InsideMiddleLeft, label.InsideMiddleRight: - width += d2target.MAX_ICON_SIZE + label.PADDING - default: - width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) - } - } - - switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - hasIconAboveBelow = true - } - } - } - - if true { - // special handling - if obj.HasOutsideBottomLabel() || hasIconAboveBelow { - height += float64(obj.LabelDimensions.Height) + label.PADDING + iconSize := float64(d2target.MAX_ICON_SIZE + 2*label.PADDING) + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + margin.top = math.Max(margin.top, iconSize) + case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + margin.bottom = math.Max(margin.bottom, iconSize) + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + margin.left = math.Max(margin.left, iconSize) + case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + margin.right = math.Max(margin.right, iconSize) + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + padding.top = math.Max(padding.top, iconSize) + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + padding.bottom = math.Max(padding.bottom, iconSize) + case label.InsideMiddleLeft: + padding.left = math.Max(padding.left, iconSize) + case label.InsideMiddleRight: + padding.right = math.Max(padding.right, iconSize) } } // reserve extra space for 3d/multiple by providing dagre the larger dimensions dx, dy := obj.GetModifierElementAdjustments() - width += dx - height += dy + margin.right += dx + margin.top += dy return } -func cleanupAdjustment(obj *d2graph.Object) { - // adjust size and position to account for space reserved for labels - if obj.HasLabel() { - position := label.Position(*obj.LabelPosition) - if position.IsShapePosition() { - labelWidth := float64(obj.LabelDimensions.Width) + label.PADDING - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - obj.Width -= labelWidth - } - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: - obj.TopLeft.X += labelWidth - obj.ShiftDescendants(labelWidth, 0) - case label.InsideMiddleLeft: - if obj.IsContainer() || obj.Icon != nil { - obj.ShiftDescendants(labelWidth, 0) - } - } - } - } - hasIconAboveBelow := false - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - position := label.Position(*obj.IconPosition) - if position.IsShapePosition() { - iconWidth := float64(d2target.MAX_ICON_SIZE + label.PADDING) - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - obj.Width -= iconWidth - } - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: - obj.TopLeft.X += iconWidth - obj.ShiftDescendants(iconWidth, 0) - case label.InsideMiddleLeft: - if obj.IsContainer() || obj.Icon != nil { - obj.ShiftDescendants(iconWidth, 0) - } - } - switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - hasIconAboveBelow = true - } - } - } - - // special handling to start/end connections below label - if true { - if obj.HasOutsideBottomLabel() || hasIconAboveBelow { - dy := float64(obj.LabelDimensions.Height) + label.PADDING - obj.Height -= dy - if obj.IsContainer() { - obj.ShiftDescendants(0, -dy/2) - } - } - } - - // remove the extra width/height we added for 3d/multiple after all objects/connections are placed - // and shift the shapes down accordingly - dx, dy := obj.GetModifierElementAdjustments() - if dx != 0 || dy != 0 { - obj.TopLeft.Y += dy - obj.ShiftDescendants(0, dy) - if !obj.IsContainer() { - obj.Width -= dx - obj.Height -= dy - } - } -} - func positionLabelsIcons(obj *d2graph.Object) { if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { @@ -982,7 +707,7 @@ func positionLabelsIcons(obj *d2graph.Object) { } } -func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, objectRanks map[*d2graph.Object]int) { +func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, objectRanks, startingParentRanks, endingParentRanks map[*d2graph.Object]int) { alignedObjects := make(map[float64][]*d2graph.Object) for _, obj := range g.Objects { if !obj.IsContainer() { @@ -1012,16 +737,16 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o } ranks = append(ranks, alignedObjects[l]) } - for _, obj := range g.Objects { - if rank, has := objectRanks[obj]; has { - fmt.Printf("%v rank: %d\n", obj.AbsID(), rank) - } else { - fmt.Printf("%v rank: none\n", obj.AbsID()) - } - } + // for _, obj := range g.Objects { + // if rank, has := objectRanks[obj]; has { + // fmt.Printf("%v rank: %d\n", obj.AbsID(), rank) + // } else { + // fmt.Printf("%v rank: none\n", obj.AbsID()) + // } + // } - startingParentRanks := make(map[*d2graph.Object]int) - endingParentRanks := make(map[*d2graph.Object]int) + startingParentRanks = make(map[*d2graph.Object]int) + endingParentRanks = make(map[*d2graph.Object]int) for _, obj := range g.Objects { if obj.IsContainer() { continue @@ -1037,52 +762,554 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o } } } - for parent, start := range startingParentRanks { - fmt.Printf("parent %v start %v end %v\n", parent.AbsID(), start, endingParentRanks[parent]) - } + // for parent, start := range startingParentRanks { + // fmt.Printf("parent %v start %v end %v\n", parent.AbsID(), start, endingParentRanks[parent]) + // } - return ranks, objectRanks + return ranks, objectRanks, startingParentRanks, endingParentRanks } -func getPositions(ranks [][]*d2graph.Object, isHorizontal bool) (tops, centers, bottoms []float64) { - for _, objects := range ranks { - min := math.Inf(1) - max := math.Inf(-1) - for _, obj := range objects { - if isHorizontal { - min = math.Min(min, obj.TopLeft.X) - max = math.Max(max, obj.TopLeft.X+obj.Width) - } else { - min = math.Min(min, obj.TopLeft.Y) - max = math.Max(max, obj.TopLeft.Y+obj.Height) - } +func getRankRange(rank []*d2graph.Object, isHorizontal bool) (min, max float64) { + min = math.Inf(1) + max = math.Inf(-1) + for _, obj := range rank { + if isHorizontal { + min = math.Min(min, obj.TopLeft.X) + max = math.Max(max, obj.TopLeft.X+obj.Width) + } else { + min = math.Min(min, obj.TopLeft.Y) + max = math.Max(max, obj.TopLeft.Y+obj.Height) } - tops = append(tops, min) + } + return +} + +func getPositions(ranks [][]*d2graph.Object, isHorizontal bool) (starts, centers, ends []float64) { + for _, objects := range ranks { + min, max := getRankRange(objects, isHorizontal) + starts = append(starts, min) if isHorizontal { centers = append(centers, objects[0].TopLeft.X+objects[0].Width/2.) } else { centers = append(centers, objects[0].TopLeft.Y+objects[0].Height/2.) } - bottoms = append(bottoms, max) + ends = append(ends, max) } return } -// shift everything down by distance if it is at or below startY -func shiftDown(g *d2graph.Graph, startY, distance float64) { - for _, obj := range g.Objects { - if obj.TopLeft.Y < startY { - continue - } - obj.TopLeft.Y += distance - } - for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if p.Y <= startY { +// shift everything down by distance if it is at or below start position +func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { + if isHorizontal { + for _, obj := range g.Objects { + if obj.TopLeft.X < start { continue } - p.Y += distance + obj.TopLeft.X += distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + // +1 in case it is off by 1 + if p.X+1 <= start { + continue + } + p.X += distance + } + } + } else { + for _, obj := range g.Objects { + if obj.TopLeft.Y < start { + continue + } + obj.TopLeft.Y += distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + // +1 in case it is off by 1 + if p.Y+1 <= start { + continue + } + p.Y += distance + } + } + } +} + +// shift down everything that is below start +// shift all nodes that are reachable via an edge or being directly below a shifting node or expanding container +// expand containers to wrap shifted nodes +func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) { + fmt.Printf("shifting %v at %v by %v\n", obj.AbsID(), start, distance) + // if obj.ID == "s" || obj.ID == "k" || true { + // return + // } + q := []*d2graph.Object{obj} + + seen := make(map[*d2graph.Object]struct{}) + shifted := make(map[*d2graph.Object]struct{}) + shiftedEdges := make(map[*d2graph.Edge]struct{}) + queue := func(o *d2graph.Object) { + if _, in := seen[o]; in { + return + } + fmt.Printf("queue %v\n", o.AbsID()) + q = append(q, o) + } + + checkBelow := func(curr *d2graph.Object) { + fmt.Printf("checking below %v\n", curr.AbsID()) + currBottom := curr.TopLeft.Y + curr.Height + currRight := curr.TopLeft.X + curr.Width + // if object below is within this distance after shifting, also shift it + threshold := 100. + if isHorizontal { + originalRight := currRight + if _, in := shifted[curr]; in { + originalRight -= distance + } + for _, other := range g.Objects { + if other == curr || curr.IsDescendantOf(other) { + continue + } + // fmt.Printf("%#v && %#v original right %v currRight %v other left %v\n\t%v\n", curr.AbsID(), other.AbsID(), + // originalRight, currRight, other.TopLeft.X, + // other.TopLeft.X-originalRight, + // ) + if originalRight < other.TopLeft.X && + other.TopLeft.X < originalRight+distance+threshold && + curr.TopLeft.Y < other.TopLeft.Y+other.Height && + other.TopLeft.Y < currBottom { + queue(other) + } + } + } else { + originalBottom := currBottom + if _, in := shifted[curr]; in { + originalBottom -= distance + } + for _, other := range g.Objects { + if other == curr || curr.IsDescendantOf(other) { + continue + } + if originalBottom < other.TopLeft.Y && + other.TopLeft.Y < originalBottom+distance+threshold && + curr.TopLeft.X < other.TopLeft.X+other.Width && + other.TopLeft.X < currRight { + queue(other) + } + } + } + } + + processQueue := func() { + for len(q) > 0 { + curr := q[0] + q = q[1:] + if _, was := seen[curr]; was { + fmt.Printf("\twas seen %v\n", curr.AbsID()) + continue + } + // skip other objects behind start + if curr != obj { + if isHorizontal { + if curr.TopLeft.X < start { + continue + } + } else { + if curr.TopLeft.Y < start { + continue + } + } + } + + if isHorizontal { + shift := false + if !isMargin { + shift = start < curr.TopLeft.X + } else { + shift = start <= curr.TopLeft.X + } + + if shift { + curr.TopLeft.X += distance + fmt.Printf("\tshifted %v\n", curr.AbsID()) + shifted[curr] = struct{}{} + } + } else { + shift := false + if !isMargin { + shift = start < curr.TopLeft.Y + } else { + shift = start <= curr.TopLeft.Y + } + if shift { + curr.TopLeft.Y += distance + fmt.Printf("\tshifted %v\n", curr.AbsID()) + shifted[curr] = struct{}{} + } + } + seen[curr] = struct{}{} + + if curr.Parent != g.Root && !curr.IsDescendantOf(obj) { + queue(curr.Parent) + } + + for _, child := range curr.ChildrenArray { + queue(child) + } + + for _, e := range g.Edges { + if _, in := shiftedEdges[e]; in { + continue + } + if e.Src == curr && e.Dst == curr { + // shift the whole self-loop with object + if isHorizontal { + for _, p := range e.Route { + p.X += distance + } + } else { + for _, p := range e.Route { + p.Y += distance + } + } + shiftedEdges[e] = struct{}{} + fmt.Printf("\tshifted %v\n", e.AbsID()) + continue + } else if e.Src == curr { + queue(e.Dst) + if isHorizontal { + for _, p := range e.Route { + if start <= p.X { + p.X += distance + } + } + } else { + for _, p := range e.Route { + if start <= p.Y { + p.Y += distance + } + } + } + shiftedEdges[e] = struct{}{} + } else if e.Dst == curr { + queue(e.Src) + if isHorizontal { + for _, p := range e.Route { + if start <= p.X { + p.X += distance + } + } + } else { + for _, p := range e.Route { + if start <= p.Y { + p.Y += distance + } + } + } + shiftedEdges[e] = struct{}{} + } + } + + // check for nodes below that need to move from the shift + checkBelow(curr) + } + } + + processQueue() + + grown := make(map[*d2graph.Object]struct{}) + for o := range seen { + if o.Parent == g.Root { + continue + } + if _, in := shifted[o.Parent]; in { + continue + } + if _, in := grown[o.Parent]; in { + continue + } + + for parent := o.Parent; parent != g.Root; parent = parent.Parent { + if _, in := shifted[parent]; in { + break + } + if _, in := grown[parent]; in { + break + } + + if isHorizontal { + if parent.TopLeft.X < start { + parent.Width += distance + grown[parent] = struct{}{} + fmt.Printf("grow %v\n", parent.AbsID()) + + checkBelow(parent) + processQueue() + } + } else { + if parent.TopLeft.Y < start { + parent.Height += distance + grown[parent] = struct{}{} + fmt.Printf("grow %v\n", parent.AbsID()) + + checkBelow(parent) + processQueue() + } + } + + } + + } +} + +func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { + ranks, _, startingParentRanks, endingParentRanks := getRanks(g, isHorizontal) + starts, _, ends := getPositions(ranks, isHorizontal) + + // shifting bottom rank down first, then moving up to next rank + for rank := len(ranks) - 1; rank >= 0; rank-- { + objects := ranks[rank] + rankMin := starts[rank] + rankMax := ends[rank] + var topMargin, bottomMargin, leftMargin, rightMargin float64 + var topPadding, bottomPadding, leftPadding, rightPadding float64 + for _, obj := range objects { + margin, padding := getSpacing(obj) + + if isHorizontal { + // if this object isn't the widest in the rank, the actual margin for the rank may be smaller + // so we compute how much margin goes past the rankMin + rankMarginLeft := obj.TopLeft.X - rankMin + margin.left + rankMarginRight := obj.TopLeft.X + obj.Width + margin.right - rankMax + leftMargin = math.Max(leftMargin, rankMarginLeft) + rightMargin = math.Max(rightMargin, rankMarginRight) + + topMargin = math.Max(topMargin, margin.top) + bottomMargin = math.Max(bottomMargin, margin.bottom) + } else { + rankMarginTop := obj.TopLeft.Y - rankMin + margin.top + rankMarginBottom := obj.TopLeft.Y + obj.Height + margin.bottom - rankMax + topMargin = math.Max(topMargin, rankMarginTop) + bottomMargin = math.Max(bottomMargin, rankMarginBottom) + + leftMargin = math.Max(leftMargin, margin.left) + rightMargin = math.Max(rightMargin, margin.right) + } + + padTopDelta := padding.top - obj.Height/2. + padBottomDelta := padding.bottom - obj.Height/2. + padLeftDelta := padding.left - obj.Width/2. + padRightDelta := padding.right - obj.Width/2. + // if padTopDelta > 0 { + // obj.Height += padTopDelta + // } + // if padBottomDelta > 0 { + // obj.Height += padBottomDelta + // } + // if padLeftDelta > 0 { + // obj.Width += padLeftDelta + // } + // if padRightDelta > 0 { + // obj.Width += padRightDelta + // } + + topPadding = math.Max(topPadding, padTopDelta) + bottomPadding = math.Max(bottomPadding, padBottomDelta) + leftPadding = math.Max(leftPadding, padLeftDelta) + rightPadding = math.Max(rightPadding, padRightDelta) + } + + var startDelta, endDelta float64 + var startPaddingDelta, endPaddingDelta float64 + if isHorizontal { + startDelta = math.Max(0, MIN_MARGIN+leftMargin-rankSep/2.) + endDelta = math.Max(0, MIN_MARGIN+rightMargin-rankSep/2.) + + // startPaddingDelta = leftPadding + // endPaddingDelta = rightPadding + } else { + startDelta = math.Max(0, MIN_MARGIN+topMargin-rankSep/2.) + endDelta = math.Max(0, MIN_MARGIN+bottomMargin-rankSep/2.) + + // startPaddingDelta = topPadding + // endPaddingDelta = bottomPadding + } + + fmt.Printf("r%v start %v sp %v ep %v end %v\n", rank, startDelta, startPaddingDelta, endPaddingDelta, endDelta) + // +1 to not include edges at bottom + if endDelta > 0 { + shiftDown(g, ends[rank]+1, endDelta, isHorizontal) + } + // TODO each ancestor container of rank may need its own padding shift + if endPaddingDelta > 0 { + shiftDown(g, ends[rank]-endPaddingDelta, endPaddingDelta, isHorizontal) + } + if startPaddingDelta > 0 { + shiftDown(g, starts[rank]+startPaddingDelta, startPaddingDelta, isHorizontal) + } + if startDelta > 0 { + shiftDown(g, starts[rank], startDelta, isHorizontal) + } + + additionalStarts := make(map[float64]float64) + additionalEnds := make(map[float64]float64) + var startCoords, endCoords []float64 + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start != rank && end != rank { + continue + } + // check to see if container needs additional margin to parent + margin, _ := getSpacing(obj) + + addStart := func(k, v float64) { + if _, has := additionalStarts[k]; !has { + additionalStarts[k] = v + startCoords = append(startCoords, k) + } else { + additionalStarts[k] = math.Max(additionalStarts[k], v) + } + } + addEnd := func(k, v float64) { + if _, has := additionalEnds[k]; !has { + additionalEnds[k] = v + endCoords = append(endCoords, k) + } else { + additionalEnds[k] = math.Max(additionalEnds[k], v) + } + } + + if start == rank { + if isHorizontal && margin.left > 0 { + addStart(obj.TopLeft.X, margin.left) + } else if !isHorizontal && margin.top > 0 { + addStart(obj.TopLeft.Y, margin.top) + } + } + if end == rank { + if isHorizontal && margin.right > 0 { + addEnd(obj.TopLeft.X+obj.Width, margin.right) + } else if !isHorizontal && margin.bottom > 0 { + addEnd(obj.TopLeft.Y+obj.Height, margin.bottom) + } + } + } + // bottom up + sort.Slice(startCoords, func(i, j int) bool { + return startCoords[i] > startCoords[j] + }) + sort.Slice(endCoords, func(i, j int) bool { + return endCoords[i] > endCoords[j] + }) + for _, coord := range endCoords { + delta := MIN_MARGIN + additionalEnds[coord] - rankSep/2 + if delta <= 0 { + continue + } + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + // don't want to grow the container that is shifting + if isHorizontal && obj.TopLeft.X+obj.Width > coord { + obj.Width += delta + } else if !isHorizontal && obj.TopLeft.Y+obj.Height > coord { + obj.Height += delta + } + } + } + shiftDown(g, coord+delta, delta, isHorizontal) + } + for _, coord := range startCoords { + delta := MIN_MARGIN + additionalStarts[coord] - rankSep/2 + if delta <= 0 { + continue + } + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + // expand all containers that pass this rank, except the ones that are moving down to fit the icon + if start <= rank && rank <= end { + // expand the containers that contain the ones moving down + if isHorizontal && obj.TopLeft.X < coord { + obj.Width += delta + } else if !isHorizontal && obj.TopLeft.Y < coord { + obj.Height += delta + } + } + } + shiftDown(g, coord, delta, isHorizontal) + } + + // We need to expand parents when shifting descendants downwards + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + if isHorizontal { + obj.Width += startDelta + endDelta + startPaddingDelta + endPaddingDelta + } else { + obj.Height += startDelta + endDelta + startPaddingDelta + endPaddingDelta + } + } + } + } + +} + +func adjustSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { + adjustRankSpacing(g, rankSep, isHorizontal) + + // adjust cross-rank spacing + crossRankIsHorizontal := !isHorizontal + for _, obj := range g.Objects { + margin, padding := getSpacing(obj) + if isHorizontal { + if margin.bottom > 0 { + shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, crossRankIsHorizontal, true) + } + if padding.bottom > 0 { + shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, padding.bottom, crossRankIsHorizontal, false) + obj.Height += padding.bottom + } + if margin.top > 0 { + shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, crossRankIsHorizontal, true) + } + if padding.top > 0 { + shiftReachableDown(g, obj, obj.TopLeft.Y, padding.top, crossRankIsHorizontal, false) + obj.Height += padding.top + } + } else { + if margin.right > 0 { + shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, crossRankIsHorizontal, true) + } + if padding.right > 0 { + shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, padding.right, crossRankIsHorizontal, false) + obj.Width += padding.right + } + if margin.left > 0 { + shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, crossRankIsHorizontal, true) + } + if padding.left > 0 { + shiftReachableDown(g, obj, obj.TopLeft.X, padding.left, crossRankIsHorizontal, false) + obj.Width += padding.left + } } } } diff --git a/e2etests/e2e_test.go b/e2etests/e2e_test.go index 64ea8bbfa..74bec7b16 100644 --- a/e2etests/e2e_test.go +++ b/e2etests/e2e_test.go @@ -208,6 +208,8 @@ func run(t *testing.T, tc testCase) { renderOpts := &d2svg.RenderOpts{ Pad: 0, ThemeID: tc.themeID, + // To compare deltas at a fixed scale + // Scale: go2.Pointer(1.), } if len(diagram.Layers) > 0 || len(diagram.Scenarios) > 0 || len(diagram.Steps) > 0 { masterID, err := diagram.HashID() From 14917b75318ac4469d2a1776f33cde8a7c13f28d Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 11 Jul 2023 11:51:42 -0700 Subject: [PATCH 061/138] handle rank direction ending container padding --- d2layouts/d2dagrelayout/layout.go | 420 ++++++++++-------------------- 1 file changed, 140 insertions(+), 280 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 0bde93782..8a0bb230b 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -140,25 +140,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err loadScript := "" idToObj := make(map[string]*d2graph.Object) - idToWidth := make(map[string]float64) - idToHeight := make(map[string]float64) for _, obj := range g.Objects { id := obj.AbsID() idToObj[id] = obj - // Note: we handle vertical spacing adjustments separately after layout, - // but for horizontal adjustments we change the width we pass to dagre. - // For containers, we use phantom nodes to adjust container widths width, height := obj.Width, obj.Height - // if isHorizontal { - // height = adjustHeight(obj) - // idToHeight[id] = height - // } else { - // width = adjustWidth(obj) - // idToWidth[id] = width - // } - // TODO update to work with direction: right/left (in that case we need to adjust heights here, - // and horizontal spacing will be adjusted separately after layout loadScript += generateAddNodeLine(id, int(width), int(height)) if obj.Parent != g.Root { @@ -166,30 +152,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - for _, obj := range g.Objects { - if !obj.IsContainer() || true { - continue - } - id := obj.AbsID() - phantomWidth, phantomHeight := 1, 1 - // when a container has nodes with no connections, the layout will be in a row - // adding a node will add NodeSep width in addition to the node's width - // to add a specific amount of space we need to subtract this from the desired width - // if we add the phantom node at rank 0 it should be at the far right and top - if isHorizontal { - heightDelta := int(math.Ceil(idToHeight[id] - obj.Height)) - phantomWidth = heightDelta - rootAttrs.NodeSep - } else { - widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) - phantomWidth = widthDelta - rootAttrs.NodeSep - } - - // add phantom children to adjust container widths - phantomID := id + "___phantom" - loadScript += generateAddNodeLine(phantomID, phantomWidth, phantomHeight) - loadScript += generateAddParentLine(phantomID, id) - } - for _, edge := range g.Edges { src, dst := getEdgeEndpoints(g, edge) @@ -301,10 +263,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } - adjustSpacing(g, float64(rootAttrs.ranksep), isHorizontal) - // for _, obj := range g.Objects { - // cleanupAdjustment(obj, isHorizontal) - // } + adjustRankSpacing(g, float64(rootAttrs.ranksep), isHorizontal) + adjustCrossRankSpacing(g, float64(rootAttrs.ranksep), !isHorizontal) for _, edge := range g.Edges { points := edge.Route @@ -615,7 +575,6 @@ type spacing struct { } func getSpacing(obj *d2graph.Object) (margin, padding spacing) { - // reserve spacing for labels if obj.HasLabel() { var position label.Position if obj.LabelPosition != nil { @@ -674,7 +633,6 @@ func getSpacing(obj *d2graph.Object) (margin, padding spacing) { } } - // reserve extra space for 3d/multiple by providing dagre the larger dimensions dx, dy := obj.GetModifierElementAdjustments() margin.right += dx margin.top += dy @@ -737,13 +695,6 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o } ranks = append(ranks, alignedObjects[l]) } - // for _, obj := range g.Objects { - // if rank, has := objectRanks[obj]; has { - // fmt.Printf("%v rank: %d\n", obj.AbsID(), rank) - // } else { - // fmt.Printf("%v rank: none\n", obj.AbsID()) - // } - // } startingParentRanks = make(map[*d2graph.Object]int) endingParentRanks = make(map[*d2graph.Object]int) @@ -762,9 +713,6 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o } } } - // for parent, start := range startingParentRanks { - // fmt.Printf("parent %v start %v end %v\n", parent.AbsID(), start, endingParentRanks[parent]) - // } return ranks, objectRanks, startingParentRanks, endingParentRanks } @@ -810,8 +758,7 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { for _, edge := range g.Edges { for _, p := range edge.Route { // Note: == so incoming edge shifts down with object at startY - // +1 in case it is off by 1 - if p.X+1 <= start { + if p.X <= start { continue } p.X += distance @@ -827,8 +774,7 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { for _, edge := range g.Edges { for _, p := range edge.Route { // Note: == so incoming edge shifts down with object at startY - // +1 in case it is off by 1 - if p.Y+1 <= start { + if p.Y <= start { continue } p.Y += distance @@ -841,10 +787,6 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { // shift all nodes that are reachable via an edge or being directly below a shifting node or expanding container // expand containers to wrap shifted nodes func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) { - fmt.Printf("shifting %v at %v by %v\n", obj.AbsID(), start, distance) - // if obj.ID == "s" || obj.ID == "k" || true { - // return - // } q := []*d2graph.Object{obj} seen := make(map[*d2graph.Object]struct{}) @@ -854,12 +796,10 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if _, in := seen[o]; in { return } - fmt.Printf("queue %v\n", o.AbsID()) q = append(q, o) } checkBelow := func(curr *d2graph.Object) { - fmt.Printf("checking below %v\n", curr.AbsID()) currBottom := curr.TopLeft.Y + curr.Height currRight := curr.TopLeft.X + curr.Width // if object below is within this distance after shifting, also shift it @@ -873,10 +813,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if other == curr || curr.IsDescendantOf(other) { continue } - // fmt.Printf("%#v && %#v original right %v currRight %v other left %v\n\t%v\n", curr.AbsID(), other.AbsID(), - // originalRight, currRight, other.TopLeft.X, - // other.TopLeft.X-originalRight, - // ) if originalRight < other.TopLeft.X && other.TopLeft.X < originalRight+distance+threshold && curr.TopLeft.Y < other.TopLeft.Y+other.Height && @@ -908,7 +844,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f curr := q[0] q = q[1:] if _, was := seen[curr]; was { - fmt.Printf("\twas seen %v\n", curr.AbsID()) continue } // skip other objects behind start @@ -934,7 +869,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if shift { curr.TopLeft.X += distance - fmt.Printf("\tshifted %v\n", curr.AbsID()) shifted[curr] = struct{}{} } } else { @@ -946,7 +880,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } if shift { curr.TopLeft.Y += distance - fmt.Printf("\tshifted %v\n", curr.AbsID()) shifted[curr] = struct{}{} } } @@ -965,7 +898,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f continue } if e.Src == curr && e.Dst == curr { - // shift the whole self-loop with object if isHorizontal { for _, p := range e.Route { p.X += distance @@ -976,7 +908,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } } shiftedEdges[e] = struct{}{} - fmt.Printf("\tshifted %v\n", e.AbsID()) continue } else if e.Src == curr { queue(e.Dst) @@ -1044,7 +975,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if parent.TopLeft.X < start { parent.Width += distance grown[parent] = struct{}{} - fmt.Printf("grow %v\n", parent.AbsID()) checkBelow(parent) processQueue() @@ -1053,261 +983,191 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if parent.TopLeft.Y < start { parent.Height += distance grown[parent] = struct{}{} - fmt.Printf("grow %v\n", parent.AbsID()) checkBelow(parent) processQueue() } } - } - } } func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { - ranks, _, startingParentRanks, endingParentRanks := getRanks(g, isHorizontal) + ranks, objectRanks, startingParentRanks, endingParentRanks := getRanks(g, isHorizontal) starts, _, ends := getPositions(ranks, isHorizontal) // shifting bottom rank down first, then moving up to next rank for rank := len(ranks) - 1; rank >= 0; rank-- { - objects := ranks[rank] - rankMin := starts[rank] - rankMax := ends[rank] - var topMargin, bottomMargin, leftMargin, rightMargin float64 - var topPadding, bottomPadding, leftPadding, rightPadding float64 - for _, obj := range objects { - margin, padding := getSpacing(obj) - - if isHorizontal { - // if this object isn't the widest in the rank, the actual margin for the rank may be smaller - // so we compute how much margin goes past the rankMin - rankMarginLeft := obj.TopLeft.X - rankMin + margin.left - rankMarginRight := obj.TopLeft.X + obj.Width + margin.right - rankMax - leftMargin = math.Max(leftMargin, rankMarginLeft) - rightMargin = math.Max(rightMargin, rankMarginRight) - - topMargin = math.Max(topMargin, margin.top) - bottomMargin = math.Max(bottomMargin, margin.bottom) - } else { - rankMarginTop := obj.TopLeft.Y - rankMin + margin.top - rankMarginBottom := obj.TopLeft.Y + obj.Height + margin.bottom - rankMax - topMargin = math.Max(topMargin, rankMarginTop) - bottomMargin = math.Max(bottomMargin, rankMarginBottom) - - leftMargin = math.Max(leftMargin, margin.left) - rightMargin = math.Max(rightMargin, margin.right) - } - - padTopDelta := padding.top - obj.Height/2. - padBottomDelta := padding.bottom - obj.Height/2. - padLeftDelta := padding.left - obj.Width/2. - padRightDelta := padding.right - obj.Width/2. - // if padTopDelta > 0 { - // obj.Height += padTopDelta - // } - // if padBottomDelta > 0 { - // obj.Height += padBottomDelta - // } - // if padLeftDelta > 0 { - // obj.Width += padLeftDelta - // } - // if padRightDelta > 0 { - // obj.Width += padRightDelta - // } - - topPadding = math.Max(topPadding, padTopDelta) - bottomPadding = math.Max(bottomPadding, padBottomDelta) - leftPadding = math.Max(leftPadding, padLeftDelta) - rightPadding = math.Max(rightPadding, padRightDelta) - } - - var startDelta, endDelta float64 - var startPaddingDelta, endPaddingDelta float64 - if isHorizontal { - startDelta = math.Max(0, MIN_MARGIN+leftMargin-rankSep/2.) - endDelta = math.Max(0, MIN_MARGIN+rightMargin-rankSep/2.) - - // startPaddingDelta = leftPadding - // endPaddingDelta = rightPadding - } else { - startDelta = math.Max(0, MIN_MARGIN+topMargin-rankSep/2.) - endDelta = math.Max(0, MIN_MARGIN+bottomMargin-rankSep/2.) - - // startPaddingDelta = topPadding - // endPaddingDelta = bottomPadding - } - - fmt.Printf("r%v start %v sp %v ep %v end %v\n", rank, startDelta, startPaddingDelta, endPaddingDelta, endDelta) - // +1 to not include edges at bottom - if endDelta > 0 { - shiftDown(g, ends[rank]+1, endDelta, isHorizontal) - } - // TODO each ancestor container of rank may need its own padding shift - if endPaddingDelta > 0 { - shiftDown(g, ends[rank]-endPaddingDelta, endPaddingDelta, isHorizontal) - } - if startPaddingDelta > 0 { - shiftDown(g, starts[rank]+startPaddingDelta, startPaddingDelta, isHorizontal) - } - if startDelta > 0 { - shiftDown(g, starts[rank], startDelta, isHorizontal) - } - - additionalStarts := make(map[float64]float64) - additionalEnds := make(map[float64]float64) - var startCoords, endCoords []float64 - for _, obj := range g.Objects { - if !obj.IsContainer() { + var startingParents []*d2graph.Object + var endingParents []*d2graph.Object + for _, obj := range ranks[rank] { + if obj.Parent == g.Root { continue } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - if start != rank && end != rank { - continue + if r, has := endingParentRanks[obj.Parent]; has && r == rank { + endingParents = append(endingParents, obj.Parent) } - // check to see if container needs additional margin to parent - margin, _ := getSpacing(obj) - - addStart := func(k, v float64) { - if _, has := additionalStarts[k]; !has { - additionalStarts[k] = v - startCoords = append(startCoords, k) - } else { - additionalStarts[k] = math.Max(additionalStarts[k], v) - } - } - addEnd := func(k, v float64) { - if _, has := additionalEnds[k]; !has { - additionalEnds[k] = v - endCoords = append(endCoords, k) - } else { - additionalEnds[k] = math.Max(additionalEnds[k], v) - } - } - - if start == rank { - if isHorizontal && margin.left > 0 { - addStart(obj.TopLeft.X, margin.left) - } else if !isHorizontal && margin.top > 0 { - addStart(obj.TopLeft.Y, margin.top) - } - } - if end == rank { - if isHorizontal && margin.right > 0 { - addEnd(obj.TopLeft.X+obj.Width, margin.right) - } else if !isHorizontal && margin.bottom > 0 { - addEnd(obj.TopLeft.Y+obj.Height, margin.bottom) - } + if r, has := startingParentRanks[obj.Parent]; has && r == rank { + startingParents = append(startingParents, obj.Parent) } } - // bottom up - sort.Slice(startCoords, func(i, j int) bool { - return startCoords[i] > startCoords[j] - }) - sort.Slice(endCoords, func(i, j int) bool { - return endCoords[i] > endCoords[j] - }) - for _, coord := range endCoords { - delta := MIN_MARGIN + additionalEnds[coord] - rankSep/2 - if delta <= 0 { - continue - } - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - if start <= rank && rank <= end { - // don't want to grow the container that is shifting - if isHorizontal && obj.TopLeft.X+obj.Width > coord { - obj.Width += delta - } else if !isHorizontal && obj.TopLeft.Y+obj.Height > coord { - obj.Height += delta - } - } - } - shiftDown(g, coord+delta, delta, isHorizontal) - } - for _, coord := range startCoords { - delta := MIN_MARGIN + additionalStarts[coord] - rankSep/2 - if delta <= 0 { - continue - } - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - // expand all containers that pass this rank, except the ones that are moving down to fit the icon - if start <= rank && rank <= end { - // expand the containers that contain the ones moving down - if isHorizontal && obj.TopLeft.X < coord { - obj.Width += delta - } else if !isHorizontal && obj.TopLeft.Y < coord { - obj.Height += delta - } - } - } - shiftDown(g, coord, delta, isHorizontal) - } - // We need to expand parents when shifting descendants downwards - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - if start <= rank && rank <= end { + var startingAncestorDeltas []float64 + for len(startingParents) > 0 { + var delta float64 + var ancestors []*d2graph.Object + for _, parent := range startingParents { + _, padding := getSpacing(parent) if isHorizontal { - obj.Width += startDelta + endDelta + startPaddingDelta + endPaddingDelta + delta = math.Max(delta, padding.left) } else { - obj.Height += startDelta + endDelta + startPaddingDelta + endPaddingDelta + delta = math.Max(delta, padding.top) } + for _, child := range parent.ChildrenArray { + if r, has := objectRanks[child]; has { + if r != rank { + continue + } + } else { + startingRank := startingParentRanks[child] + endingRank := endingParentRanks[child] + if startingRank != rank && endingRank != rank { + continue + } + } + margin, _ := getSpacing(child) + if isHorizontal { + delta = math.Max(delta, margin.left) + } else { + delta = math.Max(delta, margin.top) + } + } + if parent.Parent != g.Root { + ancestors = append(ancestors, parent.Parent) + } + } + + startingAncestorDeltas = append(startingAncestorDeltas, delta) + startingParents = ancestors + } + + var endingAncestorDeltas []float64 + for len(endingParents) > 0 { + var delta float64 + var ancestors []*d2graph.Object + for _, parent := range endingParents { + _, padding := getSpacing(parent) + if isHorizontal { + delta = math.Max(delta, padding.right) + } else { + delta = math.Max(delta, padding.bottom) + } + for _, child := range parent.ChildrenArray { + if r, has := objectRanks[child]; has { + if r != rank { + continue + } + } else { + startingRank := startingParentRanks[child] + endingRank := endingParentRanks[child] + if startingRank != rank && endingRank != rank { + continue + } + } + margin, _ := getSpacing(child) + if isHorizontal { + delta = math.Max(delta, margin.right) + } else { + delta = math.Max(delta, margin.bottom) + } + } + if parent.Parent != g.Root { + ancestors = append(ancestors, parent.Parent) + } + } + + endingAncestorDeltas = append(endingAncestorDeltas, delta) + endingParents = ancestors + } + for i := len(endingAncestorDeltas) - 1; i >= 0; i-- { + endDelta := math.Max(0, MIN_MARGIN+endingAncestorDeltas[i]-rankSep/2.) + if endDelta > 0 { + // each nested container adds rankSep/2. space in rank direction + // +1 to not include edges at bottom + position := ends[rank] + float64(i)*rankSep/2. + 1 + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + if isHorizontal && obj.TopLeft.X+obj.Width > position { + obj.Width += endDelta + } else if !isHorizontal && obj.TopLeft.Y+obj.Height > position { + obj.Height += endDelta + } + } + } + shiftDown(g, position, endDelta, isHorizontal) + } + } + for i := 0; i < len(startingAncestorDeltas); i++ { + startDelta := math.Max(0, MIN_MARGIN+startingAncestorDeltas[i]-rankSep/2.) + if startDelta > 0 { + // each nested container adds rankSep/2. space in rank direction + position := starts[rank] - float64(i)*rankSep/2. + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + if isHorizontal && obj.TopLeft.X < position { + obj.Width += startDelta + } else if !isHorizontal && obj.TopLeft.Y < position { + obj.Height += startDelta + } + } + } + shiftDown(g, position, startDelta, isHorizontal) } } } - } -func adjustSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { - adjustRankSpacing(g, rankSep, isHorizontal) - - // adjust cross-rank spacing - crossRankIsHorizontal := !isHorizontal +func adjustCrossRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { for _, obj := range g.Objects { margin, padding := getSpacing(obj) - if isHorizontal { + if !isHorizontal { if margin.bottom > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, crossRankIsHorizontal, true) + shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, isHorizontal, true) } if padding.bottom > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, padding.bottom, crossRankIsHorizontal, false) + shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, padding.bottom, isHorizontal, false) obj.Height += padding.bottom } if margin.top > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, crossRankIsHorizontal, true) + shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, isHorizontal, true) } if padding.top > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y, padding.top, crossRankIsHorizontal, false) + shiftReachableDown(g, obj, obj.TopLeft.Y, padding.top, isHorizontal, false) obj.Height += padding.top } } else { if margin.right > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, crossRankIsHorizontal, true) + shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, isHorizontal, true) } if padding.right > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, padding.right, crossRankIsHorizontal, false) + shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, padding.right, isHorizontal, false) obj.Width += padding.right } if margin.left > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, crossRankIsHorizontal, true) + shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, isHorizontal, true) } if padding.left > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X, padding.left, crossRankIsHorizontal, false) + shiftReachableDown(g, obj, obj.TopLeft.X, padding.left, isHorizontal, false) obj.Width += padding.left } } From f4854bf43d12a0d30940735799c91af1f3737501 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 11 Jul 2023 14:14:47 -0700 Subject: [PATCH 062/138] fix 3d/multiple --- d2graph/layout.go | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index 60f3bdcca..c919c841a 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -320,6 +320,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n srcShape := edge.Src.ToShape() dstShape := edge.Dst.ToShape() + startingSegment := geo.Segment{Start: points[startIndex+1], End: points[startIndex]} // if an edge runs into an outside label, stop the edge at the label instead overlapsOutsideLabel := false if edge.Src.HasLabel() { @@ -330,7 +331,6 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n 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 @@ -349,9 +349,20 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n } } if !overlapsOutsideLabel { + if intersections := edge.Src.Intersections(startingSegment); len(intersections) > 0 { + // move starting segment to 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++ + } + } // trace the edge to the specific shape's border points[startIndex] = shape.TraceToShapeBorder(srcShape, points[startIndex], points[startIndex+1]) } + endingSegment := geo.Segment{Start: points[endIndex-1], End: points[endIndex]} overlapsOutsideLabel = false if edge.Dst.HasLabel() { // assumes LabelPosition, LabelWidth, LabelHeight are all set if there is a label @@ -361,7 +372,6 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n 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 @@ -380,6 +390,16 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n } } if !overlapsOutsideLabel { + if intersections := edge.Dst.Intersections(endingSegment); len(intersections) > 0 { + // move ending segment to 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-- + } + } points[endIndex] = shape.TraceToShapeBorder(dstShape, points[endIndex], points[endIndex-1]) } return startIndex, endIndex From d25d1a3bf0d2c97dd46ab240cea1096cca26fc8a Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 11 Jul 2023 16:06:42 -0700 Subject: [PATCH 063/138] deduplicate cross rank margin adjustments --- d2layouts/d2dagrelayout/layout.go | 93 ++++++++++++++++++++++++++++--- 1 file changed, 86 insertions(+), 7 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 8a0bb230b..620026d2d 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -786,7 +786,7 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { // shift down everything that is below start // shift all nodes that are reachable via an edge or being directly below a shifting node or expanding container // expand containers to wrap shifted nodes -func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) { +func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) map[*d2graph.Object]struct{} { q := []*d2graph.Object{obj} seen := make(map[*d2graph.Object]struct{}) @@ -799,11 +799,11 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f q = append(q, o) } + // if object below is within this distance after shifting, also shift it + threshold := 100. checkBelow := func(curr *d2graph.Object) { currBottom := curr.TopLeft.Y + curr.Height currRight := curr.TopLeft.X + curr.Width - // if object below is within this distance after shifting, also shift it - threshold := 100. if isHorizontal { originalRight := currRight if _, in := shifted[curr]; in { @@ -990,6 +990,53 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } } } + + increasedMargins := make(map[*d2graph.Object]struct{}) + shiftedObjects := make([]*d2graph.Object, 0, len(shifted)) + for obj := range shifted { + shiftedObjects = append(shiftedObjects, obj) + } + for _, shifted := range shiftedObjects { + counts := true + // check if any other shifted is directly above + for _, other := range shiftedObjects { + if other == shifted || shifted.IsDescendantOf(other) { + continue + } + if isHorizontal { + if other.TopLeft.Y+other.Height < shifted.TopLeft.Y || + shifted.TopLeft.Y+shifted.Height < other.TopLeft.Y { + // doesn't line up vertically + continue + } + + // above and within threshold + if other.TopLeft.X+other.Width < shifted.TopLeft.X && + shifted.TopLeft.X < other.TopLeft.X+other.Width+threshold { + counts = false + break + } + } else { + if other.TopLeft.X+other.Width < shifted.TopLeft.X || + shifted.TopLeft.X+shifted.Width < other.TopLeft.X { + // doesn't line up horizontally + continue + } + + // above and within threshold + if other.TopLeft.Y+other.Height < shifted.TopLeft.Y && + shifted.TopLeft.Y < other.TopLeft.Y+other.Height+threshold { + counts = false + break + } + } + } + if counts { + increasedMargins[shifted] = struct{}{} + } + } + + return increasedMargins } func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { @@ -1138,33 +1185,65 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } func adjustCrossRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { + var prevMarginTop, prevMarginBottom, prevMarginLeft, prevMarginRight map[*d2graph.Object]float64 + if isHorizontal { + prevMarginLeft = make(map[*d2graph.Object]float64) + prevMarginRight = make(map[*d2graph.Object]float64) + } else { + prevMarginTop = make(map[*d2graph.Object]float64) + prevMarginBottom = make(map[*d2graph.Object]float64) + } for _, obj := range g.Objects { margin, padding := getSpacing(obj) if !isHorizontal { + if prevShift, has := prevMarginBottom[obj]; has { + margin.bottom -= prevShift + } if margin.bottom > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, isHorizontal, true) + increased := shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, isHorizontal, true) + for o := range increased { + prevMarginBottom[o] = math.Max(prevMarginBottom[o], margin.bottom) + } } if padding.bottom > 0 { shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, padding.bottom, isHorizontal, false) obj.Height += padding.bottom } + if prevShift, has := prevMarginTop[obj]; has { + margin.top -= prevShift + } if margin.top > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, isHorizontal, true) + increased := shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, isHorizontal, true) + for o := range increased { + prevMarginTop[o] = math.Max(prevMarginTop[o], margin.top) + } } if padding.top > 0 { shiftReachableDown(g, obj, obj.TopLeft.Y, padding.top, isHorizontal, false) obj.Height += padding.top } } else { + if prevShift, has := prevMarginRight[obj]; has { + margin.right -= prevShift + } if margin.right > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, isHorizontal, true) + increased := shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, isHorizontal, true) + for o := range increased { + prevMarginRight[o] = math.Max(prevMarginRight[o], margin.right) + } } if padding.right > 0 { shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, padding.right, isHorizontal, false) obj.Width += padding.right } + if prevShift, has := prevMarginLeft[obj]; has { + margin.left -= prevShift + } if margin.left > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, isHorizontal, true) + increased := shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, isHorizontal, true) + for o := range increased { + prevMarginLeft[o] = math.Max(prevMarginLeft[o], margin.left) + } } if padding.left > 0 { shiftReachableDown(g, obj, obj.TopLeft.X, padding.left, isHorizontal, false) From b6795e65e127af3e50af1f520f08b4c021986693 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 11 Jul 2023 16:30:16 -0700 Subject: [PATCH 064/138] fixes --- d2graph/layout.go | 4 +- d2layouts/d2dagrelayout/layout.go | 161 ++++++++++++++++-------------- 2 files changed, 90 insertions(+), 75 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index c919c841a..a93b3a61a 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -341,7 +341,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n 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 { + if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] startIndex++ } @@ -354,7 +354,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n 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 { + if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] startIndex++ } diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 620026d2d..f2539ccf6 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -670,10 +670,10 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o for _, obj := range g.Objects { if !obj.IsContainer() { if !isHorizontal { - y := obj.TopLeft.Y + obj.Height/2 + y := math.Ceil(obj.TopLeft.Y + obj.Height/2) alignedObjects[y] = append(alignedObjects[y], obj) } else { - x := obj.TopLeft.X + obj.Width/2 + x := math.Ceil(obj.TopLeft.X + obj.Width/2) alignedObjects[x] = append(alignedObjects[x], obj) } } @@ -717,35 +717,6 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o return ranks, objectRanks, startingParentRanks, endingParentRanks } -func getRankRange(rank []*d2graph.Object, isHorizontal bool) (min, max float64) { - min = math.Inf(1) - max = math.Inf(-1) - for _, obj := range rank { - if isHorizontal { - min = math.Min(min, obj.TopLeft.X) - max = math.Max(max, obj.TopLeft.X+obj.Width) - } else { - min = math.Min(min, obj.TopLeft.Y) - max = math.Max(max, obj.TopLeft.Y+obj.Height) - } - } - return -} - -func getPositions(ranks [][]*d2graph.Object, isHorizontal bool) (starts, centers, ends []float64) { - for _, objects := range ranks { - min, max := getRankRange(objects, isHorizontal) - starts = append(starts, min) - if isHorizontal { - centers = append(centers, objects[0].TopLeft.X+objects[0].Width/2.) - } else { - centers = append(centers, objects[0].TopLeft.Y+objects[0].Height/2.) - } - ends = append(ends, max) - } - return -} - // shift everything down by distance if it is at or below start position func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { if isHorizontal { @@ -992,47 +963,50 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } increasedMargins := make(map[*d2graph.Object]struct{}) - shiftedObjects := make([]*d2graph.Object, 0, len(shifted)) + movedObjects := make([]*d2graph.Object, 0, len(shifted)) for obj := range shifted { - shiftedObjects = append(shiftedObjects, obj) + movedObjects = append(movedObjects, obj) } - for _, shifted := range shiftedObjects { + for obj := range grown { + movedObjects = append(movedObjects, obj) + } + for _, moved := range movedObjects { counts := true // check if any other shifted is directly above - for _, other := range shiftedObjects { - if other == shifted || shifted.IsDescendantOf(other) { + for _, other := range movedObjects { + if other == moved { continue } if isHorizontal { - if other.TopLeft.Y+other.Height < shifted.TopLeft.Y || - shifted.TopLeft.Y+shifted.Height < other.TopLeft.Y { + if other.TopLeft.Y+other.Height < moved.TopLeft.Y || + moved.TopLeft.Y+moved.Height < other.TopLeft.Y { // doesn't line up vertically continue } // above and within threshold - if other.TopLeft.X+other.Width < shifted.TopLeft.X && - shifted.TopLeft.X < other.TopLeft.X+other.Width+threshold { + if other.TopLeft.X < moved.TopLeft.X && + moved.TopLeft.X < other.TopLeft.X+other.Width+threshold { counts = false break } } else { - if other.TopLeft.X+other.Width < shifted.TopLeft.X || - shifted.TopLeft.X+shifted.Width < other.TopLeft.X { + if other.TopLeft.X+other.Width < moved.TopLeft.X || + moved.TopLeft.X+moved.Width < other.TopLeft.X { // doesn't line up horizontally continue } // above and within threshold - if other.TopLeft.Y+other.Height < shifted.TopLeft.Y && - shifted.TopLeft.Y < other.TopLeft.Y+other.Height+threshold { + if other.TopLeft.Y < moved.TopLeft.Y && + moved.TopLeft.Y < other.TopLeft.Y+other.Height+threshold { counts = false break } } } if counts { - increasedMargins[shifted] = struct{}{} + increasedMargins[moved] = struct{}{} } } @@ -1041,7 +1015,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { ranks, objectRanks, startingParentRanks, endingParentRanks := getRanks(g, isHorizontal) - starts, _, ends := getPositions(ranks, isHorizontal) // shifting bottom rank down first, then moving up to next rank for rank := len(ranks) - 1; rank >= 0; rank-- { @@ -1059,16 +1032,18 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } } - var startingAncestorDeltas []float64 + startingAncestorPositions := make(map[*d2graph.Object]float64) for len(startingParents) > 0 { - var delta float64 var ancestors []*d2graph.Object for _, parent := range startingParents { _, padding := getSpacing(parent) + if _, has := startingAncestorPositions[parent]; !has { + startingAncestorPositions[parent] = math.Inf(1) + } if isHorizontal { - delta = math.Max(delta, padding.left) + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], parent.TopLeft.X+rankSep/2.-MIN_MARGIN-padding.left) } else { - delta = math.Max(delta, padding.top) + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], parent.TopLeft.Y+rankSep/2.-MIN_MARGIN-padding.top) } for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { @@ -1084,30 +1059,33 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } margin, _ := getSpacing(child) if isHorizontal { - delta = math.Max(delta, margin.left) + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], child.TopLeft.X-margin.left-MIN_MARGIN) } else { - delta = math.Max(delta, margin.top) + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], child.TopLeft.Y-margin.top-MIN_MARGIN) } } if parent.Parent != g.Root { ancestors = append(ancestors, parent.Parent) } } - - startingAncestorDeltas = append(startingAncestorDeltas, delta) startingParents = ancestors } - var endingAncestorDeltas []float64 + endingAncestorPositions := make(map[*d2graph.Object]float64) for len(endingParents) > 0 { - var delta float64 + delta := 0. var ancestors []*d2graph.Object for _, parent := range endingParents { _, padding := getSpacing(parent) + if _, has := endingAncestorPositions[parent]; !has { + endingAncestorPositions[parent] = math.Inf(-1) + } if isHorizontal { delta = math.Max(delta, padding.right) + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], parent.TopLeft.X+parent.Width-rankSep/2+MIN_MARGIN+padding.right) } else { delta = math.Max(delta, padding.bottom) + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], parent.TopLeft.Y+parent.Height-rankSep/2+MIN_MARGIN+padding.bottom) } for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { @@ -1124,24 +1102,42 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { margin, _ := getSpacing(child) if isHorizontal { delta = math.Max(delta, margin.right) + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], child.TopLeft.X+child.Width+margin.right+MIN_MARGIN) } else { delta = math.Max(delta, margin.bottom) + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], child.TopLeft.Y+child.Height+margin.bottom+MIN_MARGIN) } } if parent.Parent != g.Root { ancestors = append(ancestors, parent.Parent) } } - - endingAncestorDeltas = append(endingAncestorDeltas, delta) endingParents = ancestors } - for i := len(endingAncestorDeltas) - 1; i >= 0; i-- { - endDelta := math.Max(0, MIN_MARGIN+endingAncestorDeltas[i]-rankSep/2.) + + endingAncestorPositionOrder := make([]*d2graph.Object, 0, len(endingAncestorPositions)) + for ancestor := range endingAncestorPositions { + endingAncestorPositionOrder = append(endingAncestorPositionOrder, ancestor) + } + // adjust rank ancestors bottom-up + sort.Slice(endingAncestorPositionOrder, func(i, j int) bool { + return endingAncestorPositions[endingAncestorPositionOrder[i]] > endingAncestorPositions[endingAncestorPositionOrder[j]] + }) + + for _, ancestor := range endingAncestorPositionOrder { + var endDelta float64 + if isHorizontal { + endDelta = endingAncestorPositions[ancestor] - (ancestor.TopLeft.X + ancestor.Width) + } else { + endDelta = endingAncestorPositions[ancestor] - (ancestor.TopLeft.Y + ancestor.Height) + } if endDelta > 0 { - // each nested container adds rankSep/2. space in rank direction - // +1 to not include edges at bottom - position := ends[rank] + float64(i)*rankSep/2. + 1 + var position float64 + if isHorizontal { + position = ancestor.TopLeft.X + ancestor.Width - 1 + } else { + position = ancestor.TopLeft.Y + ancestor.Height - 1 + } for _, obj := range g.Objects { if !obj.IsContainer() { continue @@ -1159,11 +1155,30 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { shiftDown(g, position, endDelta, isHorizontal) } } - for i := 0; i < len(startingAncestorDeltas); i++ { - startDelta := math.Max(0, MIN_MARGIN+startingAncestorDeltas[i]-rankSep/2.) - if startDelta > 0 { - // each nested container adds rankSep/2. space in rank direction - position := starts[rank] - float64(i)*rankSep/2. + + startingAncestorPositionOrder := make([]*d2graph.Object, 0, len(startingAncestorPositions)) + for ancestor := range startingAncestorPositions { + startingAncestorPositionOrder = append(startingAncestorPositionOrder, ancestor) + } + // adjust rank ancestors bottom-up + sort.Slice(startingAncestorPositionOrder, func(i, j int) bool { + return startingAncestorPositions[startingAncestorPositionOrder[i]] > startingAncestorPositions[startingAncestorPositionOrder[j]] + }) + + for _, ancestor := range startingAncestorPositionOrder { + var endDelta float64 + if isHorizontal { + endDelta = ancestor.TopLeft.X - startingAncestorPositions[ancestor] + } else { + endDelta = ancestor.TopLeft.Y - startingAncestorPositions[ancestor] + } + if endDelta > 0 { + var position float64 + if isHorizontal { + position = ancestor.TopLeft.X + 1 + } else { + position = ancestor.TopLeft.Y + 1 + } for _, obj := range g.Objects { if !obj.IsContainer() { continue @@ -1171,14 +1186,14 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { start := startingParentRanks[obj] end := endingParentRanks[obj] if start <= rank && rank <= end { - if isHorizontal && obj.TopLeft.X < position { - obj.Width += startDelta - } else if !isHorizontal && obj.TopLeft.Y < position { - obj.Height += startDelta + if isHorizontal && obj.TopLeft.X+obj.Width > position { + obj.Width += endDelta + } else if !isHorizontal && obj.TopLeft.Y+obj.Height > position { + obj.Height += endDelta } } } - shiftDown(g, position, startDelta, isHorizontal) + shiftDown(g, position, endDelta, isHorizontal) } } } From 2c5c39531598d1a413089199f689c49ca777c2ae Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 14:21:51 -0700 Subject: [PATCH 065/138] handle merging multiple different child margins and container padding in rank direction --- d2layouts/d2dagrelayout/layout.go | 178 ++++++++++++++++++------------ 1 file changed, 107 insertions(+), 71 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index f2539ccf6..cea99951f 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -754,6 +754,42 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { } } +func shiftUp(g *d2graph.Graph, start, distance float64, isHorizontal bool) { + if isHorizontal { + for _, obj := range g.Objects { + if start < obj.TopLeft.X { + continue + } + obj.TopLeft.X -= distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + if start <= p.X { + continue + } + p.X -= distance + } + } + } else { + for _, obj := range g.Objects { + if start < obj.TopLeft.Y { + continue + } + obj.TopLeft.Y -= distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + if start <= p.Y { + continue + } + p.Y -= distance + } + } + } +} + // shift down everything that is below start // shift all nodes that are reachable via an edge or being directly below a shifting node or expanding container // expand containers to wrap shifted nodes @@ -1040,11 +1076,15 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { if _, has := startingAncestorPositions[parent]; !has { startingAncestorPositions[parent] = math.Inf(1) } + var startPosition float64 if isHorizontal { - startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], parent.TopLeft.X+rankSep/2.-MIN_MARGIN-padding.left) + paddingIncrease := math.Max(0, padding.left-rankSep/2) + startPosition = parent.TopLeft.X - paddingIncrease } else { - startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], parent.TopLeft.Y+rankSep/2.-MIN_MARGIN-padding.top) + paddingIncrease := math.Max(0, padding.top-rankSep/2) + startPosition = parent.TopLeft.Y - paddingIncrease } + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], startPosition) for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { if r != rank { @@ -1059,10 +1099,11 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } margin, _ := getSpacing(child) if isHorizontal { - startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], child.TopLeft.X-margin.left-MIN_MARGIN) + startPosition = child.TopLeft.X - margin.left } else { - startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], child.TopLeft.Y-margin.top-MIN_MARGIN) + startPosition = child.TopLeft.Y - margin.top } + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], startPosition) } if parent.Parent != g.Root { ancestors = append(ancestors, parent.Parent) @@ -1073,20 +1114,19 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { endingAncestorPositions := make(map[*d2graph.Object]float64) for len(endingParents) > 0 { - delta := 0. var ancestors []*d2graph.Object for _, parent := range endingParents { _, padding := getSpacing(parent) if _, has := endingAncestorPositions[parent]; !has { endingAncestorPositions[parent] = math.Inf(-1) } + var endPosition float64 if isHorizontal { - delta = math.Max(delta, padding.right) - endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], parent.TopLeft.X+parent.Width-rankSep/2+MIN_MARGIN+padding.right) + endPosition = parent.TopLeft.X + parent.Width + padding.right - rankSep/2. } else { - delta = math.Max(delta, padding.bottom) - endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], parent.TopLeft.Y+parent.Height-rankSep/2+MIN_MARGIN+padding.bottom) + endPosition = parent.TopLeft.Y + parent.Height + padding.bottom - rankSep/2. } + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], endPosition) for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { if r != rank { @@ -1100,13 +1140,13 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } } margin, _ := getSpacing(child) + if isHorizontal { - delta = math.Max(delta, margin.right) - endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], child.TopLeft.X+child.Width+margin.right+MIN_MARGIN) + endPosition = child.TopLeft.X + child.Width + margin.right } else { - delta = math.Max(delta, margin.bottom) - endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], child.TopLeft.Y+child.Height+margin.bottom+MIN_MARGIN) + endPosition = child.TopLeft.Y + child.Height + margin.bottom } + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], endPosition) } if parent.Parent != g.Root { ancestors = append(ancestors, parent.Parent) @@ -1115,70 +1155,38 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { endingParents = ancestors } - endingAncestorPositionOrder := make([]*d2graph.Object, 0, len(endingAncestorPositions)) - for ancestor := range endingAncestorPositions { - endingAncestorPositionOrder = append(endingAncestorPositionOrder, ancestor) - } - // adjust rank ancestors bottom-up - sort.Slice(endingAncestorPositionOrder, func(i, j int) bool { - return endingAncestorPositions[endingAncestorPositionOrder[i]] > endingAncestorPositions[endingAncestorPositionOrder[j]] - }) - - for _, ancestor := range endingAncestorPositionOrder { - var endDelta float64 - if isHorizontal { - endDelta = endingAncestorPositions[ancestor] - (ancestor.TopLeft.X + ancestor.Width) - } else { - endDelta = endingAncestorPositions[ancestor] - (ancestor.TopLeft.Y + ancestor.Height) - } - if endDelta > 0 { - var position float64 - if isHorizontal { - position = ancestor.TopLeft.X + ancestor.Width - 1 - } else { - position = ancestor.TopLeft.Y + ancestor.Height - 1 - } - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - if start <= rank && rank <= end { - if isHorizontal && obj.TopLeft.X+obj.Width > position { - obj.Width += endDelta - } else if !isHorizontal && obj.TopLeft.Y+obj.Height > position { - obj.Height += endDelta - } - } - } - shiftDown(g, position, endDelta, isHorizontal) - } - } - - startingAncestorPositionOrder := make([]*d2graph.Object, 0, len(startingAncestorPositions)) + startingAdjustmentOrder := make([]*d2graph.Object, 0, len(startingAncestorPositions)) for ancestor := range startingAncestorPositions { - startingAncestorPositionOrder = append(startingAncestorPositionOrder, ancestor) + startingAdjustmentOrder = append(startingAdjustmentOrder, ancestor) } - // adjust rank ancestors bottom-up - sort.Slice(startingAncestorPositionOrder, func(i, j int) bool { - return startingAncestorPositions[startingAncestorPositionOrder[i]] > startingAncestorPositions[startingAncestorPositionOrder[j]] + // adjust starting ancestors top-down + sort.Slice(startingAdjustmentOrder, func(i, j int) bool { + iPos := startingAncestorPositions[startingAdjustmentOrder[i]] + jPos := startingAncestorPositions[startingAdjustmentOrder[j]] + return iPos < jPos }) - for _, ancestor := range startingAncestorPositionOrder { - var endDelta float64 + endingAdjustmentOrder := make([]*d2graph.Object, 0, len(endingAncestorPositions)) + for ancestor := range endingAncestorPositions { + endingAdjustmentOrder = append(endingAdjustmentOrder, ancestor) + } + + // adjust ending ancestors bottom-up + sort.Slice(endingAdjustmentOrder, func(i, j int) bool { + iPos := endingAncestorPositions[endingAdjustmentOrder[i]] + jPos := endingAncestorPositions[endingAdjustmentOrder[j]] + return jPos < iPos + }) + + for _, ancestor := range endingAdjustmentOrder { + var position float64 if isHorizontal { - endDelta = ancestor.TopLeft.X - startingAncestorPositions[ancestor] + position = ancestor.TopLeft.X + ancestor.Width } else { - endDelta = ancestor.TopLeft.Y - startingAncestorPositions[ancestor] + position = ancestor.TopLeft.Y + ancestor.Height } + endDelta := endingAncestorPositions[ancestor] - position if endDelta > 0 { - var position float64 - if isHorizontal { - position = ancestor.TopLeft.X + 1 - } else { - position = ancestor.TopLeft.Y + 1 - } for _, obj := range g.Objects { if !obj.IsContainer() { continue @@ -1186,9 +1194,10 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { start := startingParentRanks[obj] end := endingParentRanks[obj] if start <= rank && rank <= end { - if isHorizontal && obj.TopLeft.X+obj.Width > position { + if isHorizontal && position <= obj.TopLeft.X+obj.Width { obj.Width += endDelta - } else if !isHorizontal && obj.TopLeft.Y+obj.Height > position { + } else if !isHorizontal && + position <= obj.TopLeft.Y+obj.Height { obj.Height += endDelta } } @@ -1196,6 +1205,33 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { shiftDown(g, position, endDelta, isHorizontal) } } + + for _, ancestor := range startingAdjustmentOrder { + var position float64 + if isHorizontal { + position = ancestor.TopLeft.X + } else { + position = ancestor.TopLeft.Y + } + startDelta := position - startingAncestorPositions[ancestor] + if startDelta > 0 { + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + if isHorizontal && obj.TopLeft.X <= position { + obj.Width += startDelta + } else if !isHorizontal && obj.TopLeft.Y <= position { + obj.Height += startDelta + } + } + } + shiftUp(g, position, startDelta, isHorizontal) + } + } } } From e52f0bb8bad43a649188dc4250e9d79f8b0a342d Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 14:45:59 -0700 Subject: [PATCH 066/138] fix tracing edge to label with multiple intersections --- d2graph/layout.go | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index a93b3a61a..4b53cee12 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -1,6 +1,7 @@ package d2graph import ( + "sort" "strings" "oss.terrastruct.com/d2/d2target" @@ -337,9 +338,13 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n labelBox.Width += 2 * label.PADDING if intersections := labelBox.Intersections(startingSegment); len(intersections) > 0 { overlapsOutsideLabel = true + p := intersections[0] + if len(intersections) > 1 { + p = findOuterIntersection(labelPosition, intersections) + } // move starting segment to label intersection point - points[startIndex] = intersections[0] - startingSegment.End = intersections[0] + points[startIndex] = p + startingSegment.End = p // if the segment becomes too short, just merge it with the next segment if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] @@ -378,9 +383,13 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n labelBox.Width += 2 * label.PADDING if intersections := labelBox.Intersections(endingSegment); len(intersections) > 0 { overlapsOutsideLabel = true + p := intersections[0] + if len(intersections) > 1 { + p = findOuterIntersection(labelPosition, intersections) + } // move ending segment to label intersection point - points[endIndex] = intersections[0] - endingSegment.End = intersections[0] + points[endIndex] = p + endingSegment.End = p // 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] @@ -404,3 +413,25 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n } return startIndex, endIndex } + +func findOuterIntersection(labelPosition label.Position, intersections []*geo.Point) *geo.Point { + switch labelPosition { + case label.OutsideTopLeft, label.OutsideTopRight, label.OutsideTopCenter: + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].Y < intersections[j].Y + }) + case label.OutsideBottomLeft, label.OutsideBottomRight, label.OutsideBottomCenter: + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].Y > intersections[j].Y + }) + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].X < intersections[j].X + }) + case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].X > intersections[j].X + }) + } + return intersections[0] +} From a32319d59838ad845b305f3e62d458ad1c229ffa Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 15:30:41 -0700 Subject: [PATCH 067/138] fix dagre_broken_arrowhead --- d2graph/layout.go | 8 ++++---- d2layouts/d2dagrelayout/layout.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index 4b53cee12..05ef65fb0 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -346,7 +346,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n points[startIndex] = p startingSegment.End = p // if the segment becomes too short, just merge it with the next segment - if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { + if startIndex+1 < endIndex && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] startIndex++ } @@ -359,7 +359,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n points[startIndex] = intersections[0] startingSegment.End = intersections[0] // if the segment becomes too short, just merge it with the next segment - if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { + if startIndex+1 < endIndex && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] startIndex++ } @@ -391,7 +391,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n points[endIndex] = p endingSegment.End = p // if the segment becomes too short, just merge it with the previous segment - if endIndex-1 > 0 && endingSegment.Length() < MIN_SEGMENT_LEN { + if endIndex-1 > startIndex && endingSegment.Length() < MIN_SEGMENT_LEN { points[endIndex-1] = points[endIndex] endIndex-- } @@ -404,7 +404,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n 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 { + if endIndex-1 > startIndex && endingSegment.Length() < MIN_SEGMENT_LEN { points[endIndex-1] = points[endIndex] endIndex-- } diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index cea99951f..6949f7179 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -273,7 +273,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err // arrowheads can appear broken if segments are very short from dagre routing a point just outside the shape // 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) { + if startIndex+2 < len(points) { newStartingSegment := *geo.NewSegment(start, points[startIndex+1]) 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 @@ -294,7 +294,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } } - if !end.Equals(points[len(points)-1]) && endIndex-2 >= 0 { + if endIndex-2 >= 0 { newEndingSegment := *geo.NewSegment(end, points[endIndex-1]) if newEndingSegment.Length() < d2graph.MIN_SEGMENT_LEN { // extend the prev segment into the shape border if possible From 180a444ca0d5aae561cd39af569a4e2cbac96c12 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 17:17:49 -0700 Subject: [PATCH 068/138] fix grid diagram shift --- d2layouts/d2dagrelayout/layout.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 6949f7179..bbf9ef4d0 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1245,6 +1245,9 @@ func adjustCrossRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool prevMarginBottom = make(map[*d2graph.Object]float64) } for _, obj := range g.Objects { + if obj.IsGridDiagram() { + continue + } margin, padding := getSpacing(obj) if !isHorizontal { if prevShift, has := prevMarginBottom[obj]; has { From 29af92310bc95873a218d6acbd173d90ed4d4587 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 14:11:14 -0700 Subject: [PATCH 069/138] fix no-primary-composite --- d2compiler/compile.go | 6 ------ d2compiler/compile_test.go | 15 ++------------- d2ir/compile.go | 6 +++++- .../TestCompile2/vars/errors/bad-var.exp.json | 4 ++++ .../vars/errors/multi-part-map.exp.json | 2 +- .../vars/errors/spread-non-solo.exp.json | 2 +- 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index e2c8b71bb..3c0946bfa 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -281,12 +281,6 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { if f.Map() != nil { if len(f.Map().Edges) > 0 { c.errorf(f.Map().Edges[0].LastRef().AST(), "vars cannot contain an edge") - } else { - for _, f := range f.Map().Fields { - if f.Primary() == nil && f.Composite == nil { - c.errorf(f.LastRef().AST(), "invalid var with no value") - } - } } } return diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index d716228cf..b3f189be2 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3797,17 +3797,6 @@ hi: ${z} `, `d2/testdata/d2compiler/TestCompile2/vars/errors/missing.d2:5:1: could not resolve variable "z"`) }, }, - { - name: "bad-var", - run: func(t *testing.T) { - assertCompile(t, ` -vars: { - x -} -hi: ${x} -`, `d2/testdata/d2compiler/TestCompile2/vars/errors/bad-var.d2:3:3: invalid var with no value`) - }, - }, { name: "multi-part-map", run: func(t *testing.T) { @@ -3818,7 +3807,7 @@ vars: { } } hi: 1 ${x} -`, `d2/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.d2:7:1: cannot substitute map variable "x" as part of a string`) +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.d2:7:1: cannot substitute composite variable "x" as part of a string`) }, }, { @@ -3938,7 +3927,7 @@ z: { d: ...${x} c } -`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.d2:8:2: cannot substitute map variable "x" as part of a string`) +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.d2:8:2: cannot substitute composite variable "x" as part of a string`) }, }, } diff --git a/d2ir/compile.go b/d2ir/compile.go index ef88d95a9..ffa5a96ae 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -188,8 +188,12 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { } } if resolvedField.Primary() == nil { + if resolvedField.Composite == nil { + c.errorf(node.LastRef().AST(), `cannot substitute variable without value: "%s"`, strings.Join(box.Substitution.IDA(), ".")) + return + } if len(s.Value) > 1 { - c.errorf(node.LastRef().AST(), `cannot substitute map variable "%s" as part of a string`, strings.Join(box.Substitution.IDA(), ".")) + c.errorf(node.LastRef().AST(), `cannot substitute composite variable "%s" as part of a string`, strings.Join(box.Substitution.IDA(), ".")) return } switch n := node.(type) { diff --git a/testdata/d2compiler/TestCompile2/vars/errors/bad-var.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/bad-var.exp.json index c079e0f3c..c740711a7 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/bad-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/bad-var.exp.json @@ -5,6 +5,10 @@ { "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/bad-var.d2,2:2:11-2:3:12", "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/bad-var.d2:3:3: invalid var with no value" + }, + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/bad-var.d2,4:4:23-4:5:24", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/bad-var.d2:5:5: invalid var with no value" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.exp.json index 70c263dfa..055c954df 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.exp.json @@ -4,7 +4,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.d2,6:0:31-6:2:33", - "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.d2:7:1: cannot substitute map variable \"x\" as part of a string" + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/multi-part-map.d2:7:1: cannot substitute composite variable \"x\" as part of a string" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.exp.json index 296f35954..3d31fd966 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.exp.json @@ -4,7 +4,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.d2,7:1:36-7:2:37", - "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.d2:8:2: cannot substitute map variable \"x\" as part of a string" + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-solo.d2:8:2: cannot substitute composite variable \"x\" as part of a string" } ] } From f12f9ca69de2546597ff5b066b63b00ff362de16 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 14:34:33 -0700 Subject: [PATCH 070/138] move edge check --- d2compiler/compile.go | 10 +++++----- d2ir/compile.go | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 3c0946bfa..0b7469f9f 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -278,11 +278,11 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { } return } else if f.Name == "vars" { - if f.Map() != nil { - if len(f.Map().Edges) > 0 { - c.errorf(f.Map().Edges[0].LastRef().AST(), "vars cannot contain an edge") - } - } + // if f.Map() != nil { + // if len(f.Map().Edges) > 0 { + // c.errorf(f.Map().Edges[0].LastRef().AST(), "vars cannot contain an edge") + // } + // } return } else if isReserved { c.compileReserved(&obj.Attributes, f) diff --git a/d2ir/compile.go b/d2ir/compile.go index ffa5a96ae..724294e52 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -523,6 +523,10 @@ func (c *compiler) compileLink(refctx *RefContext) { } func (c *compiler) compileEdges(refctx *RefContext) { + if IsVar(refctx.ScopeMap) { + c.errorf(refctx.Key, "vars cannot contain an edge") + return + } if refctx.Key.Key != nil { f, err := refctx.ScopeMap.EnsureField(refctx.Key.Key, refctx) if err != nil { From e95f61985e78be7d7e3b32b2dc93e4b48391ddbd Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 14:41:06 -0700 Subject: [PATCH 071/138] fix import test --- d2ir/import_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/d2ir/import_test.go b/d2ir/import_test.go index 0b9497abe..76012a33a 100644 --- a/d2ir/import_test.go +++ b/d2ir/import_test.go @@ -157,7 +157,7 @@ label: meow`, "a.d2": "vars: { x: 2 }; hi: ${x}", }) assert.Success(t, err) - assertQuery(t, m, 0, 0, 2, "hi") + assertQuery(t, m, 0, 0, "2", "hi") }, }, { @@ -168,7 +168,7 @@ label: meow`, "a.d2": "vars: { x: 2 }", }) assert.Success(t, err) - assertQuery(t, m, 0, 0, 1, "hi") + assertQuery(t, m, 0, 0, "1", "hi") }, }, } From d275a4503364e1e9e780c1ab1a18176df4b81c16 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 14:47:32 -0700 Subject: [PATCH 072/138] allow edges in vars --- d2compiler/compile_test.go | 29 +- d2ir/compile.go | 4 - .../vars/basic/spread-edge.exp.json | 356 ++++++++++++++++++ .../d2ir/TestCompile/imports/vars/1.exp.json | 23 +- .../d2ir/TestCompile/imports/vars/2.exp.json | 27 +- .../d2ir/TestCompile/imports/vars/3.exp.json | 27 +- 6 files changed, 391 insertions(+), 75 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index b3f189be2..aee82e145 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3501,6 +3501,23 @@ custom-disclaimer: DRAFT DISCLAIMER { assert.Equal(t, 2, len(g.Objects)) }, }, + { + name: "spread-edge", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + connections: { + x -> a + } +} +hi: { + ...${connections} +} +`, "") + assert.Equal(t, 3, len(g.Objects)) + assert.Equal(t, 1, len(g.Edges)) + }, + }, } for _, tc := range tca { @@ -3860,17 +3877,7 @@ hi: ${x} `, `d2/testdata/d2compiler/TestCompile2/vars/errors/recursive-var.d2:3:3: could not resolve variable "x"`) }, }, - { - name: "edge", - run: func(t *testing.T) { - assertCompile(t, ` -vars: { - x -> a -} -hi -`, "d2/testdata/d2compiler/TestCompile2/vars/errors/edge.d2:3:3: vars cannot contain an edge") - }, - }, + { name: "spread-non-map", run: func(t *testing.T) { diff --git a/d2ir/compile.go b/d2ir/compile.go index 724294e52..ffa5a96ae 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -523,10 +523,6 @@ func (c *compiler) compileLink(refctx *RefContext) { } func (c *compiler) compileEdges(refctx *RefContext) { - if IsVar(refctx.ScopeMap) { - c.errorf(refctx.Key, "vars cannot contain an edge") - return - } if refctx.Key.Key != nil { f, err := refctx.ScopeMap.EnsureField(refctx.Key.Key, refctx) if err != nil { diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json new file mode 100644 index 000000000..7a1960c96 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json @@ -0,0 +1,356 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,0:0:0-9:0:71", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,1:0:1-5:1:42", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,1:6:7-5:1:42", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,2:2:11-4:3:40", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,2:2:11-2:13:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,2:2:11-2:13:22", + "value": [ + { + "string": "connections", + "raw_string": "connections" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,2:15:24-4:3:40", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:4:30-3:10:36", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:4:30-3:10:36", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:4:30-3:5:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:4:30-3:5:31", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:9:35-3:10:36", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:9:35-3:10:36", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,6:0:43-8:1:70", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,6:0:43-6:2:45", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,6:0:43-6:2:45", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,6:4:47-8:1:70", + "nodes": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,7:2:51-7:19:68", + "spread": true, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,7:7:56-7:18:67", + "value": [ + { + "string": "connections", + "raw_string": "connections" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:4:30-3:5:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:4:30-3:5:31", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:9:35-3:10:36", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,3:9:35-3:10:36", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,6:0:43-6:2:45", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.d2,6:0:43-6:2:45", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json index 9d278fd74..cf6fe40f1 100644 --- a/testdata/d2ir/TestCompile/imports/vars/1.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json @@ -168,11 +168,10 @@ "name": "q", "primary": { "value": { - "range": "x.d2,0:6:6-0:18:18", + "range": "index.d2,0:20:20-0:21:21", "value": [ { - "string": "var replaced", - "raw_string": "var replaced" + "string": "var replaced" } ] } @@ -230,23 +229,7 @@ "range": "index.d2,0:20:20-0:21:21", "value": [ { - "substitution": { - "range": "index.d2,0:20:20-0:27:27", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "index.d2,0:22:22-0:26:26", - "value": [ - { - "string": "meow", - "raw_string": "meow" - } - ] - } - } - ] - } + "string": "var replaced" } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/2.exp.json b/testdata/d2ir/TestCompile/imports/vars/2.exp.json index 3107e5c6e..6a962c22b 100644 --- a/testdata/d2ir/TestCompile/imports/vars/2.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/2.exp.json @@ -312,9 +312,12 @@ "name": "hi", "primary": { "value": { - "range": "a.d2,0:11:11-0:12:12", - "raw": "2", - "value": "2" + "range": "a.d2,0:20:20-0:21:21", + "value": [ + { + "string": "2" + } + ] } }, "references": [ @@ -370,23 +373,7 @@ "range": "a.d2,0:20:20-0:21:21", "value": [ { - "substitution": { - "range": "a.d2,0:20:20-0:24:24", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "a.d2,0:22:22-0:23:23", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "2" } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/3.exp.json b/testdata/d2ir/TestCompile/imports/vars/3.exp.json index e2ddd2094..5c2b89aad 100644 --- a/testdata/d2ir/TestCompile/imports/vars/3.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/3.exp.json @@ -312,9 +312,12 @@ "name": "hi", "primary": { "value": { - "range": "index.d2,0:18:18-0:19:19", - "raw": "1", - "value": "1" + "range": "index.d2,0:27:27-0:28:28", + "value": [ + { + "string": "1" + } + ] } }, "references": [ @@ -370,23 +373,7 @@ "range": "index.d2,0:27:27-0:28:28", "value": [ { - "substitution": { - "range": "index.d2,0:27:27-0:31:31", - "spread": false, - "path": [ - { - "unquoted_string": { - "range": "index.d2,0:29:29-0:30:30", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - } + "string": "1" } ] } From da0d24555d5db78057928b7baa32a291ae3f74ec Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 15:13:24 -0700 Subject: [PATCH 073/138] rm commented code --- d2compiler/compile.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 0b7469f9f..600179d40 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -278,11 +278,6 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { } return } else if f.Name == "vars" { - // if f.Map() != nil { - // if len(f.Map().Edges) > 0 { - // c.errorf(f.Map().Edges[0].LastRef().AST(), "vars cannot contain an edge") - // } - // } return } else if isReserved { c.compileReserved(&obj.Attributes, f) From f99405eaa395ec49e3d726e75e026ca137b826e4 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 13 Jul 2023 17:13:34 -0700 Subject: [PATCH 074/138] fit container padding --- d2layouts/d2dagrelayout/layout.go | 136 +++++++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 3 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index bbf9ef4d0..deb8d3860 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -22,6 +22,7 @@ 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 +32,9 @@ var setupJS string var dagreJS string const ( - MIN_RANK_SEP = 60 - EDGE_LABEL_GAP = 20 - MIN_MARGIN = 10. + MIN_RANK_SEP = 60 + EDGE_LABEL_GAP = 20 + DEFAULT_PADDING = 30. ) type ConfigurableOpts struct { @@ -266,6 +267,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err adjustRankSpacing(g, float64(rootAttrs.ranksep), isHorizontal) adjustCrossRankSpacing(g, float64(rootAttrs.ranksep), !isHorizontal) + fitContainerPadding(g, float64(rootAttrs.ranksep), isHorizontal) + for _, edge := range g.Edges { points := edge.Route startIndex, endIndex := 0, len(points)-1 @@ -1306,3 +1309,130 @@ func adjustCrossRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool } } } + +func fitContainerPadding(g *d2graph.Graph, rankSep float64, isHorizontal bool) { + for _, obj := range g.Root.ChildrenArray { + fitPadding(obj) + } +} + +func fitPadding(obj *d2graph.Object) { + dslShape := strings.ToLower(obj.Shape.Value) + shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape] + // Note: there's no shape-specific padding/placement in dagre yet + if !obj.IsContainer() || shapeType != shape.SQUARE_TYPE { + return + } + for _, child := range obj.ChildrenArray { + fitPadding(child) + } + + _, padding := getSpacing(obj) + padding.top = math.Max(padding.top, DEFAULT_PADDING) + padding.bottom = math.Max(padding.bottom, DEFAULT_PADDING) + padding.left = math.Max(padding.left, DEFAULT_PADDING) + padding.right = math.Max(padding.right, DEFAULT_PADDING) + + innerTop := math.Inf(1) + innerBottom := math.Inf(-1) + innerLeft := math.Inf(1) + innerRight := math.Inf(-1) + + for _, child := range obj.ChildrenArray { + margin, _ := getSpacing(child) + + innerTop = math.Min(innerTop, child.TopLeft.Y-math.Max(margin.top, padding.top)) + innerBottom = math.Max(innerBottom, child.TopLeft.Y+child.Height+math.Max(margin.bottom, padding.bottom)) + innerLeft = math.Min(innerLeft, child.TopLeft.X-math.Max(margin.left, padding.left)) + innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+math.Max(margin.right, padding.right)) + } + + currentTop := obj.TopLeft.Y + currentBottom := obj.TopLeft.Y + obj.Height + currentLeft := obj.TopLeft.X + currentRight := obj.TopLeft.X + obj.Width + + topDelta := innerTop - currentTop + bottomDelta := currentBottom - innerBottom + leftDelta := innerLeft - currentLeft + rightDelta := currentRight - innerRight + + if 0 < topDelta { + obj.TopLeft.Y += topDelta + obj.Height -= topDelta + adjustEdges(obj, currentTop, topDelta, false) + } + if 0 < bottomDelta { + obj.Height -= bottomDelta + adjustEdges(obj, currentBottom, -bottomDelta, false) + } + if 0 < leftDelta { + obj.TopLeft.X += leftDelta + obj.Width -= leftDelta + adjustEdges(obj, currentLeft, leftDelta, true) + } + if 0 < rightDelta { + obj.Width -= rightDelta + adjustEdges(obj, currentRight, -rightDelta, true) + } +} + +func adjustEdges(obj *d2graph.Object, objPosition, delta float64, isHorizontal bool) { + adjust := func(p *geo.Point) { + var position float64 + if isHorizontal { + position = p.X + } else { + position = p.Y + } + if geo.PrecisionCompare(position, objPosition, 1) == 0 { + if isHorizontal { + p.X += delta + } else { + p.Y += delta + } + } else { + // check side corners + var isOnSide bool + if isHorizontal { + if geo.PrecisionCompare(p.Y, obj.TopLeft.Y, 1) == 0 || + geo.PrecisionCompare(p.Y, obj.TopLeft.Y+obj.Height, 1) == 0 { + isOnSide = true + } + } else { + if geo.PrecisionCompare(p.X, obj.TopLeft.X, 1) == 0 || + geo.PrecisionCompare(p.X, obj.TopLeft.X+obj.Width, 1) == 0 { + isOnSide = true + } + } + if isOnSide { + var isInRange bool + if delta > 0 { + if objPosition < position && position < objPosition+delta { + isInRange = true + } + } else { + if objPosition+delta < position && position < objPosition { + isInRange = true + } + } + if isInRange { + if isHorizontal { + p.X = objPosition + delta + } else { + p.Y = objPosition + delta + } + } + } + } + } + + for _, edge := range obj.Graph.Edges { + if edge.Src == obj { + adjust(edge.Route[0]) + } + if edge.Dst == obj { + adjust(edge.Route[len(edge.Route)-1]) + } + } +} From 8cce0aa54cbe440c7bfc1c91cfcc1869b5211bbe Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 11:51:45 -0700 Subject: [PATCH 075/138] don't shrink padding past edges on side --- d2layouts/d2dagrelayout/layout.go | 124 +++++++++++++++++++++++++++--- 1 file changed, 114 insertions(+), 10 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index deb8d3860..0c97abd44 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1358,25 +1358,129 @@ func fitPadding(obj *d2graph.Object) { rightDelta := currentRight - innerRight if 0 < topDelta { - obj.TopLeft.Y += topDelta - obj.Height -= topDelta - adjustEdges(obj, currentTop, topDelta, false) + topDelta = adjustDeltaForEdges(obj, currentTop, topDelta, false) + if 0 < topDelta { + obj.TopLeft.Y += topDelta + obj.Height -= topDelta + adjustEdges(obj, currentTop, topDelta, false) + } } if 0 < bottomDelta { - obj.Height -= bottomDelta - adjustEdges(obj, currentBottom, -bottomDelta, false) + bottomDelta = adjustDeltaForEdges(obj, currentBottom, -bottomDelta, false) + if 0 < bottomDelta { + obj.Height -= bottomDelta + adjustEdges(obj, currentBottom, -bottomDelta, false) + } } if 0 < leftDelta { - obj.TopLeft.X += leftDelta - obj.Width -= leftDelta - adjustEdges(obj, currentLeft, leftDelta, true) + leftDelta = adjustDeltaForEdges(obj, currentLeft, leftDelta, true) + if 0 < leftDelta { + obj.TopLeft.X += leftDelta + obj.Width -= leftDelta + adjustEdges(obj, currentLeft, leftDelta, true) + } } if 0 < rightDelta { - obj.Width -= rightDelta - adjustEdges(obj, currentRight, -rightDelta, true) + rightDelta = adjustDeltaForEdges(obj, currentRight, -rightDelta, true) + if 0 < rightDelta { + obj.Width -= rightDelta + adjustEdges(obj, currentRight, -rightDelta, true) + } } } +func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHorizontal bool) (newMagnitude float64) { + isOnCollapsingSide := func(p *geo.Point) bool { + var position float64 + if isHorizontal { + position = p.X + } else { + position = p.Y + } + if geo.PrecisionCompare(position, objPosition, 1) == 0 { + return false + } + // check for edges on side corners + var isOnSide bool + if isHorizontal { + if geo.PrecisionCompare(p.Y, obj.TopLeft.Y, 1) == 0 || + geo.PrecisionCompare(p.Y, obj.TopLeft.Y+obj.Height, 1) == 0 { + isOnSide = true + } + } else { + if geo.PrecisionCompare(p.X, obj.TopLeft.X, 1) == 0 || + geo.PrecisionCompare(p.X, obj.TopLeft.X+obj.Width, 1) == 0 { + isOnSide = true + } + } + if isOnSide { + var isInRange bool + if delta > 0 { + if objPosition < position && position < objPosition+delta { + isInRange = true + } + } else { + if objPosition+delta < position && position < objPosition { + isInRange = true + } + } + if !isInRange { + if isHorizontal { + return false + } else { + return false + } + } + } + return true + } + outermost := objPosition + delta + for _, edge := range obj.Graph.Edges { + if edge.Src == obj { + p := edge.Route[0] + if isOnCollapsingSide(p) { + var position float64 + if isHorizontal { + position = p.X + } else { + position = p.Y + } + if delta < 0 { + outermost = math.Max(outermost, position) + } else { + outermost = math.Min(outermost, position) + } + } + } + if edge.Dst == obj { + p := edge.Route[len(edge.Route)-1] + if isOnCollapsingSide(p) { + var position float64 + if isHorizontal { + position = p.X + } else { + position = p.Y + } + if delta < 0 { + outermost = math.Max(outermost, position) + } else { + outermost = math.Min(outermost, position) + } + } + } + } + newMagnitude = math.Abs(delta) + if outermost != objPosition+delta { + // only reduce to outermost + DEFAULT_PADDING + if delta < 0 { + newMagnitude = math.Max(0, objPosition-(outermost+DEFAULT_PADDING)) + } else { + newMagnitude = math.Max(0, (outermost-DEFAULT_PADDING)-objPosition) + } + } + return newMagnitude +} + func adjustEdges(obj *d2graph.Object, objPosition, delta float64, isHorizontal bool) { adjust := func(p *geo.Point) { var position float64 From 5d7b0af127a5a04339caa590cca00849f43dd5bb Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 12:01:54 -0700 Subject: [PATCH 076/138] account for child 3d/multiple in bounding box --- d2layouts/d2dagrelayout/layout.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 0c97abd44..7272002e7 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1340,11 +1340,12 @@ func fitPadding(obj *d2graph.Object) { for _, child := range obj.ChildrenArray { margin, _ := getSpacing(child) + dx, dy := child.GetModifierElementAdjustments() - innerTop = math.Min(innerTop, child.TopLeft.Y-math.Max(margin.top, padding.top)) + innerTop = math.Min(innerTop, child.TopLeft.Y-dy-math.Max(margin.top, padding.top)) innerBottom = math.Max(innerBottom, child.TopLeft.Y+child.Height+math.Max(margin.bottom, padding.bottom)) innerLeft = math.Min(innerLeft, child.TopLeft.X-math.Max(margin.left, padding.left)) - innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+math.Max(margin.right, padding.right)) + innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+dx+math.Max(margin.right, padding.right)) } currentTop := obj.TopLeft.Y From b1cb08027e3ec33936552dbfc55db63ee0fbd8f6 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 13:24:00 -0700 Subject: [PATCH 077/138] update tracing to label box --- d2graph/layout.go | 11 +++++++++++ lib/geo/box.go | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/d2graph/layout.go b/d2graph/layout.go index 05ef65fb0..358a95934 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -336,6 +336,12 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n // add left/right padding to box labelBox.TopLeft.X -= label.PADDING labelBox.Width += 2 * label.PADDING + + for labelBox.Contains(startingSegment.End) && startIndex+1 > endIndex { + startingSegment.Start = startingSegment.End + startingSegment.End = points[startIndex+2] + startIndex++ + } if intersections := labelBox.Intersections(startingSegment); len(intersections) > 0 { overlapsOutsideLabel = true p := intersections[0] @@ -381,6 +387,11 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n // add left/right padding to box labelBox.TopLeft.X -= label.PADDING labelBox.Width += 2 * label.PADDING + for labelBox.Contains(endingSegment.Start) && endIndex-1 > startIndex { + endingSegment.End = endingSegment.Start + endingSegment.Start = points[endIndex-2] + endIndex-- + } if intersections := labelBox.Intersections(endingSegment); len(intersections) > 0 { overlapsOutsideLabel = true p := intersections[0] diff --git a/lib/geo/box.go b/lib/geo/box.go index 3fe0eb7c2..de9b36cff 100644 --- a/lib/geo/box.go +++ b/lib/geo/box.go @@ -78,3 +78,8 @@ func (b *Box) ToString() string { } return fmt.Sprintf("{TopLeft: %s, Width: %.0f, Height: %.0f}", b.TopLeft.ToString(), b.Width, b.Height) } + +func (b *Box) Contains(p *Point) bool { + return !(p.X < b.TopLeft.X || b.TopLeft.X+b.Width < p.X || + p.Y < b.TopLeft.Y || b.TopLeft.Y+b.Height < p.Y) +} From 874696da3d101f62ded48339afd3e56a04deece2 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 16:08:22 -0700 Subject: [PATCH 078/138] fix --- d2layouts/d2dagrelayout/layout.go | 155 ++++++++++++++++++++---------- 1 file changed, 106 insertions(+), 49 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 7272002e7..5a2ff9145 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -266,7 +266,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err adjustRankSpacing(g, float64(rootAttrs.ranksep), isHorizontal) adjustCrossRankSpacing(g, float64(rootAttrs.ranksep), !isHorizontal) - fitContainerPadding(g, float64(rootAttrs.ranksep), isHorizontal) for _, edge := range g.Edges { @@ -723,73 +722,130 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o // shift everything down by distance if it is at or below start position func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { if isHorizontal { + for _, edge := range g.Edges { + first, last := edge.Route[0], edge.Route[len(edge.Route)-1] + if start <= first.X { + onStaticSrc := first.X == edge.Src.TopLeft.X+edge.Src.Width && edge.Src.TopLeft.X < start + if !onStaticSrc { + // src is not shifting and we are on src so don't shift + first.X += distance + } + } + if start <= last.X { + onStaticDst := last.X == edge.Dst.TopLeft.X+edge.Dst.Width && edge.Dst.TopLeft.X < start + if !onStaticDst { + last.X += distance + } + } + for i := 1; i < len(edge.Route)-1; i++ { + p := edge.Route[i] + if p.X < start { + continue + } + p.X += distance + } + } for _, obj := range g.Objects { if obj.TopLeft.X < start { continue } obj.TopLeft.X += distance } + } else { for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if p.X <= start { + first, last := edge.Route[0], edge.Route[len(edge.Route)-1] + if start <= first.Y { + onStaticSrc := first.Y == edge.Src.TopLeft.Y+edge.Src.Height && edge.Src.TopLeft.Y < start + if !onStaticSrc { + // src is not shifting and we are on src so don't shift + first.Y += distance + } + } + if start <= last.Y { + onStaticDst := last.Y == edge.Dst.TopLeft.Y+edge.Dst.Height && edge.Dst.TopLeft.Y < start + if !onStaticDst { + last.Y += distance + } + } + for i := 1; i < len(edge.Route)-1; i++ { + p := edge.Route[i] + if p.Y < start { continue } - p.X += distance + p.Y += distance } } - } else { for _, obj := range g.Objects { if obj.TopLeft.Y < start { continue } obj.TopLeft.Y += distance } - for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if p.Y <= start { - continue - } - p.Y += distance - } - } } } func shiftUp(g *d2graph.Graph, start, distance float64, isHorizontal bool) { if isHorizontal { + for _, edge := range g.Edges { + first, last := edge.Route[0], edge.Route[len(edge.Route)-1] + if first.X <= start { + onStaticSrc := first.X == edge.Src.TopLeft.X && start < edge.Src.TopLeft.X+edge.Src.Width + if !onStaticSrc { + // src is not shifting and we are on src so don't shift + first.X -= distance + } + } + if last.X <= start { + onStaticDst := last.X == edge.Dst.TopLeft.X && start < edge.Dst.TopLeft.X+edge.Dst.Width + if !onStaticDst { + last.X -= distance + } + } + for i := 1; i < len(edge.Route)-1; i++ { + p := edge.Route[i] + if start < p.X { + continue + } + p.X -= distance + } + } for _, obj := range g.Objects { if start < obj.TopLeft.X { continue } obj.TopLeft.X -= distance } + } else { for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if start <= p.X { + first, last := edge.Route[0], edge.Route[len(edge.Route)-1] + if first.Y <= start { + // don't shift first edge point if src is not shifting and we are on src + onStaticSrc := first.Y == edge.Src.TopLeft.Y && start < edge.Src.TopLeft.Y+edge.Src.Height + if !onStaticSrc { + first.Y -= distance + } + } + if last.Y <= start { + onStaticDst := last.Y == edge.Dst.TopLeft.Y && start < edge.Dst.TopLeft.Y + if !onStaticDst { + last.Y -= distance + } + } + for i := 1; i < len(edge.Route)-1; i++ { + p := edge.Route[i] + // for _, p := range edge.Route { + if start < p.Y { continue } - p.X -= distance + p.Y -= distance } } - } else { for _, obj := range g.Objects { if start < obj.TopLeft.Y { continue } obj.TopLeft.Y -= distance } - for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if start <= p.Y { - continue - } - p.Y -= distance - } - } } } @@ -1361,31 +1417,31 @@ func fitPadding(obj *d2graph.Object) { if 0 < topDelta { topDelta = adjustDeltaForEdges(obj, currentTop, topDelta, false) if 0 < topDelta { + adjustEdges(obj, currentTop, topDelta, false) obj.TopLeft.Y += topDelta obj.Height -= topDelta - adjustEdges(obj, currentTop, topDelta, false) } } if 0 < bottomDelta { bottomDelta = adjustDeltaForEdges(obj, currentBottom, -bottomDelta, false) if 0 < bottomDelta { - obj.Height -= bottomDelta adjustEdges(obj, currentBottom, -bottomDelta, false) + obj.Height -= bottomDelta } } if 0 < leftDelta { leftDelta = adjustDeltaForEdges(obj, currentLeft, leftDelta, true) if 0 < leftDelta { + adjustEdges(obj, currentLeft, leftDelta, true) obj.TopLeft.X += leftDelta obj.Width -= leftDelta - adjustEdges(obj, currentLeft, leftDelta, true) } } if 0 < rightDelta { rightDelta = adjustDeltaForEdges(obj, currentRight, -rightDelta, true) if 0 < rightDelta { - obj.Width -= rightDelta adjustEdges(obj, currentRight, -rightDelta, true) + obj.Width -= rightDelta } } } @@ -1414,23 +1470,24 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori isOnSide = true } } - if isOnSide { - var isInRange bool - if delta > 0 { - if objPosition < position && position < objPosition+delta { - isInRange = true - } - } else { - if objPosition+delta < position && position < objPosition { - isInRange = true - } + if !isOnSide { + return false + } + var isInRange bool + if delta > 0 { + if objPosition < position && position < objPosition+delta { + isInRange = true } - if !isInRange { - if isHorizontal { - return false - } else { - return false - } + } else { + if objPosition+delta < position && position < objPosition { + isInRange = true + } + } + if !isInRange { + if isHorizontal { + return false + } else { + return false } } return true From 205bf8b43d57fa14aff41cb1657f8d8385e26f3e Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 12:05:10 -0700 Subject: [PATCH 079/138] update tests --- .../testdata/all_shapes/sketch.exp.svg | 156 +-- .../testdata/all_shapes_dark/sketch.exp.svg | 156 +-- .../d2sketch/testdata/animated/sketch.exp.svg | 170 +-- .../testdata/animated_dark/sketch.exp.svg | 170 +-- .../testdata/arrowheads/sketch.exp.svg | 162 +-- .../testdata/arrowheads_dark/sketch.exp.svg | 162 +-- .../testdata/child_to_child/sketch.exp.svg | 170 +-- .../child_to_child_dark/sketch.exp.svg | 170 +-- .../testdata/connection_label/sketch.exp.svg | 160 +-- .../connection_label_dark/sketch.exp.svg | 160 +-- .../d2sketch/testdata/dots-3d/sketch.exp.svg | 168 +-- .../d2sketch/testdata/dots-all/sketch.exp.svg | 156 +-- .../testdata/dots-multiple/sketch.exp.svg | 190 +-- .../testdata/dots-real/sketch.exp.svg | 176 +-- .../testdata/double-border/sketch.exp.svg | 174 +-- .../d2sketch/testdata/opacity/sketch.exp.svg | 560 ++++---- .../testdata/opacity_dark/sketch.exp.svg | 560 ++++---- .../testdata/paper-real/sketch.exp.svg | 176 +-- .../testdata/root-fill/sketch.exp.svg | 572 ++++---- .../d2sketch/testdata/terminal/sketch.exp.svg | 198 +-- .../d2sketch/testdata/twitter/sketch.exp.svg | 644 ++++----- .../testdata/twitter_dark/sketch.exp.svg | 644 ++++----- .../testdata/all_shapes/dark_theme.exp.svg | 154 +-- .../testdata/animated/dark_theme.exp.svg | 168 +-- .../testdata/arrowheads/dark_theme.exp.svg | 160 +-- .../child_to_child/dark_theme.exp.svg | 168 +-- .../connection_label/dark_theme.exp.svg | 158 +-- .../testdata/opacity/dark_theme.exp.svg | 560 ++++---- .../testdata/twitter/dark_theme.exp.svg | 644 ++++----- .../TestCLI_E2E/multiboard/life/index.exp.svg | 152 +-- .../multiboard/life/scenarios/why.exp.svg | 152 +-- .../multiboard/life_index_d2/index.exp.svg | 152 +-- .../life_index_d2/scenarios/why.exp.svg | 152 +-- .../testdata/TestCLI_E2E/with-font.exp.svg | 158 +-- .../testdata/patterns/3d/dagre/board.exp.json | 4 +- .../testdata/patterns/3d/dagre/sketch.exp.svg | 168 +-- .../patterns/all_shapes/dagre/board.exp.json | 6 +- .../patterns/all_shapes/dagre/sketch.exp.svg | 156 +-- .../patterns/multiple/dagre/board.exp.json | 232 ++-- .../patterns/multiple/dagre/sketch.exp.svg | 190 +-- .../patterns/paper/dagre/board.exp.json | 6 +- .../patterns/paper/dagre/sketch.exp.svg | 156 +-- .../patterns/real-lines/dagre/board.exp.json | 70 +- .../patterns/real-lines/dagre/sketch.exp.svg | 182 +-- .../patterns/real/dagre/board.exp.json | 54 +- .../patterns/real/dagre/sketch.exp.svg | 176 +-- .../root-dots-with-fill/dagre/board.exp.json | 16 +- .../root-dots-with-fill/dagre/sketch.exp.svg | 154 +-- .../patterns/root-dots/dagre/board.exp.json | 16 +- .../patterns/root-dots/dagre/sketch.exp.svg | 154 +-- .../patterns/shape/dagre/board.exp.json | 16 +- .../patterns/shape/dagre/sketch.exp.svg | 154 +-- .../dagre/board.exp.json | 352 ++--- .../dagre/sketch.exp.svg | 276 ++-- .../bold_edge_label/dagre/board.exp.json | 8 +- .../bold_edge_label/dagre/sketch.exp.svg | 158 +-- .../dagre-disconnect/dagre/board.exp.json | 202 +-- .../dagre-disconnect/dagre/sketch.exp.svg | 220 ++-- .../dagre-disconnect/elk/board.exp.json | 4 +- .../dagre-disconnect/elk/sketch.exp.svg | 164 +-- .../dagre/board.exp.json | 48 +- .../dagre/sketch.exp.svg | 180 +-- .../dagre/board.exp.json | 54 +- .../dagre/sketch.exp.svg | 186 +-- .../elk_alignment/dagre/board.exp.json | 110 +- .../elk_alignment/dagre/sketch.exp.svg | 210 +-- .../elk_loop_panic/dagre/board.exp.json | 46 +- .../elk_loop_panic/dagre/sketch.exp.svg | 166 +-- .../nested_steps/dagre/board.exp.json | 20 +- .../nested_steps/dagre/sketch.exp.svg | 166 +-- .../nested_steps/elk/board.exp.json | 4 +- .../nested_steps/elk/sketch.exp.svg | 158 +-- .../opacity-on-label/dagre/board.exp.json | 4 +- .../opacity-on-label/dagre/sketch.exp.svg | 560 ++++---- .../dagre/board.exp.json | 64 +- .../dagre/sketch.exp.svg | 194 +-- .../query_param_escape/dagre/board.exp.json | 2 +- .../query_param_escape/dagre/sketch.exp.svg | 154 +-- .../root-container/dagre/board.exp.json | 68 +- .../root-container/dagre/sketch.exp.svg | 176 +-- .../dagre/board.exp.json | 278 ++-- .../dagre/sketch.exp.svg | 210 +-- .../unconnected/dagre/board.exp.json | 214 +-- .../unconnected/dagre/sketch.exp.svg | 584 ++++----- .../regression/unconnected/elk/board.exp.json | 4 +- .../regression/unconnected/elk/sketch.exp.svg | 554 ++++---- .../sanity/1_to_2/dagre/board.exp.json | 8 +- .../sanity/1_to_2/dagre/sketch.exp.svg | 152 +-- .../child_to_child/dagre/board.exp.json | 28 +- .../child_to_child/dagre/sketch.exp.svg | 168 +-- .../connection_label/dagre/board.exp.json | 4 +- .../connection_label/dagre/sketch.exp.svg | 158 +-- .../3d_fill_and_stroke/dagre/board.exp.json | 38 +- .../3d_fill_and_stroke/dagre/sketch.exp.svg | 172 +-- .../3d_fill_and_stroke/elk/board.exp.json | 2 +- .../3d_fill_and_stroke/elk/sketch.exp.svg | 154 +-- .../stable/all_shapes/dagre/board.exp.json | 6 +- .../stable/all_shapes/dagre/sketch.exp.svg | 154 +-- .../stable/all_shapes/elk/board.exp.json | 4 +- .../stable/all_shapes/elk/sketch.exp.svg | 152 +-- .../all_shapes_link/dagre/board.exp.json | 406 +++--- .../all_shapes_link/dagre/sketch.exp.svg | 404 +++--- .../stable/all_shapes_link/elk/board.exp.json | 16 +- .../stable/all_shapes_link/elk/sketch.exp.svg | 160 +-- .../all_shapes_multiple/dagre/board.exp.json | 232 ++-- .../all_shapes_multiple/dagre/sketch.exp.svg | 188 +-- .../all_shapes_multiple/elk/board.exp.json | 2 +- .../all_shapes_multiple/elk/sketch.exp.svg | 152 +-- .../all_shapes_shadow/dagre/board.exp.json | 6 +- .../all_shapes_shadow/dagre/sketch.exp.svg | 156 +-- .../all_shapes_shadow/elk/board.exp.json | 4 +- .../all_shapes_shadow/elk/sketch.exp.svg | 154 +-- .../stable/animated/dagre/board.exp.json | 52 +- .../stable/animated/dagre/sketch.exp.svg | 158 +-- .../arrowhead_labels/dagre/board.exp.json | 4 +- .../arrowhead_labels/dagre/sketch.exp.svg | 158 +-- .../arrowhead_scaling/dagre/board.exp.json | 1166 ++++++++--------- .../arrowhead_scaling/dagre/sketch.exp.svg | 518 ++++---- .../stable/binary_tree/dagre/board.exp.json | 60 +- .../stable/binary_tree/dagre/sketch.exp.svg | 152 +-- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 168 +-- .../stable/border-radius/dagre/board.exp.json | 10 +- .../stable/border-radius/dagre/sketch.exp.svg | 168 +-- .../dagre/board.exp.json | 8 +- .../dagre/sketch.exp.svg | 160 +-- .../stable/chaos2/dagre/board.exp.json | 164 +-- .../stable/chaos2/dagre/sketch.exp.svg | 606 ++++----- .../circle_arrowhead/dagre/board.exp.json | 8 +- .../circle_arrowhead/dagre/sketch.exp.svg | 158 +-- .../circular_dependency/dagre/board.exp.json | 16 +- .../circular_dependency/dagre/sketch.exp.svg | 152 +-- .../complex-layers/dagre/board.exp.json | 60 +- .../complex-layers/dagre/sketch.exp.svg | 228 ++-- .../connected_container/dagre/board.exp.json | 50 +- .../connected_container/dagre/sketch.exp.svg | 174 +-- .../constant_near_title/dagre/board.exp.json | 16 +- .../constant_near_title/dagre/sketch.exp.svg | 554 ++++---- .../container_edges/dagre/board.exp.json | 74 +- .../container_edges/dagre/sketch.exp.svg | 172 +-- .../stable/cycle-order/dagre/board.exp.json | 396 +++--- .../stable/cycle-order/dagre/sketch.exp.svg | 196 +-- .../dagre-container/dagre/board.exp.json | 36 +- .../dagre-container/dagre/sketch.exp.svg | 176 +-- .../stable/dagre_spacing/dagre/board.exp.json | 452 +++---- .../stable/dagre_spacing/dagre/sketch.exp.svg | 220 ++-- .../dagre_spacing_right/dagre/board.exp.json | 456 +++---- .../dagre_spacing_right/dagre/sketch.exp.svg | 220 ++-- .../dagre_spacing_right/elk/board.exp.json | 8 +- .../dagre_spacing_right/elk/sketch.exp.svg | 164 +-- .../stable/dense/dagre/board.exp.json | 84 +- .../stable/dense/dagre/sketch.exp.svg | 152 +-- .../different_subgraphs/dagre/board.exp.json | 86 +- .../different_subgraphs/dagre/sketch.exp.svg | 172 +-- .../stable/direction/dagre/board.exp.json | 102 +- .../stable/direction/dagre/sketch.exp.svg | 180 +-- .../edge-label-overflow/dagre/board.exp.json | 32 +- .../edge-label-overflow/dagre/sketch.exp.svg | 158 +-- .../elk_border_radius/dagre/board.exp.json | 28 +- .../elk_border_radius/dagre/sketch.exp.svg | 152 +-- .../elk_container_height/dagre/board.exp.json | 6 +- .../elk_container_height/dagre/sketch.exp.svg | 164 +-- .../stable/elk_shim/dagre/board.exp.json | 252 ++-- .../stable/elk_shim/dagre/sketch.exp.svg | 202 +-- .../stable/ent2d2_basic/dagre/board.exp.json | 36 +- .../stable/ent2d2_basic/dagre/sketch.exp.svg | 158 +-- .../stable/ent2d2_right/dagre/board.exp.json | 130 +- .../stable/ent2d2_right/dagre/sketch.exp.svg | 174 +-- .../stable/font_colors/dagre/board.exp.json | 4 +- .../stable/font_colors/dagre/sketch.exp.svg | 158 +-- .../dagre/board.exp.json | 22 +- .../dagre/sketch.exp.svg | 170 +-- .../dagre/board.exp.json | 34 +- .../dagre/sketch.exp.svg | 170 +-- .../stable/grid_icon/dagre/board.exp.json | 138 +- .../stable/grid_icon/dagre/sketch.exp.svg | 212 +-- .../stable/grid_nested/dagre/board.exp.json | 214 +-- .../stable/grid_nested/dagre/sketch.exp.svg | 256 ++-- .../stable/hexagon_3d/dagre/board.exp.json | 2 +- .../stable/hexagon_3d/dagre/sketch.exp.svg | 160 +-- .../icon-containers/dagre/board.exp.json | 20 +- .../icon-containers/dagre/sketch.exp.svg | 168 +-- .../stable/icon-label/dagre/board.exp.json | 2 +- .../stable/icon-label/dagre/sketch.exp.svg | 154 +-- .../icon_positions/dagre/board.exp.json | 466 +++---- .../icon_positions/dagre/sketch.exp.svg | 342 ++--- .../stable/images/dagre/board.exp.json | 8 +- .../stable/images/dagre/sketch.exp.svg | 156 +-- .../stable/investigate/dagre/board.exp.json | 496 +++---- .../stable/investigate/dagre/sketch.exp.svg | 226 ++-- .../stable/investigate/elk/board.exp.json | 20 +- .../stable/investigate/elk/sketch.exp.svg | 164 +-- .../label_positions/dagre/board.exp.json | 776 +++++------ .../label_positions/dagre/sketch.exp.svg | 432 +++--- .../stable/large_arch/dagre/board.exp.json | 336 ++--- .../stable/large_arch/dagre/sketch.exp.svg | 208 +-- .../stable/large_arch/elk/board.exp.json | 22 +- .../stable/large_arch/elk/sketch.exp.svg | 158 +-- .../stable/latex/dagre/board.exp.json | 12 +- .../stable/latex/dagre/sketch.exp.svg | 552 ++++---- .../testdata/stable/latex/elk/board.exp.json | 4 +- .../testdata/stable/latex/elk/sketch.exp.svg | 552 ++++---- .../legend_with_near_key/dagre/board.exp.json | 10 +- .../legend_with_near_key/dagre/sketch.exp.svg | 558 ++++---- .../markdown_stroke_fill/dagre/board.exp.json | 14 +- .../markdown_stroke_fill/dagre/sketch.exp.svg | 564 ++++---- .../md_2space_newline/dagre/board.exp.json | 10 +- .../md_2space_newline/dagre/sketch.exp.svg | 556 ++++---- .../md_backslash_newline/dagre/board.exp.json | 10 +- .../md_backslash_newline/dagre/sketch.exp.svg | 556 ++++---- .../stable/mono-font/dagre/board.exp.json | 46 +- .../stable/mono-font/dagre/sketch.exp.svg | 170 +-- .../stable/mono-font/elk/board.exp.json | 2 +- .../stable/mono-font/elk/sketch.exp.svg | 160 +-- .../dagre/board.exp.json | 92 +- .../dagre/sketch.exp.svg | 172 +-- .../multiple_offset/dagre/board.exp.json | 314 ++--- .../multiple_offset/dagre/sketch.exp.svg | 256 ++-- .../multiple_offset_left/dagre/board.exp.json | 308 ++--- .../multiple_offset_left/dagre/sketch.exp.svg | 256 ++-- .../dagre/board.exp.json | 2 +- .../dagre/sketch.exp.svg | 156 +-- .../multiple_trees/dagre/board.exp.json | 88 +- .../multiple_trees/dagre/sketch.exp.svg | 152 +-- .../stable/n22_e32/dagre/board.exp.json | 88 +- .../stable/n22_e32/dagre/sketch.exp.svg | 152 +-- .../dagre/board.exp.json | 176 +-- .../dagre/sketch.exp.svg | 202 +-- .../nested_shape_labels/dagre/board.exp.json | 12 +- .../nested_shape_labels/dagre/sketch.exp.svg | 168 +-- .../one_container_loop/dagre/board.exp.json | 28 +- .../one_container_loop/dagre/sketch.exp.svg | 166 +-- .../dagre/board.exp.json | 48 +- .../dagre/sketch.exp.svg | 168 +-- .../dagre/board.exp.json | 82 +- .../dagre/sketch.exp.svg | 158 +-- .../dagre/board.exp.json | 112 +- .../dagre/sketch.exp.svg | 202 +-- .../self-referencing/dagre/board.exp.json | 40 +- .../self-referencing/dagre/sketch.exp.svg | 158 +-- .../sequence_diagrams/dagre/board.exp.json | 244 ++-- .../sequence_diagrams/dagre/sketch.exp.svg | 220 ++-- .../sequence_diagrams/elk/board.exp.json | 4 +- .../sequence_diagrams/elk/sketch.exp.svg | 164 +-- .../stable/square_3d/dagre/board.exp.json | 20 +- .../stable/square_3d/dagre/sketch.exp.svg | 166 +-- .../dagre/board.exp.json | 184 +-- .../dagre/sketch.exp.svg | 204 +-- .../stable/stylish/dagre/board.exp.json | 20 +- .../stable/stylish/dagre/sketch.exp.svg | 172 +-- .../stable/teleport_grid/dagre/board.exp.json | 100 +- .../stable/teleport_grid/dagre/sketch.exp.svg | 604 ++++----- .../transparent_3d/dagre/board.exp.json | 2 +- .../transparent_3d/dagre/sketch.exp.svg | 160 +-- .../stable/us_map/dagre/board.exp.json | 356 ++--- .../stable/us_map/dagre/sketch.exp.svg | 152 +-- .../dagre/board.exp.json | 258 ++-- .../dagre/sketch.exp.svg | 624 ++++----- .../themes/origami/dagre/board.exp.json | 284 ++-- .../themes/origami/dagre/sketch.exp.svg | 204 +-- .../themes/terminal/dagre/board.exp.json | 274 ++-- .../themes/terminal/dagre/sketch.exp.svg | 618 ++++----- .../terminal_grayscale/dagre/board.exp.json | 246 ++-- .../terminal_grayscale/dagre/sketch.exp.svg | 198 +-- .../container_icon_label/dagre/board.exp.json | 34 +- .../container_icon_label/dagre/sketch.exp.svg | 170 +-- .../dagre/board.exp.json | 33 +- .../dagre/sketch.exp.svg | 162 +-- .../dagre/board.exp.json | 14 +- .../dagre/sketch.exp.svg | 170 +-- .../dagre/board.exp.json | 20 +- .../dagre/sketch.exp.svg | 554 ++++---- .../dagre/board.exp.json | 28 +- .../dagre/sketch.exp.svg | 588 ++++----- .../japanese-full/dagre/board.exp.json | 4 +- .../japanese-full/dagre/sketch.exp.svg | 158 +-- .../mixed-language/dagre/board.exp.json | 8 +- .../mixed-language/dagre/sketch.exp.svg | 554 ++++---- 278 files changed, 25220 insertions(+), 25217 deletions(-) diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index 9d890f6ad..84b8e7c33 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-324871669 .fill-N1{fill:#0A0F25;} + .d2-324871669 .fill-N2{fill:#676C7E;} + .d2-324871669 .fill-N3{fill:#9499AB;} + .d2-324871669 .fill-N4{fill:#CFD2DD;} + .d2-324871669 .fill-N5{fill:#DEE1EB;} + .d2-324871669 .fill-N6{fill:#EEF1F8;} + .d2-324871669 .fill-N7{fill:#FFFFFF;} + .d2-324871669 .fill-B1{fill:#0D32B2;} + .d2-324871669 .fill-B2{fill:#0D32B2;} + .d2-324871669 .fill-B3{fill:#E3E9FD;} + .d2-324871669 .fill-B4{fill:#E3E9FD;} + .d2-324871669 .fill-B5{fill:#EDF0FD;} + .d2-324871669 .fill-B6{fill:#F7F8FE;} + .d2-324871669 .fill-AA2{fill:#4A6FF3;} + .d2-324871669 .fill-AA4{fill:#EDF0FD;} + .d2-324871669 .fill-AA5{fill:#F7F8FE;} + .d2-324871669 .fill-AB4{fill:#EDF0FD;} + .d2-324871669 .fill-AB5{fill:#F7F8FE;} + .d2-324871669 .stroke-N1{stroke:#0A0F25;} + .d2-324871669 .stroke-N2{stroke:#676C7E;} + .d2-324871669 .stroke-N3{stroke:#9499AB;} + .d2-324871669 .stroke-N4{stroke:#CFD2DD;} + .d2-324871669 .stroke-N5{stroke:#DEE1EB;} + .d2-324871669 .stroke-N6{stroke:#EEF1F8;} + .d2-324871669 .stroke-N7{stroke:#FFFFFF;} + .d2-324871669 .stroke-B1{stroke:#0D32B2;} + .d2-324871669 .stroke-B2{stroke:#0D32B2;} + .d2-324871669 .stroke-B3{stroke:#E3E9FD;} + .d2-324871669 .stroke-B4{stroke:#E3E9FD;} + .d2-324871669 .stroke-B5{stroke:#EDF0FD;} + .d2-324871669 .stroke-B6{stroke:#F7F8FE;} + .d2-324871669 .stroke-AA2{stroke:#4A6FF3;} + .d2-324871669 .stroke-AA4{stroke:#EDF0FD;} + .d2-324871669 .stroke-AA5{stroke:#F7F8FE;} + .d2-324871669 .stroke-AB4{stroke:#EDF0FD;} + .d2-324871669 .stroke-AB5{stroke:#F7F8FE;} + .d2-324871669 .background-color-N1{background-color:#0A0F25;} + .d2-324871669 .background-color-N2{background-color:#676C7E;} + .d2-324871669 .background-color-N3{background-color:#9499AB;} + .d2-324871669 .background-color-N4{background-color:#CFD2DD;} + .d2-324871669 .background-color-N5{background-color:#DEE1EB;} + .d2-324871669 .background-color-N6{background-color:#EEF1F8;} + .d2-324871669 .background-color-N7{background-color:#FFFFFF;} + .d2-324871669 .background-color-B1{background-color:#0D32B2;} + .d2-324871669 .background-color-B2{background-color:#0D32B2;} + .d2-324871669 .background-color-B3{background-color:#E3E9FD;} + .d2-324871669 .background-color-B4{background-color:#E3E9FD;} + .d2-324871669 .background-color-B5{background-color:#EDF0FD;} + .d2-324871669 .background-color-B6{background-color:#F7F8FE;} + .d2-324871669 .background-color-AA2{background-color:#4A6FF3;} + .d2-324871669 .background-color-AA4{background-color:#EDF0FD;} + .d2-324871669 .background-color-AA5{background-color:#F7F8FE;} + .d2-324871669 .background-color-AB4{background-color:#EDF0FD;} + .d2-324871669 .background-color-AB5{background-color:#F7F8FE;} + .d2-324871669 .color-N1{color:#0A0F25;} + .d2-324871669 .color-N2{color:#676C7E;} + .d2-324871669 .color-N3{color:#9499AB;} + .d2-324871669 .color-N4{color:#CFD2DD;} + .d2-324871669 .color-N5{color:#DEE1EB;} + .d2-324871669 .color-N6{color:#EEF1F8;} + .d2-324871669 .color-N7{color:#FFFFFF;} + .d2-324871669 .color-B1{color:#0D32B2;} + .d2-324871669 .color-B2{color:#0D32B2;} + .d2-324871669 .color-B3{color:#E3E9FD;} + .d2-324871669 .color-B4{color:#E3E9FD;} + .d2-324871669 .color-B5{color:#EDF0FD;} + .d2-324871669 .color-B6{color:#F7F8FE;} + .d2-324871669 .color-AA2{color:#4A6FF3;} + .d2-324871669 .color-AA4{color:#EDF0FD;} + .d2-324871669 .color-AA5{color:#F7F8FE;} + .d2-324871669 .color-AB4{color:#EDF0FD;} + .d2-324871669 .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 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -110,7 +110,7 @@ - + diff --git a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg index 767d96afd..daa14ad8f 100644 --- a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-324871669 .fill-N1{fill:#CDD6F4;} + .d2-324871669 .fill-N2{fill:#BAC2DE;} + .d2-324871669 .fill-N3{fill:#A6ADC8;} + .d2-324871669 .fill-N4{fill:#585B70;} + .d2-324871669 .fill-N5{fill:#45475A;} + .d2-324871669 .fill-N6{fill:#313244;} + .d2-324871669 .fill-N7{fill:#1E1E2E;} + .d2-324871669 .fill-B1{fill:#CBA6f7;} + .d2-324871669 .fill-B2{fill:#CBA6f7;} + .d2-324871669 .fill-B3{fill:#6C7086;} + .d2-324871669 .fill-B4{fill:#585B70;} + .d2-324871669 .fill-B5{fill:#45475A;} + .d2-324871669 .fill-B6{fill:#313244;} + .d2-324871669 .fill-AA2{fill:#f38BA8;} + .d2-324871669 .fill-AA4{fill:#45475A;} + .d2-324871669 .fill-AA5{fill:#313244;} + .d2-324871669 .fill-AB4{fill:#45475A;} + .d2-324871669 .fill-AB5{fill:#313244;} + .d2-324871669 .stroke-N1{stroke:#CDD6F4;} + .d2-324871669 .stroke-N2{stroke:#BAC2DE;} + .d2-324871669 .stroke-N3{stroke:#A6ADC8;} + .d2-324871669 .stroke-N4{stroke:#585B70;} + .d2-324871669 .stroke-N5{stroke:#45475A;} + .d2-324871669 .stroke-N6{stroke:#313244;} + .d2-324871669 .stroke-N7{stroke:#1E1E2E;} + .d2-324871669 .stroke-B1{stroke:#CBA6f7;} + .d2-324871669 .stroke-B2{stroke:#CBA6f7;} + .d2-324871669 .stroke-B3{stroke:#6C7086;} + .d2-324871669 .stroke-B4{stroke:#585B70;} + .d2-324871669 .stroke-B5{stroke:#45475A;} + .d2-324871669 .stroke-B6{stroke:#313244;} + .d2-324871669 .stroke-AA2{stroke:#f38BA8;} + .d2-324871669 .stroke-AA4{stroke:#45475A;} + .d2-324871669 .stroke-AA5{stroke:#313244;} + .d2-324871669 .stroke-AB4{stroke:#45475A;} + .d2-324871669 .stroke-AB5{stroke:#313244;} + .d2-324871669 .background-color-N1{background-color:#CDD6F4;} + .d2-324871669 .background-color-N2{background-color:#BAC2DE;} + .d2-324871669 .background-color-N3{background-color:#A6ADC8;} + .d2-324871669 .background-color-N4{background-color:#585B70;} + .d2-324871669 .background-color-N5{background-color:#45475A;} + .d2-324871669 .background-color-N6{background-color:#313244;} + .d2-324871669 .background-color-N7{background-color:#1E1E2E;} + .d2-324871669 .background-color-B1{background-color:#CBA6f7;} + .d2-324871669 .background-color-B2{background-color:#CBA6f7;} + .d2-324871669 .background-color-B3{background-color:#6C7086;} + .d2-324871669 .background-color-B4{background-color:#585B70;} + .d2-324871669 .background-color-B5{background-color:#45475A;} + .d2-324871669 .background-color-B6{background-color:#313244;} + .d2-324871669 .background-color-AA2{background-color:#f38BA8;} + .d2-324871669 .background-color-AA4{background-color:#45475A;} + .d2-324871669 .background-color-AA5{background-color:#313244;} + .d2-324871669 .background-color-AB4{background-color:#45475A;} + .d2-324871669 .background-color-AB5{background-color:#313244;} + .d2-324871669 .color-N1{color:#CDD6F4;} + .d2-324871669 .color-N2{color:#BAC2DE;} + .d2-324871669 .color-N3{color:#A6ADC8;} + .d2-324871669 .color-N4{color:#585B70;} + .d2-324871669 .color-N5{color:#45475A;} + .d2-324871669 .color-N6{color:#313244;} + .d2-324871669 .color-N7{color:#1E1E2E;} + .d2-324871669 .color-B1{color:#CBA6f7;} + .d2-324871669 .color-B2{color:#CBA6f7;} + .d2-324871669 .color-B3{color:#6C7086;} + .d2-324871669 .color-B4{color:#585B70;} + .d2-324871669 .color-B5{color:#45475A;} + .d2-324871669 .color-B6{color:#313244;} + .d2-324871669 .color-AA2{color:#f38BA8;} + .d2-324871669 .color-AA4{color:#45475A;} + .d2-324871669 .color-AA5{color:#313244;} + .d2-324871669 .color-AB4{color:#45475A;} + .d2-324871669 .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}]]> -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -108,7 +108,7 @@ - + diff --git a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg index e3da23c82..ff6000380 100644 --- a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-4283185193 .fill-N1{fill:#0A0F25;} + .d2-4283185193 .fill-N2{fill:#676C7E;} + .d2-4283185193 .fill-N3{fill:#9499AB;} + .d2-4283185193 .fill-N4{fill:#CFD2DD;} + .d2-4283185193 .fill-N5{fill:#DEE1EB;} + .d2-4283185193 .fill-N6{fill:#EEF1F8;} + .d2-4283185193 .fill-N7{fill:#FFFFFF;} + .d2-4283185193 .fill-B1{fill:#0D32B2;} + .d2-4283185193 .fill-B2{fill:#0D32B2;} + .d2-4283185193 .fill-B3{fill:#E3E9FD;} + .d2-4283185193 .fill-B4{fill:#E3E9FD;} + .d2-4283185193 .fill-B5{fill:#EDF0FD;} + .d2-4283185193 .fill-B6{fill:#F7F8FE;} + .d2-4283185193 .fill-AA2{fill:#4A6FF3;} + .d2-4283185193 .fill-AA4{fill:#EDF0FD;} + .d2-4283185193 .fill-AA5{fill:#F7F8FE;} + .d2-4283185193 .fill-AB4{fill:#EDF0FD;} + .d2-4283185193 .fill-AB5{fill:#F7F8FE;} + .d2-4283185193 .stroke-N1{stroke:#0A0F25;} + .d2-4283185193 .stroke-N2{stroke:#676C7E;} + .d2-4283185193 .stroke-N3{stroke:#9499AB;} + .d2-4283185193 .stroke-N4{stroke:#CFD2DD;} + .d2-4283185193 .stroke-N5{stroke:#DEE1EB;} + .d2-4283185193 .stroke-N6{stroke:#EEF1F8;} + .d2-4283185193 .stroke-N7{stroke:#FFFFFF;} + .d2-4283185193 .stroke-B1{stroke:#0D32B2;} + .d2-4283185193 .stroke-B2{stroke:#0D32B2;} + .d2-4283185193 .stroke-B3{stroke:#E3E9FD;} + .d2-4283185193 .stroke-B4{stroke:#E3E9FD;} + .d2-4283185193 .stroke-B5{stroke:#EDF0FD;} + .d2-4283185193 .stroke-B6{stroke:#F7F8FE;} + .d2-4283185193 .stroke-AA2{stroke:#4A6FF3;} + .d2-4283185193 .stroke-AA4{stroke:#EDF0FD;} + .d2-4283185193 .stroke-AA5{stroke:#F7F8FE;} + .d2-4283185193 .stroke-AB4{stroke:#EDF0FD;} + .d2-4283185193 .stroke-AB5{stroke:#F7F8FE;} + .d2-4283185193 .background-color-N1{background-color:#0A0F25;} + .d2-4283185193 .background-color-N2{background-color:#676C7E;} + .d2-4283185193 .background-color-N3{background-color:#9499AB;} + .d2-4283185193 .background-color-N4{background-color:#CFD2DD;} + .d2-4283185193 .background-color-N5{background-color:#DEE1EB;} + .d2-4283185193 .background-color-N6{background-color:#EEF1F8;} + .d2-4283185193 .background-color-N7{background-color:#FFFFFF;} + .d2-4283185193 .background-color-B1{background-color:#0D32B2;} + .d2-4283185193 .background-color-B2{background-color:#0D32B2;} + .d2-4283185193 .background-color-B3{background-color:#E3E9FD;} + .d2-4283185193 .background-color-B4{background-color:#E3E9FD;} + .d2-4283185193 .background-color-B5{background-color:#EDF0FD;} + .d2-4283185193 .background-color-B6{background-color:#F7F8FE;} + .d2-4283185193 .background-color-AA2{background-color:#4A6FF3;} + .d2-4283185193 .background-color-AA4{background-color:#EDF0FD;} + .d2-4283185193 .background-color-AA5{background-color:#F7F8FE;} + .d2-4283185193 .background-color-AB4{background-color:#EDF0FD;} + .d2-4283185193 .background-color-AB5{background-color:#F7F8FE;} + .d2-4283185193 .color-N1{color:#0A0F25;} + .d2-4283185193 .color-N2{color:#676C7E;} + .d2-4283185193 .color-N3{color:#9499AB;} + .d2-4283185193 .color-N4{color:#CFD2DD;} + .d2-4283185193 .color-N5{color:#DEE1EB;} + .d2-4283185193 .color-N6{color:#EEF1F8;} + .d2-4283185193 .color-N7{color:#FFFFFF;} + .d2-4283185193 .color-B1{color:#0D32B2;} + .d2-4283185193 .color-B2{color:#0D32B2;} + .d2-4283185193 .color-B3{color:#E3E9FD;} + .d2-4283185193 .color-B4{color:#E3E9FD;} + .d2-4283185193 .color-B5{color:#EDF0FD;} + .d2-4283185193 .color-B6{color:#F7F8FE;} + .d2-4283185193 .color-AA2{color:#4A6FF3;} + .d2-4283185193 .color-AA4{color:#EDF0FD;} + .d2-4283185193 .color-AA5{color:#F7F8FE;} + .d2-4283185193 .color-AB4{color:#EDF0FD;} + .d2-4283185193 .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}]]> @@ -110,11 +110,11 @@ -wintersummertreessnowsun - - - +wintersummertreessnowsun + + + - - + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg index 8eededaa0..b79c12f4d 100644 --- a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-4283185193 .fill-N1{fill:#CDD6F4;} + .d2-4283185193 .fill-N2{fill:#BAC2DE;} + .d2-4283185193 .fill-N3{fill:#A6ADC8;} + .d2-4283185193 .fill-N4{fill:#585B70;} + .d2-4283185193 .fill-N5{fill:#45475A;} + .d2-4283185193 .fill-N6{fill:#313244;} + .d2-4283185193 .fill-N7{fill:#1E1E2E;} + .d2-4283185193 .fill-B1{fill:#CBA6f7;} + .d2-4283185193 .fill-B2{fill:#CBA6f7;} + .d2-4283185193 .fill-B3{fill:#6C7086;} + .d2-4283185193 .fill-B4{fill:#585B70;} + .d2-4283185193 .fill-B5{fill:#45475A;} + .d2-4283185193 .fill-B6{fill:#313244;} + .d2-4283185193 .fill-AA2{fill:#f38BA8;} + .d2-4283185193 .fill-AA4{fill:#45475A;} + .d2-4283185193 .fill-AA5{fill:#313244;} + .d2-4283185193 .fill-AB4{fill:#45475A;} + .d2-4283185193 .fill-AB5{fill:#313244;} + .d2-4283185193 .stroke-N1{stroke:#CDD6F4;} + .d2-4283185193 .stroke-N2{stroke:#BAC2DE;} + .d2-4283185193 .stroke-N3{stroke:#A6ADC8;} + .d2-4283185193 .stroke-N4{stroke:#585B70;} + .d2-4283185193 .stroke-N5{stroke:#45475A;} + .d2-4283185193 .stroke-N6{stroke:#313244;} + .d2-4283185193 .stroke-N7{stroke:#1E1E2E;} + .d2-4283185193 .stroke-B1{stroke:#CBA6f7;} + .d2-4283185193 .stroke-B2{stroke:#CBA6f7;} + .d2-4283185193 .stroke-B3{stroke:#6C7086;} + .d2-4283185193 .stroke-B4{stroke:#585B70;} + .d2-4283185193 .stroke-B5{stroke:#45475A;} + .d2-4283185193 .stroke-B6{stroke:#313244;} + .d2-4283185193 .stroke-AA2{stroke:#f38BA8;} + .d2-4283185193 .stroke-AA4{stroke:#45475A;} + .d2-4283185193 .stroke-AA5{stroke:#313244;} + .d2-4283185193 .stroke-AB4{stroke:#45475A;} + .d2-4283185193 .stroke-AB5{stroke:#313244;} + .d2-4283185193 .background-color-N1{background-color:#CDD6F4;} + .d2-4283185193 .background-color-N2{background-color:#BAC2DE;} + .d2-4283185193 .background-color-N3{background-color:#A6ADC8;} + .d2-4283185193 .background-color-N4{background-color:#585B70;} + .d2-4283185193 .background-color-N5{background-color:#45475A;} + .d2-4283185193 .background-color-N6{background-color:#313244;} + .d2-4283185193 .background-color-N7{background-color:#1E1E2E;} + .d2-4283185193 .background-color-B1{background-color:#CBA6f7;} + .d2-4283185193 .background-color-B2{background-color:#CBA6f7;} + .d2-4283185193 .background-color-B3{background-color:#6C7086;} + .d2-4283185193 .background-color-B4{background-color:#585B70;} + .d2-4283185193 .background-color-B5{background-color:#45475A;} + .d2-4283185193 .background-color-B6{background-color:#313244;} + .d2-4283185193 .background-color-AA2{background-color:#f38BA8;} + .d2-4283185193 .background-color-AA4{background-color:#45475A;} + .d2-4283185193 .background-color-AA5{background-color:#313244;} + .d2-4283185193 .background-color-AB4{background-color:#45475A;} + .d2-4283185193 .background-color-AB5{background-color:#313244;} + .d2-4283185193 .color-N1{color:#CDD6F4;} + .d2-4283185193 .color-N2{color:#BAC2DE;} + .d2-4283185193 .color-N3{color:#A6ADC8;} + .d2-4283185193 .color-N4{color:#585B70;} + .d2-4283185193 .color-N5{color:#45475A;} + .d2-4283185193 .color-N6{color:#313244;} + .d2-4283185193 .color-N7{color:#1E1E2E;} + .d2-4283185193 .color-B1{color:#CBA6f7;} + .d2-4283185193 .color-B2{color:#CBA6f7;} + .d2-4283185193 .color-B3{color:#6C7086;} + .d2-4283185193 .color-B4{color:#585B70;} + .d2-4283185193 .color-B5{color:#45475A;} + .d2-4283185193 .color-B6{color:#313244;} + .d2-4283185193 .color-AA2{color:#f38BA8;} + .d2-4283185193 .color-AA4{color:#45475A;} + .d2-4283185193 .color-AA5{color:#313244;} + .d2-4283185193 .color-AB4{color:#45475A;} + .d2-4283185193 .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}]]> -wintersummertreessnowsun - - - +wintersummertreessnowsun + + + - - + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg index 1c7c2251d..150973451 100644 --- a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1616297415 .fill-N1{fill:#0A0F25;} + .d2-1616297415 .fill-N2{fill:#676C7E;} + .d2-1616297415 .fill-N3{fill:#9499AB;} + .d2-1616297415 .fill-N4{fill:#CFD2DD;} + .d2-1616297415 .fill-N5{fill:#DEE1EB;} + .d2-1616297415 .fill-N6{fill:#EEF1F8;} + .d2-1616297415 .fill-N7{fill:#FFFFFF;} + .d2-1616297415 .fill-B1{fill:#0D32B2;} + .d2-1616297415 .fill-B2{fill:#0D32B2;} + .d2-1616297415 .fill-B3{fill:#E3E9FD;} + .d2-1616297415 .fill-B4{fill:#E3E9FD;} + .d2-1616297415 .fill-B5{fill:#EDF0FD;} + .d2-1616297415 .fill-B6{fill:#F7F8FE;} + .d2-1616297415 .fill-AA2{fill:#4A6FF3;} + .d2-1616297415 .fill-AA4{fill:#EDF0FD;} + .d2-1616297415 .fill-AA5{fill:#F7F8FE;} + .d2-1616297415 .fill-AB4{fill:#EDF0FD;} + .d2-1616297415 .fill-AB5{fill:#F7F8FE;} + .d2-1616297415 .stroke-N1{stroke:#0A0F25;} + .d2-1616297415 .stroke-N2{stroke:#676C7E;} + .d2-1616297415 .stroke-N3{stroke:#9499AB;} + .d2-1616297415 .stroke-N4{stroke:#CFD2DD;} + .d2-1616297415 .stroke-N5{stroke:#DEE1EB;} + .d2-1616297415 .stroke-N6{stroke:#EEF1F8;} + .d2-1616297415 .stroke-N7{stroke:#FFFFFF;} + .d2-1616297415 .stroke-B1{stroke:#0D32B2;} + .d2-1616297415 .stroke-B2{stroke:#0D32B2;} + .d2-1616297415 .stroke-B3{stroke:#E3E9FD;} + .d2-1616297415 .stroke-B4{stroke:#E3E9FD;} + .d2-1616297415 .stroke-B5{stroke:#EDF0FD;} + .d2-1616297415 .stroke-B6{stroke:#F7F8FE;} + .d2-1616297415 .stroke-AA2{stroke:#4A6FF3;} + .d2-1616297415 .stroke-AA4{stroke:#EDF0FD;} + .d2-1616297415 .stroke-AA5{stroke:#F7F8FE;} + .d2-1616297415 .stroke-AB4{stroke:#EDF0FD;} + .d2-1616297415 .stroke-AB5{stroke:#F7F8FE;} + .d2-1616297415 .background-color-N1{background-color:#0A0F25;} + .d2-1616297415 .background-color-N2{background-color:#676C7E;} + .d2-1616297415 .background-color-N3{background-color:#9499AB;} + .d2-1616297415 .background-color-N4{background-color:#CFD2DD;} + .d2-1616297415 .background-color-N5{background-color:#DEE1EB;} + .d2-1616297415 .background-color-N6{background-color:#EEF1F8;} + .d2-1616297415 .background-color-N7{background-color:#FFFFFF;} + .d2-1616297415 .background-color-B1{background-color:#0D32B2;} + .d2-1616297415 .background-color-B2{background-color:#0D32B2;} + .d2-1616297415 .background-color-B3{background-color:#E3E9FD;} + .d2-1616297415 .background-color-B4{background-color:#E3E9FD;} + .d2-1616297415 .background-color-B5{background-color:#EDF0FD;} + .d2-1616297415 .background-color-B6{background-color:#F7F8FE;} + .d2-1616297415 .background-color-AA2{background-color:#4A6FF3;} + .d2-1616297415 .background-color-AA4{background-color:#EDF0FD;} + .d2-1616297415 .background-color-AA5{background-color:#F7F8FE;} + .d2-1616297415 .background-color-AB4{background-color:#EDF0FD;} + .d2-1616297415 .background-color-AB5{background-color:#F7F8FE;} + .d2-1616297415 .color-N1{color:#0A0F25;} + .d2-1616297415 .color-N2{color:#676C7E;} + .d2-1616297415 .color-N3{color:#9499AB;} + .d2-1616297415 .color-N4{color:#CFD2DD;} + .d2-1616297415 .color-N5{color:#DEE1EB;} + .d2-1616297415 .color-N6{color:#EEF1F8;} + .d2-1616297415 .color-N7{color:#FFFFFF;} + .d2-1616297415 .color-B1{color:#0D32B2;} + .d2-1616297415 .color-B2{color:#0D32B2;} + .d2-1616297415 .color-B3{color:#E3E9FD;} + .d2-1616297415 .color-B4{color:#E3E9FD;} + .d2-1616297415 .color-B5{color:#EDF0FD;} + .d2-1616297415 .color-B6{color:#F7F8FE;} + .d2-1616297415 .color-AA2{color:#4A6FF3;} + .d2-1616297415 .color-AA4{color:#EDF0FD;} + .d2-1616297415 .color-AA5{color:#F7F8FE;} + .d2-1616297415 .color-AB4{color:#EDF0FD;} + .d2-1616297415 .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}]]> @@ -104,8 +104,8 @@ -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required - +112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + diff --git a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg index 8d824fc4d..a7f10b75a 100644 --- a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1616297415 .fill-N1{fill:#CDD6F4;} + .d2-1616297415 .fill-N2{fill:#BAC2DE;} + .d2-1616297415 .fill-N3{fill:#A6ADC8;} + .d2-1616297415 .fill-N4{fill:#585B70;} + .d2-1616297415 .fill-N5{fill:#45475A;} + .d2-1616297415 .fill-N6{fill:#313244;} + .d2-1616297415 .fill-N7{fill:#1E1E2E;} + .d2-1616297415 .fill-B1{fill:#CBA6f7;} + .d2-1616297415 .fill-B2{fill:#CBA6f7;} + .d2-1616297415 .fill-B3{fill:#6C7086;} + .d2-1616297415 .fill-B4{fill:#585B70;} + .d2-1616297415 .fill-B5{fill:#45475A;} + .d2-1616297415 .fill-B6{fill:#313244;} + .d2-1616297415 .fill-AA2{fill:#f38BA8;} + .d2-1616297415 .fill-AA4{fill:#45475A;} + .d2-1616297415 .fill-AA5{fill:#313244;} + .d2-1616297415 .fill-AB4{fill:#45475A;} + .d2-1616297415 .fill-AB5{fill:#313244;} + .d2-1616297415 .stroke-N1{stroke:#CDD6F4;} + .d2-1616297415 .stroke-N2{stroke:#BAC2DE;} + .d2-1616297415 .stroke-N3{stroke:#A6ADC8;} + .d2-1616297415 .stroke-N4{stroke:#585B70;} + .d2-1616297415 .stroke-N5{stroke:#45475A;} + .d2-1616297415 .stroke-N6{stroke:#313244;} + .d2-1616297415 .stroke-N7{stroke:#1E1E2E;} + .d2-1616297415 .stroke-B1{stroke:#CBA6f7;} + .d2-1616297415 .stroke-B2{stroke:#CBA6f7;} + .d2-1616297415 .stroke-B3{stroke:#6C7086;} + .d2-1616297415 .stroke-B4{stroke:#585B70;} + .d2-1616297415 .stroke-B5{stroke:#45475A;} + .d2-1616297415 .stroke-B6{stroke:#313244;} + .d2-1616297415 .stroke-AA2{stroke:#f38BA8;} + .d2-1616297415 .stroke-AA4{stroke:#45475A;} + .d2-1616297415 .stroke-AA5{stroke:#313244;} + .d2-1616297415 .stroke-AB4{stroke:#45475A;} + .d2-1616297415 .stroke-AB5{stroke:#313244;} + .d2-1616297415 .background-color-N1{background-color:#CDD6F4;} + .d2-1616297415 .background-color-N2{background-color:#BAC2DE;} + .d2-1616297415 .background-color-N3{background-color:#A6ADC8;} + .d2-1616297415 .background-color-N4{background-color:#585B70;} + .d2-1616297415 .background-color-N5{background-color:#45475A;} + .d2-1616297415 .background-color-N6{background-color:#313244;} + .d2-1616297415 .background-color-N7{background-color:#1E1E2E;} + .d2-1616297415 .background-color-B1{background-color:#CBA6f7;} + .d2-1616297415 .background-color-B2{background-color:#CBA6f7;} + .d2-1616297415 .background-color-B3{background-color:#6C7086;} + .d2-1616297415 .background-color-B4{background-color:#585B70;} + .d2-1616297415 .background-color-B5{background-color:#45475A;} + .d2-1616297415 .background-color-B6{background-color:#313244;} + .d2-1616297415 .background-color-AA2{background-color:#f38BA8;} + .d2-1616297415 .background-color-AA4{background-color:#45475A;} + .d2-1616297415 .background-color-AA5{background-color:#313244;} + .d2-1616297415 .background-color-AB4{background-color:#45475A;} + .d2-1616297415 .background-color-AB5{background-color:#313244;} + .d2-1616297415 .color-N1{color:#CDD6F4;} + .d2-1616297415 .color-N2{color:#BAC2DE;} + .d2-1616297415 .color-N3{color:#A6ADC8;} + .d2-1616297415 .color-N4{color:#585B70;} + .d2-1616297415 .color-N5{color:#45475A;} + .d2-1616297415 .color-N6{color:#313244;} + .d2-1616297415 .color-N7{color:#1E1E2E;} + .d2-1616297415 .color-B1{color:#CBA6f7;} + .d2-1616297415 .color-B2{color:#CBA6f7;} + .d2-1616297415 .color-B3{color:#6C7086;} + .d2-1616297415 .color-B4{color:#585B70;} + .d2-1616297415 .color-B5{color:#45475A;} + .d2-1616297415 .color-B6{color:#313244;} + .d2-1616297415 .color-AA2{color:#f38BA8;} + .d2-1616297415 .color-AA4{color:#45475A;} + .d2-1616297415 .color-AA5{color:#313244;} + .d2-1616297415 .color-AB4{color:#45475A;} + .d2-1616297415 .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}]]> -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required - +112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + diff --git a/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg b/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg index eef04da66..79ebb0171 100644 --- a/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3924832427 .fill-N1{fill:#0A0F25;} + .d2-3924832427 .fill-N2{fill:#676C7E;} + .d2-3924832427 .fill-N3{fill:#9499AB;} + .d2-3924832427 .fill-N4{fill:#CFD2DD;} + .d2-3924832427 .fill-N5{fill:#DEE1EB;} + .d2-3924832427 .fill-N6{fill:#EEF1F8;} + .d2-3924832427 .fill-N7{fill:#FFFFFF;} + .d2-3924832427 .fill-B1{fill:#0D32B2;} + .d2-3924832427 .fill-B2{fill:#0D32B2;} + .d2-3924832427 .fill-B3{fill:#E3E9FD;} + .d2-3924832427 .fill-B4{fill:#E3E9FD;} + .d2-3924832427 .fill-B5{fill:#EDF0FD;} + .d2-3924832427 .fill-B6{fill:#F7F8FE;} + .d2-3924832427 .fill-AA2{fill:#4A6FF3;} + .d2-3924832427 .fill-AA4{fill:#EDF0FD;} + .d2-3924832427 .fill-AA5{fill:#F7F8FE;} + .d2-3924832427 .fill-AB4{fill:#EDF0FD;} + .d2-3924832427 .fill-AB5{fill:#F7F8FE;} + .d2-3924832427 .stroke-N1{stroke:#0A0F25;} + .d2-3924832427 .stroke-N2{stroke:#676C7E;} + .d2-3924832427 .stroke-N3{stroke:#9499AB;} + .d2-3924832427 .stroke-N4{stroke:#CFD2DD;} + .d2-3924832427 .stroke-N5{stroke:#DEE1EB;} + .d2-3924832427 .stroke-N6{stroke:#EEF1F8;} + .d2-3924832427 .stroke-N7{stroke:#FFFFFF;} + .d2-3924832427 .stroke-B1{stroke:#0D32B2;} + .d2-3924832427 .stroke-B2{stroke:#0D32B2;} + .d2-3924832427 .stroke-B3{stroke:#E3E9FD;} + .d2-3924832427 .stroke-B4{stroke:#E3E9FD;} + .d2-3924832427 .stroke-B5{stroke:#EDF0FD;} + .d2-3924832427 .stroke-B6{stroke:#F7F8FE;} + .d2-3924832427 .stroke-AA2{stroke:#4A6FF3;} + .d2-3924832427 .stroke-AA4{stroke:#EDF0FD;} + .d2-3924832427 .stroke-AA5{stroke:#F7F8FE;} + .d2-3924832427 .stroke-AB4{stroke:#EDF0FD;} + .d2-3924832427 .stroke-AB5{stroke:#F7F8FE;} + .d2-3924832427 .background-color-N1{background-color:#0A0F25;} + .d2-3924832427 .background-color-N2{background-color:#676C7E;} + .d2-3924832427 .background-color-N3{background-color:#9499AB;} + .d2-3924832427 .background-color-N4{background-color:#CFD2DD;} + .d2-3924832427 .background-color-N5{background-color:#DEE1EB;} + .d2-3924832427 .background-color-N6{background-color:#EEF1F8;} + .d2-3924832427 .background-color-N7{background-color:#FFFFFF;} + .d2-3924832427 .background-color-B1{background-color:#0D32B2;} + .d2-3924832427 .background-color-B2{background-color:#0D32B2;} + .d2-3924832427 .background-color-B3{background-color:#E3E9FD;} + .d2-3924832427 .background-color-B4{background-color:#E3E9FD;} + .d2-3924832427 .background-color-B5{background-color:#EDF0FD;} + .d2-3924832427 .background-color-B6{background-color:#F7F8FE;} + .d2-3924832427 .background-color-AA2{background-color:#4A6FF3;} + .d2-3924832427 .background-color-AA4{background-color:#EDF0FD;} + .d2-3924832427 .background-color-AA5{background-color:#F7F8FE;} + .d2-3924832427 .background-color-AB4{background-color:#EDF0FD;} + .d2-3924832427 .background-color-AB5{background-color:#F7F8FE;} + .d2-3924832427 .color-N1{color:#0A0F25;} + .d2-3924832427 .color-N2{color:#676C7E;} + .d2-3924832427 .color-N3{color:#9499AB;} + .d2-3924832427 .color-N4{color:#CFD2DD;} + .d2-3924832427 .color-N5{color:#DEE1EB;} + .d2-3924832427 .color-N6{color:#EEF1F8;} + .d2-3924832427 .color-N7{color:#FFFFFF;} + .d2-3924832427 .color-B1{color:#0D32B2;} + .d2-3924832427 .color-B2{color:#0D32B2;} + .d2-3924832427 .color-B3{color:#E3E9FD;} + .d2-3924832427 .color-B4{color:#E3E9FD;} + .d2-3924832427 .color-B5{color:#EDF0FD;} + .d2-3924832427 .color-B6{color:#F7F8FE;} + .d2-3924832427 .color-AA2{color:#4A6FF3;} + .d2-3924832427 .color-AA4{color:#EDF0FD;} + .d2-3924832427 .color-AA5{color:#F7F8FE;} + .d2-3924832427 .color-AB4{color:#EDF0FD;} + .d2-3924832427 .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}]]> @@ -104,10 +104,10 @@ -wintersummersnowsun - - - - - +wintersummersnowsun + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg index ea2f23deb..11f5c2e7d 100644 --- a/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3924832427 .fill-N1{fill:#CDD6F4;} + .d2-3924832427 .fill-N2{fill:#BAC2DE;} + .d2-3924832427 .fill-N3{fill:#A6ADC8;} + .d2-3924832427 .fill-N4{fill:#585B70;} + .d2-3924832427 .fill-N5{fill:#45475A;} + .d2-3924832427 .fill-N6{fill:#313244;} + .d2-3924832427 .fill-N7{fill:#1E1E2E;} + .d2-3924832427 .fill-B1{fill:#CBA6f7;} + .d2-3924832427 .fill-B2{fill:#CBA6f7;} + .d2-3924832427 .fill-B3{fill:#6C7086;} + .d2-3924832427 .fill-B4{fill:#585B70;} + .d2-3924832427 .fill-B5{fill:#45475A;} + .d2-3924832427 .fill-B6{fill:#313244;} + .d2-3924832427 .fill-AA2{fill:#f38BA8;} + .d2-3924832427 .fill-AA4{fill:#45475A;} + .d2-3924832427 .fill-AA5{fill:#313244;} + .d2-3924832427 .fill-AB4{fill:#45475A;} + .d2-3924832427 .fill-AB5{fill:#313244;} + .d2-3924832427 .stroke-N1{stroke:#CDD6F4;} + .d2-3924832427 .stroke-N2{stroke:#BAC2DE;} + .d2-3924832427 .stroke-N3{stroke:#A6ADC8;} + .d2-3924832427 .stroke-N4{stroke:#585B70;} + .d2-3924832427 .stroke-N5{stroke:#45475A;} + .d2-3924832427 .stroke-N6{stroke:#313244;} + .d2-3924832427 .stroke-N7{stroke:#1E1E2E;} + .d2-3924832427 .stroke-B1{stroke:#CBA6f7;} + .d2-3924832427 .stroke-B2{stroke:#CBA6f7;} + .d2-3924832427 .stroke-B3{stroke:#6C7086;} + .d2-3924832427 .stroke-B4{stroke:#585B70;} + .d2-3924832427 .stroke-B5{stroke:#45475A;} + .d2-3924832427 .stroke-B6{stroke:#313244;} + .d2-3924832427 .stroke-AA2{stroke:#f38BA8;} + .d2-3924832427 .stroke-AA4{stroke:#45475A;} + .d2-3924832427 .stroke-AA5{stroke:#313244;} + .d2-3924832427 .stroke-AB4{stroke:#45475A;} + .d2-3924832427 .stroke-AB5{stroke:#313244;} + .d2-3924832427 .background-color-N1{background-color:#CDD6F4;} + .d2-3924832427 .background-color-N2{background-color:#BAC2DE;} + .d2-3924832427 .background-color-N3{background-color:#A6ADC8;} + .d2-3924832427 .background-color-N4{background-color:#585B70;} + .d2-3924832427 .background-color-N5{background-color:#45475A;} + .d2-3924832427 .background-color-N6{background-color:#313244;} + .d2-3924832427 .background-color-N7{background-color:#1E1E2E;} + .d2-3924832427 .background-color-B1{background-color:#CBA6f7;} + .d2-3924832427 .background-color-B2{background-color:#CBA6f7;} + .d2-3924832427 .background-color-B3{background-color:#6C7086;} + .d2-3924832427 .background-color-B4{background-color:#585B70;} + .d2-3924832427 .background-color-B5{background-color:#45475A;} + .d2-3924832427 .background-color-B6{background-color:#313244;} + .d2-3924832427 .background-color-AA2{background-color:#f38BA8;} + .d2-3924832427 .background-color-AA4{background-color:#45475A;} + .d2-3924832427 .background-color-AA5{background-color:#313244;} + .d2-3924832427 .background-color-AB4{background-color:#45475A;} + .d2-3924832427 .background-color-AB5{background-color:#313244;} + .d2-3924832427 .color-N1{color:#CDD6F4;} + .d2-3924832427 .color-N2{color:#BAC2DE;} + .d2-3924832427 .color-N3{color:#A6ADC8;} + .d2-3924832427 .color-N4{color:#585B70;} + .d2-3924832427 .color-N5{color:#45475A;} + .d2-3924832427 .color-N6{color:#313244;} + .d2-3924832427 .color-N7{color:#1E1E2E;} + .d2-3924832427 .color-B1{color:#CBA6f7;} + .d2-3924832427 .color-B2{color:#CBA6f7;} + .d2-3924832427 .color-B3{color:#6C7086;} + .d2-3924832427 .color-B4{color:#585B70;} + .d2-3924832427 .color-B5{color:#45475A;} + .d2-3924832427 .color-B6{color:#313244;} + .d2-3924832427 .color-AA2{color:#f38BA8;} + .d2-3924832427 .color-AA4{color:#45475A;} + .d2-3924832427 .color-AA5{color:#313244;} + .d2-3924832427 .color-AB4{color:#45475A;} + .d2-3924832427 .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}]]> -wintersummersnowsun - - - - - +wintersummersnowsun + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg index e1e5daa83..dbe261607 100644 --- a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1073612227 .fill-N1{fill:#0A0F25;} + .d2-1073612227 .fill-N2{fill:#676C7E;} + .d2-1073612227 .fill-N3{fill:#9499AB;} + .d2-1073612227 .fill-N4{fill:#CFD2DD;} + .d2-1073612227 .fill-N5{fill:#DEE1EB;} + .d2-1073612227 .fill-N6{fill:#EEF1F8;} + .d2-1073612227 .fill-N7{fill:#FFFFFF;} + .d2-1073612227 .fill-B1{fill:#0D32B2;} + .d2-1073612227 .fill-B2{fill:#0D32B2;} + .d2-1073612227 .fill-B3{fill:#E3E9FD;} + .d2-1073612227 .fill-B4{fill:#E3E9FD;} + .d2-1073612227 .fill-B5{fill:#EDF0FD;} + .d2-1073612227 .fill-B6{fill:#F7F8FE;} + .d2-1073612227 .fill-AA2{fill:#4A6FF3;} + .d2-1073612227 .fill-AA4{fill:#EDF0FD;} + .d2-1073612227 .fill-AA5{fill:#F7F8FE;} + .d2-1073612227 .fill-AB4{fill:#EDF0FD;} + .d2-1073612227 .fill-AB5{fill:#F7F8FE;} + .d2-1073612227 .stroke-N1{stroke:#0A0F25;} + .d2-1073612227 .stroke-N2{stroke:#676C7E;} + .d2-1073612227 .stroke-N3{stroke:#9499AB;} + .d2-1073612227 .stroke-N4{stroke:#CFD2DD;} + .d2-1073612227 .stroke-N5{stroke:#DEE1EB;} + .d2-1073612227 .stroke-N6{stroke:#EEF1F8;} + .d2-1073612227 .stroke-N7{stroke:#FFFFFF;} + .d2-1073612227 .stroke-B1{stroke:#0D32B2;} + .d2-1073612227 .stroke-B2{stroke:#0D32B2;} + .d2-1073612227 .stroke-B3{stroke:#E3E9FD;} + .d2-1073612227 .stroke-B4{stroke:#E3E9FD;} + .d2-1073612227 .stroke-B5{stroke:#EDF0FD;} + .d2-1073612227 .stroke-B6{stroke:#F7F8FE;} + .d2-1073612227 .stroke-AA2{stroke:#4A6FF3;} + .d2-1073612227 .stroke-AA4{stroke:#EDF0FD;} + .d2-1073612227 .stroke-AA5{stroke:#F7F8FE;} + .d2-1073612227 .stroke-AB4{stroke:#EDF0FD;} + .d2-1073612227 .stroke-AB5{stroke:#F7F8FE;} + .d2-1073612227 .background-color-N1{background-color:#0A0F25;} + .d2-1073612227 .background-color-N2{background-color:#676C7E;} + .d2-1073612227 .background-color-N3{background-color:#9499AB;} + .d2-1073612227 .background-color-N4{background-color:#CFD2DD;} + .d2-1073612227 .background-color-N5{background-color:#DEE1EB;} + .d2-1073612227 .background-color-N6{background-color:#EEF1F8;} + .d2-1073612227 .background-color-N7{background-color:#FFFFFF;} + .d2-1073612227 .background-color-B1{background-color:#0D32B2;} + .d2-1073612227 .background-color-B2{background-color:#0D32B2;} + .d2-1073612227 .background-color-B3{background-color:#E3E9FD;} + .d2-1073612227 .background-color-B4{background-color:#E3E9FD;} + .d2-1073612227 .background-color-B5{background-color:#EDF0FD;} + .d2-1073612227 .background-color-B6{background-color:#F7F8FE;} + .d2-1073612227 .background-color-AA2{background-color:#4A6FF3;} + .d2-1073612227 .background-color-AA4{background-color:#EDF0FD;} + .d2-1073612227 .background-color-AA5{background-color:#F7F8FE;} + .d2-1073612227 .background-color-AB4{background-color:#EDF0FD;} + .d2-1073612227 .background-color-AB5{background-color:#F7F8FE;} + .d2-1073612227 .color-N1{color:#0A0F25;} + .d2-1073612227 .color-N2{color:#676C7E;} + .d2-1073612227 .color-N3{color:#9499AB;} + .d2-1073612227 .color-N4{color:#CFD2DD;} + .d2-1073612227 .color-N5{color:#DEE1EB;} + .d2-1073612227 .color-N6{color:#EEF1F8;} + .d2-1073612227 .color-N7{color:#FFFFFF;} + .d2-1073612227 .color-B1{color:#0D32B2;} + .d2-1073612227 .color-B2{color:#0D32B2;} + .d2-1073612227 .color-B3{color:#E3E9FD;} + .d2-1073612227 .color-B4{color:#E3E9FD;} + .d2-1073612227 .color-B5{color:#EDF0FD;} + .d2-1073612227 .color-B6{color:#F7F8FE;} + .d2-1073612227 .color-AA2{color:#4A6FF3;} + .d2-1073612227 .color-AA4{color:#EDF0FD;} + .d2-1073612227 .color-AA5{color:#F7F8FE;} + .d2-1073612227 .color-AB4{color:#EDF0FD;} + .d2-1073612227 .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}]]> @@ -104,7 +104,7 @@ -ab hello +ab hello diff --git a/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg index 737ff46ac..bea6382ef 100644 --- a/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1073612227 .fill-N1{fill:#CDD6F4;} + .d2-1073612227 .fill-N2{fill:#BAC2DE;} + .d2-1073612227 .fill-N3{fill:#A6ADC8;} + .d2-1073612227 .fill-N4{fill:#585B70;} + .d2-1073612227 .fill-N5{fill:#45475A;} + .d2-1073612227 .fill-N6{fill:#313244;} + .d2-1073612227 .fill-N7{fill:#1E1E2E;} + .d2-1073612227 .fill-B1{fill:#CBA6f7;} + .d2-1073612227 .fill-B2{fill:#CBA6f7;} + .d2-1073612227 .fill-B3{fill:#6C7086;} + .d2-1073612227 .fill-B4{fill:#585B70;} + .d2-1073612227 .fill-B5{fill:#45475A;} + .d2-1073612227 .fill-B6{fill:#313244;} + .d2-1073612227 .fill-AA2{fill:#f38BA8;} + .d2-1073612227 .fill-AA4{fill:#45475A;} + .d2-1073612227 .fill-AA5{fill:#313244;} + .d2-1073612227 .fill-AB4{fill:#45475A;} + .d2-1073612227 .fill-AB5{fill:#313244;} + .d2-1073612227 .stroke-N1{stroke:#CDD6F4;} + .d2-1073612227 .stroke-N2{stroke:#BAC2DE;} + .d2-1073612227 .stroke-N3{stroke:#A6ADC8;} + .d2-1073612227 .stroke-N4{stroke:#585B70;} + .d2-1073612227 .stroke-N5{stroke:#45475A;} + .d2-1073612227 .stroke-N6{stroke:#313244;} + .d2-1073612227 .stroke-N7{stroke:#1E1E2E;} + .d2-1073612227 .stroke-B1{stroke:#CBA6f7;} + .d2-1073612227 .stroke-B2{stroke:#CBA6f7;} + .d2-1073612227 .stroke-B3{stroke:#6C7086;} + .d2-1073612227 .stroke-B4{stroke:#585B70;} + .d2-1073612227 .stroke-B5{stroke:#45475A;} + .d2-1073612227 .stroke-B6{stroke:#313244;} + .d2-1073612227 .stroke-AA2{stroke:#f38BA8;} + .d2-1073612227 .stroke-AA4{stroke:#45475A;} + .d2-1073612227 .stroke-AA5{stroke:#313244;} + .d2-1073612227 .stroke-AB4{stroke:#45475A;} + .d2-1073612227 .stroke-AB5{stroke:#313244;} + .d2-1073612227 .background-color-N1{background-color:#CDD6F4;} + .d2-1073612227 .background-color-N2{background-color:#BAC2DE;} + .d2-1073612227 .background-color-N3{background-color:#A6ADC8;} + .d2-1073612227 .background-color-N4{background-color:#585B70;} + .d2-1073612227 .background-color-N5{background-color:#45475A;} + .d2-1073612227 .background-color-N6{background-color:#313244;} + .d2-1073612227 .background-color-N7{background-color:#1E1E2E;} + .d2-1073612227 .background-color-B1{background-color:#CBA6f7;} + .d2-1073612227 .background-color-B2{background-color:#CBA6f7;} + .d2-1073612227 .background-color-B3{background-color:#6C7086;} + .d2-1073612227 .background-color-B4{background-color:#585B70;} + .d2-1073612227 .background-color-B5{background-color:#45475A;} + .d2-1073612227 .background-color-B6{background-color:#313244;} + .d2-1073612227 .background-color-AA2{background-color:#f38BA8;} + .d2-1073612227 .background-color-AA4{background-color:#45475A;} + .d2-1073612227 .background-color-AA5{background-color:#313244;} + .d2-1073612227 .background-color-AB4{background-color:#45475A;} + .d2-1073612227 .background-color-AB5{background-color:#313244;} + .d2-1073612227 .color-N1{color:#CDD6F4;} + .d2-1073612227 .color-N2{color:#BAC2DE;} + .d2-1073612227 .color-N3{color:#A6ADC8;} + .d2-1073612227 .color-N4{color:#585B70;} + .d2-1073612227 .color-N5{color:#45475A;} + .d2-1073612227 .color-N6{color:#313244;} + .d2-1073612227 .color-N7{color:#1E1E2E;} + .d2-1073612227 .color-B1{color:#CBA6f7;} + .d2-1073612227 .color-B2{color:#CBA6f7;} + .d2-1073612227 .color-B3{color:#6C7086;} + .d2-1073612227 .color-B4{color:#585B70;} + .d2-1073612227 .color-B5{color:#45475A;} + .d2-1073612227 .color-B6{color:#313244;} + .d2-1073612227 .color-AA2{color:#f38BA8;} + .d2-1073612227 .color-AA4{color:#45475A;} + .d2-1073612227 .color-AA5{color:#313244;} + .d2-1073612227 .color-AB4{color:#45475A;} + .d2-1073612227 .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}]]> -ab hello +ab hello diff --git a/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg index 189facffc..1e92714dc 100644 --- a/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-4178408065 .fill-N1{fill:#0A0F25;} + .d2-4178408065 .fill-N2{fill:#676C7E;} + .d2-4178408065 .fill-N3{fill:#9499AB;} + .d2-4178408065 .fill-N4{fill:#CFD2DD;} + .d2-4178408065 .fill-N5{fill:#DEE1EB;} + .d2-4178408065 .fill-N6{fill:#EEF1F8;} + .d2-4178408065 .fill-N7{fill:#FFFFFF;} + .d2-4178408065 .fill-B1{fill:#0D32B2;} + .d2-4178408065 .fill-B2{fill:#0D32B2;} + .d2-4178408065 .fill-B3{fill:#E3E9FD;} + .d2-4178408065 .fill-B4{fill:#E3E9FD;} + .d2-4178408065 .fill-B5{fill:#EDF0FD;} + .d2-4178408065 .fill-B6{fill:#F7F8FE;} + .d2-4178408065 .fill-AA2{fill:#4A6FF3;} + .d2-4178408065 .fill-AA4{fill:#EDF0FD;} + .d2-4178408065 .fill-AA5{fill:#F7F8FE;} + .d2-4178408065 .fill-AB4{fill:#EDF0FD;} + .d2-4178408065 .fill-AB5{fill:#F7F8FE;} + .d2-4178408065 .stroke-N1{stroke:#0A0F25;} + .d2-4178408065 .stroke-N2{stroke:#676C7E;} + .d2-4178408065 .stroke-N3{stroke:#9499AB;} + .d2-4178408065 .stroke-N4{stroke:#CFD2DD;} + .d2-4178408065 .stroke-N5{stroke:#DEE1EB;} + .d2-4178408065 .stroke-N6{stroke:#EEF1F8;} + .d2-4178408065 .stroke-N7{stroke:#FFFFFF;} + .d2-4178408065 .stroke-B1{stroke:#0D32B2;} + .d2-4178408065 .stroke-B2{stroke:#0D32B2;} + .d2-4178408065 .stroke-B3{stroke:#E3E9FD;} + .d2-4178408065 .stroke-B4{stroke:#E3E9FD;} + .d2-4178408065 .stroke-B5{stroke:#EDF0FD;} + .d2-4178408065 .stroke-B6{stroke:#F7F8FE;} + .d2-4178408065 .stroke-AA2{stroke:#4A6FF3;} + .d2-4178408065 .stroke-AA4{stroke:#EDF0FD;} + .d2-4178408065 .stroke-AA5{stroke:#F7F8FE;} + .d2-4178408065 .stroke-AB4{stroke:#EDF0FD;} + .d2-4178408065 .stroke-AB5{stroke:#F7F8FE;} + .d2-4178408065 .background-color-N1{background-color:#0A0F25;} + .d2-4178408065 .background-color-N2{background-color:#676C7E;} + .d2-4178408065 .background-color-N3{background-color:#9499AB;} + .d2-4178408065 .background-color-N4{background-color:#CFD2DD;} + .d2-4178408065 .background-color-N5{background-color:#DEE1EB;} + .d2-4178408065 .background-color-N6{background-color:#EEF1F8;} + .d2-4178408065 .background-color-N7{background-color:#FFFFFF;} + .d2-4178408065 .background-color-B1{background-color:#0D32B2;} + .d2-4178408065 .background-color-B2{background-color:#0D32B2;} + .d2-4178408065 .background-color-B3{background-color:#E3E9FD;} + .d2-4178408065 .background-color-B4{background-color:#E3E9FD;} + .d2-4178408065 .background-color-B5{background-color:#EDF0FD;} + .d2-4178408065 .background-color-B6{background-color:#F7F8FE;} + .d2-4178408065 .background-color-AA2{background-color:#4A6FF3;} + .d2-4178408065 .background-color-AA4{background-color:#EDF0FD;} + .d2-4178408065 .background-color-AA5{background-color:#F7F8FE;} + .d2-4178408065 .background-color-AB4{background-color:#EDF0FD;} + .d2-4178408065 .background-color-AB5{background-color:#F7F8FE;} + .d2-4178408065 .color-N1{color:#0A0F25;} + .d2-4178408065 .color-N2{color:#676C7E;} + .d2-4178408065 .color-N3{color:#9499AB;} + .d2-4178408065 .color-N4{color:#CFD2DD;} + .d2-4178408065 .color-N5{color:#DEE1EB;} + .d2-4178408065 .color-N6{color:#EEF1F8;} + .d2-4178408065 .color-N7{color:#FFFFFF;} + .d2-4178408065 .color-B1{color:#0D32B2;} + .d2-4178408065 .color-B2{color:#0D32B2;} + .d2-4178408065 .color-B3{color:#E3E9FD;} + .d2-4178408065 .color-B4{color:#E3E9FD;} + .d2-4178408065 .color-B5{color:#EDF0FD;} + .d2-4178408065 .color-B6{color:#F7F8FE;} + .d2-4178408065 .color-AA2{color:#4A6FF3;} + .d2-4178408065 .color-AA4{color:#EDF0FD;} + .d2-4178408065 .color-AA5{color:#F7F8FE;} + .d2-4178408065 .color-AB4{color:#EDF0FD;} + .d2-4178408065 .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}]]> @@ -130,12 +130,12 @@ - - -x - -y - - - + + +x + +y + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg index 03479bcfa..a3e76c87c 100644 --- a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-157526690 .fill-N1{fill:#0A0F25;} + .d2-157526690 .fill-N2{fill:#676C7E;} + .d2-157526690 .fill-N3{fill:#9499AB;} + .d2-157526690 .fill-N4{fill:#CFD2DD;} + .d2-157526690 .fill-N5{fill:#DEE1EB;} + .d2-157526690 .fill-N6{fill:#EEF1F8;} + .d2-157526690 .fill-N7{fill:#FFFFFF;} + .d2-157526690 .fill-B1{fill:#0D32B2;} + .d2-157526690 .fill-B2{fill:#0D32B2;} + .d2-157526690 .fill-B3{fill:#E3E9FD;} + .d2-157526690 .fill-B4{fill:#E3E9FD;} + .d2-157526690 .fill-B5{fill:#EDF0FD;} + .d2-157526690 .fill-B6{fill:#F7F8FE;} + .d2-157526690 .fill-AA2{fill:#4A6FF3;} + .d2-157526690 .fill-AA4{fill:#EDF0FD;} + .d2-157526690 .fill-AA5{fill:#F7F8FE;} + .d2-157526690 .fill-AB4{fill:#EDF0FD;} + .d2-157526690 .fill-AB5{fill:#F7F8FE;} + .d2-157526690 .stroke-N1{stroke:#0A0F25;} + .d2-157526690 .stroke-N2{stroke:#676C7E;} + .d2-157526690 .stroke-N3{stroke:#9499AB;} + .d2-157526690 .stroke-N4{stroke:#CFD2DD;} + .d2-157526690 .stroke-N5{stroke:#DEE1EB;} + .d2-157526690 .stroke-N6{stroke:#EEF1F8;} + .d2-157526690 .stroke-N7{stroke:#FFFFFF;} + .d2-157526690 .stroke-B1{stroke:#0D32B2;} + .d2-157526690 .stroke-B2{stroke:#0D32B2;} + .d2-157526690 .stroke-B3{stroke:#E3E9FD;} + .d2-157526690 .stroke-B4{stroke:#E3E9FD;} + .d2-157526690 .stroke-B5{stroke:#EDF0FD;} + .d2-157526690 .stroke-B6{stroke:#F7F8FE;} + .d2-157526690 .stroke-AA2{stroke:#4A6FF3;} + .d2-157526690 .stroke-AA4{stroke:#EDF0FD;} + .d2-157526690 .stroke-AA5{stroke:#F7F8FE;} + .d2-157526690 .stroke-AB4{stroke:#EDF0FD;} + .d2-157526690 .stroke-AB5{stroke:#F7F8FE;} + .d2-157526690 .background-color-N1{background-color:#0A0F25;} + .d2-157526690 .background-color-N2{background-color:#676C7E;} + .d2-157526690 .background-color-N3{background-color:#9499AB;} + .d2-157526690 .background-color-N4{background-color:#CFD2DD;} + .d2-157526690 .background-color-N5{background-color:#DEE1EB;} + .d2-157526690 .background-color-N6{background-color:#EEF1F8;} + .d2-157526690 .background-color-N7{background-color:#FFFFFF;} + .d2-157526690 .background-color-B1{background-color:#0D32B2;} + .d2-157526690 .background-color-B2{background-color:#0D32B2;} + .d2-157526690 .background-color-B3{background-color:#E3E9FD;} + .d2-157526690 .background-color-B4{background-color:#E3E9FD;} + .d2-157526690 .background-color-B5{background-color:#EDF0FD;} + .d2-157526690 .background-color-B6{background-color:#F7F8FE;} + .d2-157526690 .background-color-AA2{background-color:#4A6FF3;} + .d2-157526690 .background-color-AA4{background-color:#EDF0FD;} + .d2-157526690 .background-color-AA5{background-color:#F7F8FE;} + .d2-157526690 .background-color-AB4{background-color:#EDF0FD;} + .d2-157526690 .background-color-AB5{background-color:#F7F8FE;} + .d2-157526690 .color-N1{color:#0A0F25;} + .d2-157526690 .color-N2{color:#676C7E;} + .d2-157526690 .color-N3{color:#9499AB;} + .d2-157526690 .color-N4{color:#CFD2DD;} + .d2-157526690 .color-N5{color:#DEE1EB;} + .d2-157526690 .color-N6{color:#EEF1F8;} + .d2-157526690 .color-N7{color:#FFFFFF;} + .d2-157526690 .color-B1{color:#0D32B2;} + .d2-157526690 .color-B2{color:#0D32B2;} + .d2-157526690 .color-B3{color:#E3E9FD;} + .d2-157526690 .color-B4{color:#E3E9FD;} + .d2-157526690 .color-B5{color:#EDF0FD;} + .d2-157526690 .color-B6{color:#F7F8FE;} + .d2-157526690 .color-AA2{color:#4A6FF3;} + .d2-157526690 .color-AA4{color:#EDF0FD;} + .d2-157526690 .color-AA5{color:#F7F8FE;} + .d2-157526690 .color-AB4{color:#EDF0FD;} + .d2-157526690 .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}]]> @@ -130,7 +130,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -143,7 +143,7 @@ - + diff --git a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg index 318eb6da9..4aee06007 100644 --- a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1385175444 .fill-N1{fill:#0A0F25;} + .d2-1385175444 .fill-N2{fill:#676C7E;} + .d2-1385175444 .fill-N3{fill:#9499AB;} + .d2-1385175444 .fill-N4{fill:#CFD2DD;} + .d2-1385175444 .fill-N5{fill:#DEE1EB;} + .d2-1385175444 .fill-N6{fill:#EEF1F8;} + .d2-1385175444 .fill-N7{fill:#FFFFFF;} + .d2-1385175444 .fill-B1{fill:#0D32B2;} + .d2-1385175444 .fill-B2{fill:#0D32B2;} + .d2-1385175444 .fill-B3{fill:#E3E9FD;} + .d2-1385175444 .fill-B4{fill:#E3E9FD;} + .d2-1385175444 .fill-B5{fill:#EDF0FD;} + .d2-1385175444 .fill-B6{fill:#F7F8FE;} + .d2-1385175444 .fill-AA2{fill:#4A6FF3;} + .d2-1385175444 .fill-AA4{fill:#EDF0FD;} + .d2-1385175444 .fill-AA5{fill:#F7F8FE;} + .d2-1385175444 .fill-AB4{fill:#EDF0FD;} + .d2-1385175444 .fill-AB5{fill:#F7F8FE;} + .d2-1385175444 .stroke-N1{stroke:#0A0F25;} + .d2-1385175444 .stroke-N2{stroke:#676C7E;} + .d2-1385175444 .stroke-N3{stroke:#9499AB;} + .d2-1385175444 .stroke-N4{stroke:#CFD2DD;} + .d2-1385175444 .stroke-N5{stroke:#DEE1EB;} + .d2-1385175444 .stroke-N6{stroke:#EEF1F8;} + .d2-1385175444 .stroke-N7{stroke:#FFFFFF;} + .d2-1385175444 .stroke-B1{stroke:#0D32B2;} + .d2-1385175444 .stroke-B2{stroke:#0D32B2;} + .d2-1385175444 .stroke-B3{stroke:#E3E9FD;} + .d2-1385175444 .stroke-B4{stroke:#E3E9FD;} + .d2-1385175444 .stroke-B5{stroke:#EDF0FD;} + .d2-1385175444 .stroke-B6{stroke:#F7F8FE;} + .d2-1385175444 .stroke-AA2{stroke:#4A6FF3;} + .d2-1385175444 .stroke-AA4{stroke:#EDF0FD;} + .d2-1385175444 .stroke-AA5{stroke:#F7F8FE;} + .d2-1385175444 .stroke-AB4{stroke:#EDF0FD;} + .d2-1385175444 .stroke-AB5{stroke:#F7F8FE;} + .d2-1385175444 .background-color-N1{background-color:#0A0F25;} + .d2-1385175444 .background-color-N2{background-color:#676C7E;} + .d2-1385175444 .background-color-N3{background-color:#9499AB;} + .d2-1385175444 .background-color-N4{background-color:#CFD2DD;} + .d2-1385175444 .background-color-N5{background-color:#DEE1EB;} + .d2-1385175444 .background-color-N6{background-color:#EEF1F8;} + .d2-1385175444 .background-color-N7{background-color:#FFFFFF;} + .d2-1385175444 .background-color-B1{background-color:#0D32B2;} + .d2-1385175444 .background-color-B2{background-color:#0D32B2;} + .d2-1385175444 .background-color-B3{background-color:#E3E9FD;} + .d2-1385175444 .background-color-B4{background-color:#E3E9FD;} + .d2-1385175444 .background-color-B5{background-color:#EDF0FD;} + .d2-1385175444 .background-color-B6{background-color:#F7F8FE;} + .d2-1385175444 .background-color-AA2{background-color:#4A6FF3;} + .d2-1385175444 .background-color-AA4{background-color:#EDF0FD;} + .d2-1385175444 .background-color-AA5{background-color:#F7F8FE;} + .d2-1385175444 .background-color-AB4{background-color:#EDF0FD;} + .d2-1385175444 .background-color-AB5{background-color:#F7F8FE;} + .d2-1385175444 .color-N1{color:#0A0F25;} + .d2-1385175444 .color-N2{color:#676C7E;} + .d2-1385175444 .color-N3{color:#9499AB;} + .d2-1385175444 .color-N4{color:#CFD2DD;} + .d2-1385175444 .color-N5{color:#DEE1EB;} + .d2-1385175444 .color-N6{color:#EEF1F8;} + .d2-1385175444 .color-N7{color:#FFFFFF;} + .d2-1385175444 .color-B1{color:#0D32B2;} + .d2-1385175444 .color-B2{color:#0D32B2;} + .d2-1385175444 .color-B3{color:#E3E9FD;} + .d2-1385175444 .color-B4{color:#E3E9FD;} + .d2-1385175444 .color-B5{color:#EDF0FD;} + .d2-1385175444 .color-B6{color:#F7F8FE;} + .d2-1385175444 .color-AA2{color:#4A6FF3;} + .d2-1385175444 .color-AA4{color:#EDF0FD;} + .d2-1385175444 .color-AA5{color:#F7F8FE;} + .d2-1385175444 .color-AB4{color:#EDF0FD;} + .d2-1385175444 .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}]]> @@ -130,23 +130,23 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - - +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg index 1f4426801..1f4097ba0 100644 --- a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1726486961 .fill-N1{fill:#0A0F25;} + .d2-1726486961 .fill-N2{fill:#676C7E;} + .d2-1726486961 .fill-N3{fill:#9499AB;} + .d2-1726486961 .fill-N4{fill:#CFD2DD;} + .d2-1726486961 .fill-N5{fill:#DEE1EB;} + .d2-1726486961 .fill-N6{fill:#EEF1F8;} + .d2-1726486961 .fill-N7{fill:#FFFFFF;} + .d2-1726486961 .fill-B1{fill:#0D32B2;} + .d2-1726486961 .fill-B2{fill:#0D32B2;} + .d2-1726486961 .fill-B3{fill:#E3E9FD;} + .d2-1726486961 .fill-B4{fill:#E3E9FD;} + .d2-1726486961 .fill-B5{fill:#EDF0FD;} + .d2-1726486961 .fill-B6{fill:#F7F8FE;} + .d2-1726486961 .fill-AA2{fill:#4A6FF3;} + .d2-1726486961 .fill-AA4{fill:#EDF0FD;} + .d2-1726486961 .fill-AA5{fill:#F7F8FE;} + .d2-1726486961 .fill-AB4{fill:#EDF0FD;} + .d2-1726486961 .fill-AB5{fill:#F7F8FE;} + .d2-1726486961 .stroke-N1{stroke:#0A0F25;} + .d2-1726486961 .stroke-N2{stroke:#676C7E;} + .d2-1726486961 .stroke-N3{stroke:#9499AB;} + .d2-1726486961 .stroke-N4{stroke:#CFD2DD;} + .d2-1726486961 .stroke-N5{stroke:#DEE1EB;} + .d2-1726486961 .stroke-N6{stroke:#EEF1F8;} + .d2-1726486961 .stroke-N7{stroke:#FFFFFF;} + .d2-1726486961 .stroke-B1{stroke:#0D32B2;} + .d2-1726486961 .stroke-B2{stroke:#0D32B2;} + .d2-1726486961 .stroke-B3{stroke:#E3E9FD;} + .d2-1726486961 .stroke-B4{stroke:#E3E9FD;} + .d2-1726486961 .stroke-B5{stroke:#EDF0FD;} + .d2-1726486961 .stroke-B6{stroke:#F7F8FE;} + .d2-1726486961 .stroke-AA2{stroke:#4A6FF3;} + .d2-1726486961 .stroke-AA4{stroke:#EDF0FD;} + .d2-1726486961 .stroke-AA5{stroke:#F7F8FE;} + .d2-1726486961 .stroke-AB4{stroke:#EDF0FD;} + .d2-1726486961 .stroke-AB5{stroke:#F7F8FE;} + .d2-1726486961 .background-color-N1{background-color:#0A0F25;} + .d2-1726486961 .background-color-N2{background-color:#676C7E;} + .d2-1726486961 .background-color-N3{background-color:#9499AB;} + .d2-1726486961 .background-color-N4{background-color:#CFD2DD;} + .d2-1726486961 .background-color-N5{background-color:#DEE1EB;} + .d2-1726486961 .background-color-N6{background-color:#EEF1F8;} + .d2-1726486961 .background-color-N7{background-color:#FFFFFF;} + .d2-1726486961 .background-color-B1{background-color:#0D32B2;} + .d2-1726486961 .background-color-B2{background-color:#0D32B2;} + .d2-1726486961 .background-color-B3{background-color:#E3E9FD;} + .d2-1726486961 .background-color-B4{background-color:#E3E9FD;} + .d2-1726486961 .background-color-B5{background-color:#EDF0FD;} + .d2-1726486961 .background-color-B6{background-color:#F7F8FE;} + .d2-1726486961 .background-color-AA2{background-color:#4A6FF3;} + .d2-1726486961 .background-color-AA4{background-color:#EDF0FD;} + .d2-1726486961 .background-color-AA5{background-color:#F7F8FE;} + .d2-1726486961 .background-color-AB4{background-color:#EDF0FD;} + .d2-1726486961 .background-color-AB5{background-color:#F7F8FE;} + .d2-1726486961 .color-N1{color:#0A0F25;} + .d2-1726486961 .color-N2{color:#676C7E;} + .d2-1726486961 .color-N3{color:#9499AB;} + .d2-1726486961 .color-N4{color:#CFD2DD;} + .d2-1726486961 .color-N5{color:#DEE1EB;} + .d2-1726486961 .color-N6{color:#EEF1F8;} + .d2-1726486961 .color-N7{color:#FFFFFF;} + .d2-1726486961 .color-B1{color:#0D32B2;} + .d2-1726486961 .color-B2{color:#0D32B2;} + .d2-1726486961 .color-B3{color:#E3E9FD;} + .d2-1726486961 .color-B4{color:#E3E9FD;} + .d2-1726486961 .color-B5{color:#EDF0FD;} + .d2-1726486961 .color-B6{color:#F7F8FE;} + .d2-1726486961 .color-AA2{color:#4A6FF3;} + .d2-1726486961 .color-AA4{color:#EDF0FD;} + .d2-1726486961 .color-AA5{color:#F7F8FE;} + .d2-1726486961 .color-AB4{color:#EDF0FD;} + .d2-1726486961 .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}]]> @@ -159,13 +159,13 @@ -NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND - - - - - - - - +NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg b/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg index 6603d4227..f05834d4d 100644 --- a/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-884331314 .fill-N1{fill:#0A0F25;} + .d2-884331314 .fill-N2{fill:#676C7E;} + .d2-884331314 .fill-N3{fill:#9499AB;} + .d2-884331314 .fill-N4{fill:#CFD2DD;} + .d2-884331314 .fill-N5{fill:#DEE1EB;} + .d2-884331314 .fill-N6{fill:#EEF1F8;} + .d2-884331314 .fill-N7{fill:#FFFFFF;} + .d2-884331314 .fill-B1{fill:#0D32B2;} + .d2-884331314 .fill-B2{fill:#0D32B2;} + .d2-884331314 .fill-B3{fill:#E3E9FD;} + .d2-884331314 .fill-B4{fill:#E3E9FD;} + .d2-884331314 .fill-B5{fill:#EDF0FD;} + .d2-884331314 .fill-B6{fill:#F7F8FE;} + .d2-884331314 .fill-AA2{fill:#4A6FF3;} + .d2-884331314 .fill-AA4{fill:#EDF0FD;} + .d2-884331314 .fill-AA5{fill:#F7F8FE;} + .d2-884331314 .fill-AB4{fill:#EDF0FD;} + .d2-884331314 .fill-AB5{fill:#F7F8FE;} + .d2-884331314 .stroke-N1{stroke:#0A0F25;} + .d2-884331314 .stroke-N2{stroke:#676C7E;} + .d2-884331314 .stroke-N3{stroke:#9499AB;} + .d2-884331314 .stroke-N4{stroke:#CFD2DD;} + .d2-884331314 .stroke-N5{stroke:#DEE1EB;} + .d2-884331314 .stroke-N6{stroke:#EEF1F8;} + .d2-884331314 .stroke-N7{stroke:#FFFFFF;} + .d2-884331314 .stroke-B1{stroke:#0D32B2;} + .d2-884331314 .stroke-B2{stroke:#0D32B2;} + .d2-884331314 .stroke-B3{stroke:#E3E9FD;} + .d2-884331314 .stroke-B4{stroke:#E3E9FD;} + .d2-884331314 .stroke-B5{stroke:#EDF0FD;} + .d2-884331314 .stroke-B6{stroke:#F7F8FE;} + .d2-884331314 .stroke-AA2{stroke:#4A6FF3;} + .d2-884331314 .stroke-AA4{stroke:#EDF0FD;} + .d2-884331314 .stroke-AA5{stroke:#F7F8FE;} + .d2-884331314 .stroke-AB4{stroke:#EDF0FD;} + .d2-884331314 .stroke-AB5{stroke:#F7F8FE;} + .d2-884331314 .background-color-N1{background-color:#0A0F25;} + .d2-884331314 .background-color-N2{background-color:#676C7E;} + .d2-884331314 .background-color-N3{background-color:#9499AB;} + .d2-884331314 .background-color-N4{background-color:#CFD2DD;} + .d2-884331314 .background-color-N5{background-color:#DEE1EB;} + .d2-884331314 .background-color-N6{background-color:#EEF1F8;} + .d2-884331314 .background-color-N7{background-color:#FFFFFF;} + .d2-884331314 .background-color-B1{background-color:#0D32B2;} + .d2-884331314 .background-color-B2{background-color:#0D32B2;} + .d2-884331314 .background-color-B3{background-color:#E3E9FD;} + .d2-884331314 .background-color-B4{background-color:#E3E9FD;} + .d2-884331314 .background-color-B5{background-color:#EDF0FD;} + .d2-884331314 .background-color-B6{background-color:#F7F8FE;} + .d2-884331314 .background-color-AA2{background-color:#4A6FF3;} + .d2-884331314 .background-color-AA4{background-color:#EDF0FD;} + .d2-884331314 .background-color-AA5{background-color:#F7F8FE;} + .d2-884331314 .background-color-AB4{background-color:#EDF0FD;} + .d2-884331314 .background-color-AB5{background-color:#F7F8FE;} + .d2-884331314 .color-N1{color:#0A0F25;} + .d2-884331314 .color-N2{color:#676C7E;} + .d2-884331314 .color-N3{color:#9499AB;} + .d2-884331314 .color-N4{color:#CFD2DD;} + .d2-884331314 .color-N5{color:#DEE1EB;} + .d2-884331314 .color-N6{color:#EEF1F8;} + .d2-884331314 .color-N7{color:#FFFFFF;} + .d2-884331314 .color-B1{color:#0D32B2;} + .d2-884331314 .color-B2{color:#0D32B2;} + .d2-884331314 .color-B3{color:#E3E9FD;} + .d2-884331314 .color-B4{color:#E3E9FD;} + .d2-884331314 .color-B5{color:#EDF0FD;} + .d2-884331314 .color-B6{color:#F7F8FE;} + .d2-884331314 .color-AA2{color:#4A6FF3;} + .d2-884331314 .color-AA4{color:#EDF0FD;} + .d2-884331314 .color-AA5{color:#F7F8FE;} + .d2-884331314 .color-AB4{color:#EDF0FD;} + .d2-884331314 .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}]]> @@ -104,13 +104,13 @@ -acnormalsomethingbdnested normal - - - - +acnormalsomethingbdnested normal + + + + - - - + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg index e505986ad..2b38a2a71 100644 --- a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -852,7 +852,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. diff --git a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg index 2f2882a2d..444121bd0 100644 --- a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -850,7 +850,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. diff --git a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg index 080039407..575f38b74 100644 --- a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3722833969 .fill-N1{fill:#0A0F25;} + .d2-3722833969 .fill-N2{fill:#676C7E;} + .d2-3722833969 .fill-N3{fill:#9499AB;} + .d2-3722833969 .fill-N4{fill:#CFD2DD;} + .d2-3722833969 .fill-N5{fill:#DEE1EB;} + .d2-3722833969 .fill-N6{fill:#EEF1F8;} + .d2-3722833969 .fill-N7{fill:#FFFFFF;} + .d2-3722833969 .fill-B1{fill:#0D32B2;} + .d2-3722833969 .fill-B2{fill:#0D32B2;} + .d2-3722833969 .fill-B3{fill:#E3E9FD;} + .d2-3722833969 .fill-B4{fill:#E3E9FD;} + .d2-3722833969 .fill-B5{fill:#EDF0FD;} + .d2-3722833969 .fill-B6{fill:#F7F8FE;} + .d2-3722833969 .fill-AA2{fill:#4A6FF3;} + .d2-3722833969 .fill-AA4{fill:#EDF0FD;} + .d2-3722833969 .fill-AA5{fill:#F7F8FE;} + .d2-3722833969 .fill-AB4{fill:#EDF0FD;} + .d2-3722833969 .fill-AB5{fill:#F7F8FE;} + .d2-3722833969 .stroke-N1{stroke:#0A0F25;} + .d2-3722833969 .stroke-N2{stroke:#676C7E;} + .d2-3722833969 .stroke-N3{stroke:#9499AB;} + .d2-3722833969 .stroke-N4{stroke:#CFD2DD;} + .d2-3722833969 .stroke-N5{stroke:#DEE1EB;} + .d2-3722833969 .stroke-N6{stroke:#EEF1F8;} + .d2-3722833969 .stroke-N7{stroke:#FFFFFF;} + .d2-3722833969 .stroke-B1{stroke:#0D32B2;} + .d2-3722833969 .stroke-B2{stroke:#0D32B2;} + .d2-3722833969 .stroke-B3{stroke:#E3E9FD;} + .d2-3722833969 .stroke-B4{stroke:#E3E9FD;} + .d2-3722833969 .stroke-B5{stroke:#EDF0FD;} + .d2-3722833969 .stroke-B6{stroke:#F7F8FE;} + .d2-3722833969 .stroke-AA2{stroke:#4A6FF3;} + .d2-3722833969 .stroke-AA4{stroke:#EDF0FD;} + .d2-3722833969 .stroke-AA5{stroke:#F7F8FE;} + .d2-3722833969 .stroke-AB4{stroke:#EDF0FD;} + .d2-3722833969 .stroke-AB5{stroke:#F7F8FE;} + .d2-3722833969 .background-color-N1{background-color:#0A0F25;} + .d2-3722833969 .background-color-N2{background-color:#676C7E;} + .d2-3722833969 .background-color-N3{background-color:#9499AB;} + .d2-3722833969 .background-color-N4{background-color:#CFD2DD;} + .d2-3722833969 .background-color-N5{background-color:#DEE1EB;} + .d2-3722833969 .background-color-N6{background-color:#EEF1F8;} + .d2-3722833969 .background-color-N7{background-color:#FFFFFF;} + .d2-3722833969 .background-color-B1{background-color:#0D32B2;} + .d2-3722833969 .background-color-B2{background-color:#0D32B2;} + .d2-3722833969 .background-color-B3{background-color:#E3E9FD;} + .d2-3722833969 .background-color-B4{background-color:#E3E9FD;} + .d2-3722833969 .background-color-B5{background-color:#EDF0FD;} + .d2-3722833969 .background-color-B6{background-color:#F7F8FE;} + .d2-3722833969 .background-color-AA2{background-color:#4A6FF3;} + .d2-3722833969 .background-color-AA4{background-color:#EDF0FD;} + .d2-3722833969 .background-color-AA5{background-color:#F7F8FE;} + .d2-3722833969 .background-color-AB4{background-color:#EDF0FD;} + .d2-3722833969 .background-color-AB5{background-color:#F7F8FE;} + .d2-3722833969 .color-N1{color:#0A0F25;} + .d2-3722833969 .color-N2{color:#676C7E;} + .d2-3722833969 .color-N3{color:#9499AB;} + .d2-3722833969 .color-N4{color:#CFD2DD;} + .d2-3722833969 .color-N5{color:#DEE1EB;} + .d2-3722833969 .color-N6{color:#EEF1F8;} + .d2-3722833969 .color-N7{color:#FFFFFF;} + .d2-3722833969 .color-B1{color:#0D32B2;} + .d2-3722833969 .color-B2{color:#0D32B2;} + .d2-3722833969 .color-B3{color:#E3E9FD;} + .d2-3722833969 .color-B4{color:#E3E9FD;} + .d2-3722833969 .color-B5{color:#EDF0FD;} + .d2-3722833969 .color-B6{color:#F7F8FE;} + .d2-3722833969 .color-AA2{color:#4A6FF3;} + .d2-3722833969 .color-AA4{color:#EDF0FD;} + .d2-3722833969 .color-AA5{color:#F7F8FE;} + .d2-3722833969 .color-AB4{color:#EDF0FD;} + .d2-3722833969 .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}]]> @@ -1205,13 +1205,13 @@ -NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND - - - - - - - - +NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg index 45c1f4c51..d9f42d653 100644 --- a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg @@ -1,20 +1,20 @@ - @@ -844,23 +844,23 @@ -OEM FactoryOEM WarehouseDistributor Warehousecompany WarehouseFlow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N

company Warehouse

+OEM FactoryOEM WarehouseDistributor Warehousecompany WarehouseFlow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N

company Warehouse

  • Asset Tagging
  • Inventory
  • Staging
  • Dispatch to Site
-
 - +
 + - - - - - - - + + + + + + + \ 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 3e5b79366..7f5ade5d5 100644 --- a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3227579264 .fill-N1{fill:#000410;} + .d2-3227579264 .fill-N2{fill:#0000B8;} + .d2-3227579264 .fill-N3{fill:#9499AB;} + .d2-3227579264 .fill-N4{fill:#CFD2DD;} + .d2-3227579264 .fill-N5{fill:#C3DEF3;} + .d2-3227579264 .fill-N6{fill:#EEF1F8;} + .d2-3227579264 .fill-N7{fill:#FFFFFF;} + .d2-3227579264 .fill-B1{fill:#000410;} + .d2-3227579264 .fill-B2{fill:#0000E4;} + .d2-3227579264 .fill-B3{fill:#5AA4DC;} + .d2-3227579264 .fill-B4{fill:#E7E9EE;} + .d2-3227579264 .fill-B5{fill:#F5F6F9;} + .d2-3227579264 .fill-B6{fill:#FFFFFF;} + .d2-3227579264 .fill-AA2{fill:#008566;} + .d2-3227579264 .fill-AA4{fill:#45BBA5;} + .d2-3227579264 .fill-AA5{fill:#7ACCBD;} + .d2-3227579264 .fill-AB4{fill:#F1C759;} + .d2-3227579264 .fill-AB5{fill:#F9E088;} + .d2-3227579264 .stroke-N1{stroke:#000410;} + .d2-3227579264 .stroke-N2{stroke:#0000B8;} + .d2-3227579264 .stroke-N3{stroke:#9499AB;} + .d2-3227579264 .stroke-N4{stroke:#CFD2DD;} + .d2-3227579264 .stroke-N5{stroke:#C3DEF3;} + .d2-3227579264 .stroke-N6{stroke:#EEF1F8;} + .d2-3227579264 .stroke-N7{stroke:#FFFFFF;} + .d2-3227579264 .stroke-B1{stroke:#000410;} + .d2-3227579264 .stroke-B2{stroke:#0000E4;} + .d2-3227579264 .stroke-B3{stroke:#5AA4DC;} + .d2-3227579264 .stroke-B4{stroke:#E7E9EE;} + .d2-3227579264 .stroke-B5{stroke:#F5F6F9;} + .d2-3227579264 .stroke-B6{stroke:#FFFFFF;} + .d2-3227579264 .stroke-AA2{stroke:#008566;} + .d2-3227579264 .stroke-AA4{stroke:#45BBA5;} + .d2-3227579264 .stroke-AA5{stroke:#7ACCBD;} + .d2-3227579264 .stroke-AB4{stroke:#F1C759;} + .d2-3227579264 .stroke-AB5{stroke:#F9E088;} + .d2-3227579264 .background-color-N1{background-color:#000410;} + .d2-3227579264 .background-color-N2{background-color:#0000B8;} + .d2-3227579264 .background-color-N3{background-color:#9499AB;} + .d2-3227579264 .background-color-N4{background-color:#CFD2DD;} + .d2-3227579264 .background-color-N5{background-color:#C3DEF3;} + .d2-3227579264 .background-color-N6{background-color:#EEF1F8;} + .d2-3227579264 .background-color-N7{background-color:#FFFFFF;} + .d2-3227579264 .background-color-B1{background-color:#000410;} + .d2-3227579264 .background-color-B2{background-color:#0000E4;} + .d2-3227579264 .background-color-B3{background-color:#5AA4DC;} + .d2-3227579264 .background-color-B4{background-color:#E7E9EE;} + .d2-3227579264 .background-color-B5{background-color:#F5F6F9;} + .d2-3227579264 .background-color-B6{background-color:#FFFFFF;} + .d2-3227579264 .background-color-AA2{background-color:#008566;} + .d2-3227579264 .background-color-AA4{background-color:#45BBA5;} + .d2-3227579264 .background-color-AA5{background-color:#7ACCBD;} + .d2-3227579264 .background-color-AB4{background-color:#F1C759;} + .d2-3227579264 .background-color-AB5{background-color:#F9E088;} + .d2-3227579264 .color-N1{color:#000410;} + .d2-3227579264 .color-N2{color:#0000B8;} + .d2-3227579264 .color-N3{color:#9499AB;} + .d2-3227579264 .color-N4{color:#CFD2DD;} + .d2-3227579264 .color-N5{color:#C3DEF3;} + .d2-3227579264 .color-N6{color:#EEF1F8;} + .d2-3227579264 .color-N7{color:#FFFFFF;} + .d2-3227579264 .color-B1{color:#000410;} + .d2-3227579264 .color-B2{color:#0000E4;} + .d2-3227579264 .color-B3{color:#5AA4DC;} + .d2-3227579264 .color-B4{color:#E7E9EE;} + .d2-3227579264 .color-B5{color:#F5F6F9;} + .d2-3227579264 .color-B6{color:#FFFFFF;} + .d2-3227579264 .color-AA2{color:#008566;} + .d2-3227579264 .color-AA4{color:#45BBA5;} + .d2-3227579264 .color-AA5{color:#7ACCBD;} + .d2-3227579264 .color-AB4{color:#F1C759;} + .d2-3227579264 .color-AB5{color:#F9E088;}.appendix text.text{fill:#000410}.md{--color-fg-default:#000410;--color-fg-muted:#0000B8;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#000410;--color-border-muted:#0000E4;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0000E4;--color-accent-emphasis:#0000E4;--color-attention-subtle:#0000B8;--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-normal);mix-blend-mode:color-burn}.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-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.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-normal);mix-blend-mode:color-burn}.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}]]> @@ -137,25 +137,25 @@ -NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST - - +NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg index c16c9ba1e..2c5f9eac3 100644 --- a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -859,7 +859,7 @@ -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

+People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

  • Inject ads, who-to-follow, onboarding
  • Conversation module
    • @@ -867,46 +867,46 @@
  • Tweat deduplication
  • Served data logging
-
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

-
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

+
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg index 5e0872052..d4aee7d64 100644 --- a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -859,7 +859,7 @@ -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

+People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

  • Inject ads, who-to-follow, onboarding
  • Conversation module
    • @@ -867,46 +867,46 @@
  • Tweat deduplication
  • Served data logging
-
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

-
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

+
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg index 7416db269..cdb8f1df3 100644 --- a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-324871669 .fill-N1{fill:#CDD6F4;} + .d2-324871669 .fill-N2{fill:#BAC2DE;} + .d2-324871669 .fill-N3{fill:#A6ADC8;} + .d2-324871669 .fill-N4{fill:#585B70;} + .d2-324871669 .fill-N5{fill:#45475A;} + .d2-324871669 .fill-N6{fill:#313244;} + .d2-324871669 .fill-N7{fill:#1E1E2E;} + .d2-324871669 .fill-B1{fill:#CBA6f7;} + .d2-324871669 .fill-B2{fill:#CBA6f7;} + .d2-324871669 .fill-B3{fill:#6C7086;} + .d2-324871669 .fill-B4{fill:#585B70;} + .d2-324871669 .fill-B5{fill:#45475A;} + .d2-324871669 .fill-B6{fill:#313244;} + .d2-324871669 .fill-AA2{fill:#f38BA8;} + .d2-324871669 .fill-AA4{fill:#45475A;} + .d2-324871669 .fill-AA5{fill:#313244;} + .d2-324871669 .fill-AB4{fill:#45475A;} + .d2-324871669 .fill-AB5{fill:#313244;} + .d2-324871669 .stroke-N1{stroke:#CDD6F4;} + .d2-324871669 .stroke-N2{stroke:#BAC2DE;} + .d2-324871669 .stroke-N3{stroke:#A6ADC8;} + .d2-324871669 .stroke-N4{stroke:#585B70;} + .d2-324871669 .stroke-N5{stroke:#45475A;} + .d2-324871669 .stroke-N6{stroke:#313244;} + .d2-324871669 .stroke-N7{stroke:#1E1E2E;} + .d2-324871669 .stroke-B1{stroke:#CBA6f7;} + .d2-324871669 .stroke-B2{stroke:#CBA6f7;} + .d2-324871669 .stroke-B3{stroke:#6C7086;} + .d2-324871669 .stroke-B4{stroke:#585B70;} + .d2-324871669 .stroke-B5{stroke:#45475A;} + .d2-324871669 .stroke-B6{stroke:#313244;} + .d2-324871669 .stroke-AA2{stroke:#f38BA8;} + .d2-324871669 .stroke-AA4{stroke:#45475A;} + .d2-324871669 .stroke-AA5{stroke:#313244;} + .d2-324871669 .stroke-AB4{stroke:#45475A;} + .d2-324871669 .stroke-AB5{stroke:#313244;} + .d2-324871669 .background-color-N1{background-color:#CDD6F4;} + .d2-324871669 .background-color-N2{background-color:#BAC2DE;} + .d2-324871669 .background-color-N3{background-color:#A6ADC8;} + .d2-324871669 .background-color-N4{background-color:#585B70;} + .d2-324871669 .background-color-N5{background-color:#45475A;} + .d2-324871669 .background-color-N6{background-color:#313244;} + .d2-324871669 .background-color-N7{background-color:#1E1E2E;} + .d2-324871669 .background-color-B1{background-color:#CBA6f7;} + .d2-324871669 .background-color-B2{background-color:#CBA6f7;} + .d2-324871669 .background-color-B3{background-color:#6C7086;} + .d2-324871669 .background-color-B4{background-color:#585B70;} + .d2-324871669 .background-color-B5{background-color:#45475A;} + .d2-324871669 .background-color-B6{background-color:#313244;} + .d2-324871669 .background-color-AA2{background-color:#f38BA8;} + .d2-324871669 .background-color-AA4{background-color:#45475A;} + .d2-324871669 .background-color-AA5{background-color:#313244;} + .d2-324871669 .background-color-AB4{background-color:#45475A;} + .d2-324871669 .background-color-AB5{background-color:#313244;} + .d2-324871669 .color-N1{color:#CDD6F4;} + .d2-324871669 .color-N2{color:#BAC2DE;} + .d2-324871669 .color-N3{color:#A6ADC8;} + .d2-324871669 .color-N4{color:#585B70;} + .d2-324871669 .color-N5{color:#45475A;} + .d2-324871669 .color-N6{color:#313244;} + .d2-324871669 .color-N7{color:#1E1E2E;} + .d2-324871669 .color-B1{color:#CBA6f7;} + .d2-324871669 .color-B2{color:#CBA6f7;} + .d2-324871669 .color-B3{color:#6C7086;} + .d2-324871669 .color-B4{color:#585B70;} + .d2-324871669 .color-B5{color:#45475A;} + .d2-324871669 .color-B6{color:#313244;} + .d2-324871669 .color-AA2{color:#f38BA8;} + .d2-324871669 .color-AA4{color:#45475A;} + .d2-324871669 .color-AA5{color:#313244;} + .d2-324871669 .color-AB4{color:#45475A;} + .d2-324871669 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -102,7 +102,7 @@ - + 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 67cf082c8..4cb78e9db 100644 --- a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg @@ -1,9 +1,9 @@ -wintersummertreessnowsun - - - + .d2-4283185193 .fill-N1{fill:#CDD6F4;} + .d2-4283185193 .fill-N2{fill:#BAC2DE;} + .d2-4283185193 .fill-N3{fill:#A6ADC8;} + .d2-4283185193 .fill-N4{fill:#585B70;} + .d2-4283185193 .fill-N5{fill:#45475A;} + .d2-4283185193 .fill-N6{fill:#313244;} + .d2-4283185193 .fill-N7{fill:#1E1E2E;} + .d2-4283185193 .fill-B1{fill:#CBA6f7;} + .d2-4283185193 .fill-B2{fill:#CBA6f7;} + .d2-4283185193 .fill-B3{fill:#6C7086;} + .d2-4283185193 .fill-B4{fill:#585B70;} + .d2-4283185193 .fill-B5{fill:#45475A;} + .d2-4283185193 .fill-B6{fill:#313244;} + .d2-4283185193 .fill-AA2{fill:#f38BA8;} + .d2-4283185193 .fill-AA4{fill:#45475A;} + .d2-4283185193 .fill-AA5{fill:#313244;} + .d2-4283185193 .fill-AB4{fill:#45475A;} + .d2-4283185193 .fill-AB5{fill:#313244;} + .d2-4283185193 .stroke-N1{stroke:#CDD6F4;} + .d2-4283185193 .stroke-N2{stroke:#BAC2DE;} + .d2-4283185193 .stroke-N3{stroke:#A6ADC8;} + .d2-4283185193 .stroke-N4{stroke:#585B70;} + .d2-4283185193 .stroke-N5{stroke:#45475A;} + .d2-4283185193 .stroke-N6{stroke:#313244;} + .d2-4283185193 .stroke-N7{stroke:#1E1E2E;} + .d2-4283185193 .stroke-B1{stroke:#CBA6f7;} + .d2-4283185193 .stroke-B2{stroke:#CBA6f7;} + .d2-4283185193 .stroke-B3{stroke:#6C7086;} + .d2-4283185193 .stroke-B4{stroke:#585B70;} + .d2-4283185193 .stroke-B5{stroke:#45475A;} + .d2-4283185193 .stroke-B6{stroke:#313244;} + .d2-4283185193 .stroke-AA2{stroke:#f38BA8;} + .d2-4283185193 .stroke-AA4{stroke:#45475A;} + .d2-4283185193 .stroke-AA5{stroke:#313244;} + .d2-4283185193 .stroke-AB4{stroke:#45475A;} + .d2-4283185193 .stroke-AB5{stroke:#313244;} + .d2-4283185193 .background-color-N1{background-color:#CDD6F4;} + .d2-4283185193 .background-color-N2{background-color:#BAC2DE;} + .d2-4283185193 .background-color-N3{background-color:#A6ADC8;} + .d2-4283185193 .background-color-N4{background-color:#585B70;} + .d2-4283185193 .background-color-N5{background-color:#45475A;} + .d2-4283185193 .background-color-N6{background-color:#313244;} + .d2-4283185193 .background-color-N7{background-color:#1E1E2E;} + .d2-4283185193 .background-color-B1{background-color:#CBA6f7;} + .d2-4283185193 .background-color-B2{background-color:#CBA6f7;} + .d2-4283185193 .background-color-B3{background-color:#6C7086;} + .d2-4283185193 .background-color-B4{background-color:#585B70;} + .d2-4283185193 .background-color-B5{background-color:#45475A;} + .d2-4283185193 .background-color-B6{background-color:#313244;} + .d2-4283185193 .background-color-AA2{background-color:#f38BA8;} + .d2-4283185193 .background-color-AA4{background-color:#45475A;} + .d2-4283185193 .background-color-AA5{background-color:#313244;} + .d2-4283185193 .background-color-AB4{background-color:#45475A;} + .d2-4283185193 .background-color-AB5{background-color:#313244;} + .d2-4283185193 .color-N1{color:#CDD6F4;} + .d2-4283185193 .color-N2{color:#BAC2DE;} + .d2-4283185193 .color-N3{color:#A6ADC8;} + .d2-4283185193 .color-N4{color:#585B70;} + .d2-4283185193 .color-N5{color:#45475A;} + .d2-4283185193 .color-N6{color:#313244;} + .d2-4283185193 .color-N7{color:#1E1E2E;} + .d2-4283185193 .color-B1{color:#CBA6f7;} + .d2-4283185193 .color-B2{color:#CBA6f7;} + .d2-4283185193 .color-B3{color:#6C7086;} + .d2-4283185193 .color-B4{color:#585B70;} + .d2-4283185193 .color-B5{color:#45475A;} + .d2-4283185193 .color-B6{color:#313244;} + .d2-4283185193 .color-AA2{color:#f38BA8;} + .d2-4283185193 .color-AA4{color:#45475A;} + .d2-4283185193 .color-AA5{color:#313244;} + .d2-4283185193 .color-AB4{color:#45475A;} + .d2-4283185193 .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}]]>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 04281f795..d63b8c8df 100644 --- a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg @@ -1,16 +1,16 @@ -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required - + .d2-1616297415 .fill-N1{fill:#CDD6F4;} + .d2-1616297415 .fill-N2{fill:#BAC2DE;} + .d2-1616297415 .fill-N3{fill:#A6ADC8;} + .d2-1616297415 .fill-N4{fill:#585B70;} + .d2-1616297415 .fill-N5{fill:#45475A;} + .d2-1616297415 .fill-N6{fill:#313244;} + .d2-1616297415 .fill-N7{fill:#1E1E2E;} + .d2-1616297415 .fill-B1{fill:#CBA6f7;} + .d2-1616297415 .fill-B2{fill:#CBA6f7;} + .d2-1616297415 .fill-B3{fill:#6C7086;} + .d2-1616297415 .fill-B4{fill:#585B70;} + .d2-1616297415 .fill-B5{fill:#45475A;} + .d2-1616297415 .fill-B6{fill:#313244;} + .d2-1616297415 .fill-AA2{fill:#f38BA8;} + .d2-1616297415 .fill-AA4{fill:#45475A;} + .d2-1616297415 .fill-AA5{fill:#313244;} + .d2-1616297415 .fill-AB4{fill:#45475A;} + .d2-1616297415 .fill-AB5{fill:#313244;} + .d2-1616297415 .stroke-N1{stroke:#CDD6F4;} + .d2-1616297415 .stroke-N2{stroke:#BAC2DE;} + .d2-1616297415 .stroke-N3{stroke:#A6ADC8;} + .d2-1616297415 .stroke-N4{stroke:#585B70;} + .d2-1616297415 .stroke-N5{stroke:#45475A;} + .d2-1616297415 .stroke-N6{stroke:#313244;} + .d2-1616297415 .stroke-N7{stroke:#1E1E2E;} + .d2-1616297415 .stroke-B1{stroke:#CBA6f7;} + .d2-1616297415 .stroke-B2{stroke:#CBA6f7;} + .d2-1616297415 .stroke-B3{stroke:#6C7086;} + .d2-1616297415 .stroke-B4{stroke:#585B70;} + .d2-1616297415 .stroke-B5{stroke:#45475A;} + .d2-1616297415 .stroke-B6{stroke:#313244;} + .d2-1616297415 .stroke-AA2{stroke:#f38BA8;} + .d2-1616297415 .stroke-AA4{stroke:#45475A;} + .d2-1616297415 .stroke-AA5{stroke:#313244;} + .d2-1616297415 .stroke-AB4{stroke:#45475A;} + .d2-1616297415 .stroke-AB5{stroke:#313244;} + .d2-1616297415 .background-color-N1{background-color:#CDD6F4;} + .d2-1616297415 .background-color-N2{background-color:#BAC2DE;} + .d2-1616297415 .background-color-N3{background-color:#A6ADC8;} + .d2-1616297415 .background-color-N4{background-color:#585B70;} + .d2-1616297415 .background-color-N5{background-color:#45475A;} + .d2-1616297415 .background-color-N6{background-color:#313244;} + .d2-1616297415 .background-color-N7{background-color:#1E1E2E;} + .d2-1616297415 .background-color-B1{background-color:#CBA6f7;} + .d2-1616297415 .background-color-B2{background-color:#CBA6f7;} + .d2-1616297415 .background-color-B3{background-color:#6C7086;} + .d2-1616297415 .background-color-B4{background-color:#585B70;} + .d2-1616297415 .background-color-B5{background-color:#45475A;} + .d2-1616297415 .background-color-B6{background-color:#313244;} + .d2-1616297415 .background-color-AA2{background-color:#f38BA8;} + .d2-1616297415 .background-color-AA4{background-color:#45475A;} + .d2-1616297415 .background-color-AA5{background-color:#313244;} + .d2-1616297415 .background-color-AB4{background-color:#45475A;} + .d2-1616297415 .background-color-AB5{background-color:#313244;} + .d2-1616297415 .color-N1{color:#CDD6F4;} + .d2-1616297415 .color-N2{color:#BAC2DE;} + .d2-1616297415 .color-N3{color:#A6ADC8;} + .d2-1616297415 .color-N4{color:#585B70;} + .d2-1616297415 .color-N5{color:#45475A;} + .d2-1616297415 .color-N6{color:#313244;} + .d2-1616297415 .color-N7{color:#1E1E2E;} + .d2-1616297415 .color-B1{color:#CBA6f7;} + .d2-1616297415 .color-B2{color:#CBA6f7;} + .d2-1616297415 .color-B3{color:#6C7086;} + .d2-1616297415 .color-B4{color:#585B70;} + .d2-1616297415 .color-B5{color:#45475A;} + .d2-1616297415 .color-B6{color:#313244;} + .d2-1616297415 .color-AA2{color:#f38BA8;} + .d2-1616297415 .color-AA4{color:#45475A;} + .d2-1616297415 .color-AA5{color:#313244;} + .d2-1616297415 .color-AB4{color:#45475A;} + .d2-1616297415 .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}]]>112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + 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 6d0c2c544..108039f81 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,16 +1,16 @@ -wintersummersnowsun - - - - - + .d2-3924832427 .fill-N1{fill:#CDD6F4;} + .d2-3924832427 .fill-N2{fill:#BAC2DE;} + .d2-3924832427 .fill-N3{fill:#A6ADC8;} + .d2-3924832427 .fill-N4{fill:#585B70;} + .d2-3924832427 .fill-N5{fill:#45475A;} + .d2-3924832427 .fill-N6{fill:#313244;} + .d2-3924832427 .fill-N7{fill:#1E1E2E;} + .d2-3924832427 .fill-B1{fill:#CBA6f7;} + .d2-3924832427 .fill-B2{fill:#CBA6f7;} + .d2-3924832427 .fill-B3{fill:#6C7086;} + .d2-3924832427 .fill-B4{fill:#585B70;} + .d2-3924832427 .fill-B5{fill:#45475A;} + .d2-3924832427 .fill-B6{fill:#313244;} + .d2-3924832427 .fill-AA2{fill:#f38BA8;} + .d2-3924832427 .fill-AA4{fill:#45475A;} + .d2-3924832427 .fill-AA5{fill:#313244;} + .d2-3924832427 .fill-AB4{fill:#45475A;} + .d2-3924832427 .fill-AB5{fill:#313244;} + .d2-3924832427 .stroke-N1{stroke:#CDD6F4;} + .d2-3924832427 .stroke-N2{stroke:#BAC2DE;} + .d2-3924832427 .stroke-N3{stroke:#A6ADC8;} + .d2-3924832427 .stroke-N4{stroke:#585B70;} + .d2-3924832427 .stroke-N5{stroke:#45475A;} + .d2-3924832427 .stroke-N6{stroke:#313244;} + .d2-3924832427 .stroke-N7{stroke:#1E1E2E;} + .d2-3924832427 .stroke-B1{stroke:#CBA6f7;} + .d2-3924832427 .stroke-B2{stroke:#CBA6f7;} + .d2-3924832427 .stroke-B3{stroke:#6C7086;} + .d2-3924832427 .stroke-B4{stroke:#585B70;} + .d2-3924832427 .stroke-B5{stroke:#45475A;} + .d2-3924832427 .stroke-B6{stroke:#313244;} + .d2-3924832427 .stroke-AA2{stroke:#f38BA8;} + .d2-3924832427 .stroke-AA4{stroke:#45475A;} + .d2-3924832427 .stroke-AA5{stroke:#313244;} + .d2-3924832427 .stroke-AB4{stroke:#45475A;} + .d2-3924832427 .stroke-AB5{stroke:#313244;} + .d2-3924832427 .background-color-N1{background-color:#CDD6F4;} + .d2-3924832427 .background-color-N2{background-color:#BAC2DE;} + .d2-3924832427 .background-color-N3{background-color:#A6ADC8;} + .d2-3924832427 .background-color-N4{background-color:#585B70;} + .d2-3924832427 .background-color-N5{background-color:#45475A;} + .d2-3924832427 .background-color-N6{background-color:#313244;} + .d2-3924832427 .background-color-N7{background-color:#1E1E2E;} + .d2-3924832427 .background-color-B1{background-color:#CBA6f7;} + .d2-3924832427 .background-color-B2{background-color:#CBA6f7;} + .d2-3924832427 .background-color-B3{background-color:#6C7086;} + .d2-3924832427 .background-color-B4{background-color:#585B70;} + .d2-3924832427 .background-color-B5{background-color:#45475A;} + .d2-3924832427 .background-color-B6{background-color:#313244;} + .d2-3924832427 .background-color-AA2{background-color:#f38BA8;} + .d2-3924832427 .background-color-AA4{background-color:#45475A;} + .d2-3924832427 .background-color-AA5{background-color:#313244;} + .d2-3924832427 .background-color-AB4{background-color:#45475A;} + .d2-3924832427 .background-color-AB5{background-color:#313244;} + .d2-3924832427 .color-N1{color:#CDD6F4;} + .d2-3924832427 .color-N2{color:#BAC2DE;} + .d2-3924832427 .color-N3{color:#A6ADC8;} + .d2-3924832427 .color-N4{color:#585B70;} + .d2-3924832427 .color-N5{color:#45475A;} + .d2-3924832427 .color-N6{color:#313244;} + .d2-3924832427 .color-N7{color:#1E1E2E;} + .d2-3924832427 .color-B1{color:#CBA6f7;} + .d2-3924832427 .color-B2{color:#CBA6f7;} + .d2-3924832427 .color-B3{color:#6C7086;} + .d2-3924832427 .color-B4{color:#585B70;} + .d2-3924832427 .color-B5{color:#45475A;} + .d2-3924832427 .color-B6{color:#313244;} + .d2-3924832427 .color-AA2{color:#f38BA8;} + .d2-3924832427 .color-AA4{color:#45475A;} + .d2-3924832427 .color-AA5{color:#313244;} + .d2-3924832427 .color-AB4{color:#45475A;} + .d2-3924832427 .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}]]>wintersummersnowsun + + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg index ac464f2aa..82fe9f2b4 100644 --- a/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-1073612227 .fill-N1{fill:#CDD6F4;} + .d2-1073612227 .fill-N2{fill:#BAC2DE;} + .d2-1073612227 .fill-N3{fill:#A6ADC8;} + .d2-1073612227 .fill-N4{fill:#585B70;} + .d2-1073612227 .fill-N5{fill:#45475A;} + .d2-1073612227 .fill-N6{fill:#313244;} + .d2-1073612227 .fill-N7{fill:#1E1E2E;} + .d2-1073612227 .fill-B1{fill:#CBA6f7;} + .d2-1073612227 .fill-B2{fill:#CBA6f7;} + .d2-1073612227 .fill-B3{fill:#6C7086;} + .d2-1073612227 .fill-B4{fill:#585B70;} + .d2-1073612227 .fill-B5{fill:#45475A;} + .d2-1073612227 .fill-B6{fill:#313244;} + .d2-1073612227 .fill-AA2{fill:#f38BA8;} + .d2-1073612227 .fill-AA4{fill:#45475A;} + .d2-1073612227 .fill-AA5{fill:#313244;} + .d2-1073612227 .fill-AB4{fill:#45475A;} + .d2-1073612227 .fill-AB5{fill:#313244;} + .d2-1073612227 .stroke-N1{stroke:#CDD6F4;} + .d2-1073612227 .stroke-N2{stroke:#BAC2DE;} + .d2-1073612227 .stroke-N3{stroke:#A6ADC8;} + .d2-1073612227 .stroke-N4{stroke:#585B70;} + .d2-1073612227 .stroke-N5{stroke:#45475A;} + .d2-1073612227 .stroke-N6{stroke:#313244;} + .d2-1073612227 .stroke-N7{stroke:#1E1E2E;} + .d2-1073612227 .stroke-B1{stroke:#CBA6f7;} + .d2-1073612227 .stroke-B2{stroke:#CBA6f7;} + .d2-1073612227 .stroke-B3{stroke:#6C7086;} + .d2-1073612227 .stroke-B4{stroke:#585B70;} + .d2-1073612227 .stroke-B5{stroke:#45475A;} + .d2-1073612227 .stroke-B6{stroke:#313244;} + .d2-1073612227 .stroke-AA2{stroke:#f38BA8;} + .d2-1073612227 .stroke-AA4{stroke:#45475A;} + .d2-1073612227 .stroke-AA5{stroke:#313244;} + .d2-1073612227 .stroke-AB4{stroke:#45475A;} + .d2-1073612227 .stroke-AB5{stroke:#313244;} + .d2-1073612227 .background-color-N1{background-color:#CDD6F4;} + .d2-1073612227 .background-color-N2{background-color:#BAC2DE;} + .d2-1073612227 .background-color-N3{background-color:#A6ADC8;} + .d2-1073612227 .background-color-N4{background-color:#585B70;} + .d2-1073612227 .background-color-N5{background-color:#45475A;} + .d2-1073612227 .background-color-N6{background-color:#313244;} + .d2-1073612227 .background-color-N7{background-color:#1E1E2E;} + .d2-1073612227 .background-color-B1{background-color:#CBA6f7;} + .d2-1073612227 .background-color-B2{background-color:#CBA6f7;} + .d2-1073612227 .background-color-B3{background-color:#6C7086;} + .d2-1073612227 .background-color-B4{background-color:#585B70;} + .d2-1073612227 .background-color-B5{background-color:#45475A;} + .d2-1073612227 .background-color-B6{background-color:#313244;} + .d2-1073612227 .background-color-AA2{background-color:#f38BA8;} + .d2-1073612227 .background-color-AA4{background-color:#45475A;} + .d2-1073612227 .background-color-AA5{background-color:#313244;} + .d2-1073612227 .background-color-AB4{background-color:#45475A;} + .d2-1073612227 .background-color-AB5{background-color:#313244;} + .d2-1073612227 .color-N1{color:#CDD6F4;} + .d2-1073612227 .color-N2{color:#BAC2DE;} + .d2-1073612227 .color-N3{color:#A6ADC8;} + .d2-1073612227 .color-N4{color:#585B70;} + .d2-1073612227 .color-N5{color:#45475A;} + .d2-1073612227 .color-N6{color:#313244;} + .d2-1073612227 .color-N7{color:#1E1E2E;} + .d2-1073612227 .color-B1{color:#CBA6f7;} + .d2-1073612227 .color-B2{color:#CBA6f7;} + .d2-1073612227 .color-B3{color:#6C7086;} + .d2-1073612227 .color-B4{color:#585B70;} + .d2-1073612227 .color-B5{color:#45475A;} + .d2-1073612227 .color-B6{color:#313244;} + .d2-1073612227 .color-AA2{color:#f38BA8;} + .d2-1073612227 .color-AA4{color:#45475A;} + .d2-1073612227 .color-AA5{color:#313244;} + .d2-1073612227 .color-AB4{color:#45475A;} + .d2-1073612227 .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}]]>ab hello 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 adcf552e7..f8a608a9c 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. 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 aafb4ab50..7d7f70bb6 100644 --- a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg @@ -1,27 +1,27 @@ -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

+People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

  • Inject ads, who-to-follow, onboarding
  • Conversation module
    • @@ -851,46 +851,46 @@
  • Tweat deduplication
  • Served data logging
-
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

-
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone webHTTP AndroidThrift RPC Candidate FetchFeature HydrationCandidate sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

+
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone webHTTP AndroidThrift RPC Candidate FetchFeature HydrationCandidate sources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 da9ffaff9..debb64a29 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3098664959 .fill-N1{fill:#0A0F25;} + .d2-3098664959 .fill-N2{fill:#676C7E;} + .d2-3098664959 .fill-N3{fill:#9499AB;} + .d2-3098664959 .fill-N4{fill:#CFD2DD;} + .d2-3098664959 .fill-N5{fill:#DEE1EB;} + .d2-3098664959 .fill-N6{fill:#EEF1F8;} + .d2-3098664959 .fill-N7{fill:#FFFFFF;} + .d2-3098664959 .fill-B1{fill:#0D32B2;} + .d2-3098664959 .fill-B2{fill:#0D32B2;} + .d2-3098664959 .fill-B3{fill:#E3E9FD;} + .d2-3098664959 .fill-B4{fill:#E3E9FD;} + .d2-3098664959 .fill-B5{fill:#EDF0FD;} + .d2-3098664959 .fill-B6{fill:#F7F8FE;} + .d2-3098664959 .fill-AA2{fill:#4A6FF3;} + .d2-3098664959 .fill-AA4{fill:#EDF0FD;} + .d2-3098664959 .fill-AA5{fill:#F7F8FE;} + .d2-3098664959 .fill-AB4{fill:#EDF0FD;} + .d2-3098664959 .fill-AB5{fill:#F7F8FE;} + .d2-3098664959 .stroke-N1{stroke:#0A0F25;} + .d2-3098664959 .stroke-N2{stroke:#676C7E;} + .d2-3098664959 .stroke-N3{stroke:#9499AB;} + .d2-3098664959 .stroke-N4{stroke:#CFD2DD;} + .d2-3098664959 .stroke-N5{stroke:#DEE1EB;} + .d2-3098664959 .stroke-N6{stroke:#EEF1F8;} + .d2-3098664959 .stroke-N7{stroke:#FFFFFF;} + .d2-3098664959 .stroke-B1{stroke:#0D32B2;} + .d2-3098664959 .stroke-B2{stroke:#0D32B2;} + .d2-3098664959 .stroke-B3{stroke:#E3E9FD;} + .d2-3098664959 .stroke-B4{stroke:#E3E9FD;} + .d2-3098664959 .stroke-B5{stroke:#EDF0FD;} + .d2-3098664959 .stroke-B6{stroke:#F7F8FE;} + .d2-3098664959 .stroke-AA2{stroke:#4A6FF3;} + .d2-3098664959 .stroke-AA4{stroke:#EDF0FD;} + .d2-3098664959 .stroke-AA5{stroke:#F7F8FE;} + .d2-3098664959 .stroke-AB4{stroke:#EDF0FD;} + .d2-3098664959 .stroke-AB5{stroke:#F7F8FE;} + .d2-3098664959 .background-color-N1{background-color:#0A0F25;} + .d2-3098664959 .background-color-N2{background-color:#676C7E;} + .d2-3098664959 .background-color-N3{background-color:#9499AB;} + .d2-3098664959 .background-color-N4{background-color:#CFD2DD;} + .d2-3098664959 .background-color-N5{background-color:#DEE1EB;} + .d2-3098664959 .background-color-N6{background-color:#EEF1F8;} + .d2-3098664959 .background-color-N7{background-color:#FFFFFF;} + .d2-3098664959 .background-color-B1{background-color:#0D32B2;} + .d2-3098664959 .background-color-B2{background-color:#0D32B2;} + .d2-3098664959 .background-color-B3{background-color:#E3E9FD;} + .d2-3098664959 .background-color-B4{background-color:#E3E9FD;} + .d2-3098664959 .background-color-B5{background-color:#EDF0FD;} + .d2-3098664959 .background-color-B6{background-color:#F7F8FE;} + .d2-3098664959 .background-color-AA2{background-color:#4A6FF3;} + .d2-3098664959 .background-color-AA4{background-color:#EDF0FD;} + .d2-3098664959 .background-color-AA5{background-color:#F7F8FE;} + .d2-3098664959 .background-color-AB4{background-color:#EDF0FD;} + .d2-3098664959 .background-color-AB5{background-color:#F7F8FE;} + .d2-3098664959 .color-N1{color:#0A0F25;} + .d2-3098664959 .color-N2{color:#676C7E;} + .d2-3098664959 .color-N3{color:#9499AB;} + .d2-3098664959 .color-N4{color:#CFD2DD;} + .d2-3098664959 .color-N5{color:#DEE1EB;} + .d2-3098664959 .color-N6{color:#EEF1F8;} + .d2-3098664959 .color-N7{color:#FFFFFF;} + .d2-3098664959 .color-B1{color:#0D32B2;} + .d2-3098664959 .color-B2{color:#0D32B2;} + .d2-3098664959 .color-B3{color:#E3E9FD;} + .d2-3098664959 .color-B4{color:#E3E9FD;} + .d2-3098664959 .color-B5{color:#EDF0FD;} + .d2-3098664959 .color-B6{color:#F7F8FE;} + .d2-3098664959 .color-AA2{color:#4A6FF3;} + .d2-3098664959 .color-AA4{color:#EDF0FD;} + .d2-3098664959 .color-AA5{color:#F7F8FE;} + .d2-3098664959 .color-AB4{color:#EDF0FD;} + .d2-3098664959 .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 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 62f45f0f8..a9859f3d1 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,9 +1,9 @@ -xy + .d2-225207715 .fill-N1{fill:#0A0F25;} + .d2-225207715 .fill-N2{fill:#676C7E;} + .d2-225207715 .fill-N3{fill:#9499AB;} + .d2-225207715 .fill-N4{fill:#CFD2DD;} + .d2-225207715 .fill-N5{fill:#DEE1EB;} + .d2-225207715 .fill-N6{fill:#EEF1F8;} + .d2-225207715 .fill-N7{fill:#FFFFFF;} + .d2-225207715 .fill-B1{fill:#0D32B2;} + .d2-225207715 .fill-B2{fill:#0D32B2;} + .d2-225207715 .fill-B3{fill:#E3E9FD;} + .d2-225207715 .fill-B4{fill:#E3E9FD;} + .d2-225207715 .fill-B5{fill:#EDF0FD;} + .d2-225207715 .fill-B6{fill:#F7F8FE;} + .d2-225207715 .fill-AA2{fill:#4A6FF3;} + .d2-225207715 .fill-AA4{fill:#EDF0FD;} + .d2-225207715 .fill-AA5{fill:#F7F8FE;} + .d2-225207715 .fill-AB4{fill:#EDF0FD;} + .d2-225207715 .fill-AB5{fill:#F7F8FE;} + .d2-225207715 .stroke-N1{stroke:#0A0F25;} + .d2-225207715 .stroke-N2{stroke:#676C7E;} + .d2-225207715 .stroke-N3{stroke:#9499AB;} + .d2-225207715 .stroke-N4{stroke:#CFD2DD;} + .d2-225207715 .stroke-N5{stroke:#DEE1EB;} + .d2-225207715 .stroke-N6{stroke:#EEF1F8;} + .d2-225207715 .stroke-N7{stroke:#FFFFFF;} + .d2-225207715 .stroke-B1{stroke:#0D32B2;} + .d2-225207715 .stroke-B2{stroke:#0D32B2;} + .d2-225207715 .stroke-B3{stroke:#E3E9FD;} + .d2-225207715 .stroke-B4{stroke:#E3E9FD;} + .d2-225207715 .stroke-B5{stroke:#EDF0FD;} + .d2-225207715 .stroke-B6{stroke:#F7F8FE;} + .d2-225207715 .stroke-AA2{stroke:#4A6FF3;} + .d2-225207715 .stroke-AA4{stroke:#EDF0FD;} + .d2-225207715 .stroke-AA5{stroke:#F7F8FE;} + .d2-225207715 .stroke-AB4{stroke:#EDF0FD;} + .d2-225207715 .stroke-AB5{stroke:#F7F8FE;} + .d2-225207715 .background-color-N1{background-color:#0A0F25;} + .d2-225207715 .background-color-N2{background-color:#676C7E;} + .d2-225207715 .background-color-N3{background-color:#9499AB;} + .d2-225207715 .background-color-N4{background-color:#CFD2DD;} + .d2-225207715 .background-color-N5{background-color:#DEE1EB;} + .d2-225207715 .background-color-N6{background-color:#EEF1F8;} + .d2-225207715 .background-color-N7{background-color:#FFFFFF;} + .d2-225207715 .background-color-B1{background-color:#0D32B2;} + .d2-225207715 .background-color-B2{background-color:#0D32B2;} + .d2-225207715 .background-color-B3{background-color:#E3E9FD;} + .d2-225207715 .background-color-B4{background-color:#E3E9FD;} + .d2-225207715 .background-color-B5{background-color:#EDF0FD;} + .d2-225207715 .background-color-B6{background-color:#F7F8FE;} + .d2-225207715 .background-color-AA2{background-color:#4A6FF3;} + .d2-225207715 .background-color-AA4{background-color:#EDF0FD;} + .d2-225207715 .background-color-AA5{background-color:#F7F8FE;} + .d2-225207715 .background-color-AB4{background-color:#EDF0FD;} + .d2-225207715 .background-color-AB5{background-color:#F7F8FE;} + .d2-225207715 .color-N1{color:#0A0F25;} + .d2-225207715 .color-N2{color:#676C7E;} + .d2-225207715 .color-N3{color:#9499AB;} + .d2-225207715 .color-N4{color:#CFD2DD;} + .d2-225207715 .color-N5{color:#DEE1EB;} + .d2-225207715 .color-N6{color:#EEF1F8;} + .d2-225207715 .color-N7{color:#FFFFFF;} + .d2-225207715 .color-B1{color:#0D32B2;} + .d2-225207715 .color-B2{color:#0D32B2;} + .d2-225207715 .color-B3{color:#E3E9FD;} + .d2-225207715 .color-B4{color:#E3E9FD;} + .d2-225207715 .color-B5{color:#EDF0FD;} + .d2-225207715 .color-B6{color:#F7F8FE;} + .d2-225207715 .color-AA2{color:#4A6FF3;} + .d2-225207715 .color-AA4{color:#EDF0FD;} + .d2-225207715 .color-AA5{color:#F7F8FE;} + .d2-225207715 .color-AB4{color:#EDF0FD;} + .d2-225207715 .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 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 da9ffaff9..debb64a29 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,9 +1,9 @@ -xy + .d2-3098664959 .fill-N1{fill:#0A0F25;} + .d2-3098664959 .fill-N2{fill:#676C7E;} + .d2-3098664959 .fill-N3{fill:#9499AB;} + .d2-3098664959 .fill-N4{fill:#CFD2DD;} + .d2-3098664959 .fill-N5{fill:#DEE1EB;} + .d2-3098664959 .fill-N6{fill:#EEF1F8;} + .d2-3098664959 .fill-N7{fill:#FFFFFF;} + .d2-3098664959 .fill-B1{fill:#0D32B2;} + .d2-3098664959 .fill-B2{fill:#0D32B2;} + .d2-3098664959 .fill-B3{fill:#E3E9FD;} + .d2-3098664959 .fill-B4{fill:#E3E9FD;} + .d2-3098664959 .fill-B5{fill:#EDF0FD;} + .d2-3098664959 .fill-B6{fill:#F7F8FE;} + .d2-3098664959 .fill-AA2{fill:#4A6FF3;} + .d2-3098664959 .fill-AA4{fill:#EDF0FD;} + .d2-3098664959 .fill-AA5{fill:#F7F8FE;} + .d2-3098664959 .fill-AB4{fill:#EDF0FD;} + .d2-3098664959 .fill-AB5{fill:#F7F8FE;} + .d2-3098664959 .stroke-N1{stroke:#0A0F25;} + .d2-3098664959 .stroke-N2{stroke:#676C7E;} + .d2-3098664959 .stroke-N3{stroke:#9499AB;} + .d2-3098664959 .stroke-N4{stroke:#CFD2DD;} + .d2-3098664959 .stroke-N5{stroke:#DEE1EB;} + .d2-3098664959 .stroke-N6{stroke:#EEF1F8;} + .d2-3098664959 .stroke-N7{stroke:#FFFFFF;} + .d2-3098664959 .stroke-B1{stroke:#0D32B2;} + .d2-3098664959 .stroke-B2{stroke:#0D32B2;} + .d2-3098664959 .stroke-B3{stroke:#E3E9FD;} + .d2-3098664959 .stroke-B4{stroke:#E3E9FD;} + .d2-3098664959 .stroke-B5{stroke:#EDF0FD;} + .d2-3098664959 .stroke-B6{stroke:#F7F8FE;} + .d2-3098664959 .stroke-AA2{stroke:#4A6FF3;} + .d2-3098664959 .stroke-AA4{stroke:#EDF0FD;} + .d2-3098664959 .stroke-AA5{stroke:#F7F8FE;} + .d2-3098664959 .stroke-AB4{stroke:#EDF0FD;} + .d2-3098664959 .stroke-AB5{stroke:#F7F8FE;} + .d2-3098664959 .background-color-N1{background-color:#0A0F25;} + .d2-3098664959 .background-color-N2{background-color:#676C7E;} + .d2-3098664959 .background-color-N3{background-color:#9499AB;} + .d2-3098664959 .background-color-N4{background-color:#CFD2DD;} + .d2-3098664959 .background-color-N5{background-color:#DEE1EB;} + .d2-3098664959 .background-color-N6{background-color:#EEF1F8;} + .d2-3098664959 .background-color-N7{background-color:#FFFFFF;} + .d2-3098664959 .background-color-B1{background-color:#0D32B2;} + .d2-3098664959 .background-color-B2{background-color:#0D32B2;} + .d2-3098664959 .background-color-B3{background-color:#E3E9FD;} + .d2-3098664959 .background-color-B4{background-color:#E3E9FD;} + .d2-3098664959 .background-color-B5{background-color:#EDF0FD;} + .d2-3098664959 .background-color-B6{background-color:#F7F8FE;} + .d2-3098664959 .background-color-AA2{background-color:#4A6FF3;} + .d2-3098664959 .background-color-AA4{background-color:#EDF0FD;} + .d2-3098664959 .background-color-AA5{background-color:#F7F8FE;} + .d2-3098664959 .background-color-AB4{background-color:#EDF0FD;} + .d2-3098664959 .background-color-AB5{background-color:#F7F8FE;} + .d2-3098664959 .color-N1{color:#0A0F25;} + .d2-3098664959 .color-N2{color:#676C7E;} + .d2-3098664959 .color-N3{color:#9499AB;} + .d2-3098664959 .color-N4{color:#CFD2DD;} + .d2-3098664959 .color-N5{color:#DEE1EB;} + .d2-3098664959 .color-N6{color:#EEF1F8;} + .d2-3098664959 .color-N7{color:#FFFFFF;} + .d2-3098664959 .color-B1{color:#0D32B2;} + .d2-3098664959 .color-B2{color:#0D32B2;} + .d2-3098664959 .color-B3{color:#E3E9FD;} + .d2-3098664959 .color-B4{color:#E3E9FD;} + .d2-3098664959 .color-B5{color:#EDF0FD;} + .d2-3098664959 .color-B6{color:#F7F8FE;} + .d2-3098664959 .color-AA2{color:#4A6FF3;} + .d2-3098664959 .color-AA4{color:#EDF0FD;} + .d2-3098664959 .color-AA5{color:#F7F8FE;} + .d2-3098664959 .color-AB4{color:#EDF0FD;} + .d2-3098664959 .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 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 62f45f0f8..a9859f3d1 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,9 +1,9 @@ -xy + .d2-225207715 .fill-N1{fill:#0A0F25;} + .d2-225207715 .fill-N2{fill:#676C7E;} + .d2-225207715 .fill-N3{fill:#9499AB;} + .d2-225207715 .fill-N4{fill:#CFD2DD;} + .d2-225207715 .fill-N5{fill:#DEE1EB;} + .d2-225207715 .fill-N6{fill:#EEF1F8;} + .d2-225207715 .fill-N7{fill:#FFFFFF;} + .d2-225207715 .fill-B1{fill:#0D32B2;} + .d2-225207715 .fill-B2{fill:#0D32B2;} + .d2-225207715 .fill-B3{fill:#E3E9FD;} + .d2-225207715 .fill-B4{fill:#E3E9FD;} + .d2-225207715 .fill-B5{fill:#EDF0FD;} + .d2-225207715 .fill-B6{fill:#F7F8FE;} + .d2-225207715 .fill-AA2{fill:#4A6FF3;} + .d2-225207715 .fill-AA4{fill:#EDF0FD;} + .d2-225207715 .fill-AA5{fill:#F7F8FE;} + .d2-225207715 .fill-AB4{fill:#EDF0FD;} + .d2-225207715 .fill-AB5{fill:#F7F8FE;} + .d2-225207715 .stroke-N1{stroke:#0A0F25;} + .d2-225207715 .stroke-N2{stroke:#676C7E;} + .d2-225207715 .stroke-N3{stroke:#9499AB;} + .d2-225207715 .stroke-N4{stroke:#CFD2DD;} + .d2-225207715 .stroke-N5{stroke:#DEE1EB;} + .d2-225207715 .stroke-N6{stroke:#EEF1F8;} + .d2-225207715 .stroke-N7{stroke:#FFFFFF;} + .d2-225207715 .stroke-B1{stroke:#0D32B2;} + .d2-225207715 .stroke-B2{stroke:#0D32B2;} + .d2-225207715 .stroke-B3{stroke:#E3E9FD;} + .d2-225207715 .stroke-B4{stroke:#E3E9FD;} + .d2-225207715 .stroke-B5{stroke:#EDF0FD;} + .d2-225207715 .stroke-B6{stroke:#F7F8FE;} + .d2-225207715 .stroke-AA2{stroke:#4A6FF3;} + .d2-225207715 .stroke-AA4{stroke:#EDF0FD;} + .d2-225207715 .stroke-AA5{stroke:#F7F8FE;} + .d2-225207715 .stroke-AB4{stroke:#EDF0FD;} + .d2-225207715 .stroke-AB5{stroke:#F7F8FE;} + .d2-225207715 .background-color-N1{background-color:#0A0F25;} + .d2-225207715 .background-color-N2{background-color:#676C7E;} + .d2-225207715 .background-color-N3{background-color:#9499AB;} + .d2-225207715 .background-color-N4{background-color:#CFD2DD;} + .d2-225207715 .background-color-N5{background-color:#DEE1EB;} + .d2-225207715 .background-color-N6{background-color:#EEF1F8;} + .d2-225207715 .background-color-N7{background-color:#FFFFFF;} + .d2-225207715 .background-color-B1{background-color:#0D32B2;} + .d2-225207715 .background-color-B2{background-color:#0D32B2;} + .d2-225207715 .background-color-B3{background-color:#E3E9FD;} + .d2-225207715 .background-color-B4{background-color:#E3E9FD;} + .d2-225207715 .background-color-B5{background-color:#EDF0FD;} + .d2-225207715 .background-color-B6{background-color:#F7F8FE;} + .d2-225207715 .background-color-AA2{background-color:#4A6FF3;} + .d2-225207715 .background-color-AA4{background-color:#EDF0FD;} + .d2-225207715 .background-color-AA5{background-color:#F7F8FE;} + .d2-225207715 .background-color-AB4{background-color:#EDF0FD;} + .d2-225207715 .background-color-AB5{background-color:#F7F8FE;} + .d2-225207715 .color-N1{color:#0A0F25;} + .d2-225207715 .color-N2{color:#676C7E;} + .d2-225207715 .color-N3{color:#9499AB;} + .d2-225207715 .color-N4{color:#CFD2DD;} + .d2-225207715 .color-N5{color:#DEE1EB;} + .d2-225207715 .color-N6{color:#EEF1F8;} + .d2-225207715 .color-N7{color:#FFFFFF;} + .d2-225207715 .color-B1{color:#0D32B2;} + .d2-225207715 .color-B2{color:#0D32B2;} + .d2-225207715 .color-B3{color:#E3E9FD;} + .d2-225207715 .color-B4{color:#E3E9FD;} + .d2-225207715 .color-B5{color:#EDF0FD;} + .d2-225207715 .color-B6{color:#F7F8FE;} + .d2-225207715 .color-AA2{color:#4A6FF3;} + .d2-225207715 .color-AA4{color:#EDF0FD;} + .d2-225207715 .color-AA5{color:#F7F8FE;} + .d2-225207715 .color-AB4{color:#EDF0FD;} + .d2-225207715 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg index 6f99c984e..8072f6585 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg @@ -1,16 +1,16 @@ -Why do computers get sick often?Because their Windows are always open! italic font + .d2-3823319541 .fill-N1{fill:#0A0F25;} + .d2-3823319541 .fill-N2{fill:#676C7E;} + .d2-3823319541 .fill-N3{fill:#9499AB;} + .d2-3823319541 .fill-N4{fill:#CFD2DD;} + .d2-3823319541 .fill-N5{fill:#DEE1EB;} + .d2-3823319541 .fill-N6{fill:#EEF1F8;} + .d2-3823319541 .fill-N7{fill:#FFFFFF;} + .d2-3823319541 .fill-B1{fill:#0D32B2;} + .d2-3823319541 .fill-B2{fill:#0D32B2;} + .d2-3823319541 .fill-B3{fill:#E3E9FD;} + .d2-3823319541 .fill-B4{fill:#E3E9FD;} + .d2-3823319541 .fill-B5{fill:#EDF0FD;} + .d2-3823319541 .fill-B6{fill:#F7F8FE;} + .d2-3823319541 .fill-AA2{fill:#4A6FF3;} + .d2-3823319541 .fill-AA4{fill:#EDF0FD;} + .d2-3823319541 .fill-AA5{fill:#F7F8FE;} + .d2-3823319541 .fill-AB4{fill:#EDF0FD;} + .d2-3823319541 .fill-AB5{fill:#F7F8FE;} + .d2-3823319541 .stroke-N1{stroke:#0A0F25;} + .d2-3823319541 .stroke-N2{stroke:#676C7E;} + .d2-3823319541 .stroke-N3{stroke:#9499AB;} + .d2-3823319541 .stroke-N4{stroke:#CFD2DD;} + .d2-3823319541 .stroke-N5{stroke:#DEE1EB;} + .d2-3823319541 .stroke-N6{stroke:#EEF1F8;} + .d2-3823319541 .stroke-N7{stroke:#FFFFFF;} + .d2-3823319541 .stroke-B1{stroke:#0D32B2;} + .d2-3823319541 .stroke-B2{stroke:#0D32B2;} + .d2-3823319541 .stroke-B3{stroke:#E3E9FD;} + .d2-3823319541 .stroke-B4{stroke:#E3E9FD;} + .d2-3823319541 .stroke-B5{stroke:#EDF0FD;} + .d2-3823319541 .stroke-B6{stroke:#F7F8FE;} + .d2-3823319541 .stroke-AA2{stroke:#4A6FF3;} + .d2-3823319541 .stroke-AA4{stroke:#EDF0FD;} + .d2-3823319541 .stroke-AA5{stroke:#F7F8FE;} + .d2-3823319541 .stroke-AB4{stroke:#EDF0FD;} + .d2-3823319541 .stroke-AB5{stroke:#F7F8FE;} + .d2-3823319541 .background-color-N1{background-color:#0A0F25;} + .d2-3823319541 .background-color-N2{background-color:#676C7E;} + .d2-3823319541 .background-color-N3{background-color:#9499AB;} + .d2-3823319541 .background-color-N4{background-color:#CFD2DD;} + .d2-3823319541 .background-color-N5{background-color:#DEE1EB;} + .d2-3823319541 .background-color-N6{background-color:#EEF1F8;} + .d2-3823319541 .background-color-N7{background-color:#FFFFFF;} + .d2-3823319541 .background-color-B1{background-color:#0D32B2;} + .d2-3823319541 .background-color-B2{background-color:#0D32B2;} + .d2-3823319541 .background-color-B3{background-color:#E3E9FD;} + .d2-3823319541 .background-color-B4{background-color:#E3E9FD;} + .d2-3823319541 .background-color-B5{background-color:#EDF0FD;} + .d2-3823319541 .background-color-B6{background-color:#F7F8FE;} + .d2-3823319541 .background-color-AA2{background-color:#4A6FF3;} + .d2-3823319541 .background-color-AA4{background-color:#EDF0FD;} + .d2-3823319541 .background-color-AA5{background-color:#F7F8FE;} + .d2-3823319541 .background-color-AB4{background-color:#EDF0FD;} + .d2-3823319541 .background-color-AB5{background-color:#F7F8FE;} + .d2-3823319541 .color-N1{color:#0A0F25;} + .d2-3823319541 .color-N2{color:#676C7E;} + .d2-3823319541 .color-N3{color:#9499AB;} + .d2-3823319541 .color-N4{color:#CFD2DD;} + .d2-3823319541 .color-N5{color:#DEE1EB;} + .d2-3823319541 .color-N6{color:#EEF1F8;} + .d2-3823319541 .color-N7{color:#FFFFFF;} + .d2-3823319541 .color-B1{color:#0D32B2;} + .d2-3823319541 .color-B2{color:#0D32B2;} + .d2-3823319541 .color-B3{color:#E3E9FD;} + .d2-3823319541 .color-B4{color:#E3E9FD;} + .d2-3823319541 .color-B5{color:#EDF0FD;} + .d2-3823319541 .color-B6{color:#F7F8FE;} + .d2-3823319541 .color-AA2{color:#4A6FF3;} + .d2-3823319541 .color-AA4{color:#EDF0FD;} + .d2-3823319541 .color-AA5{color:#F7F8FE;} + .d2-3823319541 .color-AB4{color:#EDF0FD;} + .d2-3823319541 .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}]]>Why do computers get sick often?Because their Windows are always open! italic font diff --git a/e2etests/testdata/patterns/3d/dagre/board.exp.json b/e2etests/testdata/patterns/3d/dagre/board.exp.json index a07a3e175..7f4aaad05 100644 --- a/e2etests/testdata/patterns/3d/dagre/board.exp.json +++ b/e2etests/testdata/patterns/3d/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 15 + "y": 2 }, "width": 53, "height": 66, @@ -50,7 +50,7 @@ "type": "hexagon", "pos": { "x": 128, - "y": 10 + "y": 0 }, "width": 51, "height": 69, diff --git a/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg b/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg index 77e541a79..01eb2db3a 100644 --- a/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1692964923 .fill-N1{fill:#0A0F25;} + .d2-1692964923 .fill-N2{fill:#676C7E;} + .d2-1692964923 .fill-N3{fill:#9499AB;} + .d2-1692964923 .fill-N4{fill:#CFD2DD;} + .d2-1692964923 .fill-N5{fill:#DEE1EB;} + .d2-1692964923 .fill-N6{fill:#EEF1F8;} + .d2-1692964923 .fill-N7{fill:#FFFFFF;} + .d2-1692964923 .fill-B1{fill:#0D32B2;} + .d2-1692964923 .fill-B2{fill:#0D32B2;} + .d2-1692964923 .fill-B3{fill:#E3E9FD;} + .d2-1692964923 .fill-B4{fill:#E3E9FD;} + .d2-1692964923 .fill-B5{fill:#EDF0FD;} + .d2-1692964923 .fill-B6{fill:#F7F8FE;} + .d2-1692964923 .fill-AA2{fill:#4A6FF3;} + .d2-1692964923 .fill-AA4{fill:#EDF0FD;} + .d2-1692964923 .fill-AA5{fill:#F7F8FE;} + .d2-1692964923 .fill-AB4{fill:#EDF0FD;} + .d2-1692964923 .fill-AB5{fill:#F7F8FE;} + .d2-1692964923 .stroke-N1{stroke:#0A0F25;} + .d2-1692964923 .stroke-N2{stroke:#676C7E;} + .d2-1692964923 .stroke-N3{stroke:#9499AB;} + .d2-1692964923 .stroke-N4{stroke:#CFD2DD;} + .d2-1692964923 .stroke-N5{stroke:#DEE1EB;} + .d2-1692964923 .stroke-N6{stroke:#EEF1F8;} + .d2-1692964923 .stroke-N7{stroke:#FFFFFF;} + .d2-1692964923 .stroke-B1{stroke:#0D32B2;} + .d2-1692964923 .stroke-B2{stroke:#0D32B2;} + .d2-1692964923 .stroke-B3{stroke:#E3E9FD;} + .d2-1692964923 .stroke-B4{stroke:#E3E9FD;} + .d2-1692964923 .stroke-B5{stroke:#EDF0FD;} + .d2-1692964923 .stroke-B6{stroke:#F7F8FE;} + .d2-1692964923 .stroke-AA2{stroke:#4A6FF3;} + .d2-1692964923 .stroke-AA4{stroke:#EDF0FD;} + .d2-1692964923 .stroke-AA5{stroke:#F7F8FE;} + .d2-1692964923 .stroke-AB4{stroke:#EDF0FD;} + .d2-1692964923 .stroke-AB5{stroke:#F7F8FE;} + .d2-1692964923 .background-color-N1{background-color:#0A0F25;} + .d2-1692964923 .background-color-N2{background-color:#676C7E;} + .d2-1692964923 .background-color-N3{background-color:#9499AB;} + .d2-1692964923 .background-color-N4{background-color:#CFD2DD;} + .d2-1692964923 .background-color-N5{background-color:#DEE1EB;} + .d2-1692964923 .background-color-N6{background-color:#EEF1F8;} + .d2-1692964923 .background-color-N7{background-color:#FFFFFF;} + .d2-1692964923 .background-color-B1{background-color:#0D32B2;} + .d2-1692964923 .background-color-B2{background-color:#0D32B2;} + .d2-1692964923 .background-color-B3{background-color:#E3E9FD;} + .d2-1692964923 .background-color-B4{background-color:#E3E9FD;} + .d2-1692964923 .background-color-B5{background-color:#EDF0FD;} + .d2-1692964923 .background-color-B6{background-color:#F7F8FE;} + .d2-1692964923 .background-color-AA2{background-color:#4A6FF3;} + .d2-1692964923 .background-color-AA4{background-color:#EDF0FD;} + .d2-1692964923 .background-color-AA5{background-color:#F7F8FE;} + .d2-1692964923 .background-color-AB4{background-color:#EDF0FD;} + .d2-1692964923 .background-color-AB5{background-color:#F7F8FE;} + .d2-1692964923 .color-N1{color:#0A0F25;} + .d2-1692964923 .color-N2{color:#676C7E;} + .d2-1692964923 .color-N3{color:#9499AB;} + .d2-1692964923 .color-N4{color:#CFD2DD;} + .d2-1692964923 .color-N5{color:#DEE1EB;} + .d2-1692964923 .color-N6{color:#EEF1F8;} + .d2-1692964923 .color-N7{color:#FFFFFF;} + .d2-1692964923 .color-B1{color:#0D32B2;} + .d2-1692964923 .color-B2{color:#0D32B2;} + .d2-1692964923 .color-B3{color:#E3E9FD;} + .d2-1692964923 .color-B4{color:#E3E9FD;} + .d2-1692964923 .color-B5{color:#EDF0FD;} + .d2-1692964923 .color-B6{color:#F7F8FE;} + .d2-1692964923 .color-AA2{color:#4A6FF3;} + .d2-1692964923 .color-AA4{color:#EDF0FD;} + .d2-1692964923 .color-AA5{color:#F7F8FE;} + .d2-1692964923 .color-AB4{color:#EDF0FD;} + .d2-1692964923 .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}]]>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/board.exp.json b/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json index fe29298b1..8d006d204 100644 --- a/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json +++ b/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json @@ -153,11 +153,11 @@ "labelPercentage": 0, "route": [ { - "x": 53, + "x": 52.5, "y": 33 }, { - "x": 105.4000015258789, + "x": 105.30000305175781, "y": 33 }, { @@ -200,11 +200,11 @@ "labelPercentage": 0, "route": [ { - "x": 238, + "x": 237.5, "y": 33 }, { - "x": 291.20001220703125, + "x": 291.1000061035156, "y": 33 }, { 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 20116a72b..309424dd6 100644 --- a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz syncsync + .d2-3526140621 .fill-N1{fill:#0A0F25;} + .d2-3526140621 .fill-N2{fill:#676C7E;} + .d2-3526140621 .fill-N3{fill:#9499AB;} + .d2-3526140621 .fill-N4{fill:#CFD2DD;} + .d2-3526140621 .fill-N5{fill:#DEE1EB;} + .d2-3526140621 .fill-N6{fill:#EEF1F8;} + .d2-3526140621 .fill-N7{fill:#FFFFFF;} + .d2-3526140621 .fill-B1{fill:#0D32B2;} + .d2-3526140621 .fill-B2{fill:#0D32B2;} + .d2-3526140621 .fill-B3{fill:#E3E9FD;} + .d2-3526140621 .fill-B4{fill:#E3E9FD;} + .d2-3526140621 .fill-B5{fill:#EDF0FD;} + .d2-3526140621 .fill-B6{fill:#F7F8FE;} + .d2-3526140621 .fill-AA2{fill:#4A6FF3;} + .d2-3526140621 .fill-AA4{fill:#EDF0FD;} + .d2-3526140621 .fill-AA5{fill:#F7F8FE;} + .d2-3526140621 .fill-AB4{fill:#EDF0FD;} + .d2-3526140621 .fill-AB5{fill:#F7F8FE;} + .d2-3526140621 .stroke-N1{stroke:#0A0F25;} + .d2-3526140621 .stroke-N2{stroke:#676C7E;} + .d2-3526140621 .stroke-N3{stroke:#9499AB;} + .d2-3526140621 .stroke-N4{stroke:#CFD2DD;} + .d2-3526140621 .stroke-N5{stroke:#DEE1EB;} + .d2-3526140621 .stroke-N6{stroke:#EEF1F8;} + .d2-3526140621 .stroke-N7{stroke:#FFFFFF;} + .d2-3526140621 .stroke-B1{stroke:#0D32B2;} + .d2-3526140621 .stroke-B2{stroke:#0D32B2;} + .d2-3526140621 .stroke-B3{stroke:#E3E9FD;} + .d2-3526140621 .stroke-B4{stroke:#E3E9FD;} + .d2-3526140621 .stroke-B5{stroke:#EDF0FD;} + .d2-3526140621 .stroke-B6{stroke:#F7F8FE;} + .d2-3526140621 .stroke-AA2{stroke:#4A6FF3;} + .d2-3526140621 .stroke-AA4{stroke:#EDF0FD;} + .d2-3526140621 .stroke-AA5{stroke:#F7F8FE;} + .d2-3526140621 .stroke-AB4{stroke:#EDF0FD;} + .d2-3526140621 .stroke-AB5{stroke:#F7F8FE;} + .d2-3526140621 .background-color-N1{background-color:#0A0F25;} + .d2-3526140621 .background-color-N2{background-color:#676C7E;} + .d2-3526140621 .background-color-N3{background-color:#9499AB;} + .d2-3526140621 .background-color-N4{background-color:#CFD2DD;} + .d2-3526140621 .background-color-N5{background-color:#DEE1EB;} + .d2-3526140621 .background-color-N6{background-color:#EEF1F8;} + .d2-3526140621 .background-color-N7{background-color:#FFFFFF;} + .d2-3526140621 .background-color-B1{background-color:#0D32B2;} + .d2-3526140621 .background-color-B2{background-color:#0D32B2;} + .d2-3526140621 .background-color-B3{background-color:#E3E9FD;} + .d2-3526140621 .background-color-B4{background-color:#E3E9FD;} + .d2-3526140621 .background-color-B5{background-color:#EDF0FD;} + .d2-3526140621 .background-color-B6{background-color:#F7F8FE;} + .d2-3526140621 .background-color-AA2{background-color:#4A6FF3;} + .d2-3526140621 .background-color-AA4{background-color:#EDF0FD;} + .d2-3526140621 .background-color-AA5{background-color:#F7F8FE;} + .d2-3526140621 .background-color-AB4{background-color:#EDF0FD;} + .d2-3526140621 .background-color-AB5{background-color:#F7F8FE;} + .d2-3526140621 .color-N1{color:#0A0F25;} + .d2-3526140621 .color-N2{color:#676C7E;} + .d2-3526140621 .color-N3{color:#9499AB;} + .d2-3526140621 .color-N4{color:#CFD2DD;} + .d2-3526140621 .color-N5{color:#DEE1EB;} + .d2-3526140621 .color-N6{color:#EEF1F8;} + .d2-3526140621 .color-N7{color:#FFFFFF;} + .d2-3526140621 .color-B1{color:#0D32B2;} + .d2-3526140621 .color-B2{color:#0D32B2;} + .d2-3526140621 .color-B3{color:#E3E9FD;} + .d2-3526140621 .color-B4{color:#E3E9FD;} + .d2-3526140621 .color-B5{color:#EDF0FD;} + .d2-3526140621 .color-B6{color:#F7F8FE;} + .d2-3526140621 .color-AA2{color:#4A6FF3;} + .d2-3526140621 .color-AA4{color:#EDF0FD;} + .d2-3526140621 .color-AA5{color:#F7F8FE;} + .d2-3526140621 .color-AB4{color:#EDF0FD;} + .d2-3526140621 .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}]]>xyz syncsync diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json index f4db0058c..ea2e876a1 100644 --- a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 38 }, "width": 394, - "height": 1830, + "height": 1784, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "a.k", "type": "rectangle", "pos": { - "x": 20, - "y": 111 + "x": 30, + "y": 79 }, - "width": 131, - "height": 139, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 147 + "y": 109 }, "width": 51, "height": 66, @@ -130,11 +130,11 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 21, - "y": 504 + "x": 31, + "y": 472 }, - "width": 353, - "height": 139, + "width": 333, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 540 + "y": 502 }, "width": 49, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 170, - "y": 540 + "y": 502 }, "width": 54, "height": 66, @@ -254,10 +254,10 @@ "type": "rectangle", "pos": { "x": 565, - "y": 827 + "y": 824 }, "width": 259, - "height": 636, + "height": 590, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,11 +294,11 @@ "id": "s.n", "type": "rectangle", "pos": { - "x": 585, - "y": 897 + "x": 595, + "y": 865 }, - "width": 131, - "height": 139, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -335,11 +335,11 @@ "id": "k", "type": "rectangle", "pos": { - "x": 1108, - "y": 434 + "x": 1118, + "y": 472 }, - "width": 132, - "height": 243, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 1148, - "y": 522 + "y": 502 }, "width": 52, "height": 66, @@ -418,10 +418,10 @@ "type": "rectangle", "pos": { "x": 844, - "y": 827 + "y": 824 }, - "width": 397, - "height": 243, + "width": 387, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 1147, - "y": 915 + "y": 895 }, "width": 54, "height": 66, @@ -500,10 +500,10 @@ "type": "rectangle", "pos": { "x": 741, - "y": 41 + "y": 38 }, "width": 172, - "height": 243, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -540,11 +540,11 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 761, - "y": 111 + "x": 771, + "y": 79 }, - "width": 132, - "height": 139, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 801, - "y": 147 + "y": 109 }, "width": 52, "height": 66, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 284, - "y": 540 + "y": 502 }, "width": 50, "height": 66, @@ -663,11 +663,11 @@ "id": "u.s", "type": "rectangle", "pos": { - "x": 864, - "y": 897 + "x": 874, + "y": 865 }, - "width": 130, - "height": 139, + "width": 110, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 904, - "y": 933 + "y": 895 }, "width": 50, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": 1034, - "y": 915 + "y": 895 }, "width": 53, "height": 66, @@ -786,11 +786,11 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 671, - "y": 1290 + "x": 681, + "y": 1258 }, - "width": 133, - "height": 139, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 711, - "y": 1326 + "y": 1288 }, "width": 53, "height": 66, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 625, - "y": 933 + "y": 895 }, "width": 51, "height": 66, @@ -909,11 +909,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 414, - "y": 1220 + "x": 424, + "y": 1258 }, - "width": 131, - "height": 243, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -951,7 +951,7 @@ "type": "rectangle", "pos": { "x": 454, - "y": 1308 + "y": 1288 }, "width": 51, "height": 66, @@ -991,11 +991,11 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 133, - "y": 1697 + "x": 143, + "y": 1666 }, - "width": 129, - "height": 139, + "width": 109, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1033,7 +1033,7 @@ "type": "rectangle", "pos": { "x": 173, - "y": 1734 + "y": 1696 }, "width": 49, "height": 66, @@ -1097,55 +1097,55 @@ "route": [ { "x": 85.5, - "y": 213.5 + "y": 174.5 }, { "x": 85.5, - "y": 242.6999969482422 + "y": 218.5 }, { "x": 85.5, - "y": 260.89898681640625 + "y": 240.39999389648438 }, { "x": 85.5, - "y": 277.25 + "y": 256.75 }, { "x": 85.5, - "y": 293.6000061035156 + "y": 273.1000061035156 }, { "x": 85.5, - "y": 315.3999938964844 + "y": 294.8999938964844 }, { "x": 85.5, - "y": 331.75 + "y": 311.25 }, { "x": 85.5, - "y": 348.1000061035156 + "y": 327.6000061035156 }, { "x": 85.5, - "y": 369.8999938964844 + "y": 349.3999938964844 }, { "x": 85.5, - "y": 386.25 + "y": 365.75 }, { "x": 85.5, - "y": 402.6000061035156 + "y": 382.1000061035156 }, { "x": 85.5, - "y": 482.6000061035156 + "y": 458.5 }, { "x": 85.5, - "y": 541 + "y": 502.5 } ], "isCurve": true, @@ -1180,11 +1180,11 @@ "route": [ { "x": 197, - "y": 606.5 + "y": 567.5 }, { "x": 197, - "y": 619.2999877929688 + "y": 611.5 }, { "x": 197, @@ -1223,12 +1223,12 @@ "y": 775.0999755859375 }, { - "x": 274.6000061035156, - "y": 866.7999877929688 + "x": 276.6000061035156, + "y": 855.5 }, { - "x": 585, - "y": 972 + "x": 595, + "y": 915.5 } ], "isCurve": true, @@ -1263,11 +1263,11 @@ "route": [ { "x": 1173.5, - "y": 588.5 + "y": 567.5 }, { "x": 1173.5, - "y": 615.7000122070312 + "y": 611.5 }, { "x": 1173.5, @@ -1307,11 +1307,11 @@ }, { "x": 1173.5, - "y": 855.5999755859375 + "y": 851.5 }, { "x": 1173.5, - "y": 916 + "y": 895.5 } ], "isCurve": true, @@ -1346,11 +1346,11 @@ "route": [ { "x": 827.25, - "y": 213.5 + "y": 174.5 }, { "x": 827.25, - "y": 226.3000030517578 + "y": 218.5 }, { "x": 827.25, @@ -1390,11 +1390,11 @@ }, { "x": 197, - "y": 466.20001220703125 + "y": 458.5 }, { "x": 197, - "y": 541 + "y": 502.5 } ], "isCurve": true, @@ -1429,11 +1429,11 @@ "route": [ { "x": 309, - "y": 606.5 + "y": 567.5 }, { "x": 309, - "y": 619.2999877929688 + "y": 611.5 }, { "x": 309, @@ -1473,11 +1473,11 @@ }, { "x": 427.8999938964844, - "y": 864.9929809570312 + "y": 857.2930297851562 }, { "x": 903.5, - "y": 962.968017578125 + "y": 924.468017578125 } ], "isCurve": true, @@ -1512,11 +1512,11 @@ "route": [ { "x": 1060, - "y": 981.5 + "y": 960.5 }, { "x": 1060, - "y": 1008.7000122070312 + "y": 1004.5 }, { "x": 1060, @@ -1556,11 +1556,11 @@ }, { "x": 737, - "y": 1252.199951171875 + "y": 1244.5 }, { "x": 737, - "y": 1327 + "y": 1288.5 } ], "isCurve": true, @@ -1595,11 +1595,11 @@ "route": [ { "x": 650.5, - "y": 1037 + "y": 991.5 }, { "x": 650.5, - "y": 1063.4000244140625 + "y": 1054.300048828125 }, { "x": 650.5, @@ -1627,11 +1627,11 @@ }, { "x": 621.2999877929688, - "y": 1252.4000244140625 + "y": 1248.300048828125 }, { "x": 504.5, - "y": 1328 + "y": 1307.5 } ], "isCurve": true, @@ -1666,11 +1666,11 @@ "route": [ { "x": 479.5, - "y": 1374.5 + "y": 1353.5 }, { "x": 479.5, - "y": 1401.699951171875 + "y": 1397.5 }, { "x": 479.5, @@ -1698,11 +1698,11 @@ }, { "x": 197, - "y": 1659.5999755859375 + "y": 1651.9000244140625 }, { "x": 197, - "y": 1734 + "y": 1695.5 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg index 4bb381897..774187ecf 100644 --- a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1071049415 .fill-N1{fill:#0A0F25;} + .d2-1071049415 .fill-N2{fill:#676C7E;} + .d2-1071049415 .fill-N3{fill:#9499AB;} + .d2-1071049415 .fill-N4{fill:#CFD2DD;} + .d2-1071049415 .fill-N5{fill:#DEE1EB;} + .d2-1071049415 .fill-N6{fill:#EEF1F8;} + .d2-1071049415 .fill-N7{fill:#FFFFFF;} + .d2-1071049415 .fill-B1{fill:#0D32B2;} + .d2-1071049415 .fill-B2{fill:#0D32B2;} + .d2-1071049415 .fill-B3{fill:#E3E9FD;} + .d2-1071049415 .fill-B4{fill:#E3E9FD;} + .d2-1071049415 .fill-B5{fill:#EDF0FD;} + .d2-1071049415 .fill-B6{fill:#F7F8FE;} + .d2-1071049415 .fill-AA2{fill:#4A6FF3;} + .d2-1071049415 .fill-AA4{fill:#EDF0FD;} + .d2-1071049415 .fill-AA5{fill:#F7F8FE;} + .d2-1071049415 .fill-AB4{fill:#EDF0FD;} + .d2-1071049415 .fill-AB5{fill:#F7F8FE;} + .d2-1071049415 .stroke-N1{stroke:#0A0F25;} + .d2-1071049415 .stroke-N2{stroke:#676C7E;} + .d2-1071049415 .stroke-N3{stroke:#9499AB;} + .d2-1071049415 .stroke-N4{stroke:#CFD2DD;} + .d2-1071049415 .stroke-N5{stroke:#DEE1EB;} + .d2-1071049415 .stroke-N6{stroke:#EEF1F8;} + .d2-1071049415 .stroke-N7{stroke:#FFFFFF;} + .d2-1071049415 .stroke-B1{stroke:#0D32B2;} + .d2-1071049415 .stroke-B2{stroke:#0D32B2;} + .d2-1071049415 .stroke-B3{stroke:#E3E9FD;} + .d2-1071049415 .stroke-B4{stroke:#E3E9FD;} + .d2-1071049415 .stroke-B5{stroke:#EDF0FD;} + .d2-1071049415 .stroke-B6{stroke:#F7F8FE;} + .d2-1071049415 .stroke-AA2{stroke:#4A6FF3;} + .d2-1071049415 .stroke-AA4{stroke:#EDF0FD;} + .d2-1071049415 .stroke-AA5{stroke:#F7F8FE;} + .d2-1071049415 .stroke-AB4{stroke:#EDF0FD;} + .d2-1071049415 .stroke-AB5{stroke:#F7F8FE;} + .d2-1071049415 .background-color-N1{background-color:#0A0F25;} + .d2-1071049415 .background-color-N2{background-color:#676C7E;} + .d2-1071049415 .background-color-N3{background-color:#9499AB;} + .d2-1071049415 .background-color-N4{background-color:#CFD2DD;} + .d2-1071049415 .background-color-N5{background-color:#DEE1EB;} + .d2-1071049415 .background-color-N6{background-color:#EEF1F8;} + .d2-1071049415 .background-color-N7{background-color:#FFFFFF;} + .d2-1071049415 .background-color-B1{background-color:#0D32B2;} + .d2-1071049415 .background-color-B2{background-color:#0D32B2;} + .d2-1071049415 .background-color-B3{background-color:#E3E9FD;} + .d2-1071049415 .background-color-B4{background-color:#E3E9FD;} + .d2-1071049415 .background-color-B5{background-color:#EDF0FD;} + .d2-1071049415 .background-color-B6{background-color:#F7F8FE;} + .d2-1071049415 .background-color-AA2{background-color:#4A6FF3;} + .d2-1071049415 .background-color-AA4{background-color:#EDF0FD;} + .d2-1071049415 .background-color-AA5{background-color:#F7F8FE;} + .d2-1071049415 .background-color-AB4{background-color:#EDF0FD;} + .d2-1071049415 .background-color-AB5{background-color:#F7F8FE;} + .d2-1071049415 .color-N1{color:#0A0F25;} + .d2-1071049415 .color-N2{color:#676C7E;} + .d2-1071049415 .color-N3{color:#9499AB;} + .d2-1071049415 .color-N4{color:#CFD2DD;} + .d2-1071049415 .color-N5{color:#DEE1EB;} + .d2-1071049415 .color-N6{color:#EEF1F8;} + .d2-1071049415 .color-N7{color:#FFFFFF;} + .d2-1071049415 .color-B1{color:#0D32B2;} + .d2-1071049415 .color-B2{color:#0D32B2;} + .d2-1071049415 .color-B3{color:#E3E9FD;} + .d2-1071049415 .color-B4{color:#E3E9FD;} + .d2-1071049415 .color-B5{color:#EDF0FD;} + .d2-1071049415 .color-B6{color:#F7F8FE;} + .d2-1071049415 .color-AA2{color:#4A6FF3;} + .d2-1071049415 .color-AA4{color:#EDF0FD;} + .d2-1071049415 .color-AA5{color:#F7F8FE;} + .d2-1071049415 .color-AB4{color:#EDF0FD;} + .d2-1071049415 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json index 7c812c6fd..b5a1bf653 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json @@ -1163,7 +1163,7 @@ }, { "x": 413.75, - "y": 1453.5 + "y": 1454 } ], "animated": false, @@ -1365,7 +1365,7 @@ "route": [ { "x": 413.75, - "y": 1619.5 + "y": 1619 }, { "x": 413.75, diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg index b57b2f821..413a8b544 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 + .d2-3244895320 .fill-N1{fill:#0A0F25;} + .d2-3244895320 .fill-N2{fill:#676C7E;} + .d2-3244895320 .fill-N3{fill:#9499AB;} + .d2-3244895320 .fill-N4{fill:#CFD2DD;} + .d2-3244895320 .fill-N5{fill:#DEE1EB;} + .d2-3244895320 .fill-N6{fill:#EEF1F8;} + .d2-3244895320 .fill-N7{fill:#FFFFFF;} + .d2-3244895320 .fill-B1{fill:#0D32B2;} + .d2-3244895320 .fill-B2{fill:#0D32B2;} + .d2-3244895320 .fill-B3{fill:#E3E9FD;} + .d2-3244895320 .fill-B4{fill:#E3E9FD;} + .d2-3244895320 .fill-B5{fill:#EDF0FD;} + .d2-3244895320 .fill-B6{fill:#F7F8FE;} + .d2-3244895320 .fill-AA2{fill:#4A6FF3;} + .d2-3244895320 .fill-AA4{fill:#EDF0FD;} + .d2-3244895320 .fill-AA5{fill:#F7F8FE;} + .d2-3244895320 .fill-AB4{fill:#EDF0FD;} + .d2-3244895320 .fill-AB5{fill:#F7F8FE;} + .d2-3244895320 .stroke-N1{stroke:#0A0F25;} + .d2-3244895320 .stroke-N2{stroke:#676C7E;} + .d2-3244895320 .stroke-N3{stroke:#9499AB;} + .d2-3244895320 .stroke-N4{stroke:#CFD2DD;} + .d2-3244895320 .stroke-N5{stroke:#DEE1EB;} + .d2-3244895320 .stroke-N6{stroke:#EEF1F8;} + .d2-3244895320 .stroke-N7{stroke:#FFFFFF;} + .d2-3244895320 .stroke-B1{stroke:#0D32B2;} + .d2-3244895320 .stroke-B2{stroke:#0D32B2;} + .d2-3244895320 .stroke-B3{stroke:#E3E9FD;} + .d2-3244895320 .stroke-B4{stroke:#E3E9FD;} + .d2-3244895320 .stroke-B5{stroke:#EDF0FD;} + .d2-3244895320 .stroke-B6{stroke:#F7F8FE;} + .d2-3244895320 .stroke-AA2{stroke:#4A6FF3;} + .d2-3244895320 .stroke-AA4{stroke:#EDF0FD;} + .d2-3244895320 .stroke-AA5{stroke:#F7F8FE;} + .d2-3244895320 .stroke-AB4{stroke:#EDF0FD;} + .d2-3244895320 .stroke-AB5{stroke:#F7F8FE;} + .d2-3244895320 .background-color-N1{background-color:#0A0F25;} + .d2-3244895320 .background-color-N2{background-color:#676C7E;} + .d2-3244895320 .background-color-N3{background-color:#9499AB;} + .d2-3244895320 .background-color-N4{background-color:#CFD2DD;} + .d2-3244895320 .background-color-N5{background-color:#DEE1EB;} + .d2-3244895320 .background-color-N6{background-color:#EEF1F8;} + .d2-3244895320 .background-color-N7{background-color:#FFFFFF;} + .d2-3244895320 .background-color-B1{background-color:#0D32B2;} + .d2-3244895320 .background-color-B2{background-color:#0D32B2;} + .d2-3244895320 .background-color-B3{background-color:#E3E9FD;} + .d2-3244895320 .background-color-B4{background-color:#E3E9FD;} + .d2-3244895320 .background-color-B5{background-color:#EDF0FD;} + .d2-3244895320 .background-color-B6{background-color:#F7F8FE;} + .d2-3244895320 .background-color-AA2{background-color:#4A6FF3;} + .d2-3244895320 .background-color-AA4{background-color:#EDF0FD;} + .d2-3244895320 .background-color-AA5{background-color:#F7F8FE;} + .d2-3244895320 .background-color-AB4{background-color:#EDF0FD;} + .d2-3244895320 .background-color-AB5{background-color:#F7F8FE;} + .d2-3244895320 .color-N1{color:#0A0F25;} + .d2-3244895320 .color-N2{color:#676C7E;} + .d2-3244895320 .color-N3{color:#9499AB;} + .d2-3244895320 .color-N4{color:#CFD2DD;} + .d2-3244895320 .color-N5{color:#DEE1EB;} + .d2-3244895320 .color-N6{color:#EEF1F8;} + .d2-3244895320 .color-N7{color:#FFFFFF;} + .d2-3244895320 .color-B1{color:#0D32B2;} + .d2-3244895320 .color-B2{color:#0D32B2;} + .d2-3244895320 .color-B3{color:#E3E9FD;} + .d2-3244895320 .color-B4{color:#E3E9FD;} + .d2-3244895320 .color-B5{color:#EDF0FD;} + .d2-3244895320 .color-B6{color:#F7F8FE;} + .d2-3244895320 .color-AA2{color:#4A6FF3;} + .d2-3244895320 .color-AA4{color:#EDF0FD;} + .d2-3244895320 .color-AA5{color:#F7F8FE;} + .d2-3244895320 .color-AB4{color:#EDF0FD;} + .d2-3244895320 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json index 933a2048f..4b5bdb62f 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 7, + "y": 25 }, - "width": 358, - "height": 487, + "width": 343, + "height": 454, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 75 + "y": 55 }, "width": 53, "height": 66, @@ -89,11 +89,11 @@ "id": "a.c", "type": "rectangle", "pos": { - "x": 23, - "y": 355 + "x": 37, + "y": 323 }, - "width": 299, - "height": 139, + "width": 283, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 75 + "y": 55 }, "width": 52, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 265, - "y": 75 + "y": 55 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 152, - "y": 391 + "y": 353 }, "width": 54, "height": 66, @@ -277,19 +277,19 @@ "route": [ { "x": 66.5, - "y": 142 + "y": 121.5 }, { "x": 66.5, - "y": 212.39999389648438 + "y": 191.89999389648438 }, { "x": 66.69999694824219, - "y": 326.3999938964844 + "y": 303.5 }, { "x": 67.5, - "y": 356 + "y": 323.5 } ], "isCurve": true, @@ -324,19 +324,19 @@ "route": [ { "x": 179, - "y": 142 + "y": 121.5 }, { "x": 179, - "y": 212.39999389648438 + "y": 191.89999389648438 }, { "x": 179, - "y": 248 + "y": 225.10000610351562 }, { "x": 179, - "y": 320 + "y": 287.5 } ], "isCurve": true, @@ -371,19 +371,19 @@ "route": [ { "x": 291.5, - "y": 142 + "y": 121.5 }, { "x": 291.5, - "y": 212.39999389648438 + "y": 191.89999389648438 }, { "x": 291.29998779296875, - "y": 326.3999938964844 + "y": 303.5 }, { "x": 290.5, - "y": 356 + "y": 323.5 } ], "isCurve": true, 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 dd3533724..fa8b0409a 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -abc12d line 1line 2line 3line 4 - - - - - - - - + .d2-4267680593 .fill-N1{fill:#0A0F25;} + .d2-4267680593 .fill-N2{fill:#676C7E;} + .d2-4267680593 .fill-N3{fill:#9499AB;} + .d2-4267680593 .fill-N4{fill:#CFD2DD;} + .d2-4267680593 .fill-N5{fill:#DEE1EB;} + .d2-4267680593 .fill-N6{fill:#EEF1F8;} + .d2-4267680593 .fill-N7{fill:#FFFFFF;} + .d2-4267680593 .fill-B1{fill:#0D32B2;} + .d2-4267680593 .fill-B2{fill:#0D32B2;} + .d2-4267680593 .fill-B3{fill:#E3E9FD;} + .d2-4267680593 .fill-B4{fill:#E3E9FD;} + .d2-4267680593 .fill-B5{fill:#EDF0FD;} + .d2-4267680593 .fill-B6{fill:#F7F8FE;} + .d2-4267680593 .fill-AA2{fill:#4A6FF3;} + .d2-4267680593 .fill-AA4{fill:#EDF0FD;} + .d2-4267680593 .fill-AA5{fill:#F7F8FE;} + .d2-4267680593 .fill-AB4{fill:#EDF0FD;} + .d2-4267680593 .fill-AB5{fill:#F7F8FE;} + .d2-4267680593 .stroke-N1{stroke:#0A0F25;} + .d2-4267680593 .stroke-N2{stroke:#676C7E;} + .d2-4267680593 .stroke-N3{stroke:#9499AB;} + .d2-4267680593 .stroke-N4{stroke:#CFD2DD;} + .d2-4267680593 .stroke-N5{stroke:#DEE1EB;} + .d2-4267680593 .stroke-N6{stroke:#EEF1F8;} + .d2-4267680593 .stroke-N7{stroke:#FFFFFF;} + .d2-4267680593 .stroke-B1{stroke:#0D32B2;} + .d2-4267680593 .stroke-B2{stroke:#0D32B2;} + .d2-4267680593 .stroke-B3{stroke:#E3E9FD;} + .d2-4267680593 .stroke-B4{stroke:#E3E9FD;} + .d2-4267680593 .stroke-B5{stroke:#EDF0FD;} + .d2-4267680593 .stroke-B6{stroke:#F7F8FE;} + .d2-4267680593 .stroke-AA2{stroke:#4A6FF3;} + .d2-4267680593 .stroke-AA4{stroke:#EDF0FD;} + .d2-4267680593 .stroke-AA5{stroke:#F7F8FE;} + .d2-4267680593 .stroke-AB4{stroke:#EDF0FD;} + .d2-4267680593 .stroke-AB5{stroke:#F7F8FE;} + .d2-4267680593 .background-color-N1{background-color:#0A0F25;} + .d2-4267680593 .background-color-N2{background-color:#676C7E;} + .d2-4267680593 .background-color-N3{background-color:#9499AB;} + .d2-4267680593 .background-color-N4{background-color:#CFD2DD;} + .d2-4267680593 .background-color-N5{background-color:#DEE1EB;} + .d2-4267680593 .background-color-N6{background-color:#EEF1F8;} + .d2-4267680593 .background-color-N7{background-color:#FFFFFF;} + .d2-4267680593 .background-color-B1{background-color:#0D32B2;} + .d2-4267680593 .background-color-B2{background-color:#0D32B2;} + .d2-4267680593 .background-color-B3{background-color:#E3E9FD;} + .d2-4267680593 .background-color-B4{background-color:#E3E9FD;} + .d2-4267680593 .background-color-B5{background-color:#EDF0FD;} + .d2-4267680593 .background-color-B6{background-color:#F7F8FE;} + .d2-4267680593 .background-color-AA2{background-color:#4A6FF3;} + .d2-4267680593 .background-color-AA4{background-color:#EDF0FD;} + .d2-4267680593 .background-color-AA5{background-color:#F7F8FE;} + .d2-4267680593 .background-color-AB4{background-color:#EDF0FD;} + .d2-4267680593 .background-color-AB5{background-color:#F7F8FE;} + .d2-4267680593 .color-N1{color:#0A0F25;} + .d2-4267680593 .color-N2{color:#676C7E;} + .d2-4267680593 .color-N3{color:#9499AB;} + .d2-4267680593 .color-N4{color:#CFD2DD;} + .d2-4267680593 .color-N5{color:#DEE1EB;} + .d2-4267680593 .color-N6{color:#EEF1F8;} + .d2-4267680593 .color-N7{color:#FFFFFF;} + .d2-4267680593 .color-B1{color:#0D32B2;} + .d2-4267680593 .color-B2{color:#0D32B2;} + .d2-4267680593 .color-B3{color:#E3E9FD;} + .d2-4267680593 .color-B4{color:#E3E9FD;} + .d2-4267680593 .color-B5{color:#EDF0FD;} + .d2-4267680593 .color-B6{color:#F7F8FE;} + .d2-4267680593 .color-AA2{color:#4A6FF3;} + .d2-4267680593 .color-AA4{color:#EDF0FD;} + .d2-4267680593 .color-AA5{color:#F7F8FE;} + .d2-4267680593 .color-AB4{color:#EDF0FD;} + .d2-4267680593 .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}]]>abc12d line 1line 2line 3line 4 + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json index cf8775f3e..31bf03db6 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "build_workflow", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 75, + "y": 56 }, - "width": 2328, - "height": 117, + "width": 2179, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 105, - "y": 61 + "y": 86 }, "width": 270, "height": 77, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 638, - "y": 61 + "y": 86 }, "width": 209, "height": 77, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 1194, - "y": 61 + "y": 86 }, "width": 71, "height": 77, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 1593, - "y": 61 + "y": 86 }, "width": 158, "height": 77, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 2129, - "y": 61 + "y": 86 }, "width": 95, "height": 77, @@ -277,19 +277,19 @@ "route": [ { "x": 375.5, - "y": 99.5 + "y": 124.5 }, { "x": 479.8999938964844, - "y": 99.5 + "y": 124.5 }, { "x": 532.2999877929688, - "y": 99.5 + "y": 124.5 }, { "x": 637.5, - "y": 99.5 + "y": 124.5 } ], "isCurve": true, @@ -323,20 +323,20 @@ "labelPercentage": 0, "route": [ { - "x": 846.5, - "y": 99.5 + "x": 847, + "y": 124.5 }, { - "x": 985.2999877929688, - "y": 99.5 + "x": 985.4000244140625, + "y": 124.5 }, { "x": 1054.699951171875, - "y": 99.5 + "y": 124.5 }, { "x": 1193.5, - "y": 99.5 + "y": 124.5 } ], "isCurve": true, @@ -371,19 +371,19 @@ "route": [ { "x": 1265.5, - "y": 99.5 + "y": 124.5 }, { "x": 1395.9000244140625, - "y": 99.5 + "y": 124.5 }, { "x": 1461.300048828125, - "y": 99.5 + "y": 124.5 }, { "x": 1592.5, - "y": 99.5 + "y": 124.5 } ], "isCurve": true, @@ -418,19 +418,19 @@ "route": [ { "x": 1751.5, - "y": 99.5 + "y": 124.5 }, { "x": 1901.9000244140625, - "y": 99.5 + "y": 124.5 }, { "x": 1977.300048828125, - "y": 99.5 + "y": 124.5 }, { "x": 2128.5, - "y": 99.5 + "y": 124.5 } ], "isCurve": true, 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 702eadc48..12b109a42 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,23 +1,23 @@ -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas - - - - - - - - - - - + .d2-3124104395 .fill-N1{fill:#0A0F25;} + .d2-3124104395 .fill-N2{fill:#676C7E;} + .d2-3124104395 .fill-N3{fill:#9499AB;} + .d2-3124104395 .fill-N4{fill:#CFD2DD;} + .d2-3124104395 .fill-N5{fill:#DEE1EB;} + .d2-3124104395 .fill-N6{fill:#EEF1F8;} + .d2-3124104395 .fill-N7{fill:#FFFFFF;} + .d2-3124104395 .fill-B1{fill:#0D32B2;} + .d2-3124104395 .fill-B2{fill:#0D32B2;} + .d2-3124104395 .fill-B3{fill:#E3E9FD;} + .d2-3124104395 .fill-B4{fill:#E3E9FD;} + .d2-3124104395 .fill-B5{fill:#EDF0FD;} + .d2-3124104395 .fill-B6{fill:#F7F8FE;} + .d2-3124104395 .fill-AA2{fill:#4A6FF3;} + .d2-3124104395 .fill-AA4{fill:#EDF0FD;} + .d2-3124104395 .fill-AA5{fill:#F7F8FE;} + .d2-3124104395 .fill-AB4{fill:#EDF0FD;} + .d2-3124104395 .fill-AB5{fill:#F7F8FE;} + .d2-3124104395 .stroke-N1{stroke:#0A0F25;} + .d2-3124104395 .stroke-N2{stroke:#676C7E;} + .d2-3124104395 .stroke-N3{stroke:#9499AB;} + .d2-3124104395 .stroke-N4{stroke:#CFD2DD;} + .d2-3124104395 .stroke-N5{stroke:#DEE1EB;} + .d2-3124104395 .stroke-N6{stroke:#EEF1F8;} + .d2-3124104395 .stroke-N7{stroke:#FFFFFF;} + .d2-3124104395 .stroke-B1{stroke:#0D32B2;} + .d2-3124104395 .stroke-B2{stroke:#0D32B2;} + .d2-3124104395 .stroke-B3{stroke:#E3E9FD;} + .d2-3124104395 .stroke-B4{stroke:#E3E9FD;} + .d2-3124104395 .stroke-B5{stroke:#EDF0FD;} + .d2-3124104395 .stroke-B6{stroke:#F7F8FE;} + .d2-3124104395 .stroke-AA2{stroke:#4A6FF3;} + .d2-3124104395 .stroke-AA4{stroke:#EDF0FD;} + .d2-3124104395 .stroke-AA5{stroke:#F7F8FE;} + .d2-3124104395 .stroke-AB4{stroke:#EDF0FD;} + .d2-3124104395 .stroke-AB5{stroke:#F7F8FE;} + .d2-3124104395 .background-color-N1{background-color:#0A0F25;} + .d2-3124104395 .background-color-N2{background-color:#676C7E;} + .d2-3124104395 .background-color-N3{background-color:#9499AB;} + .d2-3124104395 .background-color-N4{background-color:#CFD2DD;} + .d2-3124104395 .background-color-N5{background-color:#DEE1EB;} + .d2-3124104395 .background-color-N6{background-color:#EEF1F8;} + .d2-3124104395 .background-color-N7{background-color:#FFFFFF;} + .d2-3124104395 .background-color-B1{background-color:#0D32B2;} + .d2-3124104395 .background-color-B2{background-color:#0D32B2;} + .d2-3124104395 .background-color-B3{background-color:#E3E9FD;} + .d2-3124104395 .background-color-B4{background-color:#E3E9FD;} + .d2-3124104395 .background-color-B5{background-color:#EDF0FD;} + .d2-3124104395 .background-color-B6{background-color:#F7F8FE;} + .d2-3124104395 .background-color-AA2{background-color:#4A6FF3;} + .d2-3124104395 .background-color-AA4{background-color:#EDF0FD;} + .d2-3124104395 .background-color-AA5{background-color:#F7F8FE;} + .d2-3124104395 .background-color-AB4{background-color:#EDF0FD;} + .d2-3124104395 .background-color-AB5{background-color:#F7F8FE;} + .d2-3124104395 .color-N1{color:#0A0F25;} + .d2-3124104395 .color-N2{color:#676C7E;} + .d2-3124104395 .color-N3{color:#9499AB;} + .d2-3124104395 .color-N4{color:#CFD2DD;} + .d2-3124104395 .color-N5{color:#DEE1EB;} + .d2-3124104395 .color-N6{color:#EEF1F8;} + .d2-3124104395 .color-N7{color:#FFFFFF;} + .d2-3124104395 .color-B1{color:#0D32B2;} + .d2-3124104395 .color-B2{color:#0D32B2;} + .d2-3124104395 .color-B3{color:#E3E9FD;} + .d2-3124104395 .color-B4{color:#E3E9FD;} + .d2-3124104395 .color-B5{color:#EDF0FD;} + .d2-3124104395 .color-B6{color:#F7F8FE;} + .d2-3124104395 .color-AA2{color:#4A6FF3;} + .d2-3124104395 .color-AA4{color:#EDF0FD;} + .d2-3124104395 .color-AA5{color:#F7F8FE;} + .d2-3124104395 .color-AB4{color:#EDF0FD;} + .d2-3124104395 .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}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json index 04ce3f321..c0ffb1802 100644 --- a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json +++ b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "build_workflow", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 43 }, - "width": 350, - "height": 1331, + "width": 330, + "height": 1286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 93 + "y": 73 }, "width": 270, "height": 77, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 71, - "y": 342 + "y": 322 }, "width": 209, "height": 77, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 140, - "y": 671 + "y": 651 }, "width": 71, "height": 77, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 96, - "y": 993 + "y": 973 }, "width": 158, "height": 77, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 128, - "y": 1242 + "y": 1222 }, "width": 95, "height": 77, @@ -253,11 +253,11 @@ "id": "deploy_workflow", "type": "rectangle", "pos": { - "x": 370, - "y": 41 + "x": 380, + "y": 43 }, - "width": 291, - "height": 760, + "width": 271, + "height": 715, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 410, - "y": 93 + "y": 73 }, "width": 211, "height": 77, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 411, - "y": 342 + "y": 322 }, "width": 209, "height": 77, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 468, - "y": 671 + "y": 651 }, "width": 95, "height": 77, @@ -417,11 +417,11 @@ "id": "apollo_workflow", "type": "rectangle", "pos": { - "x": 681, - "y": 41 + "x": 833, + "y": 43 }, - "width": 573, - "height": 760, + "width": 269, + "height": 715, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 879, - "y": 93 + "y": 73 }, "width": 178, "height": 77, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 863, - "y": 342 + "y": 322 }, "width": 209, "height": 77, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": 920, - "y": 671 + "y": 651 }, "width": 95, "height": 77, @@ -605,19 +605,19 @@ "route": [ { "x": 175, - "y": 170.5 + "y": 150 }, { "x": 175, - "y": 239.3000030517578 + "y": 218.8000030517578 }, { "x": 175, - "y": 273.70001220703125 + "y": 253.1999969482422 }, { "x": 175, - "y": 342.5 + "y": 322 } ], "isCurve": true, @@ -652,19 +652,19 @@ "route": [ { "x": 175, - "y": 419.5 + "y": 399 }, { "x": 175, - "y": 520.2990112304688 + "y": 499.79998779296875 }, { "x": 175, - "y": 570.7000122070312 + "y": 550.2000122070312 }, { "x": 175, - "y": 671.5 + "y": 651 } ], "isCurve": true, @@ -699,19 +699,19 @@ "route": [ { "x": 175, - "y": 748.5 + "y": 728 }, { "x": 175, - "y": 806.9000244140625 + "y": 786.4000244140625 }, { "x": 175, - "y": 924.7000122070312 + "y": 904.2000122070312 }, { "x": 175, - "y": 993.5 + "y": 973 } ], "isCurve": true, @@ -746,19 +746,19 @@ "route": [ { "x": 175, - "y": 1070.5 + "y": 1050 }, { "x": 175, - "y": 1139.300048828125 + "y": 1118.800048828125 }, { "x": 175, - "y": 1173.699951171875 + "y": 1153.199951171875 }, { "x": 175, - "y": 1242.5 + "y": 1222 } ], "isCurve": true, @@ -793,19 +793,19 @@ "route": [ { "x": 515.5, - "y": 170.5 + "y": 150 }, { "x": 515.5, - "y": 239.3000030517578 + "y": 218.8000030517578 }, { "x": 515.5, - "y": 273.70001220703125 + "y": 253.1999969482422 }, { "x": 515.5, - "y": 342.5 + "y": 322 } ], "isCurve": true, @@ -840,19 +840,19 @@ "route": [ { "x": 515.5, - "y": 419.5 + "y": 399 }, { "x": 515.5, - "y": 520.2990112304688 + "y": 499.79998779296875 }, { "x": 515.5, - "y": 570.7000122070312 + "y": 550.2000122070312 }, { "x": 515.5, - "y": 671.5 + "y": 651 } ], "isCurve": true, @@ -887,19 +887,19 @@ "route": [ { "x": 967.5, - "y": 170.5 + "y": 150 }, { "x": 967.5, - "y": 239.3000030517578 + "y": 218.8000030517578 }, { "x": 967.5, - "y": 273.70001220703125 + "y": 253.1999969482422 }, { "x": 967.5, - "y": 342.5 + "y": 322 } ], "isCurve": true, @@ -934,19 +934,19 @@ "route": [ { "x": 967.5, - "y": 419.5 + "y": 399 }, { "x": 967.5, - "y": 520.2990112304688 + "y": 499.79998779296875 }, { "x": 967.5, - "y": 570.7000122070312 + "y": 550.2000122070312 }, { "x": 967.5, - "y": 671.5 + "y": 651 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg index 8db5f0b7e..722b8090b 100644 --- a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -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 - - - - - - - - - - - - - - - - - - - - - - - + .d2-3115112857 .fill-N1{fill:#0A0F25;} + .d2-3115112857 .fill-N2{fill:#676C7E;} + .d2-3115112857 .fill-N3{fill:#9499AB;} + .d2-3115112857 .fill-N4{fill:#CFD2DD;} + .d2-3115112857 .fill-N5{fill:#DEE1EB;} + .d2-3115112857 .fill-N6{fill:#EEF1F8;} + .d2-3115112857 .fill-N7{fill:#FFFFFF;} + .d2-3115112857 .fill-B1{fill:#0D32B2;} + .d2-3115112857 .fill-B2{fill:#0D32B2;} + .d2-3115112857 .fill-B3{fill:#E3E9FD;} + .d2-3115112857 .fill-B4{fill:#E3E9FD;} + .d2-3115112857 .fill-B5{fill:#EDF0FD;} + .d2-3115112857 .fill-B6{fill:#F7F8FE;} + .d2-3115112857 .fill-AA2{fill:#4A6FF3;} + .d2-3115112857 .fill-AA4{fill:#EDF0FD;} + .d2-3115112857 .fill-AA5{fill:#F7F8FE;} + .d2-3115112857 .fill-AB4{fill:#EDF0FD;} + .d2-3115112857 .fill-AB5{fill:#F7F8FE;} + .d2-3115112857 .stroke-N1{stroke:#0A0F25;} + .d2-3115112857 .stroke-N2{stroke:#676C7E;} + .d2-3115112857 .stroke-N3{stroke:#9499AB;} + .d2-3115112857 .stroke-N4{stroke:#CFD2DD;} + .d2-3115112857 .stroke-N5{stroke:#DEE1EB;} + .d2-3115112857 .stroke-N6{stroke:#EEF1F8;} + .d2-3115112857 .stroke-N7{stroke:#FFFFFF;} + .d2-3115112857 .stroke-B1{stroke:#0D32B2;} + .d2-3115112857 .stroke-B2{stroke:#0D32B2;} + .d2-3115112857 .stroke-B3{stroke:#E3E9FD;} + .d2-3115112857 .stroke-B4{stroke:#E3E9FD;} + .d2-3115112857 .stroke-B5{stroke:#EDF0FD;} + .d2-3115112857 .stroke-B6{stroke:#F7F8FE;} + .d2-3115112857 .stroke-AA2{stroke:#4A6FF3;} + .d2-3115112857 .stroke-AA4{stroke:#EDF0FD;} + .d2-3115112857 .stroke-AA5{stroke:#F7F8FE;} + .d2-3115112857 .stroke-AB4{stroke:#EDF0FD;} + .d2-3115112857 .stroke-AB5{stroke:#F7F8FE;} + .d2-3115112857 .background-color-N1{background-color:#0A0F25;} + .d2-3115112857 .background-color-N2{background-color:#676C7E;} + .d2-3115112857 .background-color-N3{background-color:#9499AB;} + .d2-3115112857 .background-color-N4{background-color:#CFD2DD;} + .d2-3115112857 .background-color-N5{background-color:#DEE1EB;} + .d2-3115112857 .background-color-N6{background-color:#EEF1F8;} + .d2-3115112857 .background-color-N7{background-color:#FFFFFF;} + .d2-3115112857 .background-color-B1{background-color:#0D32B2;} + .d2-3115112857 .background-color-B2{background-color:#0D32B2;} + .d2-3115112857 .background-color-B3{background-color:#E3E9FD;} + .d2-3115112857 .background-color-B4{background-color:#E3E9FD;} + .d2-3115112857 .background-color-B5{background-color:#EDF0FD;} + .d2-3115112857 .background-color-B6{background-color:#F7F8FE;} + .d2-3115112857 .background-color-AA2{background-color:#4A6FF3;} + .d2-3115112857 .background-color-AA4{background-color:#EDF0FD;} + .d2-3115112857 .background-color-AA5{background-color:#F7F8FE;} + .d2-3115112857 .background-color-AB4{background-color:#EDF0FD;} + .d2-3115112857 .background-color-AB5{background-color:#F7F8FE;} + .d2-3115112857 .color-N1{color:#0A0F25;} + .d2-3115112857 .color-N2{color:#676C7E;} + .d2-3115112857 .color-N3{color:#9499AB;} + .d2-3115112857 .color-N4{color:#CFD2DD;} + .d2-3115112857 .color-N5{color:#DEE1EB;} + .d2-3115112857 .color-N6{color:#EEF1F8;} + .d2-3115112857 .color-N7{color:#FFFFFF;} + .d2-3115112857 .color-B1{color:#0D32B2;} + .d2-3115112857 .color-B2{color:#0D32B2;} + .d2-3115112857 .color-B3{color:#E3E9FD;} + .d2-3115112857 .color-B4{color:#E3E9FD;} + .d2-3115112857 .color-B5{color:#EDF0FD;} + .d2-3115112857 .color-B6{color:#F7F8FE;} + .d2-3115112857 .color-AA2{color:#4A6FF3;} + .d2-3115112857 .color-AA4{color:#EDF0FD;} + .d2-3115112857 .color-AA5{color:#F7F8FE;} + .d2-3115112857 .color-AB4{color:#EDF0FD;} + .d2-3115112857 .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}]]>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 + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json index 26c6671e4..c31719ee2 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "x", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 266, - "height": 125, + "width": 246, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 173, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -153,56 +153,56 @@ "labelPercentage": 0, "route": [ { - "x": 93, - "y": 87.0510025024414 + "x": 92.66600036621094, + "y": 67 }, { - "x": 114.33300018310547, - "y": 73.80999755859375 + "x": 114.26599884033203, + "y": 53.400001525878906 }, { "x": 121, - "y": 70.5 + "y": 50 }, { "x": 123, - "y": 70.5 + "y": 50 }, { "x": 125, - "y": 70.5 + "y": 50 }, { "x": 127.66600036621094, - "y": 77.0999984741211 + "y": 56.599998474121094 }, { "x": 129.66600036621094, - "y": 87 + "y": 66.5 }, { "x": 131.66600036621094, - "y": 96.9000015258789 + "y": 76.4000015258789 }, { "x": 131.66600036621094, - "y": 110.0999984741211 + "y": 89.5999984741211 }, { "x": 129.66600036621094, - "y": 120 + "y": 99.5 }, { "x": 127.66600036621094, - "y": 129.89999389648438 + "y": 109.4000015258789 }, { - "x": 114.33300018310547, - "y": 133.18899536132812 + "x": 114.26599884033203, + "y": 112.5999984741211 }, { - "x": 93, - "y": 119.947998046875 + "x": 92.66600036621094, + "y": 99 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg index f39aabdea..8c462a8fe 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xab - - - - + .d2-3864938258 .fill-N1{fill:#0A0F25;} + .d2-3864938258 .fill-N2{fill:#676C7E;} + .d2-3864938258 .fill-N3{fill:#9499AB;} + .d2-3864938258 .fill-N4{fill:#CFD2DD;} + .d2-3864938258 .fill-N5{fill:#DEE1EB;} + .d2-3864938258 .fill-N6{fill:#EEF1F8;} + .d2-3864938258 .fill-N7{fill:#FFFFFF;} + .d2-3864938258 .fill-B1{fill:#0D32B2;} + .d2-3864938258 .fill-B2{fill:#0D32B2;} + .d2-3864938258 .fill-B3{fill:#E3E9FD;} + .d2-3864938258 .fill-B4{fill:#E3E9FD;} + .d2-3864938258 .fill-B5{fill:#EDF0FD;} + .d2-3864938258 .fill-B6{fill:#F7F8FE;} + .d2-3864938258 .fill-AA2{fill:#4A6FF3;} + .d2-3864938258 .fill-AA4{fill:#EDF0FD;} + .d2-3864938258 .fill-AA5{fill:#F7F8FE;} + .d2-3864938258 .fill-AB4{fill:#EDF0FD;} + .d2-3864938258 .fill-AB5{fill:#F7F8FE;} + .d2-3864938258 .stroke-N1{stroke:#0A0F25;} + .d2-3864938258 .stroke-N2{stroke:#676C7E;} + .d2-3864938258 .stroke-N3{stroke:#9499AB;} + .d2-3864938258 .stroke-N4{stroke:#CFD2DD;} + .d2-3864938258 .stroke-N5{stroke:#DEE1EB;} + .d2-3864938258 .stroke-N6{stroke:#EEF1F8;} + .d2-3864938258 .stroke-N7{stroke:#FFFFFF;} + .d2-3864938258 .stroke-B1{stroke:#0D32B2;} + .d2-3864938258 .stroke-B2{stroke:#0D32B2;} + .d2-3864938258 .stroke-B3{stroke:#E3E9FD;} + .d2-3864938258 .stroke-B4{stroke:#E3E9FD;} + .d2-3864938258 .stroke-B5{stroke:#EDF0FD;} + .d2-3864938258 .stroke-B6{stroke:#F7F8FE;} + .d2-3864938258 .stroke-AA2{stroke:#4A6FF3;} + .d2-3864938258 .stroke-AA4{stroke:#EDF0FD;} + .d2-3864938258 .stroke-AA5{stroke:#F7F8FE;} + .d2-3864938258 .stroke-AB4{stroke:#EDF0FD;} + .d2-3864938258 .stroke-AB5{stroke:#F7F8FE;} + .d2-3864938258 .background-color-N1{background-color:#0A0F25;} + .d2-3864938258 .background-color-N2{background-color:#676C7E;} + .d2-3864938258 .background-color-N3{background-color:#9499AB;} + .d2-3864938258 .background-color-N4{background-color:#CFD2DD;} + .d2-3864938258 .background-color-N5{background-color:#DEE1EB;} + .d2-3864938258 .background-color-N6{background-color:#EEF1F8;} + .d2-3864938258 .background-color-N7{background-color:#FFFFFF;} + .d2-3864938258 .background-color-B1{background-color:#0D32B2;} + .d2-3864938258 .background-color-B2{background-color:#0D32B2;} + .d2-3864938258 .background-color-B3{background-color:#E3E9FD;} + .d2-3864938258 .background-color-B4{background-color:#E3E9FD;} + .d2-3864938258 .background-color-B5{background-color:#EDF0FD;} + .d2-3864938258 .background-color-B6{background-color:#F7F8FE;} + .d2-3864938258 .background-color-AA2{background-color:#4A6FF3;} + .d2-3864938258 .background-color-AA4{background-color:#EDF0FD;} + .d2-3864938258 .background-color-AA5{background-color:#F7F8FE;} + .d2-3864938258 .background-color-AB4{background-color:#EDF0FD;} + .d2-3864938258 .background-color-AB5{background-color:#F7F8FE;} + .d2-3864938258 .color-N1{color:#0A0F25;} + .d2-3864938258 .color-N2{color:#676C7E;} + .d2-3864938258 .color-N3{color:#9499AB;} + .d2-3864938258 .color-N4{color:#CFD2DD;} + .d2-3864938258 .color-N5{color:#DEE1EB;} + .d2-3864938258 .color-N6{color:#EEF1F8;} + .d2-3864938258 .color-N7{color:#FFFFFF;} + .d2-3864938258 .color-B1{color:#0D32B2;} + .d2-3864938258 .color-B2{color:#0D32B2;} + .d2-3864938258 .color-B3{color:#E3E9FD;} + .d2-3864938258 .color-B4{color:#E3E9FD;} + .d2-3864938258 .color-B5{color:#EDF0FD;} + .d2-3864938258 .color-B6{color:#F7F8FE;} + .d2-3864938258 .color-AA2{color:#4A6FF3;} + .d2-3864938258 .color-AA4{color:#EDF0FD;} + .d2-3864938258 .color-AA5{color:#F7F8FE;} + .d2-3864938258 .color-AB4{color:#EDF0FD;} + .d2-3864938258 .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}]]>xab + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json index cd584039b..a05bdd6e0 100644 --- a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json +++ b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 173, - "height": 361, + "width": 153, + "height": 362, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "step", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 93, "height": 101, @@ -90,7 +90,7 @@ "type": "step", "pos": { "x": 40, - "y": 271 + "y": 251 }, "width": 93, "height": 101, @@ -236,19 +236,19 @@ "route": [ { "x": 86, - "y": 172 + "y": 151 }, { "x": 86.4000015258789, - "y": 211.60000610351562 + "y": 191 }, { "x": 86.5999984741211, - "y": 231.60000610351562 + "y": 211 }, { "x": 87, - "y": 272 + "y": 251 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg index 6074573bb..fd9388ae8 100644 --- a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdab - - + .d2-1542977856 .fill-N1{fill:#0A0F25;} + .d2-1542977856 .fill-N2{fill:#676C7E;} + .d2-1542977856 .fill-N3{fill:#9499AB;} + .d2-1542977856 .fill-N4{fill:#CFD2DD;} + .d2-1542977856 .fill-N5{fill:#DEE1EB;} + .d2-1542977856 .fill-N6{fill:#EEF1F8;} + .d2-1542977856 .fill-N7{fill:#FFFFFF;} + .d2-1542977856 .fill-B1{fill:#0D32B2;} + .d2-1542977856 .fill-B2{fill:#0D32B2;} + .d2-1542977856 .fill-B3{fill:#E3E9FD;} + .d2-1542977856 .fill-B4{fill:#E3E9FD;} + .d2-1542977856 .fill-B5{fill:#EDF0FD;} + .d2-1542977856 .fill-B6{fill:#F7F8FE;} + .d2-1542977856 .fill-AA2{fill:#4A6FF3;} + .d2-1542977856 .fill-AA4{fill:#EDF0FD;} + .d2-1542977856 .fill-AA5{fill:#F7F8FE;} + .d2-1542977856 .fill-AB4{fill:#EDF0FD;} + .d2-1542977856 .fill-AB5{fill:#F7F8FE;} + .d2-1542977856 .stroke-N1{stroke:#0A0F25;} + .d2-1542977856 .stroke-N2{stroke:#676C7E;} + .d2-1542977856 .stroke-N3{stroke:#9499AB;} + .d2-1542977856 .stroke-N4{stroke:#CFD2DD;} + .d2-1542977856 .stroke-N5{stroke:#DEE1EB;} + .d2-1542977856 .stroke-N6{stroke:#EEF1F8;} + .d2-1542977856 .stroke-N7{stroke:#FFFFFF;} + .d2-1542977856 .stroke-B1{stroke:#0D32B2;} + .d2-1542977856 .stroke-B2{stroke:#0D32B2;} + .d2-1542977856 .stroke-B3{stroke:#E3E9FD;} + .d2-1542977856 .stroke-B4{stroke:#E3E9FD;} + .d2-1542977856 .stroke-B5{stroke:#EDF0FD;} + .d2-1542977856 .stroke-B6{stroke:#F7F8FE;} + .d2-1542977856 .stroke-AA2{stroke:#4A6FF3;} + .d2-1542977856 .stroke-AA4{stroke:#EDF0FD;} + .d2-1542977856 .stroke-AA5{stroke:#F7F8FE;} + .d2-1542977856 .stroke-AB4{stroke:#EDF0FD;} + .d2-1542977856 .stroke-AB5{stroke:#F7F8FE;} + .d2-1542977856 .background-color-N1{background-color:#0A0F25;} + .d2-1542977856 .background-color-N2{background-color:#676C7E;} + .d2-1542977856 .background-color-N3{background-color:#9499AB;} + .d2-1542977856 .background-color-N4{background-color:#CFD2DD;} + .d2-1542977856 .background-color-N5{background-color:#DEE1EB;} + .d2-1542977856 .background-color-N6{background-color:#EEF1F8;} + .d2-1542977856 .background-color-N7{background-color:#FFFFFF;} + .d2-1542977856 .background-color-B1{background-color:#0D32B2;} + .d2-1542977856 .background-color-B2{background-color:#0D32B2;} + .d2-1542977856 .background-color-B3{background-color:#E3E9FD;} + .d2-1542977856 .background-color-B4{background-color:#E3E9FD;} + .d2-1542977856 .background-color-B5{background-color:#EDF0FD;} + .d2-1542977856 .background-color-B6{background-color:#F7F8FE;} + .d2-1542977856 .background-color-AA2{background-color:#4A6FF3;} + .d2-1542977856 .background-color-AA4{background-color:#EDF0FD;} + .d2-1542977856 .background-color-AA5{background-color:#F7F8FE;} + .d2-1542977856 .background-color-AB4{background-color:#EDF0FD;} + .d2-1542977856 .background-color-AB5{background-color:#F7F8FE;} + .d2-1542977856 .color-N1{color:#0A0F25;} + .d2-1542977856 .color-N2{color:#676C7E;} + .d2-1542977856 .color-N3{color:#9499AB;} + .d2-1542977856 .color-N4{color:#CFD2DD;} + .d2-1542977856 .color-N5{color:#DEE1EB;} + .d2-1542977856 .color-N6{color:#EEF1F8;} + .d2-1542977856 .color-N7{color:#FFFFFF;} + .d2-1542977856 .color-B1{color:#0D32B2;} + .d2-1542977856 .color-B2{color:#0D32B2;} + .d2-1542977856 .color-B3{color:#E3E9FD;} + .d2-1542977856 .color-B4{color:#E3E9FD;} + .d2-1542977856 .color-B5{color:#EDF0FD;} + .d2-1542977856 .color-B6{color:#F7F8FE;} + .d2-1542977856 .color-AA2{color:#4A6FF3;} + .d2-1542977856 .color-AA4{color:#EDF0FD;} + .d2-1542977856 .color-AA5{color:#F7F8FE;} + .d2-1542977856 .color-AB4{color:#EDF0FD;} + .d2-1542977856 .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}]]>acdab + + - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/nested_steps/elk/board.exp.json b/e2etests/testdata/regression/nested_steps/elk/board.exp.json index aad53f272..165657d4f 100644 --- a/e2etests/testdata/regression/nested_steps/elk/board.exp.json +++ b/e2etests/testdata/regression/nested_steps/elk/board.exp.json @@ -239,7 +239,7 @@ "y": 163 }, { - "x": 108, + "x": 109, "y": 233 } ], @@ -277,7 +277,7 @@ "y": 384 }, { - "x": 271, + "x": 272, "y": 454 } ], diff --git a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg index 586ed6529..6fe55a571 100644 --- a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acdab + .d2-3156367360 .fill-N1{fill:#0A0F25;} + .d2-3156367360 .fill-N2{fill:#676C7E;} + .d2-3156367360 .fill-N3{fill:#9499AB;} + .d2-3156367360 .fill-N4{fill:#CFD2DD;} + .d2-3156367360 .fill-N5{fill:#DEE1EB;} + .d2-3156367360 .fill-N6{fill:#EEF1F8;} + .d2-3156367360 .fill-N7{fill:#FFFFFF;} + .d2-3156367360 .fill-B1{fill:#0D32B2;} + .d2-3156367360 .fill-B2{fill:#0D32B2;} + .d2-3156367360 .fill-B3{fill:#E3E9FD;} + .d2-3156367360 .fill-B4{fill:#E3E9FD;} + .d2-3156367360 .fill-B5{fill:#EDF0FD;} + .d2-3156367360 .fill-B6{fill:#F7F8FE;} + .d2-3156367360 .fill-AA2{fill:#4A6FF3;} + .d2-3156367360 .fill-AA4{fill:#EDF0FD;} + .d2-3156367360 .fill-AA5{fill:#F7F8FE;} + .d2-3156367360 .fill-AB4{fill:#EDF0FD;} + .d2-3156367360 .fill-AB5{fill:#F7F8FE;} + .d2-3156367360 .stroke-N1{stroke:#0A0F25;} + .d2-3156367360 .stroke-N2{stroke:#676C7E;} + .d2-3156367360 .stroke-N3{stroke:#9499AB;} + .d2-3156367360 .stroke-N4{stroke:#CFD2DD;} + .d2-3156367360 .stroke-N5{stroke:#DEE1EB;} + .d2-3156367360 .stroke-N6{stroke:#EEF1F8;} + .d2-3156367360 .stroke-N7{stroke:#FFFFFF;} + .d2-3156367360 .stroke-B1{stroke:#0D32B2;} + .d2-3156367360 .stroke-B2{stroke:#0D32B2;} + .d2-3156367360 .stroke-B3{stroke:#E3E9FD;} + .d2-3156367360 .stroke-B4{stroke:#E3E9FD;} + .d2-3156367360 .stroke-B5{stroke:#EDF0FD;} + .d2-3156367360 .stroke-B6{stroke:#F7F8FE;} + .d2-3156367360 .stroke-AA2{stroke:#4A6FF3;} + .d2-3156367360 .stroke-AA4{stroke:#EDF0FD;} + .d2-3156367360 .stroke-AA5{stroke:#F7F8FE;} + .d2-3156367360 .stroke-AB4{stroke:#EDF0FD;} + .d2-3156367360 .stroke-AB5{stroke:#F7F8FE;} + .d2-3156367360 .background-color-N1{background-color:#0A0F25;} + .d2-3156367360 .background-color-N2{background-color:#676C7E;} + .d2-3156367360 .background-color-N3{background-color:#9499AB;} + .d2-3156367360 .background-color-N4{background-color:#CFD2DD;} + .d2-3156367360 .background-color-N5{background-color:#DEE1EB;} + .d2-3156367360 .background-color-N6{background-color:#EEF1F8;} + .d2-3156367360 .background-color-N7{background-color:#FFFFFF;} + .d2-3156367360 .background-color-B1{background-color:#0D32B2;} + .d2-3156367360 .background-color-B2{background-color:#0D32B2;} + .d2-3156367360 .background-color-B3{background-color:#E3E9FD;} + .d2-3156367360 .background-color-B4{background-color:#E3E9FD;} + .d2-3156367360 .background-color-B5{background-color:#EDF0FD;} + .d2-3156367360 .background-color-B6{background-color:#F7F8FE;} + .d2-3156367360 .background-color-AA2{background-color:#4A6FF3;} + .d2-3156367360 .background-color-AA4{background-color:#EDF0FD;} + .d2-3156367360 .background-color-AA5{background-color:#F7F8FE;} + .d2-3156367360 .background-color-AB4{background-color:#EDF0FD;} + .d2-3156367360 .background-color-AB5{background-color:#F7F8FE;} + .d2-3156367360 .color-N1{color:#0A0F25;} + .d2-3156367360 .color-N2{color:#676C7E;} + .d2-3156367360 .color-N3{color:#9499AB;} + .d2-3156367360 .color-N4{color:#CFD2DD;} + .d2-3156367360 .color-N5{color:#DEE1EB;} + .d2-3156367360 .color-N6{color:#EEF1F8;} + .d2-3156367360 .color-N7{color:#FFFFFF;} + .d2-3156367360 .color-B1{color:#0D32B2;} + .d2-3156367360 .color-B2{color:#0D32B2;} + .d2-3156367360 .color-B3{color:#E3E9FD;} + .d2-3156367360 .color-B4{color:#E3E9FD;} + .d2-3156367360 .color-B5{color:#EDF0FD;} + .d2-3156367360 .color-B6{color:#F7F8FE;} + .d2-3156367360 .color-AA2{color:#4A6FF3;} + .d2-3156367360 .color-AA4{color:#EDF0FD;} + .d2-3156367360 .color-AA5{color:#F7F8FE;} + .d2-3156367360 .color-AB4{color:#EDF0FD;} + .d2-3156367360 .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}]]>acdab diff --git a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json index bef75715d..4a2c0b80a 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json +++ b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json @@ -153,11 +153,11 @@ "route": [ { "x": 161, - "y": 66 + "y": 65.5 }, { "x": 161, - "y": 120.80000305175781 + "y": 120.69999694824219 }, { "x": 161, 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 3fd901ccb..990db8fe2 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -x

linux: because a PC is a terrible thing to waste

-
a You don't have to know how the computer works,just how to work the computer. +a You don't have to know how the computer works,just how to work the computer. diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json index dfd3b611c..d09ceeafe 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json +++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "k8s", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 1175, - "height": 125, + "width": 1155, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 132, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 232, - "y": 70 + "y": 50 }, "width": 132, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 424, - "y": 70 + "y": 50 }, "width": 132, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 616, - "y": 70 + "y": 50 }, "width": 133, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 809, - "y": 70 + "y": 50 }, "width": 133, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 1002, - "y": 70 + "y": 50 }, "width": 133, "height": 66, @@ -294,11 +294,11 @@ "id": "osvc", "type": "rectangle", "pos": { - "x": 406, - "y": 328 + "x": 416, + "y": 307 }, - "width": 455, - "height": 125, + "width": 425, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 446, - "y": 357 + "y": 337 }, "width": 76, "height": 66, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 645, - "y": 357 + "y": 337 }, "width": 76, "height": 66, @@ -441,19 +441,19 @@ "route": [ { "x": 532.5, - "y": 166 + "y": 145.5 }, { "x": 532.5, - "y": 214.39999389648438 + "y": 210.3000030517578 }, { "x": 532.5, - "y": 246.89999389648438 + "y": 242.6999969482422 }, { "x": 532.5, - "y": 328.5 + "y": 307.5 } ], "isCurve": true, @@ -488,19 +488,19 @@ "route": [ { "x": 634.5, - "y": 166 + "y": 145.5 }, { "x": 634.5, - "y": 214.39999389648438 + "y": 210.3000030517578 }, { "x": 634.5, - "y": 238.6999969482422 + "y": 234.5 }, { "x": 634.5, - "y": 287.5 + "y": 266.5 } ], "isCurve": true, @@ -535,19 +535,19 @@ "route": [ { "x": 730.5, - "y": 166 + "y": 145.5 }, { "x": 730.5, - "y": 214.39999389648438 + "y": 210.3000030517578 }, { "x": 730.5, - "y": 246.89999389648438 + "y": 242.6999969482422 }, { "x": 730.5, - "y": 328.5 + "y": 307.5 } ], "isCurve": true, @@ -582,19 +582,19 @@ "route": [ { "x": 811.5, - "y": 166 + "y": 145.5 }, { "x": 811.5, - "y": 214.39999389648438 + "y": 210.3000030517578 }, { "x": 811.5, - "y": 246.89999389648438 + "y": 242.6999969482422 }, { "x": 811.5, - "y": 328.5 + "y": 307.5 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg index 347ad8307..bf048e535 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault - - - - - - - - - - - - - - - + .d2-2526460272 .fill-N1{fill:#0A0F25;} + .d2-2526460272 .fill-N2{fill:#676C7E;} + .d2-2526460272 .fill-N3{fill:#9499AB;} + .d2-2526460272 .fill-N4{fill:#CFD2DD;} + .d2-2526460272 .fill-N5{fill:#DEE1EB;} + .d2-2526460272 .fill-N6{fill:#EEF1F8;} + .d2-2526460272 .fill-N7{fill:#FFFFFF;} + .d2-2526460272 .fill-B1{fill:#0D32B2;} + .d2-2526460272 .fill-B2{fill:#0D32B2;} + .d2-2526460272 .fill-B3{fill:#E3E9FD;} + .d2-2526460272 .fill-B4{fill:#E3E9FD;} + .d2-2526460272 .fill-B5{fill:#EDF0FD;} + .d2-2526460272 .fill-B6{fill:#F7F8FE;} + .d2-2526460272 .fill-AA2{fill:#4A6FF3;} + .d2-2526460272 .fill-AA4{fill:#EDF0FD;} + .d2-2526460272 .fill-AA5{fill:#F7F8FE;} + .d2-2526460272 .fill-AB4{fill:#EDF0FD;} + .d2-2526460272 .fill-AB5{fill:#F7F8FE;} + .d2-2526460272 .stroke-N1{stroke:#0A0F25;} + .d2-2526460272 .stroke-N2{stroke:#676C7E;} + .d2-2526460272 .stroke-N3{stroke:#9499AB;} + .d2-2526460272 .stroke-N4{stroke:#CFD2DD;} + .d2-2526460272 .stroke-N5{stroke:#DEE1EB;} + .d2-2526460272 .stroke-N6{stroke:#EEF1F8;} + .d2-2526460272 .stroke-N7{stroke:#FFFFFF;} + .d2-2526460272 .stroke-B1{stroke:#0D32B2;} + .d2-2526460272 .stroke-B2{stroke:#0D32B2;} + .d2-2526460272 .stroke-B3{stroke:#E3E9FD;} + .d2-2526460272 .stroke-B4{stroke:#E3E9FD;} + .d2-2526460272 .stroke-B5{stroke:#EDF0FD;} + .d2-2526460272 .stroke-B6{stroke:#F7F8FE;} + .d2-2526460272 .stroke-AA2{stroke:#4A6FF3;} + .d2-2526460272 .stroke-AA4{stroke:#EDF0FD;} + .d2-2526460272 .stroke-AA5{stroke:#F7F8FE;} + .d2-2526460272 .stroke-AB4{stroke:#EDF0FD;} + .d2-2526460272 .stroke-AB5{stroke:#F7F8FE;} + .d2-2526460272 .background-color-N1{background-color:#0A0F25;} + .d2-2526460272 .background-color-N2{background-color:#676C7E;} + .d2-2526460272 .background-color-N3{background-color:#9499AB;} + .d2-2526460272 .background-color-N4{background-color:#CFD2DD;} + .d2-2526460272 .background-color-N5{background-color:#DEE1EB;} + .d2-2526460272 .background-color-N6{background-color:#EEF1F8;} + .d2-2526460272 .background-color-N7{background-color:#FFFFFF;} + .d2-2526460272 .background-color-B1{background-color:#0D32B2;} + .d2-2526460272 .background-color-B2{background-color:#0D32B2;} + .d2-2526460272 .background-color-B3{background-color:#E3E9FD;} + .d2-2526460272 .background-color-B4{background-color:#E3E9FD;} + .d2-2526460272 .background-color-B5{background-color:#EDF0FD;} + .d2-2526460272 .background-color-B6{background-color:#F7F8FE;} + .d2-2526460272 .background-color-AA2{background-color:#4A6FF3;} + .d2-2526460272 .background-color-AA4{background-color:#EDF0FD;} + .d2-2526460272 .background-color-AA5{background-color:#F7F8FE;} + .d2-2526460272 .background-color-AB4{background-color:#EDF0FD;} + .d2-2526460272 .background-color-AB5{background-color:#F7F8FE;} + .d2-2526460272 .color-N1{color:#0A0F25;} + .d2-2526460272 .color-N2{color:#676C7E;} + .d2-2526460272 .color-N3{color:#9499AB;} + .d2-2526460272 .color-N4{color:#CFD2DD;} + .d2-2526460272 .color-N5{color:#DEE1EB;} + .d2-2526460272 .color-N6{color:#EEF1F8;} + .d2-2526460272 .color-N7{color:#FFFFFF;} + .d2-2526460272 .color-B1{color:#0D32B2;} + .d2-2526460272 .color-B2{color:#0D32B2;} + .d2-2526460272 .color-B3{color:#E3E9FD;} + .d2-2526460272 .color-B4{color:#E3E9FD;} + .d2-2526460272 .color-B5{color:#EDF0FD;} + .d2-2526460272 .color-B6{color:#F7F8FE;} + .d2-2526460272 .color-AA2{color:#4A6FF3;} + .d2-2526460272 .color-AA4{color:#EDF0FD;} + .d2-2526460272 .color-AA5{color:#F7F8FE;} + .d2-2526460272 .color-AB4{color:#EDF0FD;} + .d2-2526460272 .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/query_param_escape/dagre/board.exp.json b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json index b691f4363..56e80e247 100644 --- a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json +++ b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 0 }, "width": 156, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, 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 5e0006e71..3902cd9b0 100644 --- a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -my network - + .d2-2973538838 .fill-N1{fill:#0A0F25;} + .d2-2973538838 .fill-N2{fill:#676C7E;} + .d2-2973538838 .fill-N3{fill:#9499AB;} + .d2-2973538838 .fill-N4{fill:#CFD2DD;} + .d2-2973538838 .fill-N5{fill:#DEE1EB;} + .d2-2973538838 .fill-N6{fill:#EEF1F8;} + .d2-2973538838 .fill-N7{fill:#FFFFFF;} + .d2-2973538838 .fill-B1{fill:#0D32B2;} + .d2-2973538838 .fill-B2{fill:#0D32B2;} + .d2-2973538838 .fill-B3{fill:#E3E9FD;} + .d2-2973538838 .fill-B4{fill:#E3E9FD;} + .d2-2973538838 .fill-B5{fill:#EDF0FD;} + .d2-2973538838 .fill-B6{fill:#F7F8FE;} + .d2-2973538838 .fill-AA2{fill:#4A6FF3;} + .d2-2973538838 .fill-AA4{fill:#EDF0FD;} + .d2-2973538838 .fill-AA5{fill:#F7F8FE;} + .d2-2973538838 .fill-AB4{fill:#EDF0FD;} + .d2-2973538838 .fill-AB5{fill:#F7F8FE;} + .d2-2973538838 .stroke-N1{stroke:#0A0F25;} + .d2-2973538838 .stroke-N2{stroke:#676C7E;} + .d2-2973538838 .stroke-N3{stroke:#9499AB;} + .d2-2973538838 .stroke-N4{stroke:#CFD2DD;} + .d2-2973538838 .stroke-N5{stroke:#DEE1EB;} + .d2-2973538838 .stroke-N6{stroke:#EEF1F8;} + .d2-2973538838 .stroke-N7{stroke:#FFFFFF;} + .d2-2973538838 .stroke-B1{stroke:#0D32B2;} + .d2-2973538838 .stroke-B2{stroke:#0D32B2;} + .d2-2973538838 .stroke-B3{stroke:#E3E9FD;} + .d2-2973538838 .stroke-B4{stroke:#E3E9FD;} + .d2-2973538838 .stroke-B5{stroke:#EDF0FD;} + .d2-2973538838 .stroke-B6{stroke:#F7F8FE;} + .d2-2973538838 .stroke-AA2{stroke:#4A6FF3;} + .d2-2973538838 .stroke-AA4{stroke:#EDF0FD;} + .d2-2973538838 .stroke-AA5{stroke:#F7F8FE;} + .d2-2973538838 .stroke-AB4{stroke:#EDF0FD;} + .d2-2973538838 .stroke-AB5{stroke:#F7F8FE;} + .d2-2973538838 .background-color-N1{background-color:#0A0F25;} + .d2-2973538838 .background-color-N2{background-color:#676C7E;} + .d2-2973538838 .background-color-N3{background-color:#9499AB;} + .d2-2973538838 .background-color-N4{background-color:#CFD2DD;} + .d2-2973538838 .background-color-N5{background-color:#DEE1EB;} + .d2-2973538838 .background-color-N6{background-color:#EEF1F8;} + .d2-2973538838 .background-color-N7{background-color:#FFFFFF;} + .d2-2973538838 .background-color-B1{background-color:#0D32B2;} + .d2-2973538838 .background-color-B2{background-color:#0D32B2;} + .d2-2973538838 .background-color-B3{background-color:#E3E9FD;} + .d2-2973538838 .background-color-B4{background-color:#E3E9FD;} + .d2-2973538838 .background-color-B5{background-color:#EDF0FD;} + .d2-2973538838 .background-color-B6{background-color:#F7F8FE;} + .d2-2973538838 .background-color-AA2{background-color:#4A6FF3;} + .d2-2973538838 .background-color-AA4{background-color:#EDF0FD;} + .d2-2973538838 .background-color-AA5{background-color:#F7F8FE;} + .d2-2973538838 .background-color-AB4{background-color:#EDF0FD;} + .d2-2973538838 .background-color-AB5{background-color:#F7F8FE;} + .d2-2973538838 .color-N1{color:#0A0F25;} + .d2-2973538838 .color-N2{color:#676C7E;} + .d2-2973538838 .color-N3{color:#9499AB;} + .d2-2973538838 .color-N4{color:#CFD2DD;} + .d2-2973538838 .color-N5{color:#DEE1EB;} + .d2-2973538838 .color-N6{color:#EEF1F8;} + .d2-2973538838 .color-N7{color:#FFFFFF;} + .d2-2973538838 .color-B1{color:#0D32B2;} + .d2-2973538838 .color-B2{color:#0D32B2;} + .d2-2973538838 .color-B3{color:#E3E9FD;} + .d2-2973538838 .color-B4{color:#E3E9FD;} + .d2-2973538838 .color-B5{color:#EDF0FD;} + .d2-2973538838 .color-B6{color:#F7F8FE;} + .d2-2973538838 .color-AA2{color:#4A6FF3;} + .d2-2973538838 .color-AA4{color:#EDF0FD;} + .d2-2973538838 .color-AA5{color:#F7F8FE;} + .d2-2973538838 .color-AB4{color:#EDF0FD;} + .d2-2973538838 .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}]]>my network + \ No newline at end of file diff --git a/e2etests/testdata/regression/root-container/dagre/board.exp.json b/e2etests/testdata/regression/root-container/dagre/board.exp.json index 7a277be91..3110ea862 100644 --- a/e2etests/testdata/regression/root-container/dagre/board.exp.json +++ b/e2etests/testdata/regression/root-container/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "main", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 246, - "height": 291, + "width": 225, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 96, - "y": 236 + "y": 216 }, "width": 54, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 70 + "y": 50 }, "width": 52, "height": 66, @@ -171,11 +171,11 @@ "id": "root", "type": "rectangle", "pos": { - "x": 266, - "y": 41 + "x": 276, + "y": 20 }, - "width": 246, - "height": 291, + "width": 225, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 306, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 362, - "y": 236 + "y": 216 }, "width": 54, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 419, - "y": 70 + "y": 50 }, "width": 52, "height": 66, @@ -359,19 +359,19 @@ "route": [ { "x": 66.75, - "y": 136.5 + "y": 116 }, { "x": 66.75, - "y": 176.5 + "y": 156 }, { "x": 73.55000305175781, - "y": 196.5 + "y": 176 }, { "x": 100.75, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -405,20 +405,20 @@ "labelPercentage": 0, "route": [ { - "x": 145.36399841308594, - "y": 236.5 + "x": 145.25, + "y": 216 }, { - "x": 172.4720001220703, - "y": 196.5 + "x": 172.4499969482422, + "y": 176 }, { "x": 179.25, - "y": 176.5 + "y": 156 }, { "x": 179.25, - "y": 136.5 + "y": 116 } ], "isCurve": true, @@ -453,19 +453,19 @@ "route": [ { "x": 332.5, - "y": 136.5 + "y": 116 }, { "x": 332.5, - "y": 176.5 + "y": 156 }, { "x": 339.29998779296875, - "y": 196.5 + "y": 176 }, { "x": 366.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -499,20 +499,20 @@ "labelPercentage": 0, "route": [ { - "x": 411.114013671875, - "y": 236.5 + "x": 411, + "y": 216 }, { - "x": 438.22198486328125, - "y": 196.5 + "x": 438.20001220703125, + "y": 176 }, { "x": 445, - "y": 176.5 + "y": 156 }, { "x": 445, - "y": 136.5 + "y": 116 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg index c7e01b108..917b69be3 100644 --- a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -mainrootxyzxyz - - - - - - - - - + .d2-1590620810 .fill-N1{fill:#0A0F25;} + .d2-1590620810 .fill-N2{fill:#676C7E;} + .d2-1590620810 .fill-N3{fill:#9499AB;} + .d2-1590620810 .fill-N4{fill:#CFD2DD;} + .d2-1590620810 .fill-N5{fill:#DEE1EB;} + .d2-1590620810 .fill-N6{fill:#EEF1F8;} + .d2-1590620810 .fill-N7{fill:#FFFFFF;} + .d2-1590620810 .fill-B1{fill:#0D32B2;} + .d2-1590620810 .fill-B2{fill:#0D32B2;} + .d2-1590620810 .fill-B3{fill:#E3E9FD;} + .d2-1590620810 .fill-B4{fill:#E3E9FD;} + .d2-1590620810 .fill-B5{fill:#EDF0FD;} + .d2-1590620810 .fill-B6{fill:#F7F8FE;} + .d2-1590620810 .fill-AA2{fill:#4A6FF3;} + .d2-1590620810 .fill-AA4{fill:#EDF0FD;} + .d2-1590620810 .fill-AA5{fill:#F7F8FE;} + .d2-1590620810 .fill-AB4{fill:#EDF0FD;} + .d2-1590620810 .fill-AB5{fill:#F7F8FE;} + .d2-1590620810 .stroke-N1{stroke:#0A0F25;} + .d2-1590620810 .stroke-N2{stroke:#676C7E;} + .d2-1590620810 .stroke-N3{stroke:#9499AB;} + .d2-1590620810 .stroke-N4{stroke:#CFD2DD;} + .d2-1590620810 .stroke-N5{stroke:#DEE1EB;} + .d2-1590620810 .stroke-N6{stroke:#EEF1F8;} + .d2-1590620810 .stroke-N7{stroke:#FFFFFF;} + .d2-1590620810 .stroke-B1{stroke:#0D32B2;} + .d2-1590620810 .stroke-B2{stroke:#0D32B2;} + .d2-1590620810 .stroke-B3{stroke:#E3E9FD;} + .d2-1590620810 .stroke-B4{stroke:#E3E9FD;} + .d2-1590620810 .stroke-B5{stroke:#EDF0FD;} + .d2-1590620810 .stroke-B6{stroke:#F7F8FE;} + .d2-1590620810 .stroke-AA2{stroke:#4A6FF3;} + .d2-1590620810 .stroke-AA4{stroke:#EDF0FD;} + .d2-1590620810 .stroke-AA5{stroke:#F7F8FE;} + .d2-1590620810 .stroke-AB4{stroke:#EDF0FD;} + .d2-1590620810 .stroke-AB5{stroke:#F7F8FE;} + .d2-1590620810 .background-color-N1{background-color:#0A0F25;} + .d2-1590620810 .background-color-N2{background-color:#676C7E;} + .d2-1590620810 .background-color-N3{background-color:#9499AB;} + .d2-1590620810 .background-color-N4{background-color:#CFD2DD;} + .d2-1590620810 .background-color-N5{background-color:#DEE1EB;} + .d2-1590620810 .background-color-N6{background-color:#EEF1F8;} + .d2-1590620810 .background-color-N7{background-color:#FFFFFF;} + .d2-1590620810 .background-color-B1{background-color:#0D32B2;} + .d2-1590620810 .background-color-B2{background-color:#0D32B2;} + .d2-1590620810 .background-color-B3{background-color:#E3E9FD;} + .d2-1590620810 .background-color-B4{background-color:#E3E9FD;} + .d2-1590620810 .background-color-B5{background-color:#EDF0FD;} + .d2-1590620810 .background-color-B6{background-color:#F7F8FE;} + .d2-1590620810 .background-color-AA2{background-color:#4A6FF3;} + .d2-1590620810 .background-color-AA4{background-color:#EDF0FD;} + .d2-1590620810 .background-color-AA5{background-color:#F7F8FE;} + .d2-1590620810 .background-color-AB4{background-color:#EDF0FD;} + .d2-1590620810 .background-color-AB5{background-color:#F7F8FE;} + .d2-1590620810 .color-N1{color:#0A0F25;} + .d2-1590620810 .color-N2{color:#676C7E;} + .d2-1590620810 .color-N3{color:#9499AB;} + .d2-1590620810 .color-N4{color:#CFD2DD;} + .d2-1590620810 .color-N5{color:#DEE1EB;} + .d2-1590620810 .color-N6{color:#EEF1F8;} + .d2-1590620810 .color-N7{color:#FFFFFF;} + .d2-1590620810 .color-B1{color:#0D32B2;} + .d2-1590620810 .color-B2{color:#0D32B2;} + .d2-1590620810 .color-B3{color:#E3E9FD;} + .d2-1590620810 .color-B4{color:#E3E9FD;} + .d2-1590620810 .color-B5{color:#EDF0FD;} + .d2-1590620810 .color-B6{color:#F7F8FE;} + .d2-1590620810 .color-AA2{color:#4A6FF3;} + .d2-1590620810 .color-AA4{color:#EDF0FD;} + .d2-1590620810 .color-AA5{color:#F7F8FE;} + .d2-1590620810 .color-AB4{color:#EDF0FD;} + .d2-1590620810 .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}]]>mainrootxyzxyz + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json index 3fff3261c..f59d42506 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 87 + "y": 147 }, "width": 53, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 453 + "y": 653 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 270 + "y": 400 }, "width": 53, "height": 66, @@ -130,11 +130,11 @@ "id": "l1", "type": "rectangle", "pos": { - "x": 153, - "y": 81 + "x": 173, + "y": 117 }, - "width": 153, - "height": 468, + "width": 113, + "height": 632, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 290 + "y": 400 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 107 + "y": 147 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 473 + "y": 653 }, "width": 53, "height": 66, @@ -294,11 +294,11 @@ "id": "l2c1", "type": "rectangle", "pos": { - "x": 406, - "y": 81 + "x": 426, + "y": 117 }, - "width": 153, - "height": 102, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 456, - "y": 107 + "y": 147 }, "width": 53, "height": 66, @@ -376,11 +376,11 @@ "id": "l2c3", "type": "rectangle", "pos": { - "x": 406, - "y": 447 + "x": 426, + "y": 623 }, - "width": 153, - "height": 102, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 456, - "y": 473 + "y": 653 }, "width": 53, "height": 66, @@ -458,11 +458,11 @@ "id": "l2c2", "type": "rectangle", "pos": { - "x": 406, - "y": 264 + "x": 426, + "y": 370 }, - "width": 153, - "height": 102, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 456, - "y": 290 + "y": 400 }, "width": 53, "height": 66, @@ -540,11 +540,11 @@ "id": "l3c1", "type": "rectangle", "pos": { - "x": 659, - "y": 81 + "x": 679, + "y": 117 }, - "width": 153, - "height": 285, + "width": 113, + "height": 379, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 107 + "y": 147 }, "width": 53, "height": 66, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 290 + "y": 400 }, "width": 53, "height": 66, @@ -663,11 +663,11 @@ "id": "l3c2", "type": "rectangle", "pos": { - "x": 659, - "y": 447 + "x": 679, + "y": 623 }, - "width": 153, - "height": 102, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 473 + "y": 653 }, "width": 53, "height": 66, @@ -745,11 +745,11 @@ "id": "l4", "type": "rectangle", "pos": { - "x": 912, - "y": 41 + "x": 952, + "y": 76 }, - "width": 253, - "height": 548, + "width": 173, + "height": 703, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,11 +786,11 @@ "id": "l4.c1", "type": "rectangle", "pos": { - "x": 962, - "y": 96 + "x": 982, + "y": 117 }, - "width": 153, - "height": 107, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 1012, - "y": 125 + "y": 147 }, "width": 53, "height": 66, @@ -868,11 +868,11 @@ "id": "l4.c2", "type": "rectangle", "pos": { - "x": 962, - "y": 279 + "x": 982, + "y": 370 }, - "width": 153, - "height": 107, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 1012, - "y": 308 + "y": 400 }, "width": 53, "height": 66, @@ -950,11 +950,11 @@ "id": "l4.c3", "type": "rectangle", "pos": { - "x": 962, - "y": 462 + "x": 982, + "y": 623 }, - "width": 153, - "height": 107, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -992,7 +992,7 @@ "type": "rectangle", "pos": { "x": 1012, - "y": 491 + "y": 653 }, "width": 53, "height": 66, @@ -1056,19 +1056,19 @@ "route": [ { "x": 53, - "y": 303 + "y": 433 }, { "x": 93, - "y": 303 + "y": 433 }, { "x": 163, - "y": 307.1000061035156 + "y": 433 }, { "x": 203, - "y": 323.5 + "y": 433 } ], "isCurve": true, @@ -1103,19 +1103,19 @@ "route": [ { "x": 53, - "y": 120 + "y": 180 }, { "x": 93, - "y": 120 + "y": 180 }, { "x": 163, - "y": 124.0999984741211 + "y": 180 }, { "x": 203, - "y": 140.5 + "y": 180 } ], "isCurve": true, @@ -1150,19 +1150,19 @@ "route": [ { "x": 53, - "y": 486 + "y": 686 }, { "x": 93, - "y": 486 + "y": 686 }, { "x": 163, - "y": 490.1000061035156 + "y": 686 }, { "x": 203, - "y": 506.5 + "y": 686 } ], "isCurve": true, @@ -1197,31 +1197,31 @@ "route": [ { "x": 256, - "y": 140.5 + "y": 180 }, { "x": 296, - "y": 140.5 + "y": 180 }, { "x": 316, - "y": 140.5 + "y": 180 }, { "x": 331, - "y": 140.5 + "y": 180 }, { "x": 346, - "y": 140.5 + "y": 180 }, { "x": 416, - "y": 140.5 + "y": 180 }, { "x": 456, - "y": 140.5 + "y": 180 } ], "isCurve": true, @@ -1256,31 +1256,31 @@ "route": [ { "x": 256, - "y": 506.5 + "y": 686 }, { "x": 296, - "y": 506.5 + "y": 686 }, { "x": 316, - "y": 506.5 + "y": 686 }, { "x": 331, - "y": 506.5 + "y": 686 }, { "x": 346, - "y": 506.5 + "y": 686 }, { "x": 416, - "y": 506.5 + "y": 686 }, { "x": 456, - "y": 506.5 + "y": 686 } ], "isCurve": true, @@ -1315,31 +1315,31 @@ "route": [ { "x": 256, - "y": 323.5 + "y": 433 }, { "x": 296, - "y": 323.5 + "y": 433 }, { "x": 316, - "y": 323.5 + "y": 433 }, { "x": 331, - "y": 323.5 + "y": 433 }, { "x": 346, - "y": 323.5 + "y": 433 }, { "x": 416, - "y": 323.5 + "y": 433 }, { "x": 456, - "y": 323.5 + "y": 433 } ], "isCurve": true, @@ -1374,31 +1374,31 @@ "route": [ { "x": 509, - "y": 140.5 + "y": 180 }, { "x": 549, - "y": 140.5 + "y": 180 }, { "x": 569, - "y": 140.5 + "y": 180 }, { "x": 584, - "y": 140.5 + "y": 180 }, { "x": 599, - "y": 140.5 + "y": 180 }, { "x": 669, - "y": 140.5 + "y": 180 }, { "x": 709, - "y": 140.5 + "y": 180 } ], "isCurve": true, @@ -1433,31 +1433,31 @@ "route": [ { "x": 509, - "y": 323.5 + "y": 433 }, { "x": 549, - "y": 323.5 + "y": 433 }, { "x": 569, - "y": 323.5 + "y": 433 }, { "x": 584, - "y": 323.5 + "y": 433 }, { "x": 599, - "y": 323.5 + "y": 433 }, { "x": 669, - "y": 323.5 + "y": 433 }, { "x": 709, - "y": 323.5 + "y": 433 } ], "isCurve": true, @@ -1492,31 +1492,31 @@ "route": [ { "x": 509, - "y": 506.5 + "y": 686 }, { "x": 549, - "y": 506.5 + "y": 686 }, { "x": 569, - "y": 506.5 + "y": 686 }, { "x": 584, - "y": 506.5 + "y": 686 }, { "x": 599, - "y": 506.5 + "y": 686 }, { "x": 669, - "y": 506.5 + "y": 686 }, { "x": 709, - "y": 506.5 + "y": 686 } ], "isCurve": true, @@ -1551,43 +1551,43 @@ "route": [ { "x": 762, - "y": 149.5 + "y": 180 }, { "x": 802, - "y": 149.5 + "y": 180 }, { "x": 822, - "y": 149.5 + "y": 180 }, { "x": 837, - "y": 149.5 + "y": 180 }, { "x": 852, - "y": 149.5 + "y": 180 }, { "x": 872, - "y": 149.5 + "y": 180 }, { "x": 887, - "y": 149.5 + "y": 180 }, { "x": 902, - "y": 149.5 + "y": 180 }, { "x": 972, - "y": 149.5 + "y": 180 }, { "x": 1012, - "y": 149.5 + "y": 180 } ], "isCurve": true, @@ -1622,43 +1622,43 @@ "route": [ { "x": 762, - "y": 332.5 + "y": 433 }, { "x": 802, - "y": 332.5 + "y": 433 }, { "x": 822, - "y": 332.5 + "y": 433 }, { "x": 837, - "y": 332.5 + "y": 433 }, { "x": 852, - "y": 332.5 + "y": 433 }, { "x": 872, - "y": 332.5 + "y": 433 }, { "x": 887, - "y": 332.5 + "y": 433 }, { "x": 902, - "y": 332.5 + "y": 433 }, { "x": 972, - "y": 332.5 + "y": 433 }, { "x": 1012, - "y": 332.5 + "y": 433 } ], "isCurve": true, @@ -1693,43 +1693,43 @@ "route": [ { "x": 762, - "y": 515.5 + "y": 686 }, { "x": 802, - "y": 515.5 + "y": 686 }, { "x": 822, - "y": 515.5 + "y": 686 }, { "x": 837, - "y": 515.5 + "y": 686 }, { "x": 852, - "y": 515.5 + "y": 686 }, { "x": 872, - "y": 515.5 + "y": 686 }, { "x": 887, - "y": 515.5 + "y": 686 }, { "x": 902, - "y": 515.5 + "y": 686 }, { "x": 972, - "y": 515.5 + "y": 686 }, { "x": 1012, - "y": 515.5 + "y": 686 } ], "isCurve": true, 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 44d3daa25..3bff1b1e8 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,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-283775832 .fill-N1{fill:#0A0F25;} + .d2-283775832 .fill-N2{fill:#676C7E;} + .d2-283775832 .fill-N3{fill:#9499AB;} + .d2-283775832 .fill-N4{fill:#CFD2DD;} + .d2-283775832 .fill-N5{fill:#DEE1EB;} + .d2-283775832 .fill-N6{fill:#EEF1F8;} + .d2-283775832 .fill-N7{fill:#FFFFFF;} + .d2-283775832 .fill-B1{fill:#0D32B2;} + .d2-283775832 .fill-B2{fill:#0D32B2;} + .d2-283775832 .fill-B3{fill:#E3E9FD;} + .d2-283775832 .fill-B4{fill:#E3E9FD;} + .d2-283775832 .fill-B5{fill:#EDF0FD;} + .d2-283775832 .fill-B6{fill:#F7F8FE;} + .d2-283775832 .fill-AA2{fill:#4A6FF3;} + .d2-283775832 .fill-AA4{fill:#EDF0FD;} + .d2-283775832 .fill-AA5{fill:#F7F8FE;} + .d2-283775832 .fill-AB4{fill:#EDF0FD;} + .d2-283775832 .fill-AB5{fill:#F7F8FE;} + .d2-283775832 .stroke-N1{stroke:#0A0F25;} + .d2-283775832 .stroke-N2{stroke:#676C7E;} + .d2-283775832 .stroke-N3{stroke:#9499AB;} + .d2-283775832 .stroke-N4{stroke:#CFD2DD;} + .d2-283775832 .stroke-N5{stroke:#DEE1EB;} + .d2-283775832 .stroke-N6{stroke:#EEF1F8;} + .d2-283775832 .stroke-N7{stroke:#FFFFFF;} + .d2-283775832 .stroke-B1{stroke:#0D32B2;} + .d2-283775832 .stroke-B2{stroke:#0D32B2;} + .d2-283775832 .stroke-B3{stroke:#E3E9FD;} + .d2-283775832 .stroke-B4{stroke:#E3E9FD;} + .d2-283775832 .stroke-B5{stroke:#EDF0FD;} + .d2-283775832 .stroke-B6{stroke:#F7F8FE;} + .d2-283775832 .stroke-AA2{stroke:#4A6FF3;} + .d2-283775832 .stroke-AA4{stroke:#EDF0FD;} + .d2-283775832 .stroke-AA5{stroke:#F7F8FE;} + .d2-283775832 .stroke-AB4{stroke:#EDF0FD;} + .d2-283775832 .stroke-AB5{stroke:#F7F8FE;} + .d2-283775832 .background-color-N1{background-color:#0A0F25;} + .d2-283775832 .background-color-N2{background-color:#676C7E;} + .d2-283775832 .background-color-N3{background-color:#9499AB;} + .d2-283775832 .background-color-N4{background-color:#CFD2DD;} + .d2-283775832 .background-color-N5{background-color:#DEE1EB;} + .d2-283775832 .background-color-N6{background-color:#EEF1F8;} + .d2-283775832 .background-color-N7{background-color:#FFFFFF;} + .d2-283775832 .background-color-B1{background-color:#0D32B2;} + .d2-283775832 .background-color-B2{background-color:#0D32B2;} + .d2-283775832 .background-color-B3{background-color:#E3E9FD;} + .d2-283775832 .background-color-B4{background-color:#E3E9FD;} + .d2-283775832 .background-color-B5{background-color:#EDF0FD;} + .d2-283775832 .background-color-B6{background-color:#F7F8FE;} + .d2-283775832 .background-color-AA2{background-color:#4A6FF3;} + .d2-283775832 .background-color-AA4{background-color:#EDF0FD;} + .d2-283775832 .background-color-AA5{background-color:#F7F8FE;} + .d2-283775832 .background-color-AB4{background-color:#EDF0FD;} + .d2-283775832 .background-color-AB5{background-color:#F7F8FE;} + .d2-283775832 .color-N1{color:#0A0F25;} + .d2-283775832 .color-N2{color:#676C7E;} + .d2-283775832 .color-N3{color:#9499AB;} + .d2-283775832 .color-N4{color:#CFD2DD;} + .d2-283775832 .color-N5{color:#DEE1EB;} + .d2-283775832 .color-N6{color:#EEF1F8;} + .d2-283775832 .color-N7{color:#FFFFFF;} + .d2-283775832 .color-B1{color:#0D32B2;} + .d2-283775832 .color-B2{color:#0D32B2;} + .d2-283775832 .color-B3{color:#E3E9FD;} + .d2-283775832 .color-B4{color:#E3E9FD;} + .d2-283775832 .color-B5{color:#EDF0FD;} + .d2-283775832 .color-B6{color:#F7F8FE;} + .d2-283775832 .color-AA2{color:#4A6FF3;} + .d2-283775832 .color-AA4{color:#EDF0FD;} + .d2-283775832 .color-AA5{color:#F7F8FE;} + .d2-283775832 .color-AB4{color:#EDF0FD;} + .d2-283775832 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json index a96c9cff3..eef3f08fe 100644 --- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json +++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 50, - "y": 262 + "y": 414 }, "width": 135, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 358, - "y": 282 + "y": 424 }, "width": 159, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 335, - "y": 368 + "y": 550 }, "width": 204, "height": 66, @@ -130,11 +130,11 @@ "id": "Gos Warehouse", "type": "rectangle", "pos": { - "x": 639, - "y": 169 + "x": 659, + "y": 299 }, - "width": 872, - "height": 272, + "width": 832, + "height": 294, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 689, - "y": 271 + "y": 388 }, "width": 94, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 883, - "y": 325 + "y": 461 }, "width": 120, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 1103, - "y": 238 + "y": 340 }, "width": 120, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 1331, - "y": 237 + "y": 329 }, "width": 122, "height": 66, @@ -336,7 +336,7 @@ "type": "text", "pos": { "x": 1323, - "y": 323 + "y": 455 }, "width": 138, "height": 108, @@ -375,11 +375,11 @@ "id": "Customer Site", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 25, + "y": 56 }, - "width": 235, - "height": 171, + "width": 186, + "height": 252, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +417,7 @@ "type": "rectangle", "pos": { "x": 55, - "y": 50 + "y": 86 }, "width": 126, "height": 66, @@ -458,7 +458,7 @@ "type": "rectangle", "pos": { "x": 66, - "y": 136 + "y": 212 }, "width": 103, "height": 66, @@ -498,8 +498,8 @@ "id": "title", "type": "text", "pos": { - "x": 436, - "y": -71 + "x": 438, + "y": -56 }, "width": 639, "height": 51, @@ -562,19 +562,19 @@ "route": [ { "x": 185, - "y": 306.489013671875 + "y": 453 }, { "x": 225, - "y": 313.2969970703125 + "y": 456.20001220703125 }, { "x": 299.5, - "y": 315 + "y": 457 }, { "x": 357.5, - "y": 315 + "y": 457 } ], "isCurve": true, @@ -608,20 +608,20 @@ "labelPercentage": 0, "route": [ { - "x": 154.0800018310547, - "y": 328 + "x": 146, + "y": 480 }, { - "x": 218.8159942626953, - "y": 386.3999938964844 + "x": 217.1999969482422, + "y": 562.4000244140625 }, { "x": 295, - "y": 401 + "y": 583 }, { "x": 335, - "y": 401 + "y": 583 } ], "isCurve": true, @@ -655,44 +655,44 @@ "labelPercentage": 0, "route": [ { - "x": 185, - "y": 270.2969970703125 + "x": 179, + "y": 414 }, { - "x": 225, - "y": 255.65899658203125 + "x": 223.8000030517578, + "y": 390 }, { "x": 245, - "y": 252 + "y": 384 }, { "x": 260, - "y": 252 + "y": 384 }, { "x": 275, - "y": 252 + "y": 384 }, { "x": 315.3999938964844, - "y": 252 + "y": 384 }, { "x": 361, - "y": 252 + "y": 384 }, { "x": 406.6000061035156, - "y": 252 + "y": 384 }, { - "x": 599, - "y": 252 + "x": 603, + "y": 384 }, { - "x": 639, - "y": 252 + "x": 659, + "y": 384 } ], "isCurve": true, @@ -726,20 +726,20 @@ "labelPercentage": 0, "route": [ { - "x": 783, - "y": 330.4070129394531 + "x": 780.8489990234375, + "y": 454.5 }, { - "x": 823, - "y": 352.8810119628906 + "x": 822.5689697265625, + "y": 485.70001220703125 }, { "x": 843, - "y": 358.5 + "y": 493.5 }, { "x": 883, - "y": 358.5 + "y": 493.5 } ], "isCurve": true, @@ -773,32 +773,32 @@ "labelPercentage": 0, "route": [ { - "x": 783, - "y": 278.5610046386719 + "x": 779.2559814453125, + "y": 387.5 }, { - "x": 823, - "y": 256.9119873046875 + "x": 822.2509765625, + "y": 354.70001220703125 }, { "x": 855, - "y": 251.5 + "y": 346.5 }, { "x": 888, - "y": 251.5 + "y": 346.5 }, { "x": 921, - "y": 251.5 + "y": 346.5 }, { "x": 1063, - "y": 253.3000030517578 + "y": 348.8999938964844 }, { "x": 1103, - "y": 260.5 + "y": 358.5 } ], "isCurve": true, @@ -832,56 +832,56 @@ "labelPercentage": 0, "route": [ { - "x": 766.7780151367188, - "y": 271 + "x": 762.5640258789062, + "y": 387.5 }, { - "x": 819.7550048828125, - "y": 214.1999969482422 + "x": 818.9119873046875, + "y": 317.5 }, { "x": 855, - "y": 200 + "y": 300 }, { "x": 888, - "y": 200 + "y": 300 }, { "x": 921, - "y": 200 + "y": 300 }, { "x": 965, - "y": 200 + "y": 300 }, { "x": 998, - "y": 200 + "y": 300 }, { "x": 1031, - "y": 200 + "y": 300 }, { "x": 1075, - "y": 200 + "y": 300 }, { "x": 1108, - "y": 200 + "y": 300 }, { "x": 1141, - "y": 200 + "y": 300 }, { - "x": 1285.5999755859375, - "y": 207.60000610351562 + "x": 1284.5999755859375, + "y": 306 }, { - "x": 1336, - "y": 238 + "x": 1331, + "y": 330 } ], "isCurve": true, @@ -916,19 +916,19 @@ "route": [ { "x": 1003, - "y": 340.7720031738281 + "y": 468 }, { "x": 1043, - "y": 328.9540100097656 + "y": 450.3999938964844 }, { - "x": 1063, - "y": 321 + "x": 1065, + "y": 438 }, { - "x": 1103, - "y": 301 + "x": 1113, + "y": 406 } ], "isCurve": true, @@ -963,19 +963,19 @@ "route": [ { "x": 1223, - "y": 271.5 + "y": 373 }, { "x": 1263, - "y": 271.5 + "y": 373 }, { "x": 1284.5999755859375, - "y": 271.5 + "y": 372 }, { "x": 1331, - "y": 271.5 + "y": 368 } ], "isCurve": true, @@ -1009,32 +1009,32 @@ "labelPercentage": 0, "route": [ { - "x": 1355.637939453125, - "y": 303.5 + "x": 1367, + "y": 395 }, { - "x": 1289.5269775390625, - "y": 363.5 + "x": 1291.800048828125, + "y": 495 }, { "x": 1251, - "y": 378.5 + "y": 520 }, { "x": 1218, - "y": 378.5 + "y": 520 }, { "x": 1185, - "y": 378.5 + "y": 520 }, { "x": 1043, - "y": 376.70001220703125 + "y": 517.5999755859375 }, { "x": 1003, - "y": 369.5 + "y": 508 } ], "isCurve": true, @@ -1069,19 +1069,19 @@ "route": [ { "x": 517.5, - "y": 315 + "y": 457 }, { "x": 574.7000122070312, - "y": 315 + "y": 457 }, { - "x": 599, - "y": 315 + "x": 603, + "y": 457 }, { - "x": 639, - "y": 315 + "x": 659, + "y": 457 } ], "isCurve": true, @@ -1116,19 +1116,19 @@ "route": [ { "x": 539, - "y": 401 + "y": 583 }, { "x": 579, - "y": 401 + "y": 583 }, { - "x": 599, - "y": 401 + "x": 603, + "y": 583 }, { - "x": 639, - "y": 401 + "x": 659, + "y": 583 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index 7d9070e88..a27d41448 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    +OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    • Asset Tagging
    • Inventory
    • Staging
    • Dispatch to Site
    -
    InstallationSupport - - - - - - - - - - - - - - +
InstallationSupport + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/unconnected/elk/board.exp.json b/e2etests/testdata/regression/unconnected/elk/board.exp.json index be39c6d92..a30837f37 100644 --- a/e2etests/testdata/regression/unconnected/elk/board.exp.json +++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json @@ -573,7 +573,7 @@ "y": 107.875 }, { - "x": 390.5, + "x": 391, "y": 107.875 } ], @@ -967,7 +967,7 @@ "labelPercentage": 0, "route": [ { - "x": 549.5, + "x": 549, "y": 107.875 }, { diff --git a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg index 815d5aae1..9573b4f80 100644 --- a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    @@ -842,7 +842,7 @@
  • Staging
  • Dispatch to Site
-
InstallationSupport +InstallationSupport diff --git a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json index b822752f8..ea5199e2c 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json @@ -153,11 +153,11 @@ "labelPercentage": 0, "route": [ { - "x": 60.5359992980957, + "x": 60.5, "y": 66 }, { - "x": 33.30699920654297, + "x": 33.29999923706055, "y": 106 }, { @@ -200,11 +200,11 @@ "labelPercentage": 0, "route": [ { - "x": 105.46299743652344, + "x": 105.5, "y": 66 }, { - "x": 132.69200134277344, + "x": 132.6999969482422, "y": 106 }, { 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 e7171621a..b87a2f699 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-4184818569 .fill-N1{fill:#0A0F25;} + .d2-4184818569 .fill-N2{fill:#676C7E;} + .d2-4184818569 .fill-N3{fill:#9499AB;} + .d2-4184818569 .fill-N4{fill:#CFD2DD;} + .d2-4184818569 .fill-N5{fill:#DEE1EB;} + .d2-4184818569 .fill-N6{fill:#EEF1F8;} + .d2-4184818569 .fill-N7{fill:#FFFFFF;} + .d2-4184818569 .fill-B1{fill:#0D32B2;} + .d2-4184818569 .fill-B2{fill:#0D32B2;} + .d2-4184818569 .fill-B3{fill:#E3E9FD;} + .d2-4184818569 .fill-B4{fill:#E3E9FD;} + .d2-4184818569 .fill-B5{fill:#EDF0FD;} + .d2-4184818569 .fill-B6{fill:#F7F8FE;} + .d2-4184818569 .fill-AA2{fill:#4A6FF3;} + .d2-4184818569 .fill-AA4{fill:#EDF0FD;} + .d2-4184818569 .fill-AA5{fill:#F7F8FE;} + .d2-4184818569 .fill-AB4{fill:#EDF0FD;} + .d2-4184818569 .fill-AB5{fill:#F7F8FE;} + .d2-4184818569 .stroke-N1{stroke:#0A0F25;} + .d2-4184818569 .stroke-N2{stroke:#676C7E;} + .d2-4184818569 .stroke-N3{stroke:#9499AB;} + .d2-4184818569 .stroke-N4{stroke:#CFD2DD;} + .d2-4184818569 .stroke-N5{stroke:#DEE1EB;} + .d2-4184818569 .stroke-N6{stroke:#EEF1F8;} + .d2-4184818569 .stroke-N7{stroke:#FFFFFF;} + .d2-4184818569 .stroke-B1{stroke:#0D32B2;} + .d2-4184818569 .stroke-B2{stroke:#0D32B2;} + .d2-4184818569 .stroke-B3{stroke:#E3E9FD;} + .d2-4184818569 .stroke-B4{stroke:#E3E9FD;} + .d2-4184818569 .stroke-B5{stroke:#EDF0FD;} + .d2-4184818569 .stroke-B6{stroke:#F7F8FE;} + .d2-4184818569 .stroke-AA2{stroke:#4A6FF3;} + .d2-4184818569 .stroke-AA4{stroke:#EDF0FD;} + .d2-4184818569 .stroke-AA5{stroke:#F7F8FE;} + .d2-4184818569 .stroke-AB4{stroke:#EDF0FD;} + .d2-4184818569 .stroke-AB5{stroke:#F7F8FE;} + .d2-4184818569 .background-color-N1{background-color:#0A0F25;} + .d2-4184818569 .background-color-N2{background-color:#676C7E;} + .d2-4184818569 .background-color-N3{background-color:#9499AB;} + .d2-4184818569 .background-color-N4{background-color:#CFD2DD;} + .d2-4184818569 .background-color-N5{background-color:#DEE1EB;} + .d2-4184818569 .background-color-N6{background-color:#EEF1F8;} + .d2-4184818569 .background-color-N7{background-color:#FFFFFF;} + .d2-4184818569 .background-color-B1{background-color:#0D32B2;} + .d2-4184818569 .background-color-B2{background-color:#0D32B2;} + .d2-4184818569 .background-color-B3{background-color:#E3E9FD;} + .d2-4184818569 .background-color-B4{background-color:#E3E9FD;} + .d2-4184818569 .background-color-B5{background-color:#EDF0FD;} + .d2-4184818569 .background-color-B6{background-color:#F7F8FE;} + .d2-4184818569 .background-color-AA2{background-color:#4A6FF3;} + .d2-4184818569 .background-color-AA4{background-color:#EDF0FD;} + .d2-4184818569 .background-color-AA5{background-color:#F7F8FE;} + .d2-4184818569 .background-color-AB4{background-color:#EDF0FD;} + .d2-4184818569 .background-color-AB5{background-color:#F7F8FE;} + .d2-4184818569 .color-N1{color:#0A0F25;} + .d2-4184818569 .color-N2{color:#676C7E;} + .d2-4184818569 .color-N3{color:#9499AB;} + .d2-4184818569 .color-N4{color:#CFD2DD;} + .d2-4184818569 .color-N5{color:#DEE1EB;} + .d2-4184818569 .color-N6{color:#EEF1F8;} + .d2-4184818569 .color-N7{color:#FFFFFF;} + .d2-4184818569 .color-B1{color:#0D32B2;} + .d2-4184818569 .color-B2{color:#0D32B2;} + .d2-4184818569 .color-B3{color:#E3E9FD;} + .d2-4184818569 .color-B4{color:#E3E9FD;} + .d2-4184818569 .color-B5{color:#EDF0FD;} + .d2-4184818569 .color-B6{color:#F7F8FE;} + .d2-4184818569 .color-AA2{color:#4A6FF3;} + .d2-4184818569 .color-AA4{color:#EDF0FD;} + .d2-4184818569 .color-AA5{color:#F7F8FE;} + .d2-4184818569 .color-AB4{color:#EDF0FD;} + .d2-4184818569 .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}]]>abc diff --git a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json index 34276371b..bbc33c06d 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 1, - "y": 41 + "x": 11, + "y": 20 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 41, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -89,11 +89,11 @@ "id": "c", "type": "rectangle", "pos": { - "x": 0, - "y": 307 + "x": 10, + "y": 286 }, - "width": 134, - "height": 125, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 336 + "y": 316 }, "width": 54, "height": 66, @@ -195,11 +195,11 @@ "route": [ { "x": 67, - "y": 136.5 + "y": 116 }, { "x": 67, - "y": 160.10000610351562 + "y": 156 }, { "x": 67, @@ -215,11 +215,11 @@ }, { "x": 67, - "y": 280.1000061035156 + "y": 276 }, { "x": 67, - "y": 336.5 + "y": 316 } ], "isCurve": true, 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 00eb18985..e230d32f5 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbd - - - - - + .d2-1868225435 .fill-N1{fill:#0A0F25;} + .d2-1868225435 .fill-N2{fill:#676C7E;} + .d2-1868225435 .fill-N3{fill:#9499AB;} + .d2-1868225435 .fill-N4{fill:#CFD2DD;} + .d2-1868225435 .fill-N5{fill:#DEE1EB;} + .d2-1868225435 .fill-N6{fill:#EEF1F8;} + .d2-1868225435 .fill-N7{fill:#FFFFFF;} + .d2-1868225435 .fill-B1{fill:#0D32B2;} + .d2-1868225435 .fill-B2{fill:#0D32B2;} + .d2-1868225435 .fill-B3{fill:#E3E9FD;} + .d2-1868225435 .fill-B4{fill:#E3E9FD;} + .d2-1868225435 .fill-B5{fill:#EDF0FD;} + .d2-1868225435 .fill-B6{fill:#F7F8FE;} + .d2-1868225435 .fill-AA2{fill:#4A6FF3;} + .d2-1868225435 .fill-AA4{fill:#EDF0FD;} + .d2-1868225435 .fill-AA5{fill:#F7F8FE;} + .d2-1868225435 .fill-AB4{fill:#EDF0FD;} + .d2-1868225435 .fill-AB5{fill:#F7F8FE;} + .d2-1868225435 .stroke-N1{stroke:#0A0F25;} + .d2-1868225435 .stroke-N2{stroke:#676C7E;} + .d2-1868225435 .stroke-N3{stroke:#9499AB;} + .d2-1868225435 .stroke-N4{stroke:#CFD2DD;} + .d2-1868225435 .stroke-N5{stroke:#DEE1EB;} + .d2-1868225435 .stroke-N6{stroke:#EEF1F8;} + .d2-1868225435 .stroke-N7{stroke:#FFFFFF;} + .d2-1868225435 .stroke-B1{stroke:#0D32B2;} + .d2-1868225435 .stroke-B2{stroke:#0D32B2;} + .d2-1868225435 .stroke-B3{stroke:#E3E9FD;} + .d2-1868225435 .stroke-B4{stroke:#E3E9FD;} + .d2-1868225435 .stroke-B5{stroke:#EDF0FD;} + .d2-1868225435 .stroke-B6{stroke:#F7F8FE;} + .d2-1868225435 .stroke-AA2{stroke:#4A6FF3;} + .d2-1868225435 .stroke-AA4{stroke:#EDF0FD;} + .d2-1868225435 .stroke-AA5{stroke:#F7F8FE;} + .d2-1868225435 .stroke-AB4{stroke:#EDF0FD;} + .d2-1868225435 .stroke-AB5{stroke:#F7F8FE;} + .d2-1868225435 .background-color-N1{background-color:#0A0F25;} + .d2-1868225435 .background-color-N2{background-color:#676C7E;} + .d2-1868225435 .background-color-N3{background-color:#9499AB;} + .d2-1868225435 .background-color-N4{background-color:#CFD2DD;} + .d2-1868225435 .background-color-N5{background-color:#DEE1EB;} + .d2-1868225435 .background-color-N6{background-color:#EEF1F8;} + .d2-1868225435 .background-color-N7{background-color:#FFFFFF;} + .d2-1868225435 .background-color-B1{background-color:#0D32B2;} + .d2-1868225435 .background-color-B2{background-color:#0D32B2;} + .d2-1868225435 .background-color-B3{background-color:#E3E9FD;} + .d2-1868225435 .background-color-B4{background-color:#E3E9FD;} + .d2-1868225435 .background-color-B5{background-color:#EDF0FD;} + .d2-1868225435 .background-color-B6{background-color:#F7F8FE;} + .d2-1868225435 .background-color-AA2{background-color:#4A6FF3;} + .d2-1868225435 .background-color-AA4{background-color:#EDF0FD;} + .d2-1868225435 .background-color-AA5{background-color:#F7F8FE;} + .d2-1868225435 .background-color-AB4{background-color:#EDF0FD;} + .d2-1868225435 .background-color-AB5{background-color:#F7F8FE;} + .d2-1868225435 .color-N1{color:#0A0F25;} + .d2-1868225435 .color-N2{color:#676C7E;} + .d2-1868225435 .color-N3{color:#9499AB;} + .d2-1868225435 .color-N4{color:#CFD2DD;} + .d2-1868225435 .color-N5{color:#DEE1EB;} + .d2-1868225435 .color-N6{color:#EEF1F8;} + .d2-1868225435 .color-N7{color:#FFFFFF;} + .d2-1868225435 .color-B1{color:#0D32B2;} + .d2-1868225435 .color-B2{color:#0D32B2;} + .d2-1868225435 .color-B3{color:#E3E9FD;} + .d2-1868225435 .color-B4{color:#E3E9FD;} + .d2-1868225435 .color-B5{color:#EDF0FD;} + .d2-1868225435 .color-B6{color:#F7F8FE;} + .d2-1868225435 .color-AA2{color:#4A6FF3;} + .d2-1868225435 .color-AA4{color:#EDF0FD;} + .d2-1868225435 .color-AA5{color:#F7F8FE;} + .d2-1868225435 .color-AB4{color:#EDF0FD;} + .d2-1868225435 .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}]]>acbd + + + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json index 312307315..434db15e4 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json @@ -113,11 +113,11 @@ "route": [ { "x": 26.5, - "y": 66 + "y": 65.5 }, { "x": 26.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 26.5, diff --git a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg index 04e56647d..f8ed8f019 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-3766461834 .fill-N1{fill:#0A0F25;} + .d2-3766461834 .fill-N2{fill:#676C7E;} + .d2-3766461834 .fill-N3{fill:#9499AB;} + .d2-3766461834 .fill-N4{fill:#CFD2DD;} + .d2-3766461834 .fill-N5{fill:#DEE1EB;} + .d2-3766461834 .fill-N6{fill:#EEF1F8;} + .d2-3766461834 .fill-N7{fill:#FFFFFF;} + .d2-3766461834 .fill-B1{fill:#0D32B2;} + .d2-3766461834 .fill-B2{fill:#0D32B2;} + .d2-3766461834 .fill-B3{fill:#E3E9FD;} + .d2-3766461834 .fill-B4{fill:#E3E9FD;} + .d2-3766461834 .fill-B5{fill:#EDF0FD;} + .d2-3766461834 .fill-B6{fill:#F7F8FE;} + .d2-3766461834 .fill-AA2{fill:#4A6FF3;} + .d2-3766461834 .fill-AA4{fill:#EDF0FD;} + .d2-3766461834 .fill-AA5{fill:#F7F8FE;} + .d2-3766461834 .fill-AB4{fill:#EDF0FD;} + .d2-3766461834 .fill-AB5{fill:#F7F8FE;} + .d2-3766461834 .stroke-N1{stroke:#0A0F25;} + .d2-3766461834 .stroke-N2{stroke:#676C7E;} + .d2-3766461834 .stroke-N3{stroke:#9499AB;} + .d2-3766461834 .stroke-N4{stroke:#CFD2DD;} + .d2-3766461834 .stroke-N5{stroke:#DEE1EB;} + .d2-3766461834 .stroke-N6{stroke:#EEF1F8;} + .d2-3766461834 .stroke-N7{stroke:#FFFFFF;} + .d2-3766461834 .stroke-B1{stroke:#0D32B2;} + .d2-3766461834 .stroke-B2{stroke:#0D32B2;} + .d2-3766461834 .stroke-B3{stroke:#E3E9FD;} + .d2-3766461834 .stroke-B4{stroke:#E3E9FD;} + .d2-3766461834 .stroke-B5{stroke:#EDF0FD;} + .d2-3766461834 .stroke-B6{stroke:#F7F8FE;} + .d2-3766461834 .stroke-AA2{stroke:#4A6FF3;} + .d2-3766461834 .stroke-AA4{stroke:#EDF0FD;} + .d2-3766461834 .stroke-AA5{stroke:#F7F8FE;} + .d2-3766461834 .stroke-AB4{stroke:#EDF0FD;} + .d2-3766461834 .stroke-AB5{stroke:#F7F8FE;} + .d2-3766461834 .background-color-N1{background-color:#0A0F25;} + .d2-3766461834 .background-color-N2{background-color:#676C7E;} + .d2-3766461834 .background-color-N3{background-color:#9499AB;} + .d2-3766461834 .background-color-N4{background-color:#CFD2DD;} + .d2-3766461834 .background-color-N5{background-color:#DEE1EB;} + .d2-3766461834 .background-color-N6{background-color:#EEF1F8;} + .d2-3766461834 .background-color-N7{background-color:#FFFFFF;} + .d2-3766461834 .background-color-B1{background-color:#0D32B2;} + .d2-3766461834 .background-color-B2{background-color:#0D32B2;} + .d2-3766461834 .background-color-B3{background-color:#E3E9FD;} + .d2-3766461834 .background-color-B4{background-color:#E3E9FD;} + .d2-3766461834 .background-color-B5{background-color:#EDF0FD;} + .d2-3766461834 .background-color-B6{background-color:#F7F8FE;} + .d2-3766461834 .background-color-AA2{background-color:#4A6FF3;} + .d2-3766461834 .background-color-AA4{background-color:#EDF0FD;} + .d2-3766461834 .background-color-AA5{background-color:#F7F8FE;} + .d2-3766461834 .background-color-AB4{background-color:#EDF0FD;} + .d2-3766461834 .background-color-AB5{background-color:#F7F8FE;} + .d2-3766461834 .color-N1{color:#0A0F25;} + .d2-3766461834 .color-N2{color:#676C7E;} + .d2-3766461834 .color-N3{color:#9499AB;} + .d2-3766461834 .color-N4{color:#CFD2DD;} + .d2-3766461834 .color-N5{color:#DEE1EB;} + .d2-3766461834 .color-N6{color:#EEF1F8;} + .d2-3766461834 .color-N7{color:#FFFFFF;} + .d2-3766461834 .color-B1{color:#0D32B2;} + .d2-3766461834 .color-B2{color:#0D32B2;} + .d2-3766461834 .color-B3{color:#E3E9FD;} + .d2-3766461834 .color-B4{color:#E3E9FD;} + .d2-3766461834 .color-B5{color:#EDF0FD;} + .d2-3766461834 .color-B6{color:#F7F8FE;} + .d2-3766461834 .color-AA2{color:#4A6FF3;} + .d2-3766461834 .color-AA4{color:#EDF0FD;} + .d2-3766461834 .color-AA5{color:#F7F8FE;} + .d2-3766461834 .color-AB4{color:#EDF0FD;} + .d2-3766461834 .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}]]>ab hello diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json index 4cf806b54..34bc15428 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json +++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "hexagon", "pos": { "x": 0, - "y": 7 + "y": 0 }, "width": 128, "height": 69, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 28, - "y": 400 + "y": 363 }, "width": 73, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 17, - "y": 191 + "y": 169 }, "width": 94, "height": 94, @@ -153,20 +153,20 @@ "labelPercentage": 0, "route": [ { - "x": 72, - "y": 76 + "x": 64, + "y": 69 }, { - "x": 71.5999984741211, - "y": 116 + "x": 64, + "y": 109 }, { - "x": 71.5, - "y": 136 + "x": 64, + "y": 126 }, { - "x": 71.5, - "y": 176 + "x": 64, + "y": 154 } ], "isCurve": true, @@ -200,20 +200,20 @@ "labelPercentage": 0, "route": [ { - "x": 71.5, - "y": 285 + "x": 64, + "y": 263 }, { - "x": 71.5, - "y": 325 + "x": 64, + "y": 303 }, { - "x": 71.5, - "y": 345 + "x": 64, + "y": 320 }, { - "x": 71.5, - "y": 385 + "x": 64, + "y": 348 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg index 5f653e080..01bf8424a 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - - -hexagon - -rect - -square - - - - + .d2-489701467 .fill-N1{fill:#0A0F25;} + .d2-489701467 .fill-N2{fill:#676C7E;} + .d2-489701467 .fill-N3{fill:#9499AB;} + .d2-489701467 .fill-N4{fill:#CFD2DD;} + .d2-489701467 .fill-N5{fill:#DEE1EB;} + .d2-489701467 .fill-N6{fill:#EEF1F8;} + .d2-489701467 .fill-N7{fill:#FFFFFF;} + .d2-489701467 .fill-B1{fill:#0D32B2;} + .d2-489701467 .fill-B2{fill:#0D32B2;} + .d2-489701467 .fill-B3{fill:#E3E9FD;} + .d2-489701467 .fill-B4{fill:#E3E9FD;} + .d2-489701467 .fill-B5{fill:#EDF0FD;} + .d2-489701467 .fill-B6{fill:#F7F8FE;} + .d2-489701467 .fill-AA2{fill:#4A6FF3;} + .d2-489701467 .fill-AA4{fill:#EDF0FD;} + .d2-489701467 .fill-AA5{fill:#F7F8FE;} + .d2-489701467 .fill-AB4{fill:#EDF0FD;} + .d2-489701467 .fill-AB5{fill:#F7F8FE;} + .d2-489701467 .stroke-N1{stroke:#0A0F25;} + .d2-489701467 .stroke-N2{stroke:#676C7E;} + .d2-489701467 .stroke-N3{stroke:#9499AB;} + .d2-489701467 .stroke-N4{stroke:#CFD2DD;} + .d2-489701467 .stroke-N5{stroke:#DEE1EB;} + .d2-489701467 .stroke-N6{stroke:#EEF1F8;} + .d2-489701467 .stroke-N7{stroke:#FFFFFF;} + .d2-489701467 .stroke-B1{stroke:#0D32B2;} + .d2-489701467 .stroke-B2{stroke:#0D32B2;} + .d2-489701467 .stroke-B3{stroke:#E3E9FD;} + .d2-489701467 .stroke-B4{stroke:#E3E9FD;} + .d2-489701467 .stroke-B5{stroke:#EDF0FD;} + .d2-489701467 .stroke-B6{stroke:#F7F8FE;} + .d2-489701467 .stroke-AA2{stroke:#4A6FF3;} + .d2-489701467 .stroke-AA4{stroke:#EDF0FD;} + .d2-489701467 .stroke-AA5{stroke:#F7F8FE;} + .d2-489701467 .stroke-AB4{stroke:#EDF0FD;} + .d2-489701467 .stroke-AB5{stroke:#F7F8FE;} + .d2-489701467 .background-color-N1{background-color:#0A0F25;} + .d2-489701467 .background-color-N2{background-color:#676C7E;} + .d2-489701467 .background-color-N3{background-color:#9499AB;} + .d2-489701467 .background-color-N4{background-color:#CFD2DD;} + .d2-489701467 .background-color-N5{background-color:#DEE1EB;} + .d2-489701467 .background-color-N6{background-color:#EEF1F8;} + .d2-489701467 .background-color-N7{background-color:#FFFFFF;} + .d2-489701467 .background-color-B1{background-color:#0D32B2;} + .d2-489701467 .background-color-B2{background-color:#0D32B2;} + .d2-489701467 .background-color-B3{background-color:#E3E9FD;} + .d2-489701467 .background-color-B4{background-color:#E3E9FD;} + .d2-489701467 .background-color-B5{background-color:#EDF0FD;} + .d2-489701467 .background-color-B6{background-color:#F7F8FE;} + .d2-489701467 .background-color-AA2{background-color:#4A6FF3;} + .d2-489701467 .background-color-AA4{background-color:#EDF0FD;} + .d2-489701467 .background-color-AA5{background-color:#F7F8FE;} + .d2-489701467 .background-color-AB4{background-color:#EDF0FD;} + .d2-489701467 .background-color-AB5{background-color:#F7F8FE;} + .d2-489701467 .color-N1{color:#0A0F25;} + .d2-489701467 .color-N2{color:#676C7E;} + .d2-489701467 .color-N3{color:#9499AB;} + .d2-489701467 .color-N4{color:#CFD2DD;} + .d2-489701467 .color-N5{color:#DEE1EB;} + .d2-489701467 .color-N6{color:#EEF1F8;} + .d2-489701467 .color-N7{color:#FFFFFF;} + .d2-489701467 .color-B1{color:#0D32B2;} + .d2-489701467 .color-B2{color:#0D32B2;} + .d2-489701467 .color-B3{color:#E3E9FD;} + .d2-489701467 .color-B4{color:#E3E9FD;} + .d2-489701467 .color-B5{color:#EDF0FD;} + .d2-489701467 .color-B6{color:#F7F8FE;} + .d2-489701467 .color-AA2{color:#4A6FF3;} + .d2-489701467 .color-AA4{color:#EDF0FD;} + .d2-489701467 .color-AA5{color:#F7F8FE;} + .d2-489701467 .color-AB4{color:#EDF0FD;} + .d2-489701467 .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}]]> + +hexagon + +rect + +square + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json index 8705f3a7d..644bffb9d 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json +++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json @@ -157,7 +157,7 @@ "y": 88 }, { - "x": 83.5, + "x": 83, "y": 158 } ], diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg index a95e8a4ae..2d9b9d012 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1489188284 .fill-N1{fill:#0A0F25;} + .d2-1489188284 .fill-N2{fill:#676C7E;} + .d2-1489188284 .fill-N3{fill:#9499AB;} + .d2-1489188284 .fill-N4{fill:#CFD2DD;} + .d2-1489188284 .fill-N5{fill:#DEE1EB;} + .d2-1489188284 .fill-N6{fill:#EEF1F8;} + .d2-1489188284 .fill-N7{fill:#FFFFFF;} + .d2-1489188284 .fill-B1{fill:#0D32B2;} + .d2-1489188284 .fill-B2{fill:#0D32B2;} + .d2-1489188284 .fill-B3{fill:#E3E9FD;} + .d2-1489188284 .fill-B4{fill:#E3E9FD;} + .d2-1489188284 .fill-B5{fill:#EDF0FD;} + .d2-1489188284 .fill-B6{fill:#F7F8FE;} + .d2-1489188284 .fill-AA2{fill:#4A6FF3;} + .d2-1489188284 .fill-AA4{fill:#EDF0FD;} + .d2-1489188284 .fill-AA5{fill:#F7F8FE;} + .d2-1489188284 .fill-AB4{fill:#EDF0FD;} + .d2-1489188284 .fill-AB5{fill:#F7F8FE;} + .d2-1489188284 .stroke-N1{stroke:#0A0F25;} + .d2-1489188284 .stroke-N2{stroke:#676C7E;} + .d2-1489188284 .stroke-N3{stroke:#9499AB;} + .d2-1489188284 .stroke-N4{stroke:#CFD2DD;} + .d2-1489188284 .stroke-N5{stroke:#DEE1EB;} + .d2-1489188284 .stroke-N6{stroke:#EEF1F8;} + .d2-1489188284 .stroke-N7{stroke:#FFFFFF;} + .d2-1489188284 .stroke-B1{stroke:#0D32B2;} + .d2-1489188284 .stroke-B2{stroke:#0D32B2;} + .d2-1489188284 .stroke-B3{stroke:#E3E9FD;} + .d2-1489188284 .stroke-B4{stroke:#E3E9FD;} + .d2-1489188284 .stroke-B5{stroke:#EDF0FD;} + .d2-1489188284 .stroke-B6{stroke:#F7F8FE;} + .d2-1489188284 .stroke-AA2{stroke:#4A6FF3;} + .d2-1489188284 .stroke-AA4{stroke:#EDF0FD;} + .d2-1489188284 .stroke-AA5{stroke:#F7F8FE;} + .d2-1489188284 .stroke-AB4{stroke:#EDF0FD;} + .d2-1489188284 .stroke-AB5{stroke:#F7F8FE;} + .d2-1489188284 .background-color-N1{background-color:#0A0F25;} + .d2-1489188284 .background-color-N2{background-color:#676C7E;} + .d2-1489188284 .background-color-N3{background-color:#9499AB;} + .d2-1489188284 .background-color-N4{background-color:#CFD2DD;} + .d2-1489188284 .background-color-N5{background-color:#DEE1EB;} + .d2-1489188284 .background-color-N6{background-color:#EEF1F8;} + .d2-1489188284 .background-color-N7{background-color:#FFFFFF;} + .d2-1489188284 .background-color-B1{background-color:#0D32B2;} + .d2-1489188284 .background-color-B2{background-color:#0D32B2;} + .d2-1489188284 .background-color-B3{background-color:#E3E9FD;} + .d2-1489188284 .background-color-B4{background-color:#E3E9FD;} + .d2-1489188284 .background-color-B5{background-color:#EDF0FD;} + .d2-1489188284 .background-color-B6{background-color:#F7F8FE;} + .d2-1489188284 .background-color-AA2{background-color:#4A6FF3;} + .d2-1489188284 .background-color-AA4{background-color:#EDF0FD;} + .d2-1489188284 .background-color-AA5{background-color:#F7F8FE;} + .d2-1489188284 .background-color-AB4{background-color:#EDF0FD;} + .d2-1489188284 .background-color-AB5{background-color:#F7F8FE;} + .d2-1489188284 .color-N1{color:#0A0F25;} + .d2-1489188284 .color-N2{color:#676C7E;} + .d2-1489188284 .color-N3{color:#9499AB;} + .d2-1489188284 .color-N4{color:#CFD2DD;} + .d2-1489188284 .color-N5{color:#DEE1EB;} + .d2-1489188284 .color-N6{color:#EEF1F8;} + .d2-1489188284 .color-N7{color:#FFFFFF;} + .d2-1489188284 .color-B1{color:#0D32B2;} + .d2-1489188284 .color-B2{color:#0D32B2;} + .d2-1489188284 .color-B3{color:#E3E9FD;} + .d2-1489188284 .color-B4{color:#E3E9FD;} + .d2-1489188284 .color-B5{color:#EDF0FD;} + .d2-1489188284 .color-B6{color:#F7F8FE;} + .d2-1489188284 .color-AA2{color:#4A6FF3;} + .d2-1489188284 .color-AA4{color:#EDF0FD;} + .d2-1489188284 .color-AA5{color:#F7F8FE;} + .d2-1489188284 .color-AB4{color:#EDF0FD;} + .d2-1489188284 .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}]]> hexagon rect -square +square diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json index 8823bccf8..9166a58a3 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json @@ -459,7 +459,7 @@ "type": "person", "pos": { "x": 653, - "y": 399 + "y": 412 }, "width": 63, "height": 66, @@ -1065,11 +1065,11 @@ }, { "x": 684.5999755859375, - "y": 348.6000061035156 + "y": 351.20001220703125 }, { "x": 685, - "y": 399 + "y": 412 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg index 2aa7b692e..5de5642c0 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3329031849 .fill-N1{fill:#0A0F25;} + .d2-3329031849 .fill-N2{fill:#676C7E;} + .d2-3329031849 .fill-N3{fill:#9499AB;} + .d2-3329031849 .fill-N4{fill:#CFD2DD;} + .d2-3329031849 .fill-N5{fill:#DEE1EB;} + .d2-3329031849 .fill-N6{fill:#EEF1F8;} + .d2-3329031849 .fill-N7{fill:#FFFFFF;} + .d2-3329031849 .fill-B1{fill:#0D32B2;} + .d2-3329031849 .fill-B2{fill:#0D32B2;} + .d2-3329031849 .fill-B3{fill:#E3E9FD;} + .d2-3329031849 .fill-B4{fill:#E3E9FD;} + .d2-3329031849 .fill-B5{fill:#EDF0FD;} + .d2-3329031849 .fill-B6{fill:#F7F8FE;} + .d2-3329031849 .fill-AA2{fill:#4A6FF3;} + .d2-3329031849 .fill-AA4{fill:#EDF0FD;} + .d2-3329031849 .fill-AA5{fill:#F7F8FE;} + .d2-3329031849 .fill-AB4{fill:#EDF0FD;} + .d2-3329031849 .fill-AB5{fill:#F7F8FE;} + .d2-3329031849 .stroke-N1{stroke:#0A0F25;} + .d2-3329031849 .stroke-N2{stroke:#676C7E;} + .d2-3329031849 .stroke-N3{stroke:#9499AB;} + .d2-3329031849 .stroke-N4{stroke:#CFD2DD;} + .d2-3329031849 .stroke-N5{stroke:#DEE1EB;} + .d2-3329031849 .stroke-N6{stroke:#EEF1F8;} + .d2-3329031849 .stroke-N7{stroke:#FFFFFF;} + .d2-3329031849 .stroke-B1{stroke:#0D32B2;} + .d2-3329031849 .stroke-B2{stroke:#0D32B2;} + .d2-3329031849 .stroke-B3{stroke:#E3E9FD;} + .d2-3329031849 .stroke-B4{stroke:#E3E9FD;} + .d2-3329031849 .stroke-B5{stroke:#EDF0FD;} + .d2-3329031849 .stroke-B6{stroke:#F7F8FE;} + .d2-3329031849 .stroke-AA2{stroke:#4A6FF3;} + .d2-3329031849 .stroke-AA4{stroke:#EDF0FD;} + .d2-3329031849 .stroke-AA5{stroke:#F7F8FE;} + .d2-3329031849 .stroke-AB4{stroke:#EDF0FD;} + .d2-3329031849 .stroke-AB5{stroke:#F7F8FE;} + .d2-3329031849 .background-color-N1{background-color:#0A0F25;} + .d2-3329031849 .background-color-N2{background-color:#676C7E;} + .d2-3329031849 .background-color-N3{background-color:#9499AB;} + .d2-3329031849 .background-color-N4{background-color:#CFD2DD;} + .d2-3329031849 .background-color-N5{background-color:#DEE1EB;} + .d2-3329031849 .background-color-N6{background-color:#EEF1F8;} + .d2-3329031849 .background-color-N7{background-color:#FFFFFF;} + .d2-3329031849 .background-color-B1{background-color:#0D32B2;} + .d2-3329031849 .background-color-B2{background-color:#0D32B2;} + .d2-3329031849 .background-color-B3{background-color:#E3E9FD;} + .d2-3329031849 .background-color-B4{background-color:#E3E9FD;} + .d2-3329031849 .background-color-B5{background-color:#EDF0FD;} + .d2-3329031849 .background-color-B6{background-color:#F7F8FE;} + .d2-3329031849 .background-color-AA2{background-color:#4A6FF3;} + .d2-3329031849 .background-color-AA4{background-color:#EDF0FD;} + .d2-3329031849 .background-color-AA5{background-color:#F7F8FE;} + .d2-3329031849 .background-color-AB4{background-color:#EDF0FD;} + .d2-3329031849 .background-color-AB5{background-color:#F7F8FE;} + .d2-3329031849 .color-N1{color:#0A0F25;} + .d2-3329031849 .color-N2{color:#676C7E;} + .d2-3329031849 .color-N3{color:#9499AB;} + .d2-3329031849 .color-N4{color:#CFD2DD;} + .d2-3329031849 .color-N5{color:#DEE1EB;} + .d2-3329031849 .color-N6{color:#EEF1F8;} + .d2-3329031849 .color-N7{color:#FFFFFF;} + .d2-3329031849 .color-B1{color:#0D32B2;} + .d2-3329031849 .color-B2{color:#0D32B2;} + .d2-3329031849 .color-B3{color:#E3E9FD;} + .d2-3329031849 .color-B4{color:#E3E9FD;} + .d2-3329031849 .color-B5{color:#EDF0FD;} + .d2-3329031849 .color-B6{color:#F7F8FE;} + .d2-3329031849 .color-AA2{color:#4A6FF3;} + .d2-3329031849 .color-AA4{color:#EDF0FD;} + .d2-3329031849 .color-AA5{color:#F7F8FE;} + .d2-3329031849 .color-AB4{color:#EDF0FD;} + .d2-3329031849 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -102,7 +102,7 @@ - + diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json index 4a1c2d4cc..af2fba9bd 100644 --- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json @@ -921,7 +921,7 @@ "y": 258 }, { - "x": 429, + "x": 430, "y": 338 } ], @@ -959,7 +959,7 @@ "y": 59 }, { - "x": 577, + "x": 576, "y": 188 } ], diff --git a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg index 1934530d5..bb159295b 100644 --- a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3786904532 .fill-N1{fill:#0A0F25;} + .d2-3786904532 .fill-N2{fill:#676C7E;} + .d2-3786904532 .fill-N3{fill:#9499AB;} + .d2-3786904532 .fill-N4{fill:#CFD2DD;} + .d2-3786904532 .fill-N5{fill:#DEE1EB;} + .d2-3786904532 .fill-N6{fill:#EEF1F8;} + .d2-3786904532 .fill-N7{fill:#FFFFFF;} + .d2-3786904532 .fill-B1{fill:#0D32B2;} + .d2-3786904532 .fill-B2{fill:#0D32B2;} + .d2-3786904532 .fill-B3{fill:#E3E9FD;} + .d2-3786904532 .fill-B4{fill:#E3E9FD;} + .d2-3786904532 .fill-B5{fill:#EDF0FD;} + .d2-3786904532 .fill-B6{fill:#F7F8FE;} + .d2-3786904532 .fill-AA2{fill:#4A6FF3;} + .d2-3786904532 .fill-AA4{fill:#EDF0FD;} + .d2-3786904532 .fill-AA5{fill:#F7F8FE;} + .d2-3786904532 .fill-AB4{fill:#EDF0FD;} + .d2-3786904532 .fill-AB5{fill:#F7F8FE;} + .d2-3786904532 .stroke-N1{stroke:#0A0F25;} + .d2-3786904532 .stroke-N2{stroke:#676C7E;} + .d2-3786904532 .stroke-N3{stroke:#9499AB;} + .d2-3786904532 .stroke-N4{stroke:#CFD2DD;} + .d2-3786904532 .stroke-N5{stroke:#DEE1EB;} + .d2-3786904532 .stroke-N6{stroke:#EEF1F8;} + .d2-3786904532 .stroke-N7{stroke:#FFFFFF;} + .d2-3786904532 .stroke-B1{stroke:#0D32B2;} + .d2-3786904532 .stroke-B2{stroke:#0D32B2;} + .d2-3786904532 .stroke-B3{stroke:#E3E9FD;} + .d2-3786904532 .stroke-B4{stroke:#E3E9FD;} + .d2-3786904532 .stroke-B5{stroke:#EDF0FD;} + .d2-3786904532 .stroke-B6{stroke:#F7F8FE;} + .d2-3786904532 .stroke-AA2{stroke:#4A6FF3;} + .d2-3786904532 .stroke-AA4{stroke:#EDF0FD;} + .d2-3786904532 .stroke-AA5{stroke:#F7F8FE;} + .d2-3786904532 .stroke-AB4{stroke:#EDF0FD;} + .d2-3786904532 .stroke-AB5{stroke:#F7F8FE;} + .d2-3786904532 .background-color-N1{background-color:#0A0F25;} + .d2-3786904532 .background-color-N2{background-color:#676C7E;} + .d2-3786904532 .background-color-N3{background-color:#9499AB;} + .d2-3786904532 .background-color-N4{background-color:#CFD2DD;} + .d2-3786904532 .background-color-N5{background-color:#DEE1EB;} + .d2-3786904532 .background-color-N6{background-color:#EEF1F8;} + .d2-3786904532 .background-color-N7{background-color:#FFFFFF;} + .d2-3786904532 .background-color-B1{background-color:#0D32B2;} + .d2-3786904532 .background-color-B2{background-color:#0D32B2;} + .d2-3786904532 .background-color-B3{background-color:#E3E9FD;} + .d2-3786904532 .background-color-B4{background-color:#E3E9FD;} + .d2-3786904532 .background-color-B5{background-color:#EDF0FD;} + .d2-3786904532 .background-color-B6{background-color:#F7F8FE;} + .d2-3786904532 .background-color-AA2{background-color:#4A6FF3;} + .d2-3786904532 .background-color-AA4{background-color:#EDF0FD;} + .d2-3786904532 .background-color-AA5{background-color:#F7F8FE;} + .d2-3786904532 .background-color-AB4{background-color:#EDF0FD;} + .d2-3786904532 .background-color-AB5{background-color:#F7F8FE;} + .d2-3786904532 .color-N1{color:#0A0F25;} + .d2-3786904532 .color-N2{color:#676C7E;} + .d2-3786904532 .color-N3{color:#9499AB;} + .d2-3786904532 .color-N4{color:#CFD2DD;} + .d2-3786904532 .color-N5{color:#DEE1EB;} + .d2-3786904532 .color-N6{color:#EEF1F8;} + .d2-3786904532 .color-N7{color:#FFFFFF;} + .d2-3786904532 .color-B1{color:#0D32B2;} + .d2-3786904532 .color-B2{color:#0D32B2;} + .d2-3786904532 .color-B3{color:#E3E9FD;} + .d2-3786904532 .color-B4{color:#E3E9FD;} + .d2-3786904532 .color-B5{color:#EDF0FD;} + .d2-3786904532 .color-B6{color:#F7F8FE;} + .d2-3786904532 .color-AA2{color:#4A6FF3;} + .d2-3786904532 .color-AA4{color:#EDF0FD;} + .d2-3786904532 .color-AA5{color:#F7F8FE;} + .d2-3786904532 .color-AB4{color:#EDF0FD;} + .d2-3786904532 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json index 8755431c2..98d98d5d3 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "linked", "type": "rectangle", "pos": { - "x": 80, - "y": 41 + "x": 90, + "y": 20 }, - "width": 1413, - "height": 595, + "width": 1393, + "height": 596, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,7 +52,7 @@ ], "pos": { "x": 120, - "y": 83 + "y": 63 }, "width": 143, "height": 66, @@ -96,7 +96,7 @@ ], "pos": { "x": 129, - "y": 262 + "y": 242 }, "width": 126, "height": 126, @@ -140,7 +140,7 @@ ], "pos": { "x": 136, - "y": 504 + "y": 484 }, "width": 111, "height": 87, @@ -184,7 +184,7 @@ ], "pos": { "x": 323, - "y": 83 + "y": 63 }, "width": 228, "height": 66, @@ -228,7 +228,7 @@ ], "pos": { "x": 363, - "y": 287 + "y": 267 }, "width": 149, "height": 76, @@ -272,7 +272,7 @@ ], "pos": { "x": 369, - "y": 488 + "y": 468 }, "width": 136, "height": 118, @@ -316,7 +316,7 @@ ], "pos": { "x": 611, - "y": 83 + "y": 63 }, "width": 173, "height": 66, @@ -360,7 +360,7 @@ ], "pos": { "x": 630, - "y": 289 + "y": 269 }, "width": 135, "height": 73, @@ -404,7 +404,7 @@ ], "pos": { "x": 624, - "y": 497 + "y": 477 }, "width": 148, "height": 101, @@ -448,7 +448,7 @@ ], "pos": { "x": 853, - "y": 71 + "y": 51 }, "width": 127, "height": 91, @@ -492,7 +492,7 @@ ], "pos": { "x": 825, - "y": 292 + "y": 272 }, "width": 183, "height": 66, @@ -536,7 +536,7 @@ ], "pos": { "x": 869, - "y": 501 + "y": 494 }, "width": 95, "height": 66, @@ -580,7 +580,7 @@ ], "pos": { "x": 1040, - "y": 70 + "y": 50 }, "width": 220, "height": 92, @@ -624,7 +624,7 @@ ], "pos": { "x": 1083, - "y": 290 + "y": 270 }, "width": 134, "height": 70, @@ -668,7 +668,7 @@ ], "pos": { "x": 1091, - "y": 488 + "y": 468 }, "width": 118, "height": 118, @@ -712,7 +712,7 @@ ], "pos": { "x": 1277, - "y": 291 + "y": 271 }, "width": 176, "height": 69, @@ -756,7 +756,7 @@ ], "pos": { "x": 1294, - "y": 505 + "y": 485 }, "width": 143, "height": 84, @@ -796,11 +796,11 @@ "id": "tooltipped", "type": "rectangle", "pos": { - "x": 80, - "y": 777 + "x": 90, + "y": 756 }, - "width": 1413, - "height": 595, + "width": 1393, + "height": 596, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -841,7 +841,7 @@ ], "pos": { "x": 120, - "y": 819 + "y": 799 }, "width": 143, "height": 66, @@ -885,7 +885,7 @@ ], "pos": { "x": 129, - "y": 998 + "y": 978 }, "width": 126, "height": 126, @@ -929,7 +929,7 @@ ], "pos": { "x": 136, - "y": 1240 + "y": 1220 }, "width": 111, "height": 87, @@ -973,7 +973,7 @@ ], "pos": { "x": 323, - "y": 819 + "y": 799 }, "width": 228, "height": 66, @@ -1017,7 +1017,7 @@ ], "pos": { "x": 363, - "y": 1023 + "y": 1003 }, "width": 149, "height": 76, @@ -1061,7 +1061,7 @@ ], "pos": { "x": 369, - "y": 1224 + "y": 1204 }, "width": 136, "height": 118, @@ -1105,7 +1105,7 @@ ], "pos": { "x": 611, - "y": 819 + "y": 799 }, "width": 173, "height": 66, @@ -1149,7 +1149,7 @@ ], "pos": { "x": 630, - "y": 1025 + "y": 1005 }, "width": 135, "height": 73, @@ -1193,7 +1193,7 @@ ], "pos": { "x": 624, - "y": 1233 + "y": 1213 }, "width": 148, "height": 101, @@ -1237,7 +1237,7 @@ ], "pos": { "x": 853, - "y": 807 + "y": 787 }, "width": 127, "height": 91, @@ -1281,7 +1281,7 @@ ], "pos": { "x": 825, - "y": 1028 + "y": 1008 }, "width": 183, "height": 66, @@ -1325,7 +1325,7 @@ ], "pos": { "x": 869, - "y": 1237 + "y": 1230 }, "width": 95, "height": 66, @@ -1369,7 +1369,7 @@ ], "pos": { "x": 1040, - "y": 806 + "y": 786 }, "width": 220, "height": 92, @@ -1413,7 +1413,7 @@ ], "pos": { "x": 1083, - "y": 1026 + "y": 1006 }, "width": 134, "height": 70, @@ -1457,7 +1457,7 @@ ], "pos": { "x": 1091, - "y": 1224 + "y": 1204 }, "width": 118, "height": 118, @@ -1501,7 +1501,7 @@ ], "pos": { "x": 1277, - "y": 1027 + "y": 1007 }, "width": 176, "height": 69, @@ -1545,7 +1545,7 @@ ], "pos": { "x": 1294, - "y": 1241 + "y": 1221 }, "width": 143, "height": 84, @@ -1585,11 +1585,11 @@ "id": "both", "type": "rectangle", "pos": { - "x": 0, - "y": 1513 + "x": 10, + "y": 1492 }, - "width": 1640, - "height": 656, + "width": 1620, + "height": 657, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1631,7 +1631,7 @@ ], "pos": { "x": 40, - "y": 1555 + "y": 1535 }, "width": 175, "height": 66, @@ -1676,7 +1676,7 @@ ], "pos": { "x": 49, - "y": 1734 + "y": 1714 }, "width": 158, "height": 158, @@ -1721,7 +1721,7 @@ ], "pos": { "x": 56, - "y": 2022 + "y": 2002 }, "width": 143, "height": 87, @@ -1766,7 +1766,7 @@ ], "pos": { "x": 275, - "y": 1555 + "y": 1535 }, "width": 260, "height": 66, @@ -1811,7 +1811,7 @@ ], "pos": { "x": 315, - "y": 1775 + "y": 1755 }, "width": 181, "height": 76, @@ -1856,7 +1856,7 @@ ], "pos": { "x": 321, - "y": 2007 + "y": 1987 }, "width": 168, "height": 118, @@ -1901,7 +1901,7 @@ ], "pos": { "x": 595, - "y": 1555 + "y": 1535 }, "width": 205, "height": 66, @@ -1946,7 +1946,7 @@ ], "pos": { "x": 614, - "y": 1777 + "y": 1757 }, "width": 167, "height": 73, @@ -1991,7 +1991,7 @@ ], "pos": { "x": 608, - "y": 2015 + "y": 1995 }, "width": 180, "height": 101, @@ -2036,7 +2036,7 @@ ], "pos": { "x": 869, - "y": 1543 + "y": 1523 }, "width": 159, "height": 91, @@ -2081,7 +2081,7 @@ ], "pos": { "x": 841, - "y": 1780 + "y": 1760 }, "width": 215, "height": 66, @@ -2126,7 +2126,7 @@ ], "pos": { "x": 885, - "y": 2010 + "y": 2003 }, "width": 127, "height": 85, @@ -2171,7 +2171,7 @@ ], "pos": { "x": 1088, - "y": 1542 + "y": 1522 }, "width": 284, "height": 92, @@ -2216,7 +2216,7 @@ ], "pos": { "x": 1145, - "y": 1778 + "y": 1758 }, "width": 171, "height": 70, @@ -2261,7 +2261,7 @@ ], "pos": { "x": 1157, - "y": 1992 + "y": 1972 }, "width": 147, "height": 147, @@ -2306,7 +2306,7 @@ ], "pos": { "x": 1376, - "y": 1779 + "y": 1759 }, "width": 224, "height": 69, @@ -2351,7 +2351,7 @@ ], "pos": { "x": 1397, - "y": 2024 + "y": 2004 }, "width": 182, "height": 84, @@ -2415,19 +2415,19 @@ "route": [ { "x": 191.5, - "y": 149.5 + "y": 129 }, { "x": 191.5, - "y": 199.89999389648438 + "y": 179.39999389648438 }, { "x": 191.5, - "y": 222.5 + "y": 202 }, { "x": 191.5, - "y": 262.5 + "y": 242 } ], "isCurve": true, @@ -2462,19 +2462,19 @@ "route": [ { "x": 191.5, - "y": 388.5 + "y": 368 }, { "x": 191.5, - "y": 428.5 + "y": 408 }, { "x": 191.60000610351562, - "y": 451.79998779296875 + "y": 431.20001220703125 }, { "x": 192, - "y": 505 + "y": 484 } ], "isCurve": true, @@ -2509,19 +2509,19 @@ "route": [ { "x": 437, - "y": 150 + "y": 129 }, { "x": 437, - "y": 200 + "y": 179.39999389648438 }, { "x": 437, - "y": 227.60000610351562 + "y": 207 }, { "x": 437, - "y": 288 + "y": 267 } ], "isCurve": true, @@ -2556,19 +2556,19 @@ "route": [ { "x": 437, - "y": 354 + "y": 333 }, { "x": 437, - "y": 421.6000061035156 + "y": 401 }, { "x": 437, - "y": 448.6000061035156 + "y": 428 }, { "x": 437, - "y": 489 + "y": 468 } ], "isCurve": true, @@ -2603,19 +2603,19 @@ "route": [ { "x": 697, - "y": 150 + "y": 129 }, { "x": 697.4000244140625, - "y": 200 + "y": 179.39999389648438 }, { "x": 697.5999755859375, - "y": 228 + "y": 207.39999389648438 }, { "x": 698, - "y": 290 + "y": 269 } ], "isCurve": true, @@ -2650,19 +2650,19 @@ "route": [ { "x": 697, - "y": 363 + "y": 342 }, { "x": 697.4000244140625, - "y": 423.3999938964844 + "y": 402.79998779296875 }, { "x": 697.5999755859375, - "y": 450.3999938964844 + "y": 429.79998779296875 }, { "x": 698, - "y": 498 + "y": 477 } ], "isCurve": true, @@ -2697,19 +2697,19 @@ "route": [ { "x": 917, - "y": 118 + "y": 97 }, { "x": 916.5999755859375, - "y": 193.60000610351562 + "y": 173 }, { "x": 916.5999755859375, - "y": 228.60000610351562 + "y": 208 }, { "x": 917, - "y": 293 + "y": 272 } ], "isCurve": true, @@ -2744,19 +2744,19 @@ "route": [ { "x": 917, - "y": 359 + "y": 338 }, { "x": 916.5999755859375, - "y": 422.6000061035156 + "y": 402 }, { "x": 916.5999755859375, - "y": 451.20001220703125 + "y": 433.20001220703125 }, { "x": 917, - "y": 502 + "y": 494 } ], "isCurve": true, @@ -2791,19 +2791,19 @@ "route": [ { "x": 1150, - "y": 163 + "y": 142 }, { "x": 1150, - "y": 202.60000610351562 + "y": 182 }, { "x": 1150, - "y": 228.1999969482422 + "y": 207.60000610351562 }, { "x": 1150, - "y": 291 + "y": 270 } ], "isCurve": true, @@ -2838,19 +2838,19 @@ "route": [ { "x": 1150, - "y": 361 + "y": 340 }, { "x": 1150, - "y": 423 + "y": 402.3999938964844 }, { "x": 1150, - "y": 448.6000061035156 + "y": 428 }, { "x": 1150, - "y": 489 + "y": 468 } ], "isCurve": true, @@ -2885,19 +2885,19 @@ "route": [ { "x": 1365, - "y": 361 + "y": 340 }, { "x": 1365, - "y": 423 + "y": 402.3999938964844 }, { "x": 1365, - "y": 452.20001220703125 + "y": 431.6000061035156 }, { "x": 1365, - "y": 507 + "y": 486 } ], "isCurve": true, @@ -2932,19 +2932,19 @@ "route": [ { "x": 191.5, - "y": 885.5 + "y": 865 }, { "x": 191.5, - "y": 935.9000244140625 + "y": 915.4000244140625 }, { "x": 191.5, - "y": 958.5 + "y": 938 }, { "x": 191.5, - "y": 998.5 + "y": 978 } ], "isCurve": true, @@ -2979,19 +2979,19 @@ "route": [ { "x": 191.5, - "y": 1124.5 + "y": 1104 }, { "x": 191.5, - "y": 1164.5 + "y": 1144 }, { "x": 191.60000610351562, - "y": 1187.800048828125 + "y": 1167.199951171875 }, { "x": 192, - "y": 1241 + "y": 1220 } ], "isCurve": true, @@ -3026,19 +3026,19 @@ "route": [ { "x": 437, - "y": 886 + "y": 865 }, { "x": 437, - "y": 936 + "y": 915.4000244140625 }, { "x": 437, - "y": 963.5999755859375 + "y": 943 }, { "x": 437, - "y": 1024 + "y": 1003 } ], "isCurve": true, @@ -3073,19 +3073,19 @@ "route": [ { "x": 437, - "y": 1090 + "y": 1069 }, { "x": 437, - "y": 1157.5999755859375 + "y": 1137 }, { "x": 437, - "y": 1184.5999755859375 + "y": 1164 }, { "x": 437, - "y": 1225 + "y": 1204 } ], "isCurve": true, @@ -3120,19 +3120,19 @@ "route": [ { "x": 697, - "y": 886 + "y": 865 }, { "x": 697.4000244140625, - "y": 936 + "y": 915.4000244140625 }, { "x": 697.5999755859375, - "y": 964 + "y": 943.4000244140625 }, { "x": 698, - "y": 1026 + "y": 1005 } ], "isCurve": true, @@ -3167,19 +3167,19 @@ "route": [ { "x": 697, - "y": 1099 + "y": 1078 }, { "x": 697.4000244140625, - "y": 1159.4000244140625 + "y": 1138.800048828125 }, { "x": 697.5999755859375, - "y": 1186.4000244140625 + "y": 1165.800048828125 }, { "x": 698, - "y": 1234 + "y": 1213 } ], "isCurve": true, @@ -3214,19 +3214,19 @@ "route": [ { "x": 917, - "y": 854 + "y": 833 }, { "x": 916.5999755859375, - "y": 929.5999755859375 + "y": 909 }, { "x": 916.5999755859375, - "y": 964.5999755859375 + "y": 944 }, { "x": 917, - "y": 1029 + "y": 1008 } ], "isCurve": true, @@ -3261,19 +3261,19 @@ "route": [ { "x": 917, - "y": 1095 + "y": 1074 }, { "x": 916.5999755859375, - "y": 1158.5999755859375 + "y": 1138 }, { "x": 916.5999755859375, - "y": 1187.199951171875 + "y": 1169.199951171875 }, { "x": 917, - "y": 1238 + "y": 1230 } ], "isCurve": true, @@ -3308,19 +3308,19 @@ "route": [ { "x": 1150, - "y": 899 + "y": 878 }, { "x": 1150, - "y": 938.5999755859375 + "y": 918 }, { "x": 1150, - "y": 964.2000122070312 + "y": 943.5999755859375 }, { "x": 1150, - "y": 1027 + "y": 1006 } ], "isCurve": true, @@ -3355,19 +3355,19 @@ "route": [ { "x": 1150, - "y": 1097 + "y": 1076 }, { "x": 1150, - "y": 1159 + "y": 1138.4000244140625 }, { "x": 1150, - "y": 1184.5999755859375 + "y": 1164 }, { "x": 1150, - "y": 1225 + "y": 1204 } ], "isCurve": true, @@ -3402,19 +3402,19 @@ "route": [ { "x": 1365, - "y": 1097 + "y": 1076 }, { "x": 1365, - "y": 1159 + "y": 1138.4000244140625 }, { "x": 1365, - "y": 1188.199951171875 + "y": 1167.5999755859375 }, { "x": 1365, - "y": 1243 + "y": 1222 } ], "isCurve": true, @@ -3449,19 +3449,19 @@ "route": [ { "x": 127.5, - "y": 1621.5 + "y": 1601 }, { "x": 127.5, - "y": 1671.9000244140625 + "y": 1651.4000244140625 }, { "x": 127.5, - "y": 1694.5 + "y": 1674 }, { "x": 127.5, - "y": 1734.5 + "y": 1714 } ], "isCurve": true, @@ -3496,19 +3496,19 @@ "route": [ { "x": 127.5, - "y": 1892.5 + "y": 1872 }, { "x": 127.5, - "y": 1932.5 + "y": 1912 }, { "x": 127.5999984741211, - "y": 1958.5999755859375 + "y": 1938 }, { "x": 128, - "y": 2023 + "y": 2002 } ], "isCurve": true, @@ -3543,19 +3543,19 @@ "route": [ { "x": 405, - "y": 1622 + "y": 1601 }, { "x": 405, - "y": 1672 + "y": 1651.4000244140625 }, { "x": 405, - "y": 1702.800048828125 + "y": 1682.199951171875 }, { "x": 405, - "y": 1776 + "y": 1755 } ], "isCurve": true, @@ -3590,19 +3590,19 @@ "route": [ { "x": 405, - "y": 1841 + "y": 1820 }, { "x": 405, - "y": 1922.199951171875 + "y": 1901.5999755859375 }, { "x": 405, - "y": 1955.5999755859375 + "y": 1935 }, { "x": 405, - "y": 2008 + "y": 1987 } ], "isCurve": true, @@ -3637,19 +3637,19 @@ "route": [ { "x": 697, - "y": 1622 + "y": 1601 }, { "x": 697.4000244140625, - "y": 1672 + "y": 1651.4000244140625 }, { "x": 697.5999755859375, - "y": 1703.199951171875 + "y": 1682.5999755859375 }, { "x": 698, - "y": 1778 + "y": 1757 } ], "isCurve": true, @@ -3684,19 +3684,19 @@ "route": [ { "x": 697, - "y": 1851 + "y": 1830 }, { "x": 697.4000244140625, - "y": 1924.199951171875 + "y": 1903.5999755859375 }, { "x": 697.5999755859375, - "y": 1957.199951171875 + "y": 1936.5999755859375 }, { "x": 698, - "y": 2016 + "y": 1995 } ], "isCurve": true, @@ -3731,19 +3731,19 @@ "route": [ { "x": 949, - "y": 1590 + "y": 1569 }, { "x": 948.5999755859375, - "y": 1665.5999755859375 + "y": 1645 }, { "x": 948.5999755859375, - "y": 1703.800048828125 + "y": 1683.199951171875 }, { "x": 949, - "y": 1781 + "y": 1760 } ], "isCurve": true, @@ -3778,19 +3778,19 @@ "route": [ { "x": 948, - "y": 1847 + "y": 1826 }, { "x": 948.4000244140625, - "y": 1923.4000244140625 + "y": 1902.800048828125 }, { "x": 948.5999755859375, - "y": 1956.199951171875 + "y": 1938.199951171875 }, { "x": 949, - "y": 2011 + "y": 2003 } ], "isCurve": true, @@ -3825,19 +3825,19 @@ "route": [ { "x": 1230, - "y": 1635 + "y": 1614 }, { "x": 1230, - "y": 1674.5999755859375 + "y": 1654 }, { "x": 1230, - "y": 1703.4000244140625 + "y": 1682.800048828125 }, { "x": 1230, - "y": 1779 + "y": 1758 } ], "isCurve": true, @@ -3872,19 +3872,19 @@ "route": [ { "x": 1230, - "y": 1848 + "y": 1828 }, { "x": 1230, - "y": 1923.5999755859375 + "y": 1903.199951171875 }, { "x": 1230, - "y": 1952.5999755859375 + "y": 1932 }, { "x": 1230, - "y": 1993 + "y": 1972 } ], "isCurve": true, @@ -3919,19 +3919,19 @@ "route": [ { "x": 1488, - "y": 1849 + "y": 1828 }, { "x": 1487.5999755859375, - "y": 1923.800048828125 + "y": 1903.199951171875 }, { "x": 1487.5999755859375, - "y": 1959.4000244140625 + "y": 1938.800048828125 }, { "x": 1488, - "y": 2027 + "y": 2006 } ], "isCurve": true, @@ -3966,19 +3966,19 @@ "route": [ { "x": 697.5, - "y": 636 + "y": 616 }, { "x": 697.5, - "y": 676 + "y": 672 }, { "x": 697.5, - "y": 704.2000122070312 + "y": 700 }, { "x": 697.5, - "y": 777 + "y": 756 } ], "isCurve": true, @@ -4013,19 +4013,19 @@ "route": [ { "x": 697.5, - "y": 1372 + "y": 1352 }, { "x": 697.5, - "y": 1412 + "y": 1408 }, { "x": 697.5, - "y": 1440.199951171875 + "y": 1436 }, { "x": 697.5, - "y": 1513 + "y": 1492 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg index 81239c0c1..48400e686 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3720214040 .fill-N1{fill:#0A0F25;} + .d2-3720214040 .fill-N2{fill:#676C7E;} + .d2-3720214040 .fill-N3{fill:#9499AB;} + .d2-3720214040 .fill-N4{fill:#CFD2DD;} + .d2-3720214040 .fill-N5{fill:#DEE1EB;} + .d2-3720214040 .fill-N6{fill:#EEF1F8;} + .d2-3720214040 .fill-N7{fill:#FFFFFF;} + .d2-3720214040 .fill-B1{fill:#0D32B2;} + .d2-3720214040 .fill-B2{fill:#0D32B2;} + .d2-3720214040 .fill-B3{fill:#E3E9FD;} + .d2-3720214040 .fill-B4{fill:#E3E9FD;} + .d2-3720214040 .fill-B5{fill:#EDF0FD;} + .d2-3720214040 .fill-B6{fill:#F7F8FE;} + .d2-3720214040 .fill-AA2{fill:#4A6FF3;} + .d2-3720214040 .fill-AA4{fill:#EDF0FD;} + .d2-3720214040 .fill-AA5{fill:#F7F8FE;} + .d2-3720214040 .fill-AB4{fill:#EDF0FD;} + .d2-3720214040 .fill-AB5{fill:#F7F8FE;} + .d2-3720214040 .stroke-N1{stroke:#0A0F25;} + .d2-3720214040 .stroke-N2{stroke:#676C7E;} + .d2-3720214040 .stroke-N3{stroke:#9499AB;} + .d2-3720214040 .stroke-N4{stroke:#CFD2DD;} + .d2-3720214040 .stroke-N5{stroke:#DEE1EB;} + .d2-3720214040 .stroke-N6{stroke:#EEF1F8;} + .d2-3720214040 .stroke-N7{stroke:#FFFFFF;} + .d2-3720214040 .stroke-B1{stroke:#0D32B2;} + .d2-3720214040 .stroke-B2{stroke:#0D32B2;} + .d2-3720214040 .stroke-B3{stroke:#E3E9FD;} + .d2-3720214040 .stroke-B4{stroke:#E3E9FD;} + .d2-3720214040 .stroke-B5{stroke:#EDF0FD;} + .d2-3720214040 .stroke-B6{stroke:#F7F8FE;} + .d2-3720214040 .stroke-AA2{stroke:#4A6FF3;} + .d2-3720214040 .stroke-AA4{stroke:#EDF0FD;} + .d2-3720214040 .stroke-AA5{stroke:#F7F8FE;} + .d2-3720214040 .stroke-AB4{stroke:#EDF0FD;} + .d2-3720214040 .stroke-AB5{stroke:#F7F8FE;} + .d2-3720214040 .background-color-N1{background-color:#0A0F25;} + .d2-3720214040 .background-color-N2{background-color:#676C7E;} + .d2-3720214040 .background-color-N3{background-color:#9499AB;} + .d2-3720214040 .background-color-N4{background-color:#CFD2DD;} + .d2-3720214040 .background-color-N5{background-color:#DEE1EB;} + .d2-3720214040 .background-color-N6{background-color:#EEF1F8;} + .d2-3720214040 .background-color-N7{background-color:#FFFFFF;} + .d2-3720214040 .background-color-B1{background-color:#0D32B2;} + .d2-3720214040 .background-color-B2{background-color:#0D32B2;} + .d2-3720214040 .background-color-B3{background-color:#E3E9FD;} + .d2-3720214040 .background-color-B4{background-color:#E3E9FD;} + .d2-3720214040 .background-color-B5{background-color:#EDF0FD;} + .d2-3720214040 .background-color-B6{background-color:#F7F8FE;} + .d2-3720214040 .background-color-AA2{background-color:#4A6FF3;} + .d2-3720214040 .background-color-AA4{background-color:#EDF0FD;} + .d2-3720214040 .background-color-AA5{background-color:#F7F8FE;} + .d2-3720214040 .background-color-AB4{background-color:#EDF0FD;} + .d2-3720214040 .background-color-AB5{background-color:#F7F8FE;} + .d2-3720214040 .color-N1{color:#0A0F25;} + .d2-3720214040 .color-N2{color:#676C7E;} + .d2-3720214040 .color-N3{color:#9499AB;} + .d2-3720214040 .color-N4{color:#CFD2DD;} + .d2-3720214040 .color-N5{color:#DEE1EB;} + .d2-3720214040 .color-N6{color:#EEF1F8;} + .d2-3720214040 .color-N7{color:#FFFFFF;} + .d2-3720214040 .color-B1{color:#0D32B2;} + .d2-3720214040 .color-B2{color:#0D32B2;} + .d2-3720214040 .color-B3{color:#E3E9FD;} + .d2-3720214040 .color-B4{color:#E3E9FD;} + .d2-3720214040 .color-B5{color:#EDF0FD;} + .d2-3720214040 .color-B6{color:#F7F8FE;} + .d2-3720214040 .color-AA2{color:#4A6FF3;} + .d2-3720214040 .color-AA4{color:#EDF0FD;} + .d2-3720214040 .color-AA5{color:#F7F8FE;} + .d2-3720214040 .color-AB4{color:#EDF0FD;} + .d2-3720214040 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -111,7 +111,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -267,7 +267,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -316,7 +316,7 @@ -example +example @@ -329,7 +329,7 @@ -example +example @@ -342,7 +342,7 @@ -example +example @@ -355,7 +355,7 @@ -example +example @@ -368,7 +368,7 @@ -example +example @@ -381,7 +381,7 @@ -example +example @@ -394,7 +394,7 @@ -example +example @@ -407,7 +407,7 @@ -example +example @@ -420,7 +420,7 @@ -example +example @@ -433,7 +433,7 @@ -example +example @@ -446,7 +446,7 @@ -example +example @@ -459,7 +459,7 @@ -example +example @@ -472,7 +472,7 @@ -example +example @@ -485,7 +485,7 @@ -example +example @@ -498,7 +498,7 @@ -example +example @@ -511,7 +511,7 @@ -example +example @@ -524,7 +524,7 @@ -example +example @@ -537,7 +537,7 @@ -example +example @@ -549,7 +549,7 @@ - + @@ -562,7 +562,7 @@ -example +example @@ -574,7 +574,7 @@ - + @@ -587,7 +587,7 @@ -example +example @@ -599,7 +599,7 @@ - + @@ -612,7 +612,7 @@ -example +example @@ -624,7 +624,7 @@ - + @@ -637,7 +637,7 @@ -example +example @@ -649,7 +649,7 @@ - + @@ -662,7 +662,7 @@ -example +example @@ -674,7 +674,7 @@ - + @@ -687,7 +687,7 @@ -example +example @@ -699,7 +699,7 @@ - + @@ -712,7 +712,7 @@ -example +example @@ -724,7 +724,7 @@ - + @@ -737,7 +737,7 @@ -example +example @@ -749,7 +749,7 @@ - + @@ -762,7 +762,7 @@ -example +example @@ -774,7 +774,7 @@ - + @@ -787,7 +787,7 @@ -example +example @@ -799,7 +799,7 @@ - + @@ -812,7 +812,7 @@ -example +example @@ -824,7 +824,7 @@ - + @@ -837,7 +837,7 @@ -example +example @@ -849,7 +849,7 @@ - + @@ -862,7 +862,7 @@ -example +example @@ -874,7 +874,7 @@ - + @@ -887,7 +887,7 @@ -example +example @@ -899,7 +899,7 @@ - + @@ -912,7 +912,7 @@ -example +example @@ -924,7 +924,7 @@ - + @@ -937,7 +937,7 @@ -example +example @@ -949,60 +949,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json index 5482b7844..1085c73a9 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json @@ -2571,7 +2571,7 @@ }, { "x": 680, - "y": 251 + "y": 265 } ], "animated": false, @@ -2646,7 +2646,7 @@ "y": 109 }, { - "x": 859, + "x": 858, "y": 254 } ], @@ -2684,7 +2684,7 @@ "y": 320 }, { - "x": 859, + "x": 858, "y": 420 } ], @@ -2989,7 +2989,7 @@ }, { "x": 680, - "y": 897 + "y": 911 } ], "animated": false, @@ -3064,7 +3064,7 @@ "y": 755 }, { - "x": 859, + "x": 858, "y": 900 } ], @@ -3102,7 +3102,7 @@ "y": 966 }, { - "x": 859, + "x": 858, "y": 1066 } ], @@ -3407,7 +3407,7 @@ }, { "x": 640, - "y": 1559 + "y": 1573 } ], "animated": false, @@ -3444,7 +3444,7 @@ "y": 1632 }, { - "x": 639, + "x": 640, "y": 1744 } ], diff --git a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg index ae8524149..5a3182b68 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-2197716131 .fill-N1{fill:#0A0F25;} + .d2-2197716131 .fill-N2{fill:#676C7E;} + .d2-2197716131 .fill-N3{fill:#9499AB;} + .d2-2197716131 .fill-N4{fill:#CFD2DD;} + .d2-2197716131 .fill-N5{fill:#DEE1EB;} + .d2-2197716131 .fill-N6{fill:#EEF1F8;} + .d2-2197716131 .fill-N7{fill:#FFFFFF;} + .d2-2197716131 .fill-B1{fill:#0D32B2;} + .d2-2197716131 .fill-B2{fill:#0D32B2;} + .d2-2197716131 .fill-B3{fill:#E3E9FD;} + .d2-2197716131 .fill-B4{fill:#E3E9FD;} + .d2-2197716131 .fill-B5{fill:#EDF0FD;} + .d2-2197716131 .fill-B6{fill:#F7F8FE;} + .d2-2197716131 .fill-AA2{fill:#4A6FF3;} + .d2-2197716131 .fill-AA4{fill:#EDF0FD;} + .d2-2197716131 .fill-AA5{fill:#F7F8FE;} + .d2-2197716131 .fill-AB4{fill:#EDF0FD;} + .d2-2197716131 .fill-AB5{fill:#F7F8FE;} + .d2-2197716131 .stroke-N1{stroke:#0A0F25;} + .d2-2197716131 .stroke-N2{stroke:#676C7E;} + .d2-2197716131 .stroke-N3{stroke:#9499AB;} + .d2-2197716131 .stroke-N4{stroke:#CFD2DD;} + .d2-2197716131 .stroke-N5{stroke:#DEE1EB;} + .d2-2197716131 .stroke-N6{stroke:#EEF1F8;} + .d2-2197716131 .stroke-N7{stroke:#FFFFFF;} + .d2-2197716131 .stroke-B1{stroke:#0D32B2;} + .d2-2197716131 .stroke-B2{stroke:#0D32B2;} + .d2-2197716131 .stroke-B3{stroke:#E3E9FD;} + .d2-2197716131 .stroke-B4{stroke:#E3E9FD;} + .d2-2197716131 .stroke-B5{stroke:#EDF0FD;} + .d2-2197716131 .stroke-B6{stroke:#F7F8FE;} + .d2-2197716131 .stroke-AA2{stroke:#4A6FF3;} + .d2-2197716131 .stroke-AA4{stroke:#EDF0FD;} + .d2-2197716131 .stroke-AA5{stroke:#F7F8FE;} + .d2-2197716131 .stroke-AB4{stroke:#EDF0FD;} + .d2-2197716131 .stroke-AB5{stroke:#F7F8FE;} + .d2-2197716131 .background-color-N1{background-color:#0A0F25;} + .d2-2197716131 .background-color-N2{background-color:#676C7E;} + .d2-2197716131 .background-color-N3{background-color:#9499AB;} + .d2-2197716131 .background-color-N4{background-color:#CFD2DD;} + .d2-2197716131 .background-color-N5{background-color:#DEE1EB;} + .d2-2197716131 .background-color-N6{background-color:#EEF1F8;} + .d2-2197716131 .background-color-N7{background-color:#FFFFFF;} + .d2-2197716131 .background-color-B1{background-color:#0D32B2;} + .d2-2197716131 .background-color-B2{background-color:#0D32B2;} + .d2-2197716131 .background-color-B3{background-color:#E3E9FD;} + .d2-2197716131 .background-color-B4{background-color:#E3E9FD;} + .d2-2197716131 .background-color-B5{background-color:#EDF0FD;} + .d2-2197716131 .background-color-B6{background-color:#F7F8FE;} + .d2-2197716131 .background-color-AA2{background-color:#4A6FF3;} + .d2-2197716131 .background-color-AA4{background-color:#EDF0FD;} + .d2-2197716131 .background-color-AA5{background-color:#F7F8FE;} + .d2-2197716131 .background-color-AB4{background-color:#EDF0FD;} + .d2-2197716131 .background-color-AB5{background-color:#F7F8FE;} + .d2-2197716131 .color-N1{color:#0A0F25;} + .d2-2197716131 .color-N2{color:#676C7E;} + .d2-2197716131 .color-N3{color:#9499AB;} + .d2-2197716131 .color-N4{color:#CFD2DD;} + .d2-2197716131 .color-N5{color:#DEE1EB;} + .d2-2197716131 .color-N6{color:#EEF1F8;} + .d2-2197716131 .color-N7{color:#FFFFFF;} + .d2-2197716131 .color-B1{color:#0D32B2;} + .d2-2197716131 .color-B2{color:#0D32B2;} + .d2-2197716131 .color-B3{color:#E3E9FD;} + .d2-2197716131 .color-B4{color:#E3E9FD;} + .d2-2197716131 .color-B5{color:#EDF0FD;} + .d2-2197716131 .color-B6{color:#F7F8FE;} + .d2-2197716131 .color-AA2{color:#4A6FF3;} + .d2-2197716131 .color-AA4{color:#EDF0FD;} + .d2-2197716131 .color-AA5{color:#F7F8FE;} + .d2-2197716131 .color-AB4{color:#EDF0FD;} + .d2-2197716131 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -949,7 +949,7 @@ - + diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json index 2a9dfa653..d36e36dcb 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 23 + "y": 13 }, "width": 111, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 9, - "y": 212 + "y": 192 }, "width": 94, "height": 94, @@ -90,7 +90,7 @@ "type": "page", "pos": { "x": 16, - "y": 432 + "y": 402 }, "width": 79, "height": 87, @@ -131,7 +131,7 @@ "type": "parallelogram", "pos": { "x": 181, - "y": 23 + "y": 13 }, "width": 196, "height": 66, @@ -172,7 +172,7 @@ "type": "document", "pos": { "x": 221, - "y": 221 + "y": 201 }, "width": 117, "height": 76, @@ -213,7 +213,7 @@ "type": "cylinder", "pos": { "x": 227, - "y": 416 + "y": 386 }, "width": 104, "height": 118, @@ -253,8 +253,8 @@ "id": "queue", "type": "queue", "pos": { - "x": 447, - "y": 23 + "x": 437, + "y": 13 }, "width": 141, "height": 66, @@ -294,8 +294,8 @@ "id": "package", "type": "package", "pos": { - "x": 466, - "y": 223 + "x": 456, + "y": 203 }, "width": 103, "height": 73, @@ -335,8 +335,8 @@ "id": "step", "type": "step", "pos": { - "x": 460, - "y": 425 + "x": 450, + "y": 395 }, "width": 116, "height": 101, @@ -376,8 +376,8 @@ "id": "callout", "type": "callout", "pos": { - "x": 667, - "y": 11 + "x": 657, + "y": 1 }, "width": 95, "height": 91, @@ -417,8 +417,8 @@ "id": "stored_data", "type": "stored_data", "pos": { - "x": 639, - "y": 226 + "x": 629, + "y": 206 }, "width": 151, "height": 66, @@ -458,8 +458,8 @@ "id": "person", "type": "person", "pos": { - "x": 683, - "y": 429 + "x": 673, + "y": 412 }, "width": 63, "height": 66, @@ -499,8 +499,8 @@ "id": "diamond", "type": "diamond", "pos": { - "x": 832, - "y": 10 + "x": 812, + "y": 0 }, "width": 156, "height": 92, @@ -540,8 +540,8 @@ "id": "oval", "type": "oval", "pos": { - "x": 862, - "y": 224 + "x": 842, + "y": 204 }, "width": 97, "height": 70, @@ -581,8 +581,8 @@ "id": "circle", "type": "oval", "pos": { - "x": 865, - "y": 430 + "x": 845, + "y": 400 }, "width": 91, "height": 91, @@ -622,8 +622,8 @@ "id": "hexagon", "type": "hexagon", "pos": { - "x": 1058, - "y": 22 + "x": 1038, + "y": 12 }, "width": 128, "height": 69, @@ -663,8 +663,8 @@ "id": "cloud", "type": "cloud", "pos": { - "x": 1070, - "y": 217 + "x": 1050, + "y": 197 }, "width": 104, "height": 84, @@ -727,20 +727,20 @@ "labelPercentage": 0, "route": [ { - "x": 60.5, - "y": 89 + "x": 55.5, + "y": 79 }, { - "x": 60.5, - "y": 139.39999389648438 + "x": 55.5, + "y": 129.39999389648438 }, { - "x": 60.5, - "y": 162 + "x": 55.5, + "y": 150 }, { - "x": 60.5, - "y": 202 + "x": 55.5, + "y": 182 } ], "isCurve": true, @@ -774,20 +774,20 @@ "labelPercentage": 0, "route": [ { - "x": 60.5, - "y": 306 + "x": 55.5, + "y": 286 }, { - "x": 60.5, - "y": 346 + "x": 55.5, + "y": 326 }, { - "x": 60.599998474121094, - "y": 369.20001220703125 + "x": 55.599998474121094, + "y": 347.20001220703125 }, { - "x": 61, - "y": 422 + "x": 56, + "y": 392 } ], "isCurve": true, @@ -821,20 +821,20 @@ "labelPercentage": 0, "route": [ { - "x": 284, - "y": 89 + "x": 279, + "y": 79 }, { - "x": 284, - "y": 139.39999389648438 + "x": 279, + "y": 129.39999389648438 }, { - "x": 284, - "y": 163.8000030517578 + "x": 279, + "y": 151.8000030517578 }, { - "x": 284, - "y": 211 + "x": 279, + "y": 191 } ], "isCurve": true, @@ -868,20 +868,20 @@ "labelPercentage": 0, "route": [ { - "x": 284, - "y": 283 + "x": 279, + "y": 267 }, { - "x": 284, - "y": 341.3999938964844 + "x": 279, + "y": 322.20001220703125 }, { - "x": 284, - "y": 366 + "x": 279, + "y": 344 }, { - "x": 284, - "y": 406 + "x": 279, + "y": 376 } ], "isCurve": true, @@ -915,20 +915,20 @@ "labelPercentage": 0, "route": [ { - "x": 522, - "y": 89 + "x": 507, + "y": 79 }, { - "x": 522.4000244140625, - "y": 139.39999389648438 + "x": 507.3999938964844, + "y": 129.39999389648438 }, { - "x": 522.5999755859375, - "y": 164.1999969482422 + "x": 507.6000061035156, + "y": 152.1999969482422 }, { - "x": 523, - "y": 213 + "x": 508, + "y": 193 } ], "isCurve": true, @@ -962,20 +962,20 @@ "labelPercentage": 0, "route": [ { - "x": 522, - "y": 296 + "x": 507, + "y": 276 }, { - "x": 522.4000244140625, - "y": 344 + "x": 507.3999938964844, + "y": 324 }, { - "x": 522.5999755859375, - "y": 367.79998779296875 + "x": 507.6000061035156, + "y": 345.79998779296875 }, { - "x": 523, - "y": 415 + "x": 508, + "y": 385 } ], "isCurve": true, @@ -1009,20 +1009,20 @@ "labelPercentage": 0, "route": [ { - "x": 720, - "y": 95 + "x": 705, + "y": 47 }, { - "x": 719.5999755859375, - "y": 140.60000610351562 + "x": 704.5999755859375, + "y": 123 }, { - "x": 719.5999755859375, - "y": 164.8000030517578 + "x": 704.5999755859375, + "y": 152.8000030517578 }, { - "x": 720, - "y": 216 + "x": 705, + "y": 196 } ], "isCurve": true, @@ -1056,20 +1056,20 @@ "labelPercentage": 0, "route": [ { - "x": 719, - "y": 292 + "x": 704, + "y": 272 }, { - "x": 719.4000244140625, - "y": 343.20001220703125 + "x": 704.4000244140625, + "y": 323.20001220703125 }, { - "x": 719.5999755859375, - "y": 368.6000061035156 + "x": 704.5999755859375, + "y": 349.6000061035156 }, { - "x": 720, - "y": 419 + "x": 705, + "y": 404 } ], "isCurve": true, @@ -1103,20 +1103,20 @@ "labelPercentage": 0, "route": [ { - "x": 915, - "y": 100 + "x": 890, + "y": 92 }, { - "x": 915, - "y": 141.60000610351562 + "x": 890, + "y": 132 }, { - "x": 915, - "y": 164.39999389648438 + "x": 890, + "y": 152.60000610351562 }, { - "x": 915, - "y": 214 + "x": 890, + "y": 195 } ], "isCurve": true, @@ -1150,20 +1150,20 @@ "labelPercentage": 0, "route": [ { - "x": 915, - "y": 294 + "x": 890, + "y": 274 }, { - "x": 915, - "y": 343.6000061035156 + "x": 890, + "y": 323.6000061035156 }, { - "x": 915, - "y": 368.79998779296875 + "x": 890, + "y": 347 }, { - "x": 915, - "y": 420 + "x": 890, + "y": 391 } ], "isCurve": true, @@ -1197,20 +1197,20 @@ "labelPercentage": 0, "route": [ { - "x": 1127, - "y": 91 + "x": 1102, + "y": 81 }, { - "x": 1127, - "y": 139.8000030517578 + "x": 1102, + "y": 129.8000030517578 }, { - "x": 1127, - "y": 163.8000030517578 + "x": 1102, + "y": 152.60000610351562 }, { - "x": 1127, - "y": 211 + "x": 1102, + "y": 195 } ], "isCurve": true, 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 766cb4a0d..310e68bc2 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - - + .d2-3711942085 .fill-N1{fill:#0A0F25;} + .d2-3711942085 .fill-N2{fill:#676C7E;} + .d2-3711942085 .fill-N3{fill:#9499AB;} + .d2-3711942085 .fill-N4{fill:#CFD2DD;} + .d2-3711942085 .fill-N5{fill:#DEE1EB;} + .d2-3711942085 .fill-N6{fill:#EEF1F8;} + .d2-3711942085 .fill-N7{fill:#FFFFFF;} + .d2-3711942085 .fill-B1{fill:#0D32B2;} + .d2-3711942085 .fill-B2{fill:#0D32B2;} + .d2-3711942085 .fill-B3{fill:#E3E9FD;} + .d2-3711942085 .fill-B4{fill:#E3E9FD;} + .d2-3711942085 .fill-B5{fill:#EDF0FD;} + .d2-3711942085 .fill-B6{fill:#F7F8FE;} + .d2-3711942085 .fill-AA2{fill:#4A6FF3;} + .d2-3711942085 .fill-AA4{fill:#EDF0FD;} + .d2-3711942085 .fill-AA5{fill:#F7F8FE;} + .d2-3711942085 .fill-AB4{fill:#EDF0FD;} + .d2-3711942085 .fill-AB5{fill:#F7F8FE;} + .d2-3711942085 .stroke-N1{stroke:#0A0F25;} + .d2-3711942085 .stroke-N2{stroke:#676C7E;} + .d2-3711942085 .stroke-N3{stroke:#9499AB;} + .d2-3711942085 .stroke-N4{stroke:#CFD2DD;} + .d2-3711942085 .stroke-N5{stroke:#DEE1EB;} + .d2-3711942085 .stroke-N6{stroke:#EEF1F8;} + .d2-3711942085 .stroke-N7{stroke:#FFFFFF;} + .d2-3711942085 .stroke-B1{stroke:#0D32B2;} + .d2-3711942085 .stroke-B2{stroke:#0D32B2;} + .d2-3711942085 .stroke-B3{stroke:#E3E9FD;} + .d2-3711942085 .stroke-B4{stroke:#E3E9FD;} + .d2-3711942085 .stroke-B5{stroke:#EDF0FD;} + .d2-3711942085 .stroke-B6{stroke:#F7F8FE;} + .d2-3711942085 .stroke-AA2{stroke:#4A6FF3;} + .d2-3711942085 .stroke-AA4{stroke:#EDF0FD;} + .d2-3711942085 .stroke-AA5{stroke:#F7F8FE;} + .d2-3711942085 .stroke-AB4{stroke:#EDF0FD;} + .d2-3711942085 .stroke-AB5{stroke:#F7F8FE;} + .d2-3711942085 .background-color-N1{background-color:#0A0F25;} + .d2-3711942085 .background-color-N2{background-color:#676C7E;} + .d2-3711942085 .background-color-N3{background-color:#9499AB;} + .d2-3711942085 .background-color-N4{background-color:#CFD2DD;} + .d2-3711942085 .background-color-N5{background-color:#DEE1EB;} + .d2-3711942085 .background-color-N6{background-color:#EEF1F8;} + .d2-3711942085 .background-color-N7{background-color:#FFFFFF;} + .d2-3711942085 .background-color-B1{background-color:#0D32B2;} + .d2-3711942085 .background-color-B2{background-color:#0D32B2;} + .d2-3711942085 .background-color-B3{background-color:#E3E9FD;} + .d2-3711942085 .background-color-B4{background-color:#E3E9FD;} + .d2-3711942085 .background-color-B5{background-color:#EDF0FD;} + .d2-3711942085 .background-color-B6{background-color:#F7F8FE;} + .d2-3711942085 .background-color-AA2{background-color:#4A6FF3;} + .d2-3711942085 .background-color-AA4{background-color:#EDF0FD;} + .d2-3711942085 .background-color-AA5{background-color:#F7F8FE;} + .d2-3711942085 .background-color-AB4{background-color:#EDF0FD;} + .d2-3711942085 .background-color-AB5{background-color:#F7F8FE;} + .d2-3711942085 .color-N1{color:#0A0F25;} + .d2-3711942085 .color-N2{color:#676C7E;} + .d2-3711942085 .color-N3{color:#9499AB;} + .d2-3711942085 .color-N4{color:#CFD2DD;} + .d2-3711942085 .color-N5{color:#DEE1EB;} + .d2-3711942085 .color-N6{color:#EEF1F8;} + .d2-3711942085 .color-N7{color:#FFFFFF;} + .d2-3711942085 .color-B1{color:#0D32B2;} + .d2-3711942085 .color-B2{color:#0D32B2;} + .d2-3711942085 .color-B3{color:#E3E9FD;} + .d2-3711942085 .color-B4{color:#E3E9FD;} + .d2-3711942085 .color-B5{color:#EDF0FD;} + .d2-3711942085 .color-B6{color:#F7F8FE;} + .d2-3711942085 .color-AA2{color:#4A6FF3;} + .d2-3711942085 .color-AA4{color:#EDF0FD;} + .d2-3711942085 .color-AA5{color:#F7F8FE;} + .d2-3711942085 .color-AB4{color:#EDF0FD;} + .d2-3711942085 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json index 8d0479cff..da3e013e0 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json @@ -921,7 +921,7 @@ "y": 278 }, { - "x": 454, + "x": 455, "y": 358 } ], 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 d2124ad22..5bcce435c 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-1362320649 .fill-N1{fill:#0A0F25;} + .d2-1362320649 .fill-N2{fill:#676C7E;} + .d2-1362320649 .fill-N3{fill:#9499AB;} + .d2-1362320649 .fill-N4{fill:#CFD2DD;} + .d2-1362320649 .fill-N5{fill:#DEE1EB;} + .d2-1362320649 .fill-N6{fill:#EEF1F8;} + .d2-1362320649 .fill-N7{fill:#FFFFFF;} + .d2-1362320649 .fill-B1{fill:#0D32B2;} + .d2-1362320649 .fill-B2{fill:#0D32B2;} + .d2-1362320649 .fill-B3{fill:#E3E9FD;} + .d2-1362320649 .fill-B4{fill:#E3E9FD;} + .d2-1362320649 .fill-B5{fill:#EDF0FD;} + .d2-1362320649 .fill-B6{fill:#F7F8FE;} + .d2-1362320649 .fill-AA2{fill:#4A6FF3;} + .d2-1362320649 .fill-AA4{fill:#EDF0FD;} + .d2-1362320649 .fill-AA5{fill:#F7F8FE;} + .d2-1362320649 .fill-AB4{fill:#EDF0FD;} + .d2-1362320649 .fill-AB5{fill:#F7F8FE;} + .d2-1362320649 .stroke-N1{stroke:#0A0F25;} + .d2-1362320649 .stroke-N2{stroke:#676C7E;} + .d2-1362320649 .stroke-N3{stroke:#9499AB;} + .d2-1362320649 .stroke-N4{stroke:#CFD2DD;} + .d2-1362320649 .stroke-N5{stroke:#DEE1EB;} + .d2-1362320649 .stroke-N6{stroke:#EEF1F8;} + .d2-1362320649 .stroke-N7{stroke:#FFFFFF;} + .d2-1362320649 .stroke-B1{stroke:#0D32B2;} + .d2-1362320649 .stroke-B2{stroke:#0D32B2;} + .d2-1362320649 .stroke-B3{stroke:#E3E9FD;} + .d2-1362320649 .stroke-B4{stroke:#E3E9FD;} + .d2-1362320649 .stroke-B5{stroke:#EDF0FD;} + .d2-1362320649 .stroke-B6{stroke:#F7F8FE;} + .d2-1362320649 .stroke-AA2{stroke:#4A6FF3;} + .d2-1362320649 .stroke-AA4{stroke:#EDF0FD;} + .d2-1362320649 .stroke-AA5{stroke:#F7F8FE;} + .d2-1362320649 .stroke-AB4{stroke:#EDF0FD;} + .d2-1362320649 .stroke-AB5{stroke:#F7F8FE;} + .d2-1362320649 .background-color-N1{background-color:#0A0F25;} + .d2-1362320649 .background-color-N2{background-color:#676C7E;} + .d2-1362320649 .background-color-N3{background-color:#9499AB;} + .d2-1362320649 .background-color-N4{background-color:#CFD2DD;} + .d2-1362320649 .background-color-N5{background-color:#DEE1EB;} + .d2-1362320649 .background-color-N6{background-color:#EEF1F8;} + .d2-1362320649 .background-color-N7{background-color:#FFFFFF;} + .d2-1362320649 .background-color-B1{background-color:#0D32B2;} + .d2-1362320649 .background-color-B2{background-color:#0D32B2;} + .d2-1362320649 .background-color-B3{background-color:#E3E9FD;} + .d2-1362320649 .background-color-B4{background-color:#E3E9FD;} + .d2-1362320649 .background-color-B5{background-color:#EDF0FD;} + .d2-1362320649 .background-color-B6{background-color:#F7F8FE;} + .d2-1362320649 .background-color-AA2{background-color:#4A6FF3;} + .d2-1362320649 .background-color-AA4{background-color:#EDF0FD;} + .d2-1362320649 .background-color-AA5{background-color:#F7F8FE;} + .d2-1362320649 .background-color-AB4{background-color:#EDF0FD;} + .d2-1362320649 .background-color-AB5{background-color:#F7F8FE;} + .d2-1362320649 .color-N1{color:#0A0F25;} + .d2-1362320649 .color-N2{color:#676C7E;} + .d2-1362320649 .color-N3{color:#9499AB;} + .d2-1362320649 .color-N4{color:#CFD2DD;} + .d2-1362320649 .color-N5{color:#DEE1EB;} + .d2-1362320649 .color-N6{color:#EEF1F8;} + .d2-1362320649 .color-N7{color:#FFFFFF;} + .d2-1362320649 .color-B1{color:#0D32B2;} + .d2-1362320649 .color-B2{color:#0D32B2;} + .d2-1362320649 .color-B3{color:#E3E9FD;} + .d2-1362320649 .color-B4{color:#E3E9FD;} + .d2-1362320649 .color-B5{color:#EDF0FD;} + .d2-1362320649 .color-B6{color:#F7F8FE;} + .d2-1362320649 .color-AA2{color:#4A6FF3;} + .d2-1362320649 .color-AA4{color:#EDF0FD;} + .d2-1362320649 .color-AA5{color:#F7F8FE;} + .d2-1362320649 .color-AB4{color:#EDF0FD;} + .d2-1362320649 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json index 2ebf32b0d..df40e65bd 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json @@ -459,7 +459,7 @@ "type": "person", "pos": { "x": 653, - "y": 399 + "y": 412 }, "width": 63, "height": 66, @@ -1065,11 +1065,11 @@ }, { "x": 684.5999755859375, - "y": 348.6000061035156 + "y": 351.20001220703125 }, { "x": 685, - "y": 399 + "y": 412 } ], "isCurve": true, 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 4904853c2..c48a01919 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3724172000 .fill-N1{fill:#0A0F25;} + .d2-3724172000 .fill-N2{fill:#676C7E;} + .d2-3724172000 .fill-N3{fill:#9499AB;} + .d2-3724172000 .fill-N4{fill:#CFD2DD;} + .d2-3724172000 .fill-N5{fill:#DEE1EB;} + .d2-3724172000 .fill-N6{fill:#EEF1F8;} + .d2-3724172000 .fill-N7{fill:#FFFFFF;} + .d2-3724172000 .fill-B1{fill:#0D32B2;} + .d2-3724172000 .fill-B2{fill:#0D32B2;} + .d2-3724172000 .fill-B3{fill:#E3E9FD;} + .d2-3724172000 .fill-B4{fill:#E3E9FD;} + .d2-3724172000 .fill-B5{fill:#EDF0FD;} + .d2-3724172000 .fill-B6{fill:#F7F8FE;} + .d2-3724172000 .fill-AA2{fill:#4A6FF3;} + .d2-3724172000 .fill-AA4{fill:#EDF0FD;} + .d2-3724172000 .fill-AA5{fill:#F7F8FE;} + .d2-3724172000 .fill-AB4{fill:#EDF0FD;} + .d2-3724172000 .fill-AB5{fill:#F7F8FE;} + .d2-3724172000 .stroke-N1{stroke:#0A0F25;} + .d2-3724172000 .stroke-N2{stroke:#676C7E;} + .d2-3724172000 .stroke-N3{stroke:#9499AB;} + .d2-3724172000 .stroke-N4{stroke:#CFD2DD;} + .d2-3724172000 .stroke-N5{stroke:#DEE1EB;} + .d2-3724172000 .stroke-N6{stroke:#EEF1F8;} + .d2-3724172000 .stroke-N7{stroke:#FFFFFF;} + .d2-3724172000 .stroke-B1{stroke:#0D32B2;} + .d2-3724172000 .stroke-B2{stroke:#0D32B2;} + .d2-3724172000 .stroke-B3{stroke:#E3E9FD;} + .d2-3724172000 .stroke-B4{stroke:#E3E9FD;} + .d2-3724172000 .stroke-B5{stroke:#EDF0FD;} + .d2-3724172000 .stroke-B6{stroke:#F7F8FE;} + .d2-3724172000 .stroke-AA2{stroke:#4A6FF3;} + .d2-3724172000 .stroke-AA4{stroke:#EDF0FD;} + .d2-3724172000 .stroke-AA5{stroke:#F7F8FE;} + .d2-3724172000 .stroke-AB4{stroke:#EDF0FD;} + .d2-3724172000 .stroke-AB5{stroke:#F7F8FE;} + .d2-3724172000 .background-color-N1{background-color:#0A0F25;} + .d2-3724172000 .background-color-N2{background-color:#676C7E;} + .d2-3724172000 .background-color-N3{background-color:#9499AB;} + .d2-3724172000 .background-color-N4{background-color:#CFD2DD;} + .d2-3724172000 .background-color-N5{background-color:#DEE1EB;} + .d2-3724172000 .background-color-N6{background-color:#EEF1F8;} + .d2-3724172000 .background-color-N7{background-color:#FFFFFF;} + .d2-3724172000 .background-color-B1{background-color:#0D32B2;} + .d2-3724172000 .background-color-B2{background-color:#0D32B2;} + .d2-3724172000 .background-color-B3{background-color:#E3E9FD;} + .d2-3724172000 .background-color-B4{background-color:#E3E9FD;} + .d2-3724172000 .background-color-B5{background-color:#EDF0FD;} + .d2-3724172000 .background-color-B6{background-color:#F7F8FE;} + .d2-3724172000 .background-color-AA2{background-color:#4A6FF3;} + .d2-3724172000 .background-color-AA4{background-color:#EDF0FD;} + .d2-3724172000 .background-color-AA5{background-color:#F7F8FE;} + .d2-3724172000 .background-color-AB4{background-color:#EDF0FD;} + .d2-3724172000 .background-color-AB5{background-color:#F7F8FE;} + .d2-3724172000 .color-N1{color:#0A0F25;} + .d2-3724172000 .color-N2{color:#676C7E;} + .d2-3724172000 .color-N3{color:#9499AB;} + .d2-3724172000 .color-N4{color:#CFD2DD;} + .d2-3724172000 .color-N5{color:#DEE1EB;} + .d2-3724172000 .color-N6{color:#EEF1F8;} + .d2-3724172000 .color-N7{color:#FFFFFF;} + .d2-3724172000 .color-B1{color:#0D32B2;} + .d2-3724172000 .color-B2{color:#0D32B2;} + .d2-3724172000 .color-B3{color:#E3E9FD;} + .d2-3724172000 .color-B4{color:#E3E9FD;} + .d2-3724172000 .color-B5{color:#EDF0FD;} + .d2-3724172000 .color-B6{color:#F7F8FE;} + .d2-3724172000 .color-AA2{color:#4A6FF3;} + .d2-3724172000 .color-AA4{color:#EDF0FD;} + .d2-3724172000 .color-AA5{color:#F7F8FE;} + .d2-3724172000 .color-AB4{color:#EDF0FD;} + .d2-3724172000 .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 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -110,7 +110,7 @@ - + diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json index a803707f8..b1404b802 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json @@ -921,7 +921,7 @@ "y": 258 }, { - "x": 429, + "x": 430, "y": 338 } ], @@ -959,7 +959,7 @@ "y": 59 }, { - "x": 577, + "x": 576, "y": 188 } ], diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg index 98d73c2a9..2e0c91694 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3775577395 .fill-N1{fill:#0A0F25;} + .d2-3775577395 .fill-N2{fill:#676C7E;} + .d2-3775577395 .fill-N3{fill:#9499AB;} + .d2-3775577395 .fill-N4{fill:#CFD2DD;} + .d2-3775577395 .fill-N5{fill:#DEE1EB;} + .d2-3775577395 .fill-N6{fill:#EEF1F8;} + .d2-3775577395 .fill-N7{fill:#FFFFFF;} + .d2-3775577395 .fill-B1{fill:#0D32B2;} + .d2-3775577395 .fill-B2{fill:#0D32B2;} + .d2-3775577395 .fill-B3{fill:#E3E9FD;} + .d2-3775577395 .fill-B4{fill:#E3E9FD;} + .d2-3775577395 .fill-B5{fill:#EDF0FD;} + .d2-3775577395 .fill-B6{fill:#F7F8FE;} + .d2-3775577395 .fill-AA2{fill:#4A6FF3;} + .d2-3775577395 .fill-AA4{fill:#EDF0FD;} + .d2-3775577395 .fill-AA5{fill:#F7F8FE;} + .d2-3775577395 .fill-AB4{fill:#EDF0FD;} + .d2-3775577395 .fill-AB5{fill:#F7F8FE;} + .d2-3775577395 .stroke-N1{stroke:#0A0F25;} + .d2-3775577395 .stroke-N2{stroke:#676C7E;} + .d2-3775577395 .stroke-N3{stroke:#9499AB;} + .d2-3775577395 .stroke-N4{stroke:#CFD2DD;} + .d2-3775577395 .stroke-N5{stroke:#DEE1EB;} + .d2-3775577395 .stroke-N6{stroke:#EEF1F8;} + .d2-3775577395 .stroke-N7{stroke:#FFFFFF;} + .d2-3775577395 .stroke-B1{stroke:#0D32B2;} + .d2-3775577395 .stroke-B2{stroke:#0D32B2;} + .d2-3775577395 .stroke-B3{stroke:#E3E9FD;} + .d2-3775577395 .stroke-B4{stroke:#E3E9FD;} + .d2-3775577395 .stroke-B5{stroke:#EDF0FD;} + .d2-3775577395 .stroke-B6{stroke:#F7F8FE;} + .d2-3775577395 .stroke-AA2{stroke:#4A6FF3;} + .d2-3775577395 .stroke-AA4{stroke:#EDF0FD;} + .d2-3775577395 .stroke-AA5{stroke:#F7F8FE;} + .d2-3775577395 .stroke-AB4{stroke:#EDF0FD;} + .d2-3775577395 .stroke-AB5{stroke:#F7F8FE;} + .d2-3775577395 .background-color-N1{background-color:#0A0F25;} + .d2-3775577395 .background-color-N2{background-color:#676C7E;} + .d2-3775577395 .background-color-N3{background-color:#9499AB;} + .d2-3775577395 .background-color-N4{background-color:#CFD2DD;} + .d2-3775577395 .background-color-N5{background-color:#DEE1EB;} + .d2-3775577395 .background-color-N6{background-color:#EEF1F8;} + .d2-3775577395 .background-color-N7{background-color:#FFFFFF;} + .d2-3775577395 .background-color-B1{background-color:#0D32B2;} + .d2-3775577395 .background-color-B2{background-color:#0D32B2;} + .d2-3775577395 .background-color-B3{background-color:#E3E9FD;} + .d2-3775577395 .background-color-B4{background-color:#E3E9FD;} + .d2-3775577395 .background-color-B5{background-color:#EDF0FD;} + .d2-3775577395 .background-color-B6{background-color:#F7F8FE;} + .d2-3775577395 .background-color-AA2{background-color:#4A6FF3;} + .d2-3775577395 .background-color-AA4{background-color:#EDF0FD;} + .d2-3775577395 .background-color-AA5{background-color:#F7F8FE;} + .d2-3775577395 .background-color-AB4{background-color:#EDF0FD;} + .d2-3775577395 .background-color-AB5{background-color:#F7F8FE;} + .d2-3775577395 .color-N1{color:#0A0F25;} + .d2-3775577395 .color-N2{color:#676C7E;} + .d2-3775577395 .color-N3{color:#9499AB;} + .d2-3775577395 .color-N4{color:#CFD2DD;} + .d2-3775577395 .color-N5{color:#DEE1EB;} + .d2-3775577395 .color-N6{color:#EEF1F8;} + .d2-3775577395 .color-N7{color:#FFFFFF;} + .d2-3775577395 .color-B1{color:#0D32B2;} + .d2-3775577395 .color-B2{color:#0D32B2;} + .d2-3775577395 .color-B3{color:#E3E9FD;} + .d2-3775577395 .color-B4{color:#E3E9FD;} + .d2-3775577395 .color-B5{color:#EDF0FD;} + .d2-3775577395 .color-B6{color:#F7F8FE;} + .d2-3775577395 .color-AA2{color:#4A6FF3;} + .d2-3775577395 .color-AA4{color:#EDF0FD;} + .d2-3775577395 .color-AA5{color:#F7F8FE;} + .d2-3775577395 .color-AB4{color:#EDF0FD;} + .d2-3775577395 .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 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/animated/dagre/board.exp.json b/e2etests/testdata/stable/animated/dagre/board.exp.json index 808ce1b9c..7ef09c9b6 100644 --- a/e2etests/testdata/stable/animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/animated/dagre/board.exp.json @@ -563,12 +563,12 @@ "labelPercentage": 0, "route": [ { - "x": 94.322998046875, - "y": 66 + "x": 94.5, + "y": 65.5 }, { - "x": 54.4640007019043, - "y": 114.4000015258789 + "x": 54.5, + "y": 114.30000305175781 }, { "x": 44.5, @@ -610,12 +610,12 @@ "labelPercentage": 0, "route": [ { - "x": 154.14700317382812, - "y": 66 + "x": 154, + "y": 65.5 }, { - "x": 202.0290069580078, - "y": 114.4000015258789 + "x": 202, + "y": 114.30000305175781 }, { "x": 214, @@ -658,11 +658,11 @@ "route": [ { "x": 405.25, - "y": 187 + "y": 187.5 }, { "x": 405.25, - "y": 138.60000610351562 + "y": 138.6999969482422 }, { "x": 405.25, @@ -705,11 +705,11 @@ "route": [ { "x": 575.75, - "y": 66 + "y": 65.5 }, { "x": 575.75, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 575.75, @@ -751,12 +751,12 @@ "labelPercentage": 0, "route": [ { - "x": 828.5, - "y": 66 + "x": 828.25, + "y": 65.5 }, { - "x": 751.5, - "y": 114.4000015258789 + "x": 751.4500122070312, + "y": 114.30000305175781 }, { "x": 732.25, @@ -798,12 +798,12 @@ "labelPercentage": 0, "route": [ { - "x": 879.5, - "y": 66 + "x": 879.75, + "y": 65.5 }, { - "x": 877.2999877929688, - "y": 114.4000015258789 + "x": 877.3499755859375, + "y": 114.30000305175781 }, { "x": 876.75, @@ -845,12 +845,12 @@ "labelPercentage": 0, "route": [ { - "x": 931.5579833984375, - "y": 66 + "x": 931.25, + "y": 65.5 }, { - "x": 1005.7109985351562, - "y": 114.4000015258789 + "x": 1005.6500244140625, + "y": 114.30000305175781 }, { "x": 1024.25, @@ -893,11 +893,11 @@ "route": [ { "x": 1175.5, - "y": 66 + "y": 65.5 }, { "x": 1175.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 1175.5, diff --git a/e2etests/testdata/stable/animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/animated/dagre/sketch.exp.svg index 7649abeaa..485c905ab 100644 --- a/e2etests/testdata/stable/animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/animated/dagre/sketch.exp.svg @@ -1,22 +1,22 @@ -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear + .d2-3123507233 .fill-N1{fill:#0A0F25;} + .d2-3123507233 .fill-N2{fill:#676C7E;} + .d2-3123507233 .fill-N3{fill:#9499AB;} + .d2-3123507233 .fill-N4{fill:#CFD2DD;} + .d2-3123507233 .fill-N5{fill:#DEE1EB;} + .d2-3123507233 .fill-N6{fill:#EEF1F8;} + .d2-3123507233 .fill-N7{fill:#FFFFFF;} + .d2-3123507233 .fill-B1{fill:#0D32B2;} + .d2-3123507233 .fill-B2{fill:#0D32B2;} + .d2-3123507233 .fill-B3{fill:#E3E9FD;} + .d2-3123507233 .fill-B4{fill:#E3E9FD;} + .d2-3123507233 .fill-B5{fill:#EDF0FD;} + .d2-3123507233 .fill-B6{fill:#F7F8FE;} + .d2-3123507233 .fill-AA2{fill:#4A6FF3;} + .d2-3123507233 .fill-AA4{fill:#EDF0FD;} + .d2-3123507233 .fill-AA5{fill:#F7F8FE;} + .d2-3123507233 .fill-AB4{fill:#EDF0FD;} + .d2-3123507233 .fill-AB5{fill:#F7F8FE;} + .d2-3123507233 .stroke-N1{stroke:#0A0F25;} + .d2-3123507233 .stroke-N2{stroke:#676C7E;} + .d2-3123507233 .stroke-N3{stroke:#9499AB;} + .d2-3123507233 .stroke-N4{stroke:#CFD2DD;} + .d2-3123507233 .stroke-N5{stroke:#DEE1EB;} + .d2-3123507233 .stroke-N6{stroke:#EEF1F8;} + .d2-3123507233 .stroke-N7{stroke:#FFFFFF;} + .d2-3123507233 .stroke-B1{stroke:#0D32B2;} + .d2-3123507233 .stroke-B2{stroke:#0D32B2;} + .d2-3123507233 .stroke-B3{stroke:#E3E9FD;} + .d2-3123507233 .stroke-B4{stroke:#E3E9FD;} + .d2-3123507233 .stroke-B5{stroke:#EDF0FD;} + .d2-3123507233 .stroke-B6{stroke:#F7F8FE;} + .d2-3123507233 .stroke-AA2{stroke:#4A6FF3;} + .d2-3123507233 .stroke-AA4{stroke:#EDF0FD;} + .d2-3123507233 .stroke-AA5{stroke:#F7F8FE;} + .d2-3123507233 .stroke-AB4{stroke:#EDF0FD;} + .d2-3123507233 .stroke-AB5{stroke:#F7F8FE;} + .d2-3123507233 .background-color-N1{background-color:#0A0F25;} + .d2-3123507233 .background-color-N2{background-color:#676C7E;} + .d2-3123507233 .background-color-N3{background-color:#9499AB;} + .d2-3123507233 .background-color-N4{background-color:#CFD2DD;} + .d2-3123507233 .background-color-N5{background-color:#DEE1EB;} + .d2-3123507233 .background-color-N6{background-color:#EEF1F8;} + .d2-3123507233 .background-color-N7{background-color:#FFFFFF;} + .d2-3123507233 .background-color-B1{background-color:#0D32B2;} + .d2-3123507233 .background-color-B2{background-color:#0D32B2;} + .d2-3123507233 .background-color-B3{background-color:#E3E9FD;} + .d2-3123507233 .background-color-B4{background-color:#E3E9FD;} + .d2-3123507233 .background-color-B5{background-color:#EDF0FD;} + .d2-3123507233 .background-color-B6{background-color:#F7F8FE;} + .d2-3123507233 .background-color-AA2{background-color:#4A6FF3;} + .d2-3123507233 .background-color-AA4{background-color:#EDF0FD;} + .d2-3123507233 .background-color-AA5{background-color:#F7F8FE;} + .d2-3123507233 .background-color-AB4{background-color:#EDF0FD;} + .d2-3123507233 .background-color-AB5{background-color:#F7F8FE;} + .d2-3123507233 .color-N1{color:#0A0F25;} + .d2-3123507233 .color-N2{color:#676C7E;} + .d2-3123507233 .color-N3{color:#9499AB;} + .d2-3123507233 .color-N4{color:#CFD2DD;} + .d2-3123507233 .color-N5{color:#DEE1EB;} + .d2-3123507233 .color-N6{color:#EEF1F8;} + .d2-3123507233 .color-N7{color:#FFFFFF;} + .d2-3123507233 .color-B1{color:#0D32B2;} + .d2-3123507233 .color-B2{color:#0D32B2;} + .d2-3123507233 .color-B3{color:#E3E9FD;} + .d2-3123507233 .color-B4{color:#E3E9FD;} + .d2-3123507233 .color-B5{color:#EDF0FD;} + .d2-3123507233 .color-B6{color:#F7F8FE;} + .d2-3123507233 .color-AA2{color:#4A6FF3;} + .d2-3123507233 .color-AA4{color:#EDF0FD;} + .d2-3123507233 .color-AA5{color:#F7F8FE;} + .d2-3123507233 .color-AB4{color:#EDF0FD;} + .d2-3123507233 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json index 86ecae421..3311c9b1e 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json @@ -137,11 +137,11 @@ "route": [ { "x": 100.5, - "y": 66 + "y": 65.5 }, { "x": 100.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 100.5, diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg index 73478444e..284e9a38f 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab To err is human, to moo bovine1* + .d2-634513937 .fill-N1{fill:#0A0F25;} + .d2-634513937 .fill-N2{fill:#676C7E;} + .d2-634513937 .fill-N3{fill:#9499AB;} + .d2-634513937 .fill-N4{fill:#CFD2DD;} + .d2-634513937 .fill-N5{fill:#DEE1EB;} + .d2-634513937 .fill-N6{fill:#EEF1F8;} + .d2-634513937 .fill-N7{fill:#FFFFFF;} + .d2-634513937 .fill-B1{fill:#0D32B2;} + .d2-634513937 .fill-B2{fill:#0D32B2;} + .d2-634513937 .fill-B3{fill:#E3E9FD;} + .d2-634513937 .fill-B4{fill:#E3E9FD;} + .d2-634513937 .fill-B5{fill:#EDF0FD;} + .d2-634513937 .fill-B6{fill:#F7F8FE;} + .d2-634513937 .fill-AA2{fill:#4A6FF3;} + .d2-634513937 .fill-AA4{fill:#EDF0FD;} + .d2-634513937 .fill-AA5{fill:#F7F8FE;} + .d2-634513937 .fill-AB4{fill:#EDF0FD;} + .d2-634513937 .fill-AB5{fill:#F7F8FE;} + .d2-634513937 .stroke-N1{stroke:#0A0F25;} + .d2-634513937 .stroke-N2{stroke:#676C7E;} + .d2-634513937 .stroke-N3{stroke:#9499AB;} + .d2-634513937 .stroke-N4{stroke:#CFD2DD;} + .d2-634513937 .stroke-N5{stroke:#DEE1EB;} + .d2-634513937 .stroke-N6{stroke:#EEF1F8;} + .d2-634513937 .stroke-N7{stroke:#FFFFFF;} + .d2-634513937 .stroke-B1{stroke:#0D32B2;} + .d2-634513937 .stroke-B2{stroke:#0D32B2;} + .d2-634513937 .stroke-B3{stroke:#E3E9FD;} + .d2-634513937 .stroke-B4{stroke:#E3E9FD;} + .d2-634513937 .stroke-B5{stroke:#EDF0FD;} + .d2-634513937 .stroke-B6{stroke:#F7F8FE;} + .d2-634513937 .stroke-AA2{stroke:#4A6FF3;} + .d2-634513937 .stroke-AA4{stroke:#EDF0FD;} + .d2-634513937 .stroke-AA5{stroke:#F7F8FE;} + .d2-634513937 .stroke-AB4{stroke:#EDF0FD;} + .d2-634513937 .stroke-AB5{stroke:#F7F8FE;} + .d2-634513937 .background-color-N1{background-color:#0A0F25;} + .d2-634513937 .background-color-N2{background-color:#676C7E;} + .d2-634513937 .background-color-N3{background-color:#9499AB;} + .d2-634513937 .background-color-N4{background-color:#CFD2DD;} + .d2-634513937 .background-color-N5{background-color:#DEE1EB;} + .d2-634513937 .background-color-N6{background-color:#EEF1F8;} + .d2-634513937 .background-color-N7{background-color:#FFFFFF;} + .d2-634513937 .background-color-B1{background-color:#0D32B2;} + .d2-634513937 .background-color-B2{background-color:#0D32B2;} + .d2-634513937 .background-color-B3{background-color:#E3E9FD;} + .d2-634513937 .background-color-B4{background-color:#E3E9FD;} + .d2-634513937 .background-color-B5{background-color:#EDF0FD;} + .d2-634513937 .background-color-B6{background-color:#F7F8FE;} + .d2-634513937 .background-color-AA2{background-color:#4A6FF3;} + .d2-634513937 .background-color-AA4{background-color:#EDF0FD;} + .d2-634513937 .background-color-AA5{background-color:#F7F8FE;} + .d2-634513937 .background-color-AB4{background-color:#EDF0FD;} + .d2-634513937 .background-color-AB5{background-color:#F7F8FE;} + .d2-634513937 .color-N1{color:#0A0F25;} + .d2-634513937 .color-N2{color:#676C7E;} + .d2-634513937 .color-N3{color:#9499AB;} + .d2-634513937 .color-N4{color:#CFD2DD;} + .d2-634513937 .color-N5{color:#DEE1EB;} + .d2-634513937 .color-N6{color:#EEF1F8;} + .d2-634513937 .color-N7{color:#FFFFFF;} + .d2-634513937 .color-B1{color:#0D32B2;} + .d2-634513937 .color-B2{color:#0D32B2;} + .d2-634513937 .color-B3{color:#E3E9FD;} + .d2-634513937 .color-B4{color:#E3E9FD;} + .d2-634513937 .color-B5{color:#EDF0FD;} + .d2-634513937 .color-B6{color:#F7F8FE;} + .d2-634513937 .color-AA2{color:#4A6FF3;} + .d2-634513937 .color-AA4{color:#EDF0FD;} + .d2-634513937 .color-AA5{color:#F7F8FE;} + .d2-634513937 .color-AB4{color:#EDF0FD;} + .d2-634513937 .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}]]>ab To err is human, to moo bovine1* diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json index 81469cb78..da688e287 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "default.start", "type": "rectangle", "pos": { - "x": 20, + "x": 30, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -88,11 +88,11 @@ "id": "default.end", "type": "rectangle", "pos": { - "x": 20, + "x": 30, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -129,7 +129,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -170,7 +170,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -211,7 +211,7 @@ "type": "rectangle", "pos": { "x": 172, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -252,7 +252,7 @@ "type": "rectangle", "pos": { "x": 172, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -293,7 +293,7 @@ "type": "rectangle", "pos": { "x": 285, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -334,7 +334,7 @@ "type": "rectangle", "pos": { "x": 285, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -375,7 +375,7 @@ "type": "rectangle", "pos": { "x": 399, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -416,7 +416,7 @@ "type": "rectangle", "pos": { "x": 399, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -457,7 +457,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -498,7 +498,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -539,10 +539,10 @@ "type": "rectangle", "pos": { "x": 653, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -579,11 +579,11 @@ "id": "line.start", "type": "rectangle", "pos": { - "x": 673, + "x": 683, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -619,11 +619,11 @@ "id": "line.end", "type": "rectangle", "pos": { - "x": 673, + "x": 683, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -660,7 +660,7 @@ "type": "rectangle", "pos": { "x": 713, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -701,7 +701,7 @@ "type": "rectangle", "pos": { "x": 713, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -742,7 +742,7 @@ "type": "rectangle", "pos": { "x": 825, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -783,7 +783,7 @@ "type": "rectangle", "pos": { "x": 825, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -824,7 +824,7 @@ "type": "rectangle", "pos": { "x": 938, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -865,7 +865,7 @@ "type": "rectangle", "pos": { "x": 938, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -906,7 +906,7 @@ "type": "rectangle", "pos": { "x": 1052, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -947,7 +947,7 @@ "type": "rectangle", "pos": { "x": 1052, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -988,7 +988,7 @@ "type": "rectangle", "pos": { "x": 1165, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -1029,7 +1029,7 @@ "type": "rectangle", "pos": { "x": 1165, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -1070,10 +1070,10 @@ "type": "rectangle", "pos": { "x": 1306, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1110,11 +1110,11 @@ "id": "arrow.start", "type": "rectangle", "pos": { - "x": 1326, + "x": 1336, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1150,11 +1150,11 @@ "id": "arrow.end", "type": "rectangle", "pos": { - "x": 1326, + "x": 1336, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1191,7 +1191,7 @@ "type": "rectangle", "pos": { "x": 1366, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -1232,7 +1232,7 @@ "type": "rectangle", "pos": { "x": 1366, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -1273,7 +1273,7 @@ "type": "rectangle", "pos": { "x": 1478, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -1314,7 +1314,7 @@ "type": "rectangle", "pos": { "x": 1478, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -1355,7 +1355,7 @@ "type": "rectangle", "pos": { "x": 1591, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -1396,7 +1396,7 @@ "type": "rectangle", "pos": { "x": 1591, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -1437,7 +1437,7 @@ "type": "rectangle", "pos": { "x": 1705, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -1478,7 +1478,7 @@ "type": "rectangle", "pos": { "x": 1705, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -1519,7 +1519,7 @@ "type": "rectangle", "pos": { "x": 1818, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -1560,7 +1560,7 @@ "type": "rectangle", "pos": { "x": 1818, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -1601,10 +1601,10 @@ "type": "rectangle", "pos": { "x": 1959, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1641,11 +1641,11 @@ "id": "diamond.start", "type": "rectangle", "pos": { - "x": 1979, + "x": 1989, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1681,11 +1681,11 @@ "id": "diamond.end", "type": "rectangle", "pos": { - "x": 1979, + "x": 1989, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1722,7 +1722,7 @@ "type": "rectangle", "pos": { "x": 2019, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -1763,7 +1763,7 @@ "type": "rectangle", "pos": { "x": 2019, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -1804,7 +1804,7 @@ "type": "rectangle", "pos": { "x": 2131, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -1845,7 +1845,7 @@ "type": "rectangle", "pos": { "x": 2131, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -1886,7 +1886,7 @@ "type": "rectangle", "pos": { "x": 2244, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -1927,7 +1927,7 @@ "type": "rectangle", "pos": { "x": 2244, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -1968,7 +1968,7 @@ "type": "rectangle", "pos": { "x": 2358, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -2009,7 +2009,7 @@ "type": "rectangle", "pos": { "x": 2358, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -2050,7 +2050,7 @@ "type": "rectangle", "pos": { "x": 2471, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -2091,7 +2091,7 @@ "type": "rectangle", "pos": { "x": 2471, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -2132,10 +2132,10 @@ "type": "rectangle", "pos": { "x": 2612, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2172,11 +2172,11 @@ "id": "filled diamond.start", "type": "rectangle", "pos": { - "x": 2632, + "x": 2642, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2212,11 +2212,11 @@ "id": "filled diamond.end", "type": "rectangle", "pos": { - "x": 2632, + "x": 2642, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2253,7 +2253,7 @@ "type": "rectangle", "pos": { "x": 2672, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -2294,7 +2294,7 @@ "type": "rectangle", "pos": { "x": 2672, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -2335,7 +2335,7 @@ "type": "rectangle", "pos": { "x": 2784, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -2376,7 +2376,7 @@ "type": "rectangle", "pos": { "x": 2784, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -2417,7 +2417,7 @@ "type": "rectangle", "pos": { "x": 2897, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -2458,7 +2458,7 @@ "type": "rectangle", "pos": { "x": 2897, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -2499,7 +2499,7 @@ "type": "rectangle", "pos": { "x": 3011, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -2540,7 +2540,7 @@ "type": "rectangle", "pos": { "x": 3011, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -2581,7 +2581,7 @@ "type": "rectangle", "pos": { "x": 3124, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -2622,7 +2622,7 @@ "type": "rectangle", "pos": { "x": 3124, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -2663,10 +2663,10 @@ "type": "rectangle", "pos": { "x": 3265, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2703,11 +2703,11 @@ "id": "circle.start", "type": "rectangle", "pos": { - "x": 3285, + "x": 3295, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2743,11 +2743,11 @@ "id": "circle.end", "type": "rectangle", "pos": { - "x": 3285, + "x": 3295, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2784,7 +2784,7 @@ "type": "rectangle", "pos": { "x": 3325, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -2825,7 +2825,7 @@ "type": "rectangle", "pos": { "x": 3325, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -2866,7 +2866,7 @@ "type": "rectangle", "pos": { "x": 3437, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -2907,7 +2907,7 @@ "type": "rectangle", "pos": { "x": 3437, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -2948,7 +2948,7 @@ "type": "rectangle", "pos": { "x": 3550, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -2989,7 +2989,7 @@ "type": "rectangle", "pos": { "x": 3550, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -3030,7 +3030,7 @@ "type": "rectangle", "pos": { "x": 3664, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -3071,7 +3071,7 @@ "type": "rectangle", "pos": { "x": 3664, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -3112,7 +3112,7 @@ "type": "rectangle", "pos": { "x": 3777, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -3153,7 +3153,7 @@ "type": "rectangle", "pos": { "x": 3777, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -3194,10 +3194,10 @@ "type": "rectangle", "pos": { "x": 3918, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3234,11 +3234,11 @@ "id": "filled circle.start", "type": "rectangle", "pos": { - "x": 3938, + "x": 3948, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3274,11 +3274,11 @@ "id": "filled circle.end", "type": "rectangle", "pos": { - "x": 3938, + "x": 3948, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3315,7 +3315,7 @@ "type": "rectangle", "pos": { "x": 3978, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -3356,7 +3356,7 @@ "type": "rectangle", "pos": { "x": 3978, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -3397,7 +3397,7 @@ "type": "rectangle", "pos": { "x": 4090, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -3438,7 +3438,7 @@ "type": "rectangle", "pos": { "x": 4090, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -3479,7 +3479,7 @@ "type": "rectangle", "pos": { "x": 4203, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -3520,7 +3520,7 @@ "type": "rectangle", "pos": { "x": 4203, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -3561,7 +3561,7 @@ "type": "rectangle", "pos": { "x": 4317, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -3602,7 +3602,7 @@ "type": "rectangle", "pos": { "x": 4317, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -3643,7 +3643,7 @@ "type": "rectangle", "pos": { "x": 4430, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -3684,7 +3684,7 @@ "type": "rectangle", "pos": { "x": 4430, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -3725,10 +3725,10 @@ "type": "rectangle", "pos": { "x": 4571, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3765,11 +3765,11 @@ "id": "cf one.start", "type": "rectangle", "pos": { - "x": 4591, + "x": 4601, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3805,11 +3805,11 @@ "id": "cf one.end", "type": "rectangle", "pos": { - "x": 4591, + "x": 4601, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3846,7 +3846,7 @@ "type": "rectangle", "pos": { "x": 4631, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -3887,7 +3887,7 @@ "type": "rectangle", "pos": { "x": 4631, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -3928,7 +3928,7 @@ "type": "rectangle", "pos": { "x": 4743, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -3969,7 +3969,7 @@ "type": "rectangle", "pos": { "x": 4743, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -4010,7 +4010,7 @@ "type": "rectangle", "pos": { "x": 4856, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -4051,7 +4051,7 @@ "type": "rectangle", "pos": { "x": 4856, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -4092,7 +4092,7 @@ "type": "rectangle", "pos": { "x": 4970, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -4133,7 +4133,7 @@ "type": "rectangle", "pos": { "x": 4970, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -4174,7 +4174,7 @@ "type": "rectangle", "pos": { "x": 5083, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -4215,7 +4215,7 @@ "type": "rectangle", "pos": { "x": 5083, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -4256,10 +4256,10 @@ "type": "rectangle", "pos": { "x": 5224, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4296,11 +4296,11 @@ "id": "cf one required.start", "type": "rectangle", "pos": { - "x": 5244, + "x": 5254, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4336,11 +4336,11 @@ "id": "cf one required.end", "type": "rectangle", "pos": { - "x": 5244, + "x": 5254, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4377,7 +4377,7 @@ "type": "rectangle", "pos": { "x": 5284, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -4418,7 +4418,7 @@ "type": "rectangle", "pos": { "x": 5284, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -4459,7 +4459,7 @@ "type": "rectangle", "pos": { "x": 5396, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -4500,7 +4500,7 @@ "type": "rectangle", "pos": { "x": 5396, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -4541,7 +4541,7 @@ "type": "rectangle", "pos": { "x": 5509, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -4582,7 +4582,7 @@ "type": "rectangle", "pos": { "x": 5509, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -4623,7 +4623,7 @@ "type": "rectangle", "pos": { "x": 5623, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -4664,7 +4664,7 @@ "type": "rectangle", "pos": { "x": 5623, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -4705,7 +4705,7 @@ "type": "rectangle", "pos": { "x": 5736, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -4746,7 +4746,7 @@ "type": "rectangle", "pos": { "x": 5736, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -4787,10 +4787,10 @@ "type": "rectangle", "pos": { "x": 5877, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4827,11 +4827,11 @@ "id": "cf many.start", "type": "rectangle", "pos": { - "x": 5897, + "x": 5907, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4867,11 +4867,11 @@ "id": "cf many.end", "type": "rectangle", "pos": { - "x": 5897, + "x": 5907, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4908,7 +4908,7 @@ "type": "rectangle", "pos": { "x": 5937, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -4949,7 +4949,7 @@ "type": "rectangle", "pos": { "x": 5937, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -4990,7 +4990,7 @@ "type": "rectangle", "pos": { "x": 6049, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -5031,7 +5031,7 @@ "type": "rectangle", "pos": { "x": 6049, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -5072,7 +5072,7 @@ "type": "rectangle", "pos": { "x": 6162, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -5113,7 +5113,7 @@ "type": "rectangle", "pos": { "x": 6162, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -5154,7 +5154,7 @@ "type": "rectangle", "pos": { "x": 6276, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -5195,7 +5195,7 @@ "type": "rectangle", "pos": { "x": 6276, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -5236,7 +5236,7 @@ "type": "rectangle", "pos": { "x": 6389, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -5277,7 +5277,7 @@ "type": "rectangle", "pos": { "x": 6389, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -5318,10 +5318,10 @@ "type": "rectangle", "pos": { "x": 6530, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5358,11 +5358,11 @@ "id": "cf many required.start", "type": "rectangle", "pos": { - "x": 6550, + "x": 6560, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5398,11 +5398,11 @@ "id": "cf many required.end", "type": "rectangle", "pos": { - "x": 6550, + "x": 6560, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5439,7 +5439,7 @@ "type": "rectangle", "pos": { "x": 6590, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -5480,7 +5480,7 @@ "type": "rectangle", "pos": { "x": 6590, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -5521,7 +5521,7 @@ "type": "rectangle", "pos": { "x": 6702, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -5562,7 +5562,7 @@ "type": "rectangle", "pos": { "x": 6702, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -5603,7 +5603,7 @@ "type": "rectangle", "pos": { "x": 6815, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -5644,7 +5644,7 @@ "type": "rectangle", "pos": { "x": 6815, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -5685,7 +5685,7 @@ "type": "rectangle", "pos": { "x": 6929, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -5726,7 +5726,7 @@ "type": "rectangle", "pos": { "x": 6929, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -5767,7 +5767,7 @@ "type": "rectangle", "pos": { "x": 7042, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -5808,7 +5808,7 @@ "type": "rectangle", "pos": { "x": 7042, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -5872,31 +5872,31 @@ "route": [ { "x": 86, - "y": 186.5 + "y": 166 }, { "x": 86, - "y": 226.5 + "y": 206 }, { "x": 86, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 86, - "y": 266.75 + "y": 246.25 }, { "x": 86, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 86, - "y": 367.5 + "y": 347 }, { "x": 86, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -5931,31 +5931,31 @@ "route": [ { "x": 198.5, - "y": 186.5 + "y": 166 }, { "x": 198.5, - "y": 226.5 + "y": 206 }, { "x": 198.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 198.5, - "y": 266.75 + "y": 246.25 }, { "x": 198.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 198.5, - "y": 367.5 + "y": 347 }, { "x": 198.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -5990,31 +5990,31 @@ "route": [ { "x": 312, - "y": 186.5 + "y": 166 }, { "x": 312, - "y": 226.5 + "y": 206 }, { "x": 312, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 312, - "y": 266.75 + "y": 246.25 }, { "x": 312, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 312, - "y": 367.5 + "y": 347 }, { "x": 312, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6049,31 +6049,31 @@ "route": [ { "x": 425.5, - "y": 186.5 + "y": 166 }, { "x": 425.5, - "y": 226.5 + "y": 206 }, { "x": 425.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 425.5, - "y": 266.75 + "y": 246.25 }, { "x": 425.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 425.5, - "y": 367.5 + "y": 347 }, { "x": 425.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6108,31 +6108,31 @@ "route": [ { "x": 542.5, - "y": 186.5 + "y": 166 }, { "x": 542.5, - "y": 226.5 + "y": 206 }, { "x": 542.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 542.5, - "y": 266.75 + "y": 246.25 }, { "x": 542.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 542.5, - "y": 367.5 + "y": 347 }, { "x": 542.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6167,31 +6167,31 @@ "route": [ { "x": 739, - "y": 186.5 + "y": 166 }, { "x": 739, - "y": 226.5 + "y": 206 }, { "x": 739, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 739, - "y": 266.75 + "y": 246.25 }, { "x": 739, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 739, - "y": 367.5 + "y": 347 }, { "x": 739, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6226,31 +6226,31 @@ "route": [ { "x": 851.5, - "y": 186.5 + "y": 166 }, { "x": 851.5, - "y": 226.5 + "y": 206 }, { "x": 851.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 851.5, - "y": 266.75 + "y": 246.25 }, { "x": 851.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 851.5, - "y": 367.5 + "y": 347 }, { "x": 851.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6285,31 +6285,31 @@ "route": [ { "x": 965, - "y": 186.5 + "y": 166 }, { "x": 965, - "y": 226.5 + "y": 206 }, { "x": 965, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 965, - "y": 266.75 + "y": 246.25 }, { "x": 965, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 965, - "y": 367.5 + "y": 347 }, { "x": 965, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6344,31 +6344,31 @@ "route": [ { "x": 1078.5, - "y": 186.5 + "y": 166 }, { "x": 1078.5, - "y": 226.5 + "y": 206 }, { "x": 1078.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1078.5, - "y": 266.75 + "y": 246.25 }, { "x": 1078.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1078.5, - "y": 367.5 + "y": 347 }, { "x": 1078.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6403,31 +6403,31 @@ "route": [ { "x": 1195.5, - "y": 186.5 + "y": 166 }, { "x": 1195.5, - "y": 226.5 + "y": 206 }, { "x": 1195.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1195.5, - "y": 266.75 + "y": 246.25 }, { "x": 1195.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1195.5, - "y": 367.5 + "y": 347 }, { "x": 1195.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6462,31 +6462,31 @@ "route": [ { "x": 1392, - "y": 186.5 + "y": 166 }, { "x": 1392, - "y": 226.5 + "y": 206 }, { "x": 1392, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1392, - "y": 266.75 + "y": 246.25 }, { "x": 1392, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1392, - "y": 367.5 + "y": 347 }, { "x": 1392, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6521,31 +6521,31 @@ "route": [ { "x": 1504.5, - "y": 186.5 + "y": 166 }, { "x": 1504.5, - "y": 226.5 + "y": 206 }, { "x": 1504.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1504.5, - "y": 266.75 + "y": 246.25 }, { "x": 1504.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1504.5, - "y": 367.5 + "y": 347 }, { "x": 1504.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6580,31 +6580,31 @@ "route": [ { "x": 1618, - "y": 186.5 + "y": 166 }, { "x": 1618, - "y": 226.5 + "y": 206 }, { "x": 1618, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1618, - "y": 266.75 + "y": 246.25 }, { "x": 1618, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1618, - "y": 367.5 + "y": 347 }, { "x": 1618, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6639,31 +6639,31 @@ "route": [ { "x": 1731.5, - "y": 186.5 + "y": 166 }, { "x": 1731.5, - "y": 226.5 + "y": 206 }, { "x": 1731.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1731.5, - "y": 266.75 + "y": 246.25 }, { "x": 1731.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1731.5, - "y": 367.5 + "y": 347 }, { "x": 1731.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6698,31 +6698,31 @@ "route": [ { "x": 1848.5, - "y": 186.5 + "y": 166 }, { "x": 1848.5, - "y": 226.5 + "y": 206 }, { "x": 1848.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1848.5, - "y": 266.75 + "y": 246.25 }, { "x": 1848.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1848.5, - "y": 367.5 + "y": 347 }, { "x": 1848.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6757,31 +6757,31 @@ "route": [ { "x": 2045, - "y": 186.5 + "y": 166 }, { "x": 2045, - "y": 226.5 + "y": 206 }, { "x": 2045, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2045, - "y": 266.75 + "y": 246.25 }, { "x": 2045, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2045, - "y": 367.5 + "y": 347 }, { "x": 2045, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6816,31 +6816,31 @@ "route": [ { "x": 2157.5, - "y": 186.5 + "y": 166 }, { "x": 2157.5, - "y": 226.5 + "y": 206 }, { "x": 2157.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2157.5, - "y": 266.75 + "y": 246.25 }, { "x": 2157.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2157.5, - "y": 367.5 + "y": 347 }, { "x": 2157.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6875,31 +6875,31 @@ "route": [ { "x": 2271, - "y": 186.5 + "y": 166 }, { "x": 2271, - "y": 226.5 + "y": 206 }, { "x": 2271, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2271, - "y": 266.75 + "y": 246.25 }, { "x": 2271, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2271, - "y": 367.5 + "y": 347 }, { "x": 2271, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6934,31 +6934,31 @@ "route": [ { "x": 2384.5, - "y": 186.5 + "y": 166 }, { "x": 2384.5, - "y": 226.5 + "y": 206 }, { "x": 2384.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2384.5, - "y": 266.75 + "y": 246.25 }, { "x": 2384.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2384.5, - "y": 367.5 + "y": 347 }, { "x": 2384.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6993,31 +6993,31 @@ "route": [ { "x": 2501.5, - "y": 186.5 + "y": 166 }, { "x": 2501.5, - "y": 226.5 + "y": 206 }, { "x": 2501.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2501.5, - "y": 266.75 + "y": 246.25 }, { "x": 2501.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2501.5, - "y": 367.5 + "y": 347 }, { "x": 2501.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7052,31 +7052,31 @@ "route": [ { "x": 2698, - "y": 186.5 + "y": 166 }, { "x": 2698, - "y": 226.5 + "y": 206 }, { "x": 2698, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2698, - "y": 266.75 + "y": 246.25 }, { "x": 2698, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2698, - "y": 367.5 + "y": 347 }, { "x": 2698, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7111,31 +7111,31 @@ "route": [ { "x": 2810.5, - "y": 186.5 + "y": 166 }, { "x": 2810.5, - "y": 226.5 + "y": 206 }, { "x": 2810.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2810.5, - "y": 266.75 + "y": 246.25 }, { "x": 2810.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2810.5, - "y": 367.5 + "y": 347 }, { "x": 2810.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7170,31 +7170,31 @@ "route": [ { "x": 2924, - "y": 186.5 + "y": 166 }, { "x": 2924, - "y": 226.5 + "y": 206 }, { "x": 2924, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2924, - "y": 266.75 + "y": 246.25 }, { "x": 2924, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2924, - "y": 367.5 + "y": 347 }, { "x": 2924, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7229,31 +7229,31 @@ "route": [ { "x": 3037.5, - "y": 186.5 + "y": 166 }, { "x": 3037.5, - "y": 226.5 + "y": 206 }, { "x": 3037.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3037.5, - "y": 266.75 + "y": 246.25 }, { "x": 3037.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3037.5, - "y": 367.5 + "y": 347 }, { "x": 3037.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7288,31 +7288,31 @@ "route": [ { "x": 3154.5, - "y": 186.5 + "y": 166 }, { "x": 3154.5, - "y": 226.5 + "y": 206 }, { "x": 3154.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3154.5, - "y": 266.75 + "y": 246.25 }, { "x": 3154.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3154.5, - "y": 367.5 + "y": 347 }, { "x": 3154.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7347,31 +7347,31 @@ "route": [ { "x": 3351, - "y": 186.5 + "y": 166 }, { "x": 3351, - "y": 226.5 + "y": 206 }, { "x": 3351, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3351, - "y": 266.75 + "y": 246.25 }, { "x": 3351, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3351, - "y": 367.5 + "y": 347 }, { "x": 3351, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7406,31 +7406,31 @@ "route": [ { "x": 3463.5, - "y": 186.5 + "y": 166 }, { "x": 3463.5, - "y": 226.5 + "y": 206 }, { "x": 3463.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3463.5, - "y": 266.75 + "y": 246.25 }, { "x": 3463.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3463.5, - "y": 367.5 + "y": 347 }, { "x": 3463.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7465,31 +7465,31 @@ "route": [ { "x": 3577, - "y": 186.5 + "y": 166 }, { "x": 3577, - "y": 226.5 + "y": 206 }, { "x": 3577, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3577, - "y": 266.75 + "y": 246.25 }, { "x": 3577, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3577, - "y": 367.5 + "y": 347 }, { "x": 3577, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7524,31 +7524,31 @@ "route": [ { "x": 3690.5, - "y": 186.5 + "y": 166 }, { "x": 3690.5, - "y": 226.5 + "y": 206 }, { "x": 3690.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3690.5, - "y": 266.75 + "y": 246.25 }, { "x": 3690.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3690.5, - "y": 367.5 + "y": 347 }, { "x": 3690.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7583,31 +7583,31 @@ "route": [ { "x": 3807.5, - "y": 186.5 + "y": 166 }, { "x": 3807.5, - "y": 226.5 + "y": 206 }, { "x": 3807.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3807.5, - "y": 266.75 + "y": 246.25 }, { "x": 3807.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3807.5, - "y": 367.5 + "y": 347 }, { "x": 3807.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7642,31 +7642,31 @@ "route": [ { "x": 4004, - "y": 186.5 + "y": 166 }, { "x": 4004, - "y": 226.5 + "y": 206 }, { "x": 4004, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4004, - "y": 266.75 + "y": 246.25 }, { "x": 4004, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4004, - "y": 367.5 + "y": 347 }, { "x": 4004, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7701,31 +7701,31 @@ "route": [ { "x": 4116.5, - "y": 186.5 + "y": 166 }, { "x": 4116.5, - "y": 226.5 + "y": 206 }, { "x": 4116.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4116.5, - "y": 266.75 + "y": 246.25 }, { "x": 4116.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4116.5, - "y": 367.5 + "y": 347 }, { "x": 4116.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7760,31 +7760,31 @@ "route": [ { "x": 4230, - "y": 186.5 + "y": 166 }, { "x": 4230, - "y": 226.5 + "y": 206 }, { "x": 4230, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4230, - "y": 266.75 + "y": 246.25 }, { "x": 4230, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4230, - "y": 367.5 + "y": 347 }, { "x": 4230, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7819,31 +7819,31 @@ "route": [ { "x": 4343.5, - "y": 186.5 + "y": 166 }, { "x": 4343.5, - "y": 226.5 + "y": 206 }, { "x": 4343.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4343.5, - "y": 266.75 + "y": 246.25 }, { "x": 4343.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4343.5, - "y": 367.5 + "y": 347 }, { "x": 4343.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7878,31 +7878,31 @@ "route": [ { "x": 4460.5, - "y": 186.5 + "y": 166 }, { "x": 4460.5, - "y": 226.5 + "y": 206 }, { "x": 4460.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4460.5, - "y": 266.75 + "y": 246.25 }, { "x": 4460.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4460.5, - "y": 367.5 + "y": 347 }, { "x": 4460.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7937,31 +7937,31 @@ "route": [ { "x": 4657, - "y": 186.5 + "y": 166 }, { "x": 4657, - "y": 226.5 + "y": 206 }, { "x": 4657, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4657, - "y": 266.75 + "y": 246.25 }, { "x": 4657, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4657, - "y": 367.5 + "y": 347 }, { "x": 4657, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7996,31 +7996,31 @@ "route": [ { "x": 4769.5, - "y": 186.5 + "y": 166 }, { "x": 4769.5, - "y": 226.5 + "y": 206 }, { "x": 4769.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4769.5, - "y": 266.75 + "y": 246.25 }, { "x": 4769.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4769.5, - "y": 367.5 + "y": 347 }, { "x": 4769.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8055,31 +8055,31 @@ "route": [ { "x": 4883, - "y": 186.5 + "y": 166 }, { "x": 4883, - "y": 226.5 + "y": 206 }, { "x": 4883, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4883, - "y": 266.75 + "y": 246.25 }, { "x": 4883, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4883, - "y": 367.5 + "y": 347 }, { "x": 4883, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8114,31 +8114,31 @@ "route": [ { "x": 4996.5, - "y": 186.5 + "y": 166 }, { "x": 4996.5, - "y": 226.5 + "y": 206 }, { "x": 4996.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4996.5, - "y": 266.75 + "y": 246.25 }, { "x": 4996.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4996.5, - "y": 367.5 + "y": 347 }, { "x": 4996.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8173,31 +8173,31 @@ "route": [ { "x": 5113.5, - "y": 186.5 + "y": 166 }, { "x": 5113.5, - "y": 226.5 + "y": 206 }, { "x": 5113.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5113.5, - "y": 266.75 + "y": 246.25 }, { "x": 5113.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5113.5, - "y": 367.5 + "y": 347 }, { "x": 5113.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8232,31 +8232,31 @@ "route": [ { "x": 5310, - "y": 186.5 + "y": 166 }, { "x": 5310, - "y": 226.5 + "y": 206 }, { "x": 5310, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5310, - "y": 266.75 + "y": 246.25 }, { "x": 5310, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5310, - "y": 367.5 + "y": 347 }, { "x": 5310, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8291,31 +8291,31 @@ "route": [ { "x": 5422.5, - "y": 186.5 + "y": 166 }, { "x": 5422.5, - "y": 226.5 + "y": 206 }, { "x": 5422.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5422.5, - "y": 266.75 + "y": 246.25 }, { "x": 5422.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5422.5, - "y": 367.5 + "y": 347 }, { "x": 5422.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8350,31 +8350,31 @@ "route": [ { "x": 5536, - "y": 186.5 + "y": 166 }, { "x": 5536, - "y": 226.5 + "y": 206 }, { "x": 5536, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5536, - "y": 266.75 + "y": 246.25 }, { "x": 5536, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5536, - "y": 367.5 + "y": 347 }, { "x": 5536, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8409,31 +8409,31 @@ "route": [ { "x": 5649.5, - "y": 186.5 + "y": 166 }, { "x": 5649.5, - "y": 226.5 + "y": 206 }, { "x": 5649.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5649.5, - "y": 266.75 + "y": 246.25 }, { "x": 5649.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5649.5, - "y": 367.5 + "y": 347 }, { "x": 5649.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8468,31 +8468,31 @@ "route": [ { "x": 5766.5, - "y": 186.5 + "y": 166 }, { "x": 5766.5, - "y": 226.5 + "y": 206 }, { "x": 5766.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5766.5, - "y": 266.75 + "y": 246.25 }, { "x": 5766.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5766.5, - "y": 367.5 + "y": 347 }, { "x": 5766.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8527,31 +8527,31 @@ "route": [ { "x": 5963, - "y": 186.5 + "y": 166 }, { "x": 5963, - "y": 226.5 + "y": 206 }, { "x": 5963, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5963, - "y": 266.75 + "y": 246.25 }, { "x": 5963, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5963, - "y": 367.5 + "y": 347 }, { "x": 5963, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8586,31 +8586,31 @@ "route": [ { "x": 6075.5, - "y": 186.5 + "y": 166 }, { "x": 6075.5, - "y": 226.5 + "y": 206 }, { "x": 6075.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6075.5, - "y": 266.75 + "y": 246.25 }, { "x": 6075.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6075.5, - "y": 367.5 + "y": 347 }, { "x": 6075.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8645,31 +8645,31 @@ "route": [ { "x": 6189, - "y": 186.5 + "y": 166 }, { "x": 6189, - "y": 226.5 + "y": 206 }, { "x": 6189, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6189, - "y": 266.75 + "y": 246.25 }, { "x": 6189, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6189, - "y": 367.5 + "y": 347 }, { "x": 6189, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8704,31 +8704,31 @@ "route": [ { "x": 6302.5, - "y": 186.5 + "y": 166 }, { "x": 6302.5, - "y": 226.5 + "y": 206 }, { "x": 6302.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6302.5, - "y": 266.75 + "y": 246.25 }, { "x": 6302.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6302.5, - "y": 367.5 + "y": 347 }, { "x": 6302.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8763,31 +8763,31 @@ "route": [ { "x": 6419.5, - "y": 186.5 + "y": 166 }, { "x": 6419.5, - "y": 226.5 + "y": 206 }, { "x": 6419.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6419.5, - "y": 266.75 + "y": 246.25 }, { "x": 6419.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6419.5, - "y": 367.5 + "y": 347 }, { "x": 6419.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8822,31 +8822,31 @@ "route": [ { "x": 6616, - "y": 186.5 + "y": 166 }, { "x": 6616, - "y": 226.5 + "y": 206 }, { "x": 6616, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6616, - "y": 266.75 + "y": 246.25 }, { "x": 6616, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6616, - "y": 367.5 + "y": 347 }, { "x": 6616, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8881,31 +8881,31 @@ "route": [ { "x": 6728.5, - "y": 186.5 + "y": 166 }, { "x": 6728.5, - "y": 226.5 + "y": 206 }, { "x": 6728.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6728.5, - "y": 266.75 + "y": 246.25 }, { "x": 6728.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6728.5, - "y": 367.5 + "y": 347 }, { "x": 6728.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8940,31 +8940,31 @@ "route": [ { "x": 6842, - "y": 186.5 + "y": 166 }, { "x": 6842, - "y": 226.5 + "y": 206 }, { "x": 6842, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6842, - "y": 266.75 + "y": 246.25 }, { "x": 6842, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6842, - "y": 367.5 + "y": 347 }, { "x": 6842, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8999,31 +8999,31 @@ "route": [ { "x": 6955.5, - "y": 186.5 + "y": 166 }, { "x": 6955.5, - "y": 226.5 + "y": 206 }, { "x": 6955.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6955.5, - "y": 266.75 + "y": 246.25 }, { "x": 6955.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6955.5, - "y": 367.5 + "y": 347 }, { "x": 6955.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -9058,31 +9058,31 @@ "route": [ { "x": 7072.5, - "y": 186.5 + "y": 166 }, { "x": 7072.5, - "y": 226.5 + "y": 206 }, { "x": 7072.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 7072.5, - "y": 266.75 + "y": 246.25 }, { "x": 7072.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 7072.5, - "y": 367.5 + "y": 347 }, { "x": 7072.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg index 0adedcfd4..47613983b 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-179009198 .fill-N1{fill:#0A0F25;} + .d2-179009198 .fill-N2{fill:#676C7E;} + .d2-179009198 .fill-N3{fill:#9499AB;} + .d2-179009198 .fill-N4{fill:#CFD2DD;} + .d2-179009198 .fill-N5{fill:#DEE1EB;} + .d2-179009198 .fill-N6{fill:#EEF1F8;} + .d2-179009198 .fill-N7{fill:#FFFFFF;} + .d2-179009198 .fill-B1{fill:#0D32B2;} + .d2-179009198 .fill-B2{fill:#0D32B2;} + .d2-179009198 .fill-B3{fill:#E3E9FD;} + .d2-179009198 .fill-B4{fill:#E3E9FD;} + .d2-179009198 .fill-B5{fill:#EDF0FD;} + .d2-179009198 .fill-B6{fill:#F7F8FE;} + .d2-179009198 .fill-AA2{fill:#4A6FF3;} + .d2-179009198 .fill-AA4{fill:#EDF0FD;} + .d2-179009198 .fill-AA5{fill:#F7F8FE;} + .d2-179009198 .fill-AB4{fill:#EDF0FD;} + .d2-179009198 .fill-AB5{fill:#F7F8FE;} + .d2-179009198 .stroke-N1{stroke:#0A0F25;} + .d2-179009198 .stroke-N2{stroke:#676C7E;} + .d2-179009198 .stroke-N3{stroke:#9499AB;} + .d2-179009198 .stroke-N4{stroke:#CFD2DD;} + .d2-179009198 .stroke-N5{stroke:#DEE1EB;} + .d2-179009198 .stroke-N6{stroke:#EEF1F8;} + .d2-179009198 .stroke-N7{stroke:#FFFFFF;} + .d2-179009198 .stroke-B1{stroke:#0D32B2;} + .d2-179009198 .stroke-B2{stroke:#0D32B2;} + .d2-179009198 .stroke-B3{stroke:#E3E9FD;} + .d2-179009198 .stroke-B4{stroke:#E3E9FD;} + .d2-179009198 .stroke-B5{stroke:#EDF0FD;} + .d2-179009198 .stroke-B6{stroke:#F7F8FE;} + .d2-179009198 .stroke-AA2{stroke:#4A6FF3;} + .d2-179009198 .stroke-AA4{stroke:#EDF0FD;} + .d2-179009198 .stroke-AA5{stroke:#F7F8FE;} + .d2-179009198 .stroke-AB4{stroke:#EDF0FD;} + .d2-179009198 .stroke-AB5{stroke:#F7F8FE;} + .d2-179009198 .background-color-N1{background-color:#0A0F25;} + .d2-179009198 .background-color-N2{background-color:#676C7E;} + .d2-179009198 .background-color-N3{background-color:#9499AB;} + .d2-179009198 .background-color-N4{background-color:#CFD2DD;} + .d2-179009198 .background-color-N5{background-color:#DEE1EB;} + .d2-179009198 .background-color-N6{background-color:#EEF1F8;} + .d2-179009198 .background-color-N7{background-color:#FFFFFF;} + .d2-179009198 .background-color-B1{background-color:#0D32B2;} + .d2-179009198 .background-color-B2{background-color:#0D32B2;} + .d2-179009198 .background-color-B3{background-color:#E3E9FD;} + .d2-179009198 .background-color-B4{background-color:#E3E9FD;} + .d2-179009198 .background-color-B5{background-color:#EDF0FD;} + .d2-179009198 .background-color-B6{background-color:#F7F8FE;} + .d2-179009198 .background-color-AA2{background-color:#4A6FF3;} + .d2-179009198 .background-color-AA4{background-color:#EDF0FD;} + .d2-179009198 .background-color-AA5{background-color:#F7F8FE;} + .d2-179009198 .background-color-AB4{background-color:#EDF0FD;} + .d2-179009198 .background-color-AB5{background-color:#F7F8FE;} + .d2-179009198 .color-N1{color:#0A0F25;} + .d2-179009198 .color-N2{color:#676C7E;} + .d2-179009198 .color-N3{color:#9499AB;} + .d2-179009198 .color-N4{color:#CFD2DD;} + .d2-179009198 .color-N5{color:#DEE1EB;} + .d2-179009198 .color-N6{color:#EEF1F8;} + .d2-179009198 .color-N7{color:#FFFFFF;} + .d2-179009198 .color-B1{color:#0D32B2;} + .d2-179009198 .color-B2{color:#0D32B2;} + .d2-179009198 .color-B3{color:#E3E9FD;} + .d2-179009198 .color-B4{color:#E3E9FD;} + .d2-179009198 .color-B5{color:#EDF0FD;} + .d2-179009198 .color-B6{color:#F7F8FE;} + .d2-179009198 .color-AA2{color:#4A6FF3;} + .d2-179009198 .color-AA4{color:#EDF0FD;} + .d2-179009198 .color-AA5{color:#F7F8FE;} + .d2-179009198 .color-AB4{color:#EDF0FD;} + .d2-179009198 .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}]]>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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json index 8b80123da..803757e7f 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json @@ -645,12 +645,12 @@ "labelPercentage": 0, "route": [ { - "x": 392.25, - "y": 42.72100067138672 + "x": 392.5, + "y": 43 }, { - "x": 232.4499969482422, - "y": 101.34400177001953 + "x": 232.5, + "y": 101.4000015258789 }, { "x": 192.5, @@ -740,11 +740,11 @@ "route": [ { "x": 166, - "y": 218.9040069580078 + "y": 219 }, { "x": 98.80000305175781, - "y": 269.3800048828125 + "y": 269.3999938964844 }, { "x": 82, @@ -786,12 +786,12 @@ "labelPercentage": 0, "route": [ { - "x": 219, - "y": 218.9499969482422 + "x": 218.75, + "y": 219 }, { - "x": 286, - "y": 269.3900146484375 + "x": 285.95001220703125, + "y": 269.3999938964844 }, { "x": 302.75, @@ -880,12 +880,12 @@ "labelPercentage": 0, "route": [ { - "x": 666.75, - "y": 218.29299926757812 + "x": 667.25, + "y": 218 }, { - "x": 736.75, - "y": 269.25799560546875 + "x": 736.8499755859375, + "y": 269.20001220703125 }, { "x": 754.25, @@ -927,11 +927,11 @@ "labelPercentage": 0, "route": [ { - "x": 59.93299865722656, + "x": 59.5, "y": 398 }, { - "x": 33.18600082397461, + "x": 33.0989990234375, "y": 438 }, { @@ -974,11 +974,11 @@ "labelPercentage": 0, "route": [ { - "x": 104.06600189208984, + "x": 104.5, "y": 398 }, { - "x": 130.81300354003906, + "x": 130.89999389648438, "y": 438 }, { @@ -1021,11 +1021,11 @@ "labelPercentage": 0, "route": [ { - "x": 280.5840148925781, + "x": 281, "y": 398 }, { - "x": 253.71600341796875, + "x": 253.8000030517578, "y": 438 }, { @@ -1068,11 +1068,11 @@ "labelPercentage": 0, "route": [ { - "x": 324.9150085449219, + "x": 324.5, "y": 398 }, { - "x": 351.7829895019531, + "x": 351.70001220703125, "y": 438 }, { @@ -1115,11 +1115,11 @@ "labelPercentage": 0, "route": [ { - "x": 503.5360107421875, + "x": 503.5, "y": 398 }, { - "x": 476.3070068359375, + "x": 476.29998779296875, "y": 438 }, { @@ -1162,11 +1162,11 @@ "labelPercentage": 0, "route": [ { - "x": 548.4630126953125, + "x": 548.5, "y": 398 }, { - "x": 575.6920166015625, + "x": 575.7000122070312, "y": 438 }, { @@ -1209,11 +1209,11 @@ "labelPercentage": 0, "route": [ { - "x": 731.6859741210938, + "x": 731.5, "y": 398 }, { - "x": 704.3369750976562, + "x": 704.2999877929688, "y": 438 }, { @@ -1256,11 +1256,11 @@ "labelPercentage": 0, "route": [ { - "x": 776.81298828125, + "x": 777, "y": 398 }, { - "x": 804.1619873046875, + "x": 804.2000122070312, "y": 438 }, { diff --git a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg index 94fa5f5f4..1bd5bf5f4 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmno + .d2-3211180343 .fill-N1{fill:#0A0F25;} + .d2-3211180343 .fill-N2{fill:#676C7E;} + .d2-3211180343 .fill-N3{fill:#9499AB;} + .d2-3211180343 .fill-N4{fill:#CFD2DD;} + .d2-3211180343 .fill-N5{fill:#DEE1EB;} + .d2-3211180343 .fill-N6{fill:#EEF1F8;} + .d2-3211180343 .fill-N7{fill:#FFFFFF;} + .d2-3211180343 .fill-B1{fill:#0D32B2;} + .d2-3211180343 .fill-B2{fill:#0D32B2;} + .d2-3211180343 .fill-B3{fill:#E3E9FD;} + .d2-3211180343 .fill-B4{fill:#E3E9FD;} + .d2-3211180343 .fill-B5{fill:#EDF0FD;} + .d2-3211180343 .fill-B6{fill:#F7F8FE;} + .d2-3211180343 .fill-AA2{fill:#4A6FF3;} + .d2-3211180343 .fill-AA4{fill:#EDF0FD;} + .d2-3211180343 .fill-AA5{fill:#F7F8FE;} + .d2-3211180343 .fill-AB4{fill:#EDF0FD;} + .d2-3211180343 .fill-AB5{fill:#F7F8FE;} + .d2-3211180343 .stroke-N1{stroke:#0A0F25;} + .d2-3211180343 .stroke-N2{stroke:#676C7E;} + .d2-3211180343 .stroke-N3{stroke:#9499AB;} + .d2-3211180343 .stroke-N4{stroke:#CFD2DD;} + .d2-3211180343 .stroke-N5{stroke:#DEE1EB;} + .d2-3211180343 .stroke-N6{stroke:#EEF1F8;} + .d2-3211180343 .stroke-N7{stroke:#FFFFFF;} + .d2-3211180343 .stroke-B1{stroke:#0D32B2;} + .d2-3211180343 .stroke-B2{stroke:#0D32B2;} + .d2-3211180343 .stroke-B3{stroke:#E3E9FD;} + .d2-3211180343 .stroke-B4{stroke:#E3E9FD;} + .d2-3211180343 .stroke-B5{stroke:#EDF0FD;} + .d2-3211180343 .stroke-B6{stroke:#F7F8FE;} + .d2-3211180343 .stroke-AA2{stroke:#4A6FF3;} + .d2-3211180343 .stroke-AA4{stroke:#EDF0FD;} + .d2-3211180343 .stroke-AA5{stroke:#F7F8FE;} + .d2-3211180343 .stroke-AB4{stroke:#EDF0FD;} + .d2-3211180343 .stroke-AB5{stroke:#F7F8FE;} + .d2-3211180343 .background-color-N1{background-color:#0A0F25;} + .d2-3211180343 .background-color-N2{background-color:#676C7E;} + .d2-3211180343 .background-color-N3{background-color:#9499AB;} + .d2-3211180343 .background-color-N4{background-color:#CFD2DD;} + .d2-3211180343 .background-color-N5{background-color:#DEE1EB;} + .d2-3211180343 .background-color-N6{background-color:#EEF1F8;} + .d2-3211180343 .background-color-N7{background-color:#FFFFFF;} + .d2-3211180343 .background-color-B1{background-color:#0D32B2;} + .d2-3211180343 .background-color-B2{background-color:#0D32B2;} + .d2-3211180343 .background-color-B3{background-color:#E3E9FD;} + .d2-3211180343 .background-color-B4{background-color:#E3E9FD;} + .d2-3211180343 .background-color-B5{background-color:#EDF0FD;} + .d2-3211180343 .background-color-B6{background-color:#F7F8FE;} + .d2-3211180343 .background-color-AA2{background-color:#4A6FF3;} + .d2-3211180343 .background-color-AA4{background-color:#EDF0FD;} + .d2-3211180343 .background-color-AA5{background-color:#F7F8FE;} + .d2-3211180343 .background-color-AB4{background-color:#EDF0FD;} + .d2-3211180343 .background-color-AB5{background-color:#F7F8FE;} + .d2-3211180343 .color-N1{color:#0A0F25;} + .d2-3211180343 .color-N2{color:#676C7E;} + .d2-3211180343 .color-N3{color:#9499AB;} + .d2-3211180343 .color-N4{color:#CFD2DD;} + .d2-3211180343 .color-N5{color:#DEE1EB;} + .d2-3211180343 .color-N6{color:#EEF1F8;} + .d2-3211180343 .color-N7{color:#FFFFFF;} + .d2-3211180343 .color-B1{color:#0D32B2;} + .d2-3211180343 .color-B2{color:#0D32B2;} + .d2-3211180343 .color-B3{color:#E3E9FD;} + .d2-3211180343 .color-B4{color:#E3E9FD;} + .d2-3211180343 .color-B5{color:#EDF0FD;} + .d2-3211180343 .color-B6{color:#F7F8FE;} + .d2-3211180343 .color-AA2{color:#4A6FF3;} + .d2-3211180343 .color-AA4{color:#EDF0FD;} + .d2-3211180343 .color-AA5{color:#F7F8FE;} + .d2-3211180343 .color-AB4{color:#EDF0FD;} + .d2-3211180343 .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}]]>abcdefghijklmno diff --git a/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json b/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json index dfaebf0f6..1909736bc 100644 --- a/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json +++ b/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 8 + "y": 0 }, "width": 53, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 113, - "y": 8 + "y": 0 }, "width": 54, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 227, - "y": 13 + "y": 0 }, "width": 112, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 409, - "y": 8 + "y": 0 }, "width": 94, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 563, - "y": 15 + "y": 0 }, "width": 114, "height": 66, 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 5e0f09e53..4864bf294 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,9 +1,9 @@ -xymultiple2double - -three-dee - - - - - - + .d2-1870845507 .fill-N1{fill:#0A0F25;} + .d2-1870845507 .fill-N2{fill:#676C7E;} + .d2-1870845507 .fill-N3{fill:#9499AB;} + .d2-1870845507 .fill-N4{fill:#CFD2DD;} + .d2-1870845507 .fill-N5{fill:#DEE1EB;} + .d2-1870845507 .fill-N6{fill:#EEF1F8;} + .d2-1870845507 .fill-N7{fill:#FFFFFF;} + .d2-1870845507 .fill-B1{fill:#0D32B2;} + .d2-1870845507 .fill-B2{fill:#0D32B2;} + .d2-1870845507 .fill-B3{fill:#E3E9FD;} + .d2-1870845507 .fill-B4{fill:#E3E9FD;} + .d2-1870845507 .fill-B5{fill:#EDF0FD;} + .d2-1870845507 .fill-B6{fill:#F7F8FE;} + .d2-1870845507 .fill-AA2{fill:#4A6FF3;} + .d2-1870845507 .fill-AA4{fill:#EDF0FD;} + .d2-1870845507 .fill-AA5{fill:#F7F8FE;} + .d2-1870845507 .fill-AB4{fill:#EDF0FD;} + .d2-1870845507 .fill-AB5{fill:#F7F8FE;} + .d2-1870845507 .stroke-N1{stroke:#0A0F25;} + .d2-1870845507 .stroke-N2{stroke:#676C7E;} + .d2-1870845507 .stroke-N3{stroke:#9499AB;} + .d2-1870845507 .stroke-N4{stroke:#CFD2DD;} + .d2-1870845507 .stroke-N5{stroke:#DEE1EB;} + .d2-1870845507 .stroke-N6{stroke:#EEF1F8;} + .d2-1870845507 .stroke-N7{stroke:#FFFFFF;} + .d2-1870845507 .stroke-B1{stroke:#0D32B2;} + .d2-1870845507 .stroke-B2{stroke:#0D32B2;} + .d2-1870845507 .stroke-B3{stroke:#E3E9FD;} + .d2-1870845507 .stroke-B4{stroke:#E3E9FD;} + .d2-1870845507 .stroke-B5{stroke:#EDF0FD;} + .d2-1870845507 .stroke-B6{stroke:#F7F8FE;} + .d2-1870845507 .stroke-AA2{stroke:#4A6FF3;} + .d2-1870845507 .stroke-AA4{stroke:#EDF0FD;} + .d2-1870845507 .stroke-AA5{stroke:#F7F8FE;} + .d2-1870845507 .stroke-AB4{stroke:#EDF0FD;} + .d2-1870845507 .stroke-AB5{stroke:#F7F8FE;} + .d2-1870845507 .background-color-N1{background-color:#0A0F25;} + .d2-1870845507 .background-color-N2{background-color:#676C7E;} + .d2-1870845507 .background-color-N3{background-color:#9499AB;} + .d2-1870845507 .background-color-N4{background-color:#CFD2DD;} + .d2-1870845507 .background-color-N5{background-color:#DEE1EB;} + .d2-1870845507 .background-color-N6{background-color:#EEF1F8;} + .d2-1870845507 .background-color-N7{background-color:#FFFFFF;} + .d2-1870845507 .background-color-B1{background-color:#0D32B2;} + .d2-1870845507 .background-color-B2{background-color:#0D32B2;} + .d2-1870845507 .background-color-B3{background-color:#E3E9FD;} + .d2-1870845507 .background-color-B4{background-color:#E3E9FD;} + .d2-1870845507 .background-color-B5{background-color:#EDF0FD;} + .d2-1870845507 .background-color-B6{background-color:#F7F8FE;} + .d2-1870845507 .background-color-AA2{background-color:#4A6FF3;} + .d2-1870845507 .background-color-AA4{background-color:#EDF0FD;} + .d2-1870845507 .background-color-AA5{background-color:#F7F8FE;} + .d2-1870845507 .background-color-AB4{background-color:#EDF0FD;} + .d2-1870845507 .background-color-AB5{background-color:#F7F8FE;} + .d2-1870845507 .color-N1{color:#0A0F25;} + .d2-1870845507 .color-N2{color:#676C7E;} + .d2-1870845507 .color-N3{color:#9499AB;} + .d2-1870845507 .color-N4{color:#CFD2DD;} + .d2-1870845507 .color-N5{color:#DEE1EB;} + .d2-1870845507 .color-N6{color:#EEF1F8;} + .d2-1870845507 .color-N7{color:#FFFFFF;} + .d2-1870845507 .color-B1{color:#0D32B2;} + .d2-1870845507 .color-B2{color:#0D32B2;} + .d2-1870845507 .color-B3{color:#E3E9FD;} + .d2-1870845507 .color-B4{color:#E3E9FD;} + .d2-1870845507 .color-B5{color:#EDF0FD;} + .d2-1870845507 .color-B6{color:#F7F8FE;} + .d2-1870845507 .color-AA2{color:#4A6FF3;} + .d2-1870845507 .color-AA4{color:#EDF0FD;} + .d2-1870845507 .color-AA5{color:#F7F8FE;} + .d2-1870845507 .color-AB4{color:#EDF0FD;} + .d2-1870845507 .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}]]>xymultiple2double + +three-dee + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/border-radius/dagre/board.exp.json b/e2etests/testdata/stable/border-radius/dagre/board.exp.json index 5ba6f7ec5..bf1caec53 100644 --- a/e2etests/testdata/stable/border-radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/border-radius/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 8 + "y": 0 }, "width": 53, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 113, - "y": 8 + "y": 0 }, "width": 54, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 227, - "y": 13 + "y": 0 }, "width": 112, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 409, - "y": 8 + "y": 0 }, "width": 94, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 563, - "y": 15 + "y": 0 }, "width": 114, "height": 66, diff --git a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg index 5a593e723..cdde8277c 100644 --- a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double - -three-dee - - - - - - + .d2-3519978381 .fill-N1{fill:#0A0F25;} + .d2-3519978381 .fill-N2{fill:#676C7E;} + .d2-3519978381 .fill-N3{fill:#9499AB;} + .d2-3519978381 .fill-N4{fill:#CFD2DD;} + .d2-3519978381 .fill-N5{fill:#DEE1EB;} + .d2-3519978381 .fill-N6{fill:#EEF1F8;} + .d2-3519978381 .fill-N7{fill:#FFFFFF;} + .d2-3519978381 .fill-B1{fill:#0D32B2;} + .d2-3519978381 .fill-B2{fill:#0D32B2;} + .d2-3519978381 .fill-B3{fill:#E3E9FD;} + .d2-3519978381 .fill-B4{fill:#E3E9FD;} + .d2-3519978381 .fill-B5{fill:#EDF0FD;} + .d2-3519978381 .fill-B6{fill:#F7F8FE;} + .d2-3519978381 .fill-AA2{fill:#4A6FF3;} + .d2-3519978381 .fill-AA4{fill:#EDF0FD;} + .d2-3519978381 .fill-AA5{fill:#F7F8FE;} + .d2-3519978381 .fill-AB4{fill:#EDF0FD;} + .d2-3519978381 .fill-AB5{fill:#F7F8FE;} + .d2-3519978381 .stroke-N1{stroke:#0A0F25;} + .d2-3519978381 .stroke-N2{stroke:#676C7E;} + .d2-3519978381 .stroke-N3{stroke:#9499AB;} + .d2-3519978381 .stroke-N4{stroke:#CFD2DD;} + .d2-3519978381 .stroke-N5{stroke:#DEE1EB;} + .d2-3519978381 .stroke-N6{stroke:#EEF1F8;} + .d2-3519978381 .stroke-N7{stroke:#FFFFFF;} + .d2-3519978381 .stroke-B1{stroke:#0D32B2;} + .d2-3519978381 .stroke-B2{stroke:#0D32B2;} + .d2-3519978381 .stroke-B3{stroke:#E3E9FD;} + .d2-3519978381 .stroke-B4{stroke:#E3E9FD;} + .d2-3519978381 .stroke-B5{stroke:#EDF0FD;} + .d2-3519978381 .stroke-B6{stroke:#F7F8FE;} + .d2-3519978381 .stroke-AA2{stroke:#4A6FF3;} + .d2-3519978381 .stroke-AA4{stroke:#EDF0FD;} + .d2-3519978381 .stroke-AA5{stroke:#F7F8FE;} + .d2-3519978381 .stroke-AB4{stroke:#EDF0FD;} + .d2-3519978381 .stroke-AB5{stroke:#F7F8FE;} + .d2-3519978381 .background-color-N1{background-color:#0A0F25;} + .d2-3519978381 .background-color-N2{background-color:#676C7E;} + .d2-3519978381 .background-color-N3{background-color:#9499AB;} + .d2-3519978381 .background-color-N4{background-color:#CFD2DD;} + .d2-3519978381 .background-color-N5{background-color:#DEE1EB;} + .d2-3519978381 .background-color-N6{background-color:#EEF1F8;} + .d2-3519978381 .background-color-N7{background-color:#FFFFFF;} + .d2-3519978381 .background-color-B1{background-color:#0D32B2;} + .d2-3519978381 .background-color-B2{background-color:#0D32B2;} + .d2-3519978381 .background-color-B3{background-color:#E3E9FD;} + .d2-3519978381 .background-color-B4{background-color:#E3E9FD;} + .d2-3519978381 .background-color-B5{background-color:#EDF0FD;} + .d2-3519978381 .background-color-B6{background-color:#F7F8FE;} + .d2-3519978381 .background-color-AA2{background-color:#4A6FF3;} + .d2-3519978381 .background-color-AA4{background-color:#EDF0FD;} + .d2-3519978381 .background-color-AA5{background-color:#F7F8FE;} + .d2-3519978381 .background-color-AB4{background-color:#EDF0FD;} + .d2-3519978381 .background-color-AB5{background-color:#F7F8FE;} + .d2-3519978381 .color-N1{color:#0A0F25;} + .d2-3519978381 .color-N2{color:#676C7E;} + .d2-3519978381 .color-N3{color:#9499AB;} + .d2-3519978381 .color-N4{color:#CFD2DD;} + .d2-3519978381 .color-N5{color:#DEE1EB;} + .d2-3519978381 .color-N6{color:#EEF1F8;} + .d2-3519978381 .color-N7{color:#FFFFFF;} + .d2-3519978381 .color-B1{color:#0D32B2;} + .d2-3519978381 .color-B2{color:#0D32B2;} + .d2-3519978381 .color-B3{color:#E3E9FD;} + .d2-3519978381 .color-B4{color:#E3E9FD;} + .d2-3519978381 .color-B5{color:#EDF0FD;} + .d2-3519978381 .color-B6{color:#F7F8FE;} + .d2-3519978381 .color-AA2{color:#4A6FF3;} + .d2-3519978381 .color-AA4{color:#EDF0FD;} + .d2-3519978381 .color-AA5{color:#F7F8FE;} + .d2-3519978381 .color-AB4{color:#EDF0FD;} + .d2-3519978381 .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}]]>xymultiple2double + +three-dee + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json index 9209f1046..56fda7bc9 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json @@ -167,19 +167,19 @@ "route": [ { "x": 32, - "y": 29 + "y": 16 }, { "x": 72, - "y": 29 + "y": 16 }, { "x": 92, - "y": 29 + "y": 16 }, { "x": 132, - "y": 29 + "y": 16 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg index cdcc7ed57..ba55a50e0 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -r1r2 eth1eth1 - + .d2-1364058592 .fill-N1{fill:#0A0F25;} + .d2-1364058592 .fill-N2{fill:#676C7E;} + .d2-1364058592 .fill-N3{fill:#9499AB;} + .d2-1364058592 .fill-N4{fill:#CFD2DD;} + .d2-1364058592 .fill-N5{fill:#DEE1EB;} + .d2-1364058592 .fill-N6{fill:#EEF1F8;} + .d2-1364058592 .fill-N7{fill:#FFFFFF;} + .d2-1364058592 .fill-B1{fill:#0D32B2;} + .d2-1364058592 .fill-B2{fill:#0D32B2;} + .d2-1364058592 .fill-B3{fill:#E3E9FD;} + .d2-1364058592 .fill-B4{fill:#E3E9FD;} + .d2-1364058592 .fill-B5{fill:#EDF0FD;} + .d2-1364058592 .fill-B6{fill:#F7F8FE;} + .d2-1364058592 .fill-AA2{fill:#4A6FF3;} + .d2-1364058592 .fill-AA4{fill:#EDF0FD;} + .d2-1364058592 .fill-AA5{fill:#F7F8FE;} + .d2-1364058592 .fill-AB4{fill:#EDF0FD;} + .d2-1364058592 .fill-AB5{fill:#F7F8FE;} + .d2-1364058592 .stroke-N1{stroke:#0A0F25;} + .d2-1364058592 .stroke-N2{stroke:#676C7E;} + .d2-1364058592 .stroke-N3{stroke:#9499AB;} + .d2-1364058592 .stroke-N4{stroke:#CFD2DD;} + .d2-1364058592 .stroke-N5{stroke:#DEE1EB;} + .d2-1364058592 .stroke-N6{stroke:#EEF1F8;} + .d2-1364058592 .stroke-N7{stroke:#FFFFFF;} + .d2-1364058592 .stroke-B1{stroke:#0D32B2;} + .d2-1364058592 .stroke-B2{stroke:#0D32B2;} + .d2-1364058592 .stroke-B3{stroke:#E3E9FD;} + .d2-1364058592 .stroke-B4{stroke:#E3E9FD;} + .d2-1364058592 .stroke-B5{stroke:#EDF0FD;} + .d2-1364058592 .stroke-B6{stroke:#F7F8FE;} + .d2-1364058592 .stroke-AA2{stroke:#4A6FF3;} + .d2-1364058592 .stroke-AA4{stroke:#EDF0FD;} + .d2-1364058592 .stroke-AA5{stroke:#F7F8FE;} + .d2-1364058592 .stroke-AB4{stroke:#EDF0FD;} + .d2-1364058592 .stroke-AB5{stroke:#F7F8FE;} + .d2-1364058592 .background-color-N1{background-color:#0A0F25;} + .d2-1364058592 .background-color-N2{background-color:#676C7E;} + .d2-1364058592 .background-color-N3{background-color:#9499AB;} + .d2-1364058592 .background-color-N4{background-color:#CFD2DD;} + .d2-1364058592 .background-color-N5{background-color:#DEE1EB;} + .d2-1364058592 .background-color-N6{background-color:#EEF1F8;} + .d2-1364058592 .background-color-N7{background-color:#FFFFFF;} + .d2-1364058592 .background-color-B1{background-color:#0D32B2;} + .d2-1364058592 .background-color-B2{background-color:#0D32B2;} + .d2-1364058592 .background-color-B3{background-color:#E3E9FD;} + .d2-1364058592 .background-color-B4{background-color:#E3E9FD;} + .d2-1364058592 .background-color-B5{background-color:#EDF0FD;} + .d2-1364058592 .background-color-B6{background-color:#F7F8FE;} + .d2-1364058592 .background-color-AA2{background-color:#4A6FF3;} + .d2-1364058592 .background-color-AA4{background-color:#EDF0FD;} + .d2-1364058592 .background-color-AA5{background-color:#F7F8FE;} + .d2-1364058592 .background-color-AB4{background-color:#EDF0FD;} + .d2-1364058592 .background-color-AB5{background-color:#F7F8FE;} + .d2-1364058592 .color-N1{color:#0A0F25;} + .d2-1364058592 .color-N2{color:#676C7E;} + .d2-1364058592 .color-N3{color:#9499AB;} + .d2-1364058592 .color-N4{color:#CFD2DD;} + .d2-1364058592 .color-N5{color:#DEE1EB;} + .d2-1364058592 .color-N6{color:#EEF1F8;} + .d2-1364058592 .color-N7{color:#FFFFFF;} + .d2-1364058592 .color-B1{color:#0D32B2;} + .d2-1364058592 .color-B2{color:#0D32B2;} + .d2-1364058592 .color-B3{color:#E3E9FD;} + .d2-1364058592 .color-B4{color:#E3E9FD;} + .d2-1364058592 .color-B5{color:#EDF0FD;} + .d2-1364058592 .color-B6{color:#F7F8FE;} + .d2-1364058592 .color-AA2{color:#4A6FF3;} + .d2-1364058592 .color-AA4{color:#EDF0FD;} + .d2-1364058592 .color-AA5{color:#F7F8FE;} + .d2-1364058592 .color-AB4{color:#EDF0FD;} + .d2-1364058592 .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}]]>r1r2 eth1eth1 + \ No newline at end of file diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json index 6c720f8ad..6c41fddc7 100644 --- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 23 }, - "width": 813, - "height": 1314, + "width": 802, + "height": 1268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 106 + "y": 64 }, "width": 574, - "height": 1219, + "height": 1197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,11 +89,11 @@ "id": "aa.bb.cc", "type": "rectangle", "pos": { - "x": 40, - "y": 721 + "x": 42, + "y": 691 }, - "width": 343, - "height": 572, + "width": 253, + "height": 540, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -130,11 +130,11 @@ "id": "aa.bb.cc.dd", "type": "rectangle", "pos": { - "x": 62, - "y": 782 + "x": 72, + "y": 722 }, - "width": 213, - "height": 140, + "width": 193, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "text", "pos": { "x": 102, - "y": 842 + "y": 775 }, "width": 16, "height": 21, @@ -212,7 +212,7 @@ "type": "rectangle", "pos": { "x": 178, - "y": 819 + "y": 752 }, "width": 57, "height": 66, @@ -253,7 +253,7 @@ "type": "text", "pos": { "x": 171, - "y": 1043 + "y": 989 }, "width": 17, "height": 21, @@ -293,7 +293,7 @@ "type": "rectangle", "pos": { "x": 177, - "y": 1189 + "y": 1135 }, "width": 63, "height": 66, @@ -334,10 +334,10 @@ "type": "package", "pos": { "x": 140, - "y": 169 + "y": 100 }, "width": 434, - "height": 161, + "height": 192, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -375,7 +375,7 @@ "type": "diamond", "pos": { "x": 434, - "y": 204 + "y": 150 }, "width": 50, "height": 92, @@ -416,7 +416,7 @@ "type": "oval", "pos": { "x": 451, - "y": 1169 + "y": 1131 }, "width": 74, "height": 74, @@ -457,7 +457,7 @@ "type": "rectangle", "pos": { "x": 676, - "y": 772 + "y": 752 }, "width": 54, "height": 66, @@ -498,7 +498,7 @@ "type": "cylinder", "pos": { "x": 667, - "y": 433 + "y": 413 }, "width": 71, "height": 118, @@ -539,7 +539,7 @@ "type": "text", "pos": { "x": 633, - "y": 1178 + "y": 1158 }, "width": 16, "height": 21, @@ -579,7 +579,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 1155 + "y": 1135 }, "width": 63, "height": 66, @@ -643,19 +643,19 @@ "route": [ { "x": 109.75, - "y": 863.5 + "y": 796.5 }, { "x": 109.75, - "y": 910.2999877929688 + "y": 853.7000122070312 }, { "x": 121.94999694824219, - "y": 994.9000244140625 + "y": 940.9000244140625 }, { "x": 170.75, - "y": 1044.5 + "y": 990.5 } ], "isCurve": true, @@ -690,19 +690,19 @@ "route": [ { "x": 179.75, - "y": 1064 + "y": 1009.5 }, { "x": 179.75, - "y": 1112.4000244140625 + "y": 1058.300048828125 }, { "x": 183.5500030517578, - "y": 1137.5 + "y": 1083.5 }, { "x": 198.75, - "y": 1189.5 + "y": 1135.5 } ], "isCurve": true, @@ -737,43 +737,43 @@ "route": [ { "x": 192, - "y": 331 + "y": 292 }, { "x": 192.1999969482422, - "y": 379 + "y": 340.3999938964844 }, { "x": 192.25, - "y": 414.8999938964844 + "y": 376.3999938964844 }, { "x": 192.25, - "y": 450.75 + "y": 412.25 }, { "x": 192.25, - "y": 486.6000061035156 + "y": 448.1000061035156 }, { "x": 192.25, - "y": 534.4000244140625 + "y": 495.8999938964844 }, { "x": 192.25, - "y": 570.25 + "y": 531.75 }, { "x": 192.25, - "y": 606.0999755859375 + "y": 567.5999755859375 }, { "x": 192.25, - "y": 708.7999877929688 + "y": 666 }, { "x": 192.25, - "y": 782 + "y": 722 } ], "isCurve": true, @@ -808,11 +808,11 @@ "route": [ { "x": 675.75, - "y": 796.2960205078125 + "y": 775.7960205078125 }, { "x": 593.75, - "y": 804.2960205078125 + "y": 747.7960205078125 } ], "animated": false, @@ -846,19 +846,19 @@ "route": [ { "x": 667, - "y": 502 + "y": 482 }, { "x": 317.79901123046875, - "y": 590 + "y": 569.5999755859375 }, { "x": 230.5, - "y": 634 + "y": 611.5 }, { "x": 230.5, - "y": 722 + "y": 691.5 } ], "isCurve": true, @@ -893,31 +893,31 @@ "route": [ { "x": 703, - "y": 552 + "y": 531 }, { "x": 702.7999877929688, - "y": 600 + "y": 579.4000244140625 }, { "x": 702.75, - "y": 624.0999755859375 + "y": 603.5999755859375 }, { "x": 702.75, - "y": 642.25 + "y": 621.75 }, { "x": 702.75, - "y": 660.4000244140625 + "y": 639.9000244140625 }, { "x": 702.75, - "y": 732.5 + "y": 712 }, { "x": 702.75, - "y": 772.5 + "y": 752 } ], "isCurve": true, @@ -952,11 +952,11 @@ "route": [ { "x": 667, - "y": 464 + "y": 443 }, { "x": 594.25, - "y": 441.12298583984375 + "y": 384.62298583984375 } ], "animated": false, @@ -990,19 +990,19 @@ "route": [ { "x": 675.75, - "y": 810.9920043945312 + "y": 790.4920043945312 }, { "x": 370.95001220703125, - "y": 872.9979858398438 + "y": 852.4979858398438 }, { "x": 273.45001220703125, - "y": 968.8499755859375 + "y": 941.6500244140625 }, { "x": 188.25, - "y": 1048.251953125 + "y": 994.2520141601562 } ], "isCurve": true, @@ -1037,19 +1037,19 @@ "route": [ { "x": 667, - "y": 472 + "y": 451 }, { "x": 531.2000122070312, - "y": 392.79998779296875 + "y": 372.20001220703125 }, { "x": 497.20001220703125, - "y": 364.6000061035156 + "y": 340.3999938964844 }, { "x": 497, - "y": 331 + "y": 292 } ], "isCurve": true, @@ -1083,12 +1083,12 @@ "labelPercentage": 0, "route": [ { - "x": 383, - "y": 895.5 + "x": 294.75, + "y": 857.0599975585938 }, { "x": 675.75, - "y": 811.5599975585938 + "y": 791.0599975585938 } ], "animated": false, @@ -1122,55 +1122,55 @@ "route": [ { "x": 403, - "y": 331 + "y": 292 }, { "x": 402.79998779296875, - "y": 364.6000061035156 + "y": 340.3999938964844 }, { "x": 402.75, - "y": 396.8999938964844 + "y": 376.3999938964844 }, { "x": 402.75, - "y": 432.75 + "y": 412.25 }, { "x": 402.75, - "y": 468.6000061035156 + "y": 448.1000061035156 }, { "x": 402.75, - "y": 516.4000244140625 + "y": 495.8999938964844 }, { "x": 402.75, - "y": 552.25 + "y": 531.75 }, { "x": 402.75, - "y": 588.0999755859375 + "y": 567.5999755859375 }, { "x": 402.75, - "y": 624.0999755859375 + "y": 603.5999755859375 }, { "x": 402.75, - "y": 642.25 + "y": 621.75 }, { "x": 402.75, - "y": 660.4000244140625 + "y": 639.9000244140625 }, { "x": 457.3500061035156, - "y": 737.6060180664062 + "y": 717.1060180664062 }, { "x": 675.75, - "y": 798.030029296875 + "y": 777.530029296875 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg index ead9b6534..5d6e15b3e 100644 --- a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - - - - - - - - - - - - - - - - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json index 3b17bb5df..233454bdb 100644 --- a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json +++ b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json @@ -195,11 +195,11 @@ "route": [ { "x": 26.5, - "y": 66 + "y": 65.5 }, { "x": 26.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 26.5, @@ -242,11 +242,11 @@ "route": [ { "x": 140, - "y": 66 + "y": 65.5 }, { "x": 140, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 140, diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg index 400e0c53b..12b9c1089 100644 --- a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcd circle filled-circle + .d2-431616550 .fill-N1{fill:#0A0F25;} + .d2-431616550 .fill-N2{fill:#676C7E;} + .d2-431616550 .fill-N3{fill:#9499AB;} + .d2-431616550 .fill-N4{fill:#CFD2DD;} + .d2-431616550 .fill-N5{fill:#DEE1EB;} + .d2-431616550 .fill-N6{fill:#EEF1F8;} + .d2-431616550 .fill-N7{fill:#FFFFFF;} + .d2-431616550 .fill-B1{fill:#0D32B2;} + .d2-431616550 .fill-B2{fill:#0D32B2;} + .d2-431616550 .fill-B3{fill:#E3E9FD;} + .d2-431616550 .fill-B4{fill:#E3E9FD;} + .d2-431616550 .fill-B5{fill:#EDF0FD;} + .d2-431616550 .fill-B6{fill:#F7F8FE;} + .d2-431616550 .fill-AA2{fill:#4A6FF3;} + .d2-431616550 .fill-AA4{fill:#EDF0FD;} + .d2-431616550 .fill-AA5{fill:#F7F8FE;} + .d2-431616550 .fill-AB4{fill:#EDF0FD;} + .d2-431616550 .fill-AB5{fill:#F7F8FE;} + .d2-431616550 .stroke-N1{stroke:#0A0F25;} + .d2-431616550 .stroke-N2{stroke:#676C7E;} + .d2-431616550 .stroke-N3{stroke:#9499AB;} + .d2-431616550 .stroke-N4{stroke:#CFD2DD;} + .d2-431616550 .stroke-N5{stroke:#DEE1EB;} + .d2-431616550 .stroke-N6{stroke:#EEF1F8;} + .d2-431616550 .stroke-N7{stroke:#FFFFFF;} + .d2-431616550 .stroke-B1{stroke:#0D32B2;} + .d2-431616550 .stroke-B2{stroke:#0D32B2;} + .d2-431616550 .stroke-B3{stroke:#E3E9FD;} + .d2-431616550 .stroke-B4{stroke:#E3E9FD;} + .d2-431616550 .stroke-B5{stroke:#EDF0FD;} + .d2-431616550 .stroke-B6{stroke:#F7F8FE;} + .d2-431616550 .stroke-AA2{stroke:#4A6FF3;} + .d2-431616550 .stroke-AA4{stroke:#EDF0FD;} + .d2-431616550 .stroke-AA5{stroke:#F7F8FE;} + .d2-431616550 .stroke-AB4{stroke:#EDF0FD;} + .d2-431616550 .stroke-AB5{stroke:#F7F8FE;} + .d2-431616550 .background-color-N1{background-color:#0A0F25;} + .d2-431616550 .background-color-N2{background-color:#676C7E;} + .d2-431616550 .background-color-N3{background-color:#9499AB;} + .d2-431616550 .background-color-N4{background-color:#CFD2DD;} + .d2-431616550 .background-color-N5{background-color:#DEE1EB;} + .d2-431616550 .background-color-N6{background-color:#EEF1F8;} + .d2-431616550 .background-color-N7{background-color:#FFFFFF;} + .d2-431616550 .background-color-B1{background-color:#0D32B2;} + .d2-431616550 .background-color-B2{background-color:#0D32B2;} + .d2-431616550 .background-color-B3{background-color:#E3E9FD;} + .d2-431616550 .background-color-B4{background-color:#E3E9FD;} + .d2-431616550 .background-color-B5{background-color:#EDF0FD;} + .d2-431616550 .background-color-B6{background-color:#F7F8FE;} + .d2-431616550 .background-color-AA2{background-color:#4A6FF3;} + .d2-431616550 .background-color-AA4{background-color:#EDF0FD;} + .d2-431616550 .background-color-AA5{background-color:#F7F8FE;} + .d2-431616550 .background-color-AB4{background-color:#EDF0FD;} + .d2-431616550 .background-color-AB5{background-color:#F7F8FE;} + .d2-431616550 .color-N1{color:#0A0F25;} + .d2-431616550 .color-N2{color:#676C7E;} + .d2-431616550 .color-N3{color:#9499AB;} + .d2-431616550 .color-N4{color:#CFD2DD;} + .d2-431616550 .color-N5{color:#DEE1EB;} + .d2-431616550 .color-N6{color:#EEF1F8;} + .d2-431616550 .color-N7{color:#FFFFFF;} + .d2-431616550 .color-B1{color:#0D32B2;} + .d2-431616550 .color-B2{color:#0D32B2;} + .d2-431616550 .color-B3{color:#E3E9FD;} + .d2-431616550 .color-B4{color:#E3E9FD;} + .d2-431616550 .color-B5{color:#EDF0FD;} + .d2-431616550 .color-B6{color:#F7F8FE;} + .d2-431616550 .color-AA2{color:#4A6FF3;} + .d2-431616550 .color-AA4{color:#EDF0FD;} + .d2-431616550 .color-AA5{color:#F7F8FE;} + .d2-431616550 .color-AB4{color:#EDF0FD;} + .d2-431616550 .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}]]>abcd circle filled-circle diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json index ae5607b91..92810f68e 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json @@ -153,11 +153,11 @@ "labelPercentage": 0, "route": [ { - "x": 22.52400016784668, + "x": 22.5, "y": 66 }, { - "x": 17.70400047302246, + "x": 17.700000762939453, "y": 106 }, { @@ -200,11 +200,11 @@ "labelPercentage": 0, "route": [ { - "x": 22.52400016784668, + "x": 22.5, "y": 232 }, { - "x": 17.70400047302246, + "x": 17.700000762939453, "y": 272 }, { @@ -247,11 +247,11 @@ "labelPercentage": 0, "route": [ { - "x": 30.475000381469727, + "x": 30.5, "y": 332 }, { - "x": 35.29499816894531, + "x": 35.29999923706055, "y": 292 }, { @@ -294,11 +294,11 @@ "labelPercentage": 0, "route": [ { - "x": 30.475000381469727, + "x": 30.5, "y": 166 }, { - "x": 35.29499816894531, + "x": 35.29999923706055, "y": 126 }, { diff --git a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg index bea32ac65..49548aa65 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-2691357969 .fill-N1{fill:#0A0F25;} + .d2-2691357969 .fill-N2{fill:#676C7E;} + .d2-2691357969 .fill-N3{fill:#9499AB;} + .d2-2691357969 .fill-N4{fill:#CFD2DD;} + .d2-2691357969 .fill-N5{fill:#DEE1EB;} + .d2-2691357969 .fill-N6{fill:#EEF1F8;} + .d2-2691357969 .fill-N7{fill:#FFFFFF;} + .d2-2691357969 .fill-B1{fill:#0D32B2;} + .d2-2691357969 .fill-B2{fill:#0D32B2;} + .d2-2691357969 .fill-B3{fill:#E3E9FD;} + .d2-2691357969 .fill-B4{fill:#E3E9FD;} + .d2-2691357969 .fill-B5{fill:#EDF0FD;} + .d2-2691357969 .fill-B6{fill:#F7F8FE;} + .d2-2691357969 .fill-AA2{fill:#4A6FF3;} + .d2-2691357969 .fill-AA4{fill:#EDF0FD;} + .d2-2691357969 .fill-AA5{fill:#F7F8FE;} + .d2-2691357969 .fill-AB4{fill:#EDF0FD;} + .d2-2691357969 .fill-AB5{fill:#F7F8FE;} + .d2-2691357969 .stroke-N1{stroke:#0A0F25;} + .d2-2691357969 .stroke-N2{stroke:#676C7E;} + .d2-2691357969 .stroke-N3{stroke:#9499AB;} + .d2-2691357969 .stroke-N4{stroke:#CFD2DD;} + .d2-2691357969 .stroke-N5{stroke:#DEE1EB;} + .d2-2691357969 .stroke-N6{stroke:#EEF1F8;} + .d2-2691357969 .stroke-N7{stroke:#FFFFFF;} + .d2-2691357969 .stroke-B1{stroke:#0D32B2;} + .d2-2691357969 .stroke-B2{stroke:#0D32B2;} + .d2-2691357969 .stroke-B3{stroke:#E3E9FD;} + .d2-2691357969 .stroke-B4{stroke:#E3E9FD;} + .d2-2691357969 .stroke-B5{stroke:#EDF0FD;} + .d2-2691357969 .stroke-B6{stroke:#F7F8FE;} + .d2-2691357969 .stroke-AA2{stroke:#4A6FF3;} + .d2-2691357969 .stroke-AA4{stroke:#EDF0FD;} + .d2-2691357969 .stroke-AA5{stroke:#F7F8FE;} + .d2-2691357969 .stroke-AB4{stroke:#EDF0FD;} + .d2-2691357969 .stroke-AB5{stroke:#F7F8FE;} + .d2-2691357969 .background-color-N1{background-color:#0A0F25;} + .d2-2691357969 .background-color-N2{background-color:#676C7E;} + .d2-2691357969 .background-color-N3{background-color:#9499AB;} + .d2-2691357969 .background-color-N4{background-color:#CFD2DD;} + .d2-2691357969 .background-color-N5{background-color:#DEE1EB;} + .d2-2691357969 .background-color-N6{background-color:#EEF1F8;} + .d2-2691357969 .background-color-N7{background-color:#FFFFFF;} + .d2-2691357969 .background-color-B1{background-color:#0D32B2;} + .d2-2691357969 .background-color-B2{background-color:#0D32B2;} + .d2-2691357969 .background-color-B3{background-color:#E3E9FD;} + .d2-2691357969 .background-color-B4{background-color:#E3E9FD;} + .d2-2691357969 .background-color-B5{background-color:#EDF0FD;} + .d2-2691357969 .background-color-B6{background-color:#F7F8FE;} + .d2-2691357969 .background-color-AA2{background-color:#4A6FF3;} + .d2-2691357969 .background-color-AA4{background-color:#EDF0FD;} + .d2-2691357969 .background-color-AA5{background-color:#F7F8FE;} + .d2-2691357969 .background-color-AB4{background-color:#EDF0FD;} + .d2-2691357969 .background-color-AB5{background-color:#F7F8FE;} + .d2-2691357969 .color-N1{color:#0A0F25;} + .d2-2691357969 .color-N2{color:#676C7E;} + .d2-2691357969 .color-N3{color:#9499AB;} + .d2-2691357969 .color-N4{color:#CFD2DD;} + .d2-2691357969 .color-N5{color:#DEE1EB;} + .d2-2691357969 .color-N6{color:#EEF1F8;} + .d2-2691357969 .color-N7{color:#FFFFFF;} + .d2-2691357969 .color-B1{color:#0D32B2;} + .d2-2691357969 .color-B2{color:#0D32B2;} + .d2-2691357969 .color-B3{color:#E3E9FD;} + .d2-2691357969 .color-B4{color:#E3E9FD;} + .d2-2691357969 .color-B5{color:#EDF0FD;} + .d2-2691357969 .color-B6{color:#F7F8FE;} + .d2-2691357969 .color-AA2{color:#4A6FF3;} + .d2-2691357969 .color-AA4{color:#EDF0FD;} + .d2-2691357969 .color-AA5{color:#F7F8FE;} + .d2-2691357969 .color-AB4{color:#EDF0FD;} + .d2-2691357969 .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}]]>abc diff --git a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json index 7994d67f4..67a45d48e 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json +++ b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json @@ -656,11 +656,11 @@ "id": "find contractors", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 361, - "height": 125, + "width": 341, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -698,7 +698,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 110, "height": 66, @@ -739,7 +739,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 70 + "y": 50 }, "width": 111, "height": 66, @@ -827,11 +827,11 @@ "id": "find contractors", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 361, - "height": 125, + "width": 341, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 110, "height": 66, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 70 + "y": 50 }, "width": 111, "height": 66, @@ -1015,11 +1015,11 @@ "route": [ { "x": 265.5, - "y": 166 + "y": 146 }, { "x": 265.5, - "y": 206 + "y": 202 }, { "x": 265.5, @@ -1087,11 +1087,11 @@ "id": "find contractors", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 361, - "height": 125, + "width": 341, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1129,7 +1129,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 110, "height": 66, @@ -1170,7 +1170,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 70 + "y": 50 }, "width": 111, "height": 66, @@ -1357,11 +1357,11 @@ "route": [ { "x": 265.5, - "y": 166 + "y": 146 }, { "x": 265.5, - "y": 206 + "y": 202 }, { "x": 265.5, @@ -1476,11 +1476,11 @@ "id": "find contractors", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 361, - "height": 125, + "width": 341, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1518,7 +1518,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 110, "height": 66, @@ -1559,7 +1559,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 70 + "y": 50 }, "width": 111, "height": 66, @@ -1787,11 +1787,11 @@ "route": [ { "x": 265.5, - "y": 166 + "y": 146 }, { "x": 265.5, - "y": 206 + "y": 202 }, { "x": 265.5, diff --git a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg index a7c854fa5..258d202f1 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -windowroofgarage +}]]>windowroofgarage -blindsglass +blindsglass -shinglesstarlinkutility hookup +shinglesstarlinkutility hookup -toolsvehicles +toolsvehicles - + -find contractorscraigslistfacebook - - - - -find contractorssolicit quotescraigslistfacebook - - +find contractorscraigslistfacebook + + + + +find contractorssolicit quotescraigslistfacebook + + - - -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook - - + + +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook + + - - -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook - - + + +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook + + - - -windowroofgaragewaterrainthunder + + +windowroofgaragewaterrainthunder diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json index 8f545f1fc..a90ceb89c 100644 --- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 21, - "y": 41 + "x": 31, + "y": 20 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -89,11 +89,11 @@ "id": "c", "type": "rectangle", "pos": { - "x": 20, - "y": 307 + "x": 30, + "y": 286 }, - "width": 134, - "height": 125, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 336 + "y": 316 }, "width": 54, "height": 66, @@ -172,10 +172,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 573 + "y": 561 }, "width": 174, - "height": 225, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -212,11 +212,11 @@ "id": "f.h", "type": "rectangle", "pos": { - "x": 20, - "y": 638 + "x": 30, + "y": 602 }, - "width": 134, - "height": 130, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 670 + "y": 632 }, "width": 54, "height": 66, @@ -318,11 +318,11 @@ "route": [ { "x": 87, - "y": 136.5 + "y": 116 }, { "x": 87, - "y": 160.10000610351562 + "y": 156 }, { "x": 87, @@ -338,11 +338,11 @@ }, { "x": 87, - "y": 280.1000061035156 + "y": 276 }, { "x": 87, - "y": 336.5 + "y": 316 } ], "isCurve": true, @@ -377,11 +377,11 @@ "route": [ { "x": 87, - "y": 402.5 + "y": 382 }, { "x": 87, - "y": 426.1000061035156 + "y": 422 }, { "x": 87, @@ -409,11 +409,11 @@ }, { "x": 87, - "y": 599.7000122070312 + "y": 592 }, { "x": 87, - "y": 670.5 + "y": 632 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg index 179dd14c5..52e889fc8 100644 --- a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acfbdhg - - - - - - - - + .d2-2101698003 .fill-N1{fill:#0A0F25;} + .d2-2101698003 .fill-N2{fill:#676C7E;} + .d2-2101698003 .fill-N3{fill:#9499AB;} + .d2-2101698003 .fill-N4{fill:#CFD2DD;} + .d2-2101698003 .fill-N5{fill:#DEE1EB;} + .d2-2101698003 .fill-N6{fill:#EEF1F8;} + .d2-2101698003 .fill-N7{fill:#FFFFFF;} + .d2-2101698003 .fill-B1{fill:#0D32B2;} + .d2-2101698003 .fill-B2{fill:#0D32B2;} + .d2-2101698003 .fill-B3{fill:#E3E9FD;} + .d2-2101698003 .fill-B4{fill:#E3E9FD;} + .d2-2101698003 .fill-B5{fill:#EDF0FD;} + .d2-2101698003 .fill-B6{fill:#F7F8FE;} + .d2-2101698003 .fill-AA2{fill:#4A6FF3;} + .d2-2101698003 .fill-AA4{fill:#EDF0FD;} + .d2-2101698003 .fill-AA5{fill:#F7F8FE;} + .d2-2101698003 .fill-AB4{fill:#EDF0FD;} + .d2-2101698003 .fill-AB5{fill:#F7F8FE;} + .d2-2101698003 .stroke-N1{stroke:#0A0F25;} + .d2-2101698003 .stroke-N2{stroke:#676C7E;} + .d2-2101698003 .stroke-N3{stroke:#9499AB;} + .d2-2101698003 .stroke-N4{stroke:#CFD2DD;} + .d2-2101698003 .stroke-N5{stroke:#DEE1EB;} + .d2-2101698003 .stroke-N6{stroke:#EEF1F8;} + .d2-2101698003 .stroke-N7{stroke:#FFFFFF;} + .d2-2101698003 .stroke-B1{stroke:#0D32B2;} + .d2-2101698003 .stroke-B2{stroke:#0D32B2;} + .d2-2101698003 .stroke-B3{stroke:#E3E9FD;} + .d2-2101698003 .stroke-B4{stroke:#E3E9FD;} + .d2-2101698003 .stroke-B5{stroke:#EDF0FD;} + .d2-2101698003 .stroke-B6{stroke:#F7F8FE;} + .d2-2101698003 .stroke-AA2{stroke:#4A6FF3;} + .d2-2101698003 .stroke-AA4{stroke:#EDF0FD;} + .d2-2101698003 .stroke-AA5{stroke:#F7F8FE;} + .d2-2101698003 .stroke-AB4{stroke:#EDF0FD;} + .d2-2101698003 .stroke-AB5{stroke:#F7F8FE;} + .d2-2101698003 .background-color-N1{background-color:#0A0F25;} + .d2-2101698003 .background-color-N2{background-color:#676C7E;} + .d2-2101698003 .background-color-N3{background-color:#9499AB;} + .d2-2101698003 .background-color-N4{background-color:#CFD2DD;} + .d2-2101698003 .background-color-N5{background-color:#DEE1EB;} + .d2-2101698003 .background-color-N6{background-color:#EEF1F8;} + .d2-2101698003 .background-color-N7{background-color:#FFFFFF;} + .d2-2101698003 .background-color-B1{background-color:#0D32B2;} + .d2-2101698003 .background-color-B2{background-color:#0D32B2;} + .d2-2101698003 .background-color-B3{background-color:#E3E9FD;} + .d2-2101698003 .background-color-B4{background-color:#E3E9FD;} + .d2-2101698003 .background-color-B5{background-color:#EDF0FD;} + .d2-2101698003 .background-color-B6{background-color:#F7F8FE;} + .d2-2101698003 .background-color-AA2{background-color:#4A6FF3;} + .d2-2101698003 .background-color-AA4{background-color:#EDF0FD;} + .d2-2101698003 .background-color-AA5{background-color:#F7F8FE;} + .d2-2101698003 .background-color-AB4{background-color:#EDF0FD;} + .d2-2101698003 .background-color-AB5{background-color:#F7F8FE;} + .d2-2101698003 .color-N1{color:#0A0F25;} + .d2-2101698003 .color-N2{color:#676C7E;} + .d2-2101698003 .color-N3{color:#9499AB;} + .d2-2101698003 .color-N4{color:#CFD2DD;} + .d2-2101698003 .color-N5{color:#DEE1EB;} + .d2-2101698003 .color-N6{color:#EEF1F8;} + .d2-2101698003 .color-N7{color:#FFFFFF;} + .d2-2101698003 .color-B1{color:#0D32B2;} + .d2-2101698003 .color-B2{color:#0D32B2;} + .d2-2101698003 .color-B3{color:#E3E9FD;} + .d2-2101698003 .color-B4{color:#E3E9FD;} + .d2-2101698003 .color-B5{color:#EDF0FD;} + .d2-2101698003 .color-B6{color:#F7F8FE;} + .d2-2101698003 .color-AA2{color:#4A6FF3;} + .d2-2101698003 .color-AA4{color:#EDF0FD;} + .d2-2101698003 .color-AA5{color:#F7F8FE;} + .d2-2101698003 .color-AB4{color:#EDF0FD;} + .d2-2101698003 .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}]]>acfbdhg + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json index 84fec31bf..ac0d6e0df 100644 --- a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json +++ b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json @@ -275,11 +275,11 @@ "labelPercentage": 0, "route": [ { - "x": 188.70399475097656, + "x": 188.5, "y": 66 }, { - "x": 227.74000549316406, + "x": 227.6999969482422, "y": 106 }, { @@ -322,11 +322,11 @@ "labelPercentage": 0, "route": [ { - "x": 201.31900024414062, + "x": 201.5, "y": 232 }, { - "x": 157.46299743652344, + "x": 157.5, "y": 272 }, { @@ -369,11 +369,11 @@ "labelPercentage": 0, "route": [ { - "x": 61.52399826049805, + "x": 61.5, "y": 332 }, { - "x": 56.70399856567383, + "x": 56.70000076293945, "y": 292 }, { @@ -428,11 +428,11 @@ "labelPercentage": 0, "route": [ { - "x": 241.47500610351562, + "x": 241.5, "y": 232 }, { - "x": 246.2949981689453, + "x": 246.3000030517578, "y": 272 }, { diff --git a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg index 2d767b093..68c6d3b7e 100644 --- a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 + diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json index 9fd39e265..94aba95e2 100644 --- a/e2etests/testdata/stable/container_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/container_edges/dagre/board.exp.json @@ -48,11 +48,11 @@ "id": "g", "type": "rectangle", "pos": { - "x": 0, - "y": 207 + "x": 10, + "y": 186 }, - "width": 133, - "height": 657, + "width": 113, + "height": 658, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -131,10 +131,10 @@ "type": "rectangle", "pos": { "x": 153, - "y": 423 + "y": 411 }, "width": 173, - "height": 225, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,11 +171,11 @@ "id": "d.h", "type": "rectangle", "pos": { - "x": 173, - "y": 488 + "x": 183, + "y": 452 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 520 + "y": 482 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 768 + "y": 748 }, "width": 53, "height": 66, @@ -367,11 +367,11 @@ }, { "x": 66.5, - "y": 180.10000610351562 + "y": 176 }, { "x": 66.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -406,11 +406,11 @@ "route": [ { "x": 66.5, - "y": 302.5 + "y": 282 }, { "x": 66.5, - "y": 326.1000061035156 + "y": 322 }, { "x": 66.5, @@ -426,11 +426,11 @@ }, { "x": 95.9000015258789, - "y": 453.70001220703125 + "y": 446 }, { "x": 213.5, - "y": 540.5 + "y": 502 } ], "isCurve": true, @@ -465,19 +465,19 @@ "route": [ { "x": 226.25, - "y": 648 + "y": 608 }, { "x": 79.8499984741211, - "y": 688 + "y": 680 }, { "x": 46.04999923706055, - "y": 712.0999755859375 + "y": 708 }, { "x": 57.25, - "y": 768.5 + "y": 748 } ], "isCurve": true, @@ -511,12 +511,12 @@ "labelPercentage": 0, "route": [ { - "x": 61.23099899291992, - "y": 834.5 + "x": 61.25, + "y": 814 }, { - "x": 54.84600067138672, - "y": 858.0999755859375 + "x": 54.849998474121094, + "y": 854 }, { "x": 54.849998474121094, @@ -558,20 +558,20 @@ "labelPercentage": 0, "route": [ { - "x": 75.74299621582031, + "x": 75.75, "y": 964 }, { - "x": 86.947998046875, + "x": 86.94999694824219, "y": 924 }, { "x": 89.75, - "y": 904 + "y": 900 }, { "x": 89.75, - "y": 864 + "y": 844 } ], "isCurve": true, @@ -605,20 +605,20 @@ "labelPercentage": 0, "route": [ { - "x": 132.75, - "y": 726 + "x": 122.75, + "y": 685 }, { - "x": 236.75, - "y": 663.5999755859375 + "x": 234.75, + "y": 655.4000244140625 }, { "x": 262.75, - "y": 642.0999755859375 + "y": 634 }, { "x": 262.75, - "y": 618.5 + "y": 578 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg index b6eedb676..9a2dc461d 100644 --- a/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -agdfbhec - + .d2-3525810451 .fill-N1{fill:#0A0F25;} + .d2-3525810451 .fill-N2{fill:#676C7E;} + .d2-3525810451 .fill-N3{fill:#9499AB;} + .d2-3525810451 .fill-N4{fill:#CFD2DD;} + .d2-3525810451 .fill-N5{fill:#DEE1EB;} + .d2-3525810451 .fill-N6{fill:#EEF1F8;} + .d2-3525810451 .fill-N7{fill:#FFFFFF;} + .d2-3525810451 .fill-B1{fill:#0D32B2;} + .d2-3525810451 .fill-B2{fill:#0D32B2;} + .d2-3525810451 .fill-B3{fill:#E3E9FD;} + .d2-3525810451 .fill-B4{fill:#E3E9FD;} + .d2-3525810451 .fill-B5{fill:#EDF0FD;} + .d2-3525810451 .fill-B6{fill:#F7F8FE;} + .d2-3525810451 .fill-AA2{fill:#4A6FF3;} + .d2-3525810451 .fill-AA4{fill:#EDF0FD;} + .d2-3525810451 .fill-AA5{fill:#F7F8FE;} + .d2-3525810451 .fill-AB4{fill:#EDF0FD;} + .d2-3525810451 .fill-AB5{fill:#F7F8FE;} + .d2-3525810451 .stroke-N1{stroke:#0A0F25;} + .d2-3525810451 .stroke-N2{stroke:#676C7E;} + .d2-3525810451 .stroke-N3{stroke:#9499AB;} + .d2-3525810451 .stroke-N4{stroke:#CFD2DD;} + .d2-3525810451 .stroke-N5{stroke:#DEE1EB;} + .d2-3525810451 .stroke-N6{stroke:#EEF1F8;} + .d2-3525810451 .stroke-N7{stroke:#FFFFFF;} + .d2-3525810451 .stroke-B1{stroke:#0D32B2;} + .d2-3525810451 .stroke-B2{stroke:#0D32B2;} + .d2-3525810451 .stroke-B3{stroke:#E3E9FD;} + .d2-3525810451 .stroke-B4{stroke:#E3E9FD;} + .d2-3525810451 .stroke-B5{stroke:#EDF0FD;} + .d2-3525810451 .stroke-B6{stroke:#F7F8FE;} + .d2-3525810451 .stroke-AA2{stroke:#4A6FF3;} + .d2-3525810451 .stroke-AA4{stroke:#EDF0FD;} + .d2-3525810451 .stroke-AA5{stroke:#F7F8FE;} + .d2-3525810451 .stroke-AB4{stroke:#EDF0FD;} + .d2-3525810451 .stroke-AB5{stroke:#F7F8FE;} + .d2-3525810451 .background-color-N1{background-color:#0A0F25;} + .d2-3525810451 .background-color-N2{background-color:#676C7E;} + .d2-3525810451 .background-color-N3{background-color:#9499AB;} + .d2-3525810451 .background-color-N4{background-color:#CFD2DD;} + .d2-3525810451 .background-color-N5{background-color:#DEE1EB;} + .d2-3525810451 .background-color-N6{background-color:#EEF1F8;} + .d2-3525810451 .background-color-N7{background-color:#FFFFFF;} + .d2-3525810451 .background-color-B1{background-color:#0D32B2;} + .d2-3525810451 .background-color-B2{background-color:#0D32B2;} + .d2-3525810451 .background-color-B3{background-color:#E3E9FD;} + .d2-3525810451 .background-color-B4{background-color:#E3E9FD;} + .d2-3525810451 .background-color-B5{background-color:#EDF0FD;} + .d2-3525810451 .background-color-B6{background-color:#F7F8FE;} + .d2-3525810451 .background-color-AA2{background-color:#4A6FF3;} + .d2-3525810451 .background-color-AA4{background-color:#EDF0FD;} + .d2-3525810451 .background-color-AA5{background-color:#F7F8FE;} + .d2-3525810451 .background-color-AB4{background-color:#EDF0FD;} + .d2-3525810451 .background-color-AB5{background-color:#F7F8FE;} + .d2-3525810451 .color-N1{color:#0A0F25;} + .d2-3525810451 .color-N2{color:#676C7E;} + .d2-3525810451 .color-N3{color:#9499AB;} + .d2-3525810451 .color-N4{color:#CFD2DD;} + .d2-3525810451 .color-N5{color:#DEE1EB;} + .d2-3525810451 .color-N6{color:#EEF1F8;} + .d2-3525810451 .color-N7{color:#FFFFFF;} + .d2-3525810451 .color-B1{color:#0D32B2;} + .d2-3525810451 .color-B2{color:#0D32B2;} + .d2-3525810451 .color-B3{color:#E3E9FD;} + .d2-3525810451 .color-B4{color:#E3E9FD;} + .d2-3525810451 .color-B5{color:#EDF0FD;} + .d2-3525810451 .color-B6{color:#F7F8FE;} + .d2-3525810451 .color-AA2{color:#4A6FF3;} + .d2-3525810451 .color-AA4{color:#EDF0FD;} + .d2-3525810451 .color-AA5{color:#F7F8FE;} + .d2-3525810451 .color-AB4{color:#EDF0FD;} + .d2-3525810451 .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/cycle-order/dagre/board.exp.json b/e2etests/testdata/stable/cycle-order/dagre/board.exp.json index 860aaa8f7..aae8b0aa5 100644 --- a/e2etests/testdata/stable/cycle-order/dagre/board.exp.json +++ b/e2etests/testdata/stable/cycle-order/dagre/board.exp.json @@ -10,11 +10,11 @@ "group" ], "pos": { - "x": 0, - "y": 41 + "x": 20, + "y": 150 }, - "width": 170, - "height": 216, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -54,11 +54,11 @@ "group" ], "pos": { - "x": 270, - "y": 41 + "x": 290, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -98,11 +98,11 @@ "group" ], "pos": { - "x": 540, - "y": 41 + "x": 560, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -142,11 +142,11 @@ "group" ], "pos": { - "x": 810, - "y": 41 + "x": 830, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -186,11 +186,11 @@ "group" ], "pos": { - "x": 1080, - "y": 41 + "x": 1100, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -230,11 +230,11 @@ "group" ], "pos": { - "x": 1350, - "y": 41 + "x": 1370, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -274,11 +274,11 @@ "group" ], "pos": { - "x": 1620, - "y": 41 + "x": 1640, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -318,11 +318,11 @@ "group" ], "pos": { - "x": 1890, - "y": 41 + "x": 1910, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -362,11 +362,11 @@ "group" ], "pos": { - "x": 2160, - "y": 41 + "x": 2180, + "y": 150 }, - "width": 170, - "height": 216, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -407,7 +407,7 @@ ], "pos": { "x": 50, - "y": 111 + "y": 180 }, "width": 70, "height": 70, @@ -463,7 +463,7 @@ ], "pos": { "x": 320, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -519,7 +519,7 @@ ], "pos": { "x": 590, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -575,7 +575,7 @@ ], "pos": { "x": 860, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -631,7 +631,7 @@ ], "pos": { "x": 1130, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -687,7 +687,7 @@ ], "pos": { "x": 1400, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -743,7 +743,7 @@ ], "pos": { "x": 1670, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -799,7 +799,7 @@ ], "pos": { "x": 1940, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -855,7 +855,7 @@ ], "pos": { "x": 2210, - "y": 111 + "y": 180 }, "width": 70, "height": 70, @@ -930,20 +930,20 @@ "labelPercentage": 0, "route": [ { - "x": 170, - "y": 80 + "x": 150, + "y": 167 }, { - "x": 210, - "y": 80 + "x": 206, + "y": 167 }, { - "x": 230, - "y": 80 + "x": 234, + "y": 167 }, { - "x": 270, - "y": 80 + "x": 290, + "y": 167 } ], "isCurve": true, @@ -977,20 +977,20 @@ "labelPercentage": 0, "route": [ { - "x": 440, - "y": 80 + "x": 420, + "y": 121 }, { - "x": 480, - "y": 80 + "x": 476, + "y": 121 }, { - "x": 500, - "y": 80 + "x": 504, + "y": 121 }, { - "x": 540, - "y": 80 + "x": 560, + "y": 121 } ], "isCurve": true, @@ -1024,20 +1024,20 @@ "labelPercentage": 0, "route": [ { - "x": 710, - "y": 80 + "x": 690, + "y": 121 }, { - "x": 750, - "y": 80 + "x": 746, + "y": 121 }, { - "x": 770, - "y": 80 + "x": 774, + "y": 121 }, { - "x": 810, - "y": 80 + "x": 830, + "y": 121 } ], "isCurve": true, @@ -1071,20 +1071,20 @@ "labelPercentage": 0, "route": [ { - "x": 980, - "y": 80 + "x": 960, + "y": 121 }, { - "x": 1020, - "y": 80 + "x": 1016, + "y": 121 }, { - "x": 1040, - "y": 80 + "x": 1044, + "y": 121 }, { - "x": 1080, - "y": 80 + "x": 1100, + "y": 121 } ], "isCurve": true, @@ -1118,20 +1118,20 @@ "labelPercentage": 0, "route": [ { - "x": 1250, - "y": 80 + "x": 1230, + "y": 121 }, { - "x": 1290, - "y": 80 + "x": 1286, + "y": 121 }, { - "x": 1310, - "y": 80 + "x": 1314, + "y": 121 }, { - "x": 1350, - "y": 80 + "x": 1370, + "y": 121 } ], "isCurve": true, @@ -1165,20 +1165,20 @@ "labelPercentage": 0, "route": [ { - "x": 1520, - "y": 80 + "x": 1500, + "y": 121 }, { - "x": 1560, - "y": 80 + "x": 1556, + "y": 121 }, { - "x": 1580, - "y": 80 + "x": 1584, + "y": 121 }, { - "x": 1620, - "y": 80 + "x": 1640, + "y": 121 } ], "isCurve": true, @@ -1212,20 +1212,20 @@ "labelPercentage": 0, "route": [ { - "x": 1790, - "y": 80 + "x": 1770, + "y": 121 }, { - "x": 1830, - "y": 80 + "x": 1826, + "y": 121 }, { - "x": 1850, - "y": 80 + "x": 1854, + "y": 121 }, { - "x": 1890, - "y": 80 + "x": 1910, + "y": 121 } ], "isCurve": true, @@ -1259,20 +1259,20 @@ "labelPercentage": 0, "route": [ { - "x": 2060, - "y": 80 + "x": 2040, + "y": 167 }, { - "x": 2100, - "y": 80 + "x": 2096, + "y": 167 }, { - "x": 2120, - "y": 80 + "x": 2124, + "y": 167 }, { - "x": 2160, - "y": 80 + "x": 2180, + "y": 167 } ], "isCurve": true, @@ -1306,344 +1306,344 @@ "labelPercentage": 0, "route": [ { - "x": 2160, - "y": 198 + "x": 2180, + "y": 262 }, { - "x": 2120, - "y": 198 + "x": 2124, + "y": 262 }, { "x": 2100, - "y": 198 + "y": 262 }, { "x": 2085, - "y": 198 + "y": 262 }, { "x": 2070, - "y": 198 + "y": 262 }, { "x": 2043, - "y": 198 + "y": 262 }, { "x": 2017.5, - "y": 198 + "y": 262 }, { "x": 1992, - "y": 198 + "y": 262 }, { "x": 1958, - "y": 198 + "y": 262 }, { "x": 1932.5, - "y": 198 + "y": 262 }, { "x": 1907, - "y": 198 + "y": 262 }, { "x": 1880, - "y": 198 + "y": 262 }, { "x": 1865, - "y": 198 + "y": 262 }, { "x": 1850, - "y": 198 + "y": 262 }, { "x": 1830, - "y": 198 + "y": 262 }, { "x": 1815, - "y": 198 + "y": 262 }, { "x": 1800, - "y": 198 + "y": 262 }, { "x": 1773, - "y": 198 + "y": 262 }, { "x": 1747.5, - "y": 198 + "y": 262 }, { "x": 1722, - "y": 198 + "y": 262 }, { "x": 1688, - "y": 198 + "y": 262 }, { "x": 1662.5, - "y": 198 + "y": 262 }, { "x": 1637, - "y": 198 + "y": 262 }, { "x": 1610, - "y": 198 + "y": 262 }, { "x": 1595, - "y": 198 + "y": 262 }, { "x": 1580, - "y": 198 + "y": 262 }, { "x": 1560, - "y": 198 + "y": 262 }, { "x": 1545, - "y": 198 + "y": 262 }, { "x": 1530, - "y": 198 + "y": 262 }, { "x": 1503, - "y": 198 + "y": 262 }, { "x": 1477.5, - "y": 198 + "y": 262 }, { "x": 1452, - "y": 198 + "y": 262 }, { "x": 1418, - "y": 198 + "y": 262 }, { "x": 1392.5, - "y": 198 + "y": 262 }, { "x": 1367, - "y": 198 + "y": 262 }, { "x": 1340, - "y": 198 + "y": 262 }, { "x": 1325, - "y": 198 + "y": 262 }, { "x": 1310, - "y": 198 + "y": 262 }, { "x": 1290, - "y": 198 + "y": 262 }, { "x": 1275, - "y": 198 + "y": 262 }, { "x": 1260, - "y": 198 + "y": 262 }, { "x": 1233, - "y": 198 + "y": 262 }, { "x": 1207.5, - "y": 198 + "y": 262 }, { "x": 1182, - "y": 198 + "y": 262 }, { "x": 1148, - "y": 198 + "y": 262 }, { "x": 1122.5, - "y": 198 + "y": 262 }, { "x": 1097, - "y": 198 + "y": 262 }, { "x": 1070, - "y": 198 + "y": 262 }, { "x": 1055, - "y": 198 + "y": 262 }, { "x": 1040, - "y": 198 + "y": 262 }, { "x": 1020, - "y": 198 + "y": 262 }, { "x": 1005, - "y": 198 + "y": 262 }, { "x": 990, - "y": 198 + "y": 262 }, { "x": 963, - "y": 198 + "y": 262 }, { "x": 937.5, - "y": 198 + "y": 262 }, { "x": 912, - "y": 198 + "y": 262 }, { "x": 878, - "y": 198 + "y": 262 }, { "x": 852.5, - "y": 198 + "y": 262 }, { "x": 827, - "y": 198 + "y": 262 }, { "x": 800, - "y": 198 + "y": 262 }, { "x": 785, - "y": 198 + "y": 262 }, { "x": 770, - "y": 198 + "y": 262 }, { "x": 750, - "y": 198 + "y": 262 }, { "x": 735, - "y": 198 + "y": 262 }, { "x": 720, - "y": 198 + "y": 262 }, { "x": 693, - "y": 198 + "y": 262 }, { "x": 667.5, - "y": 198 + "y": 262 }, { "x": 642, - "y": 198 + "y": 262 }, { "x": 608, - "y": 198 + "y": 262 }, { "x": 582.5, - "y": 198 + "y": 262 }, { "x": 557, - "y": 198 + "y": 262 }, { "x": 530, - "y": 198 + "y": 262 }, { "x": 515, - "y": 198 + "y": 262 }, { "x": 500, - "y": 198 + "y": 262 }, { "x": 480, - "y": 198 + "y": 262 }, { "x": 465, - "y": 198 + "y": 262 }, { "x": 450, - "y": 198 + "y": 262 }, { "x": 423, - "y": 198 + "y": 262 }, { "x": 397.5, - "y": 198 + "y": 262 }, { "x": 372, - "y": 198 + "y": 262 }, { "x": 338, - "y": 198 + "y": 262 }, { "x": 312.5, - "y": 198 + "y": 262 }, { "x": 287, - "y": 198 + "y": 262 }, { - "x": 210, - "y": 198 + "x": 206, + "y": 262 }, { - "x": 170, - "y": 198 + "x": 150, + "y": 262 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg index 78deb234b..d7523362c 100644 --- a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana - - - - - - - - - - - - - - - - - - - + .d2-2162570574 .fill-N1{fill:#0A0F25;} + .d2-2162570574 .fill-N2{fill:#676C7E;} + .d2-2162570574 .fill-N3{fill:#9499AB;} + .d2-2162570574 .fill-N4{fill:#CFD2DD;} + .d2-2162570574 .fill-N5{fill:#DEE1EB;} + .d2-2162570574 .fill-N6{fill:#EEF1F8;} + .d2-2162570574 .fill-N7{fill:#FFFFFF;} + .d2-2162570574 .fill-B1{fill:#0D32B2;} + .d2-2162570574 .fill-B2{fill:#0D32B2;} + .d2-2162570574 .fill-B3{fill:#E3E9FD;} + .d2-2162570574 .fill-B4{fill:#E3E9FD;} + .d2-2162570574 .fill-B5{fill:#EDF0FD;} + .d2-2162570574 .fill-B6{fill:#F7F8FE;} + .d2-2162570574 .fill-AA2{fill:#4A6FF3;} + .d2-2162570574 .fill-AA4{fill:#EDF0FD;} + .d2-2162570574 .fill-AA5{fill:#F7F8FE;} + .d2-2162570574 .fill-AB4{fill:#EDF0FD;} + .d2-2162570574 .fill-AB5{fill:#F7F8FE;} + .d2-2162570574 .stroke-N1{stroke:#0A0F25;} + .d2-2162570574 .stroke-N2{stroke:#676C7E;} + .d2-2162570574 .stroke-N3{stroke:#9499AB;} + .d2-2162570574 .stroke-N4{stroke:#CFD2DD;} + .d2-2162570574 .stroke-N5{stroke:#DEE1EB;} + .d2-2162570574 .stroke-N6{stroke:#EEF1F8;} + .d2-2162570574 .stroke-N7{stroke:#FFFFFF;} + .d2-2162570574 .stroke-B1{stroke:#0D32B2;} + .d2-2162570574 .stroke-B2{stroke:#0D32B2;} + .d2-2162570574 .stroke-B3{stroke:#E3E9FD;} + .d2-2162570574 .stroke-B4{stroke:#E3E9FD;} + .d2-2162570574 .stroke-B5{stroke:#EDF0FD;} + .d2-2162570574 .stroke-B6{stroke:#F7F8FE;} + .d2-2162570574 .stroke-AA2{stroke:#4A6FF3;} + .d2-2162570574 .stroke-AA4{stroke:#EDF0FD;} + .d2-2162570574 .stroke-AA5{stroke:#F7F8FE;} + .d2-2162570574 .stroke-AB4{stroke:#EDF0FD;} + .d2-2162570574 .stroke-AB5{stroke:#F7F8FE;} + .d2-2162570574 .background-color-N1{background-color:#0A0F25;} + .d2-2162570574 .background-color-N2{background-color:#676C7E;} + .d2-2162570574 .background-color-N3{background-color:#9499AB;} + .d2-2162570574 .background-color-N4{background-color:#CFD2DD;} + .d2-2162570574 .background-color-N5{background-color:#DEE1EB;} + .d2-2162570574 .background-color-N6{background-color:#EEF1F8;} + .d2-2162570574 .background-color-N7{background-color:#FFFFFF;} + .d2-2162570574 .background-color-B1{background-color:#0D32B2;} + .d2-2162570574 .background-color-B2{background-color:#0D32B2;} + .d2-2162570574 .background-color-B3{background-color:#E3E9FD;} + .d2-2162570574 .background-color-B4{background-color:#E3E9FD;} + .d2-2162570574 .background-color-B5{background-color:#EDF0FD;} + .d2-2162570574 .background-color-B6{background-color:#F7F8FE;} + .d2-2162570574 .background-color-AA2{background-color:#4A6FF3;} + .d2-2162570574 .background-color-AA4{background-color:#EDF0FD;} + .d2-2162570574 .background-color-AA5{background-color:#F7F8FE;} + .d2-2162570574 .background-color-AB4{background-color:#EDF0FD;} + .d2-2162570574 .background-color-AB5{background-color:#F7F8FE;} + .d2-2162570574 .color-N1{color:#0A0F25;} + .d2-2162570574 .color-N2{color:#676C7E;} + .d2-2162570574 .color-N3{color:#9499AB;} + .d2-2162570574 .color-N4{color:#CFD2DD;} + .d2-2162570574 .color-N5{color:#DEE1EB;} + .d2-2162570574 .color-N6{color:#EEF1F8;} + .d2-2162570574 .color-N7{color:#FFFFFF;} + .d2-2162570574 .color-B1{color:#0D32B2;} + .d2-2162570574 .color-B2{color:#0D32B2;} + .d2-2162570574 .color-B3{color:#E3E9FD;} + .d2-2162570574 .color-B4{color:#E3E9FD;} + .d2-2162570574 .color-B5{color:#EDF0FD;} + .d2-2162570574 .color-B6{color:#F7F8FE;} + .d2-2162570574 .color-AA2{color:#4A6FF3;} + .d2-2162570574 .color-AA4{color:#EDF0FD;} + .d2-2162570574 .color-AA5{color:#F7F8FE;} + .d2-2162570574 .color-AB4{color:#EDF0FD;} + .d2-2162570574 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + + + + + + + + + + + + + + + + + + + \ 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 index ff93ed8e0..e74934654 100644 --- a/e2etests/testdata/stable/dagre-container/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre-container/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 359, - "height": 125, + "width": 339, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 266, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -171,11 +171,11 @@ "id": "b", "type": "rectangle", "pos": { - "x": 0, - "y": 307 + "x": 10, + "y": 286 }, - "width": 359, - "height": 125, + "width": 339, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 336 + "y": 316 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 336 + "y": 316 }, "width": 53, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 266, - "y": 336 + "y": 316 }, "width": 53, "height": 66, @@ -359,19 +359,19 @@ "route": [ { "x": 179.5, - "y": 166 + "y": 146 }, { "x": 179.5, - "y": 206 + "y": 202 }, { "x": 179.5, - "y": 226 + "y": 221.8000030517578 }, { "x": 179.5, - "y": 266 + "y": 245 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg index 116abf33f..2bcb7768a 100644 --- a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ababcabc - - - - - - - - - + .d2-770613611 .fill-N1{fill:#0A0F25;} + .d2-770613611 .fill-N2{fill:#676C7E;} + .d2-770613611 .fill-N3{fill:#9499AB;} + .d2-770613611 .fill-N4{fill:#CFD2DD;} + .d2-770613611 .fill-N5{fill:#DEE1EB;} + .d2-770613611 .fill-N6{fill:#EEF1F8;} + .d2-770613611 .fill-N7{fill:#FFFFFF;} + .d2-770613611 .fill-B1{fill:#0D32B2;} + .d2-770613611 .fill-B2{fill:#0D32B2;} + .d2-770613611 .fill-B3{fill:#E3E9FD;} + .d2-770613611 .fill-B4{fill:#E3E9FD;} + .d2-770613611 .fill-B5{fill:#EDF0FD;} + .d2-770613611 .fill-B6{fill:#F7F8FE;} + .d2-770613611 .fill-AA2{fill:#4A6FF3;} + .d2-770613611 .fill-AA4{fill:#EDF0FD;} + .d2-770613611 .fill-AA5{fill:#F7F8FE;} + .d2-770613611 .fill-AB4{fill:#EDF0FD;} + .d2-770613611 .fill-AB5{fill:#F7F8FE;} + .d2-770613611 .stroke-N1{stroke:#0A0F25;} + .d2-770613611 .stroke-N2{stroke:#676C7E;} + .d2-770613611 .stroke-N3{stroke:#9499AB;} + .d2-770613611 .stroke-N4{stroke:#CFD2DD;} + .d2-770613611 .stroke-N5{stroke:#DEE1EB;} + .d2-770613611 .stroke-N6{stroke:#EEF1F8;} + .d2-770613611 .stroke-N7{stroke:#FFFFFF;} + .d2-770613611 .stroke-B1{stroke:#0D32B2;} + .d2-770613611 .stroke-B2{stroke:#0D32B2;} + .d2-770613611 .stroke-B3{stroke:#E3E9FD;} + .d2-770613611 .stroke-B4{stroke:#E3E9FD;} + .d2-770613611 .stroke-B5{stroke:#EDF0FD;} + .d2-770613611 .stroke-B6{stroke:#F7F8FE;} + .d2-770613611 .stroke-AA2{stroke:#4A6FF3;} + .d2-770613611 .stroke-AA4{stroke:#EDF0FD;} + .d2-770613611 .stroke-AA5{stroke:#F7F8FE;} + .d2-770613611 .stroke-AB4{stroke:#EDF0FD;} + .d2-770613611 .stroke-AB5{stroke:#F7F8FE;} + .d2-770613611 .background-color-N1{background-color:#0A0F25;} + .d2-770613611 .background-color-N2{background-color:#676C7E;} + .d2-770613611 .background-color-N3{background-color:#9499AB;} + .d2-770613611 .background-color-N4{background-color:#CFD2DD;} + .d2-770613611 .background-color-N5{background-color:#DEE1EB;} + .d2-770613611 .background-color-N6{background-color:#EEF1F8;} + .d2-770613611 .background-color-N7{background-color:#FFFFFF;} + .d2-770613611 .background-color-B1{background-color:#0D32B2;} + .d2-770613611 .background-color-B2{background-color:#0D32B2;} + .d2-770613611 .background-color-B3{background-color:#E3E9FD;} + .d2-770613611 .background-color-B4{background-color:#E3E9FD;} + .d2-770613611 .background-color-B5{background-color:#EDF0FD;} + .d2-770613611 .background-color-B6{background-color:#F7F8FE;} + .d2-770613611 .background-color-AA2{background-color:#4A6FF3;} + .d2-770613611 .background-color-AA4{background-color:#EDF0FD;} + .d2-770613611 .background-color-AA5{background-color:#F7F8FE;} + .d2-770613611 .background-color-AB4{background-color:#EDF0FD;} + .d2-770613611 .background-color-AB5{background-color:#F7F8FE;} + .d2-770613611 .color-N1{color:#0A0F25;} + .d2-770613611 .color-N2{color:#676C7E;} + .d2-770613611 .color-N3{color:#9499AB;} + .d2-770613611 .color-N4{color:#CFD2DD;} + .d2-770613611 .color-N5{color:#DEE1EB;} + .d2-770613611 .color-N6{color:#EEF1F8;} + .d2-770613611 .color-N7{color:#FFFFFF;} + .d2-770613611 .color-B1{color:#0D32B2;} + .d2-770613611 .color-B2{color:#0D32B2;} + .d2-770613611 .color-B3{color:#E3E9FD;} + .d2-770613611 .color-B4{color:#E3E9FD;} + .d2-770613611 .color-B5{color:#EDF0FD;} + .d2-770613611 .color-B6{color:#F7F8FE;} + .d2-770613611 .color-AA2{color:#4A6FF3;} + .d2-770613611 .color-AA4{color:#EDF0FD;} + .d2-770613611 .color-AA5{color:#F7F8FE;} + .d2-770613611 .color-AB4{color:#EDF0FD;} + .d2-770613611 .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}]]>ababcabc + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json index e541e6bfb..e8ecc9ba9 100644 --- a/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 19 }, - "width": 424, - "height": 1922, + "width": 498, + "height": 1888, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "a.k", "type": "rectangle", "pos": { - "x": 22, - "y": 112 + "x": 32, + "y": 60 }, - "width": 131, - "height": 142, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 150 + "y": 90 }, "width": 51, "height": 66, @@ -130,11 +130,11 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 20, - "y": 514 + "x": 30, + "y": 441 }, - "width": 384, - "height": 194, + "width": 438, + "height": 164, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -175,7 +175,7 @@ ], "pos": { "x": 60, - "y": 570 + "y": 488 }, "width": 54, "height": 82, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 174, - "y": 578 + "y": 496 }, "width": 54, "height": 66, @@ -256,11 +256,11 @@ "id": "s", "type": "rectangle", "pos": { - "x": 595, - "y": 897 + "x": 669, + "y": 817 }, "width": 259, - "height": 651, + "height": 682, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -300,11 +300,11 @@ "icon" ], "pos": { - "x": 615, - "y": 968 + "x": 699, + "y": 891 }, - "width": 131, - "height": 142, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -353,11 +353,11 @@ "id": "k", "type": "rectangle", "pos": { - "x": 1280, - "y": 443 + "x": 1524, + "y": 466 }, - "width": 132, - "height": 301, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -394,8 +394,8 @@ "id": "k.s", "type": "rectangle", "pos": { - "x": 1320, - "y": 560 + "x": 1554, + "y": 496 }, "width": 52, "height": 66, @@ -435,11 +435,11 @@ "id": "u", "type": "rectangle", "pos": { - "x": 874, - "y": 897 + "x": 948, + "y": 861 }, - "width": 539, - "height": 249, + "width": 689, + "height": 270, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -476,8 +476,8 @@ "id": "u.o", "type": "rectangle", "pos": { - "x": 1319, - "y": 988 + "x": 1553, + "y": 921 }, "width": 54, "height": 66, @@ -518,10 +518,10 @@ "type": "rectangle", "pos": { "x": 842, - "y": 41 + "y": 19 }, "width": 172, - "height": 249, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -558,11 +558,11 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 862, - "y": 112 + "x": 872, + "y": 60 }, - "width": 132, - "height": 142, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -600,7 +600,7 @@ "type": "rectangle", "pos": { "x": 902, - "y": 150 + "y": 90 }, "width": 52, "height": 66, @@ -644,11 +644,11 @@ "IconOutsideLeftTop" ], "pos": { - "x": 288, - "y": 552 + "x": 362, + "y": 483 }, "width": 76, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -700,11 +700,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 894, - "y": 988 + "x": 978, + "y": 891 }, - "width": 130, - "height": 122, + "width": 110, + "height": 127, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -744,8 +744,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 934, - "y": 1016 + "x": 1008, + "y": 921 }, "width": 50, "height": 66, @@ -788,8 +788,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 1064, - "y": 988 + "x": 1138, + "y": 921 }, "width": 195, "height": 66, @@ -829,11 +829,11 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 701, - "y": 1370 + "x": 785, + "y": 1343 }, - "width": 133, - "height": 142, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -870,8 +870,8 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 741, - "y": 1408 + "x": 815, + "y": 1373 }, "width": 53, "height": 66, @@ -911,8 +911,8 @@ "id": "s.n.f", "type": "rectangle", "pos": { - "x": 655, - "y": 1006 + "x": 729, + "y": 921 }, "width": 51, "height": 66, @@ -952,11 +952,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 444, - "y": 1299 + "x": 528, + "y": 1343 }, - "width": 131, - "height": 249, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -993,8 +993,8 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 484, - "y": 1390 + "x": 558, + "y": 1373 }, "width": 51, "height": 66, @@ -1034,11 +1034,11 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 148, - "y": 1785 + "x": 158, + "y": 1751 }, - "width": 129, - "height": 142, + "width": 109, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1076,7 +1076,7 @@ "type": "rectangle", "pos": { "x": 188, - "y": 1823 + "y": 1781 }, "width": 49, "height": 66, @@ -1140,55 +1140,55 @@ "route": [ { "x": 87, - "y": 216.5 + "y": 155.5 }, { "x": 87, - "y": 246.89999389648438 + "y": 199.5 }, { "x": 87, - "y": 265.70001220703125 + "y": 221.39999389648438 }, { "x": 87, - "y": 282.5 + "y": 237.75 }, { "x": 87, - "y": 299.29998779296875 + "y": 254.10000610351562 }, { "x": 87, - "y": 321.70001220703125 + "y": 275.8999938964844 }, { "x": 87, - "y": 338.5 + "y": 292.25 }, { "x": 87, - "y": 355.29998779296875 + "y": 308.6000061035156 }, { "x": 87, - "y": 377.70001220703125 + "y": 330.3999938964844 }, { "x": 87, - "y": 394.5 + "y": 346.75 }, { "x": 87, - "y": 411.29998779296875 + "y": 363.1000061035156 }, { "x": 87, - "y": 488.5 + "y": 432.1000061035156 }, { "x": 87, - "y": 528.5 + "y": 446.5 } ], "isCurve": true, @@ -1223,55 +1223,55 @@ "route": [ { "x": 201, - "y": 644.5 + "y": 561.5 }, { "x": 201, - "y": 679.2999877929688 + "y": 615.9000244140625 }, { "x": 201, - "y": 699.2000122070312 + "y": 640.4000244140625 }, { "x": 201, - "y": 716 + "y": 656.75 }, { "x": 201, - "y": 732.7999877929688 + "y": 673.0999755859375 }, { "x": 201, - "y": 755.2000122070312 + "y": 694.9000244140625 }, { "x": 201, - "y": 772 + "y": 711.25 }, { "x": 201, - "y": 788.7999877929688 + "y": 727.5999755859375 }, { "x": 201, - "y": 811.2000122070312 + "y": 749.4000244140625 }, { "x": 201, - "y": 828 + "y": 765.75 }, { "x": 201, - "y": 844.7999877929688 + "y": 782.0999755859375 }, { - "x": 283.79998779296875, - "y": 938.7000122070312 + "x": 300.6000061035156, + "y": 881.7000122070312 }, { - "x": 615, - "y": 1045.5 + "x": 699, + "y": 942.5 } ], "isCurve": true, @@ -1305,56 +1305,56 @@ "labelPercentage": 0, "route": [ { - "x": 1345.5, - "y": 626.5 + "x": 1579.5, + "y": 561.5 }, { - "x": 1345.5, - "y": 675.7000122070312 + "x": 1579.5, + "y": 615.9000244140625 }, { - "x": 1345.5, - "y": 699.2000122070312 + "x": 1579.5, + "y": 640.4000244140625 }, { - "x": 1345.5, - "y": 716 + "x": 1579.5, + "y": 656.75 }, { - "x": 1345.5, - "y": 732.7999877929688 + "x": 1579.5, + "y": 673.0999755859375 }, { - "x": 1345.5, - "y": 755.2000122070312 + "x": 1579.5, + "y": 694.9000244140625 }, { - "x": 1345.5, - "y": 772 + "x": 1579.5, + "y": 711.25 }, { - "x": 1345.5, - "y": 788.7999877929688 + "x": 1579.5, + "y": 727.5999755859375 }, { - "x": 1345.5, - "y": 811.2000122070312 + "x": 1579.5, + "y": 749.4000244140625 }, { - "x": 1345.5, - "y": 828 + "x": 1579.5, + "y": 765.75 }, { - "x": 1345.5, - "y": 844.7999877929688 + "x": 1579.5, + "y": 782.0999755859375 }, { - "x": 1345.5, - "y": 927.2999877929688 + "x": 1579.5, + "y": 877.5 }, { - "x": 1345.5, - "y": 988.5 + "x": 1579.5, + "y": 921.5 } ], "isCurve": true, @@ -1389,55 +1389,55 @@ "route": [ { "x": 928.25, - "y": 216.5 + "y": 155.5 }, { "x": 928.25, - "y": 230.5 + "y": 199.5 }, { "x": 928.25, - "y": 245.1999969482422 + "y": 221.39999389648438 }, { "x": 928.25, - "y": 262 + "y": 237.75 }, { "x": 928.25, - "y": 278.79998779296875 + "y": 254.10000610351562 }, { "x": 782.7999877929688, - "y": 301.20001220703125 + "y": 275.8999938964844 }, { "x": 564.625, - "y": 318 + "y": 292.25 }, { "x": 346.4490051269531, - "y": 334.79998779296875 + "y": 308.6000061035156 }, { "x": 201, - "y": 357.20001220703125 + "y": 330.3999938964844 }, { "x": 201, - "y": 374 + "y": 346.75 }, { "x": 201, - "y": 390.79998779296875 + "y": 363.1000061035156 }, { "x": 201, - "y": 482.1000061035156 + "y": 442.1000061035156 }, { "x": 201, - "y": 578.5 + "y": 496.5 } ], "isCurve": true, @@ -1471,56 +1471,56 @@ "labelPercentage": 0, "route": [ { - "x": 326, - "y": 670.5 + "x": 400, + "y": 574.5 }, { - "x": 326, - "y": 684.5 + "x": 400, + "y": 618.5 }, { - "x": 326, - "y": 699.2000122070312 + "x": 400, + "y": 640.4000244140625 }, { - "x": 326, - "y": 716 + "x": 400, + "y": 656.75 }, { - "x": 326, - "y": 732.7999877929688 + "x": 400, + "y": 673.0999755859375 }, { - "x": 326, - "y": 755.2000122070312 + "x": 400, + "y": 694.9000244140625 }, { - "x": 326, - "y": 772 + "x": 400, + "y": 711.25 }, { - "x": 326, - "y": 788.7999877929688 + "x": 400, + "y": 727.5999755859375 }, { - "x": 326, - "y": 811.2000122070312 + "x": 400, + "y": 749.4000244140625 }, { - "x": 326, - "y": 828 + "x": 400, + "y": 765.75 }, { - "x": 326, - "y": 844.7999877929688 + "x": 400, + "y": 782.0999755859375 }, { - "x": 447.5, - "y": 938.7960205078125 + "x": 521.5, + "y": 883.3079833984375 }, { - "x": 933.5, - "y": 1045.9820556640625 + "x": 1007.5, + "y": 950.541015625 } ], "isCurve": true, @@ -1554,56 +1554,56 @@ "labelPercentage": 0, "route": [ { - "x": 1161, - "y": 1054.5 + "x": 1235, + "y": 986.5 }, { - "x": 1161, - "y": 1082.9000244140625 + "x": 1235, + "y": 1030.5 }, { - "x": 1161, - "y": 1101.199951171875 + "x": 1235, + "y": 1064.199951171875 }, { - "x": 1161, - "y": 1118 + "x": 1235, + "y": 1098.25 }, { - "x": 1161, - "y": 1134.800048828125 + "x": 1235, + "y": 1132.300048828125 }, { - "x": 1082.199951171875, - "y": 1157.199951171875 + "x": 1156.199951171875, + "y": 1165.9000244140625 }, { - "x": 964, - "y": 1174 + "x": 1038, + "y": 1182.25 }, { - "x": 845.7999877929688, - "y": 1190.800048828125 + "x": 919.7999877929688, + "y": 1198.5999755859375 }, { - "x": 767, - "y": 1213.199951171875 + "x": 841, + "y": 1220.4000244140625 }, { - "x": 767, - "y": 1230 + "x": 841, + "y": 1236.75 }, { - "x": 767, - "y": 1246.800048828125 + "x": 841, + "y": 1253.0999755859375 }, { - "x": 767, - "y": 1332.9000244140625 + "x": 841, + "y": 1329.5 }, { - "x": 767, - "y": 1408.5 + "x": 841, + "y": 1373.5 } ], "isCurve": true, @@ -1637,44 +1637,44 @@ "labelPercentage": 0, "route": [ { - "x": 680.5, - "y": 1110.5 + "x": 754.5, + "y": 1017.5 }, { - "x": 680.5, - "y": 1138.9000244140625 + "x": 754.5, + "y": 1127.5 }, { - "x": 680.5, - "y": 1157.199951171875 + "x": 754.5, + "y": 1165.9000244140625 }, { - "x": 680.5, - "y": 1174 + "x": 754.5, + "y": 1182.25 }, { - "x": 680.5, - "y": 1190.800048828125 + "x": 754.5, + "y": 1198.5999755859375 }, { - "x": 680.5, - "y": 1213.199951171875 + "x": 754.5, + "y": 1220.4000244140625 }, { - "x": 680.5, - "y": 1230 + "x": 754.5, + "y": 1236.75 }, { - "x": 680.5, - "y": 1246.800048828125 + "x": 754.5, + "y": 1253.0999755859375 }, { - "x": 651.2999877929688, + "x": 725.2999877929688, "y": 1333.300048828125 }, { - "x": 534.5, - "y": 1410.5 + "x": 608.5, + "y": 1392.5 } ], "isCurve": true, @@ -1708,44 +1708,44 @@ "labelPercentage": 0, "route": [ { - "x": 509.5, - "y": 1456.5 + "x": 583.5, + "y": 1438.5 }, { - "x": 509.5, - "y": 1484.9000244140625 + "x": 583.5, + "y": 1482.5 }, { - "x": 509.5, - "y": 1503.199951171875 + "x": 583.5, + "y": 1504.4000244140625 }, { - "x": 509.5, - "y": 1520 + "x": 583.5, + "y": 1520.75 }, { - "x": 509.5, - "y": 1536.800048828125 + "x": 583.5, + "y": 1537.0999755859375 }, { - "x": 450, - "y": 1566.0999755859375 + "x": 509.20001220703125, + "y": 1565.800048828125 }, { - "x": 360.75, - "y": 1593.25 + "x": 397.75, + "y": 1592.5 }, { - "x": 271.5, - "y": 1620.4000244140625 + "x": 286.29998779296875, + "y": 1619.199951171875 }, { "x": 212, - "y": 1747.9000244140625 + "y": 1736.9000244140625 }, { "x": 212, - "y": 1823.5 + "y": 1780.5 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg index fa88a0678..635e962da 100644 --- a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3512699457 .fill-N1{fill:#0A0F25;} + .d2-3512699457 .fill-N2{fill:#676C7E;} + .d2-3512699457 .fill-N3{fill:#9499AB;} + .d2-3512699457 .fill-N4{fill:#CFD2DD;} + .d2-3512699457 .fill-N5{fill:#DEE1EB;} + .d2-3512699457 .fill-N6{fill:#EEF1F8;} + .d2-3512699457 .fill-N7{fill:#FFFFFF;} + .d2-3512699457 .fill-B1{fill:#0D32B2;} + .d2-3512699457 .fill-B2{fill:#0D32B2;} + .d2-3512699457 .fill-B3{fill:#E3E9FD;} + .d2-3512699457 .fill-B4{fill:#E3E9FD;} + .d2-3512699457 .fill-B5{fill:#EDF0FD;} + .d2-3512699457 .fill-B6{fill:#F7F8FE;} + .d2-3512699457 .fill-AA2{fill:#4A6FF3;} + .d2-3512699457 .fill-AA4{fill:#EDF0FD;} + .d2-3512699457 .fill-AA5{fill:#F7F8FE;} + .d2-3512699457 .fill-AB4{fill:#EDF0FD;} + .d2-3512699457 .fill-AB5{fill:#F7F8FE;} + .d2-3512699457 .stroke-N1{stroke:#0A0F25;} + .d2-3512699457 .stroke-N2{stroke:#676C7E;} + .d2-3512699457 .stroke-N3{stroke:#9499AB;} + .d2-3512699457 .stroke-N4{stroke:#CFD2DD;} + .d2-3512699457 .stroke-N5{stroke:#DEE1EB;} + .d2-3512699457 .stroke-N6{stroke:#EEF1F8;} + .d2-3512699457 .stroke-N7{stroke:#FFFFFF;} + .d2-3512699457 .stroke-B1{stroke:#0D32B2;} + .d2-3512699457 .stroke-B2{stroke:#0D32B2;} + .d2-3512699457 .stroke-B3{stroke:#E3E9FD;} + .d2-3512699457 .stroke-B4{stroke:#E3E9FD;} + .d2-3512699457 .stroke-B5{stroke:#EDF0FD;} + .d2-3512699457 .stroke-B6{stroke:#F7F8FE;} + .d2-3512699457 .stroke-AA2{stroke:#4A6FF3;} + .d2-3512699457 .stroke-AA4{stroke:#EDF0FD;} + .d2-3512699457 .stroke-AA5{stroke:#F7F8FE;} + .d2-3512699457 .stroke-AB4{stroke:#EDF0FD;} + .d2-3512699457 .stroke-AB5{stroke:#F7F8FE;} + .d2-3512699457 .background-color-N1{background-color:#0A0F25;} + .d2-3512699457 .background-color-N2{background-color:#676C7E;} + .d2-3512699457 .background-color-N3{background-color:#9499AB;} + .d2-3512699457 .background-color-N4{background-color:#CFD2DD;} + .d2-3512699457 .background-color-N5{background-color:#DEE1EB;} + .d2-3512699457 .background-color-N6{background-color:#EEF1F8;} + .d2-3512699457 .background-color-N7{background-color:#FFFFFF;} + .d2-3512699457 .background-color-B1{background-color:#0D32B2;} + .d2-3512699457 .background-color-B2{background-color:#0D32B2;} + .d2-3512699457 .background-color-B3{background-color:#E3E9FD;} + .d2-3512699457 .background-color-B4{background-color:#E3E9FD;} + .d2-3512699457 .background-color-B5{background-color:#EDF0FD;} + .d2-3512699457 .background-color-B6{background-color:#F7F8FE;} + .d2-3512699457 .background-color-AA2{background-color:#4A6FF3;} + .d2-3512699457 .background-color-AA4{background-color:#EDF0FD;} + .d2-3512699457 .background-color-AA5{background-color:#F7F8FE;} + .d2-3512699457 .background-color-AB4{background-color:#EDF0FD;} + .d2-3512699457 .background-color-AB5{background-color:#F7F8FE;} + .d2-3512699457 .color-N1{color:#0A0F25;} + .d2-3512699457 .color-N2{color:#676C7E;} + .d2-3512699457 .color-N3{color:#9499AB;} + .d2-3512699457 .color-N4{color:#CFD2DD;} + .d2-3512699457 .color-N5{color:#DEE1EB;} + .d2-3512699457 .color-N6{color:#EEF1F8;} + .d2-3512699457 .color-N7{color:#FFFFFF;} + .d2-3512699457 .color-B1{color:#0D32B2;} + .d2-3512699457 .color-B2{color:#0D32B2;} + .d2-3512699457 .color-B3{color:#E3E9FD;} + .d2-3512699457 .color-B4{color:#E3E9FD;} + .d2-3512699457 .color-B5{color:#EDF0FD;} + .d2-3512699457 .color-B6{color:#F7F8FE;} + .d2-3512699457 .color-AA2{color:#4A6FF3;} + .d2-3512699457 .color-AA4{color:#EDF0FD;} + .d2-3512699457 .color-AA5{color:#F7F8FE;} + .d2-3512699457 .color-AB4{color:#EDF0FD;} + .d2-3512699457 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json index 1429be57f..b53b2c7b7 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 17, + "y": 147 }, - "width": 1784, - "height": 756, + "width": 1787, + "height": 580, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "a.k", "type": "rectangle", "pos": { - "x": 50, - "y": 168 + "x": 47, + "y": 213 }, - "width": 152, - "height": 300, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,8 +89,8 @@ "id": "a.k.t", "type": "rectangle", "pos": { - "x": 101, - "y": 341 + "x": 77, + "y": 243 }, "width": 51, "height": 66, @@ -130,11 +130,11 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 402, - "y": 168 + "x": 378, + "y": 188 }, - "width": 176, - "height": 537, + "width": 180, + "height": 509, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -175,7 +175,7 @@ ], "pos": { "x": 463, - "y": 333 + "y": 235 }, "width": 54, "height": 82, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 463, - "y": 453 + "y": 418 }, "width": 54, "height": 66, @@ -256,11 +256,11 @@ "id": "s", "type": "rectangle", "pos": { - "x": 728, - "y": 1398 + "x": 840, + "y": 1035 }, - "width": 748, - "height": 855, + "width": 656, + "height": 364, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -300,11 +300,11 @@ "icon" ], "pos": { - "x": 778, - "y": 1525 + "x": 870, + "y": 1109 }, - "width": 295, - "height": 300, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -353,11 +353,11 @@ "id": "k", "type": "rectangle", "pos": { - "x": 352, - "y": 2716 + "x": 434, + "y": 1911 }, - "width": 276, - "height": 295, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -395,7 +395,7 @@ "type": "rectangle", "pos": { "x": 464, - "y": 2886 + "y": 1941 }, "width": 52, "height": 66, @@ -435,11 +435,11 @@ "id": "u", "type": "rectangle", "pos": { - "x": 728, - "y": 2406 + "x": 798, + "y": 1465 }, - "width": 395, - "height": 605, + "width": 385, + "height": 572, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -477,7 +477,7 @@ "type": "rectangle", "pos": { "x": 899, - "y": 2886 + "y": 1941 }, "width": 54, "height": 66, @@ -517,11 +517,11 @@ "id": "h", "type": "rectangle", "pos": { - "x": 0, - "y": 1721 + "x": 16, + "y": 1105 }, - "width": 252, - "height": 519, + "width": 172, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -558,11 +558,11 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 50, - "y": 1848 + "x": 46, + "y": 1146 }, - "width": 152, - "height": 300, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -599,8 +599,8 @@ "id": "h.m.s", "type": "rectangle", "pos": { - "x": 100, - "y": 2021 + "x": 76, + "y": 1176 }, "width": 52, "height": 66, @@ -645,10 +645,10 @@ ], "pos": { "x": 452, - "y": 539 + "y": 544 }, "width": 76, - "height": 118, + "height": 123, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -700,11 +700,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 778, - "y": 2547 + "x": 871, + "y": 1495 }, - "width": 295, - "height": 174, + "width": 110, + "height": 127, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -745,7 +745,7 @@ ], "pos": { "x": 901, - "y": 2601 + "y": 1525 }, "width": 50, "height": 66, @@ -789,7 +789,7 @@ ], "pos": { "x": 828, - "y": 2800 + "y": 1815 }, "width": 195, "height": 66, @@ -829,11 +829,11 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 1273, - "y": 1861 + "x": 1353, + "y": 1243 }, - "width": 153, - "height": 300, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -870,8 +870,8 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 1323, - "y": 2034 + "x": 1383, + "y": 1273 }, "width": 53, "height": 66, @@ -912,7 +912,7 @@ "type": "rectangle", "pos": { "x": 900, - "y": 1698 + "y": 1139 }, "width": 51, "height": 66, @@ -952,11 +952,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 1223, - "y": 950 + "x": 1354, + "y": 803 }, - "width": 253, - "height": 295, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -993,8 +993,8 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 1324, - "y": 1120 + "x": 1384, + "y": 833 }, "width": 51, "height": 66, @@ -1034,11 +1034,11 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 1585, - "y": 287 + "x": 1665, + "y": 393 }, - "width": 149, - "height": 300, + "width": 109, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1075,8 +1075,8 @@ "id": "a.g.i", "type": "rectangle", "pos": { - "x": 1635, - "y": 460 + "x": 1695, + "y": 423 }, "width": 49, "height": 66, @@ -1139,56 +1139,56 @@ "labelPercentage": 0, "route": [ { - "x": 152.5, - "y": 374.5 + "x": 128.5, + "y": 276 }, { - "x": 192.10000610351562, - "y": 374.5 + "x": 168.10000610351562, + "y": 276 }, { - "x": 212, - "y": 374.5 + "x": 188, + "y": 276 }, { - "x": 227, - "y": 374.5 + "x": 203, + "y": 276 }, { - "x": 242, - "y": 374.5 + "x": 218, + "y": 276 }, { - "x": 262, - "y": 374.5 + "x": 238, + "y": 276 }, { - "x": 277, - "y": 374.5 + "x": 253, + "y": 276 }, { - "x": 292, - "y": 374.5 + "x": 268, + "y": 276 }, { - "x": 312, - "y": 374.5 + "x": 288, + "y": 276 }, { - "x": 327, - "y": 374.5 + "x": 303, + "y": 276 }, { - "x": 342, - "y": 374.5 + "x": 318, + "y": 276 }, { - "x": 414.20001220703125, - "y": 374.5 + "x": 395, + "y": 276 }, { "x": 463, - "y": 374.5 + "y": 276 } ], "isCurve": true, @@ -1223,55 +1223,55 @@ "route": [ { "x": 517, - "y": 477.5 + "y": 451 }, { "x": 565.7999877929688, - "y": 477.5 + "y": 451 }, { "x": 588, - "y": 477.5 + "y": 451 }, { "x": 603, - "y": 477.5 + "y": 451 }, { "x": 618, - "y": 477.5 + "y": 451 }, { "x": 638, - "y": 477.5 + "y": 451 }, { "x": 653, - "y": 477.5 + "y": 451 }, { "x": 668, - "y": 477.5 + "y": 451 }, { "x": 688, - "y": 477.5 + "y": 451 }, { "x": 703, - "y": 477.5 + "y": 451 }, { "x": 718, - "y": 477.5 + "y": 451 }, { - "x": 802.2000122070312, - "y": 681.7000122070312 + "x": 803.4000244140625, + "y": 582.5999755859375 }, { - "x": 899, - "y": 1498.5 + "x": 905, + "y": 1109 } ], "isCurve": true, @@ -1306,55 +1306,55 @@ "route": [ { "x": 516, - "y": 2919.5 + "y": 1974 }, { "x": 565.5999755859375, - "y": 2919.5 + "y": 1974 }, { "x": 588, - "y": 2919.5 + "y": 1974 }, { "x": 603, - "y": 2919.5 + "y": 1974 }, { "x": 618, - "y": 2919.5 + "y": 1974 }, { "x": 638, - "y": 2919.5 + "y": 1974 }, { "x": 653, - "y": 2919.5 + "y": 1974 }, { "x": 668, - "y": 2919.5 + "y": 1974 }, { "x": 688, - "y": 2919.5 + "y": 1974 }, { "x": 703, - "y": 2919.5 + "y": 1974 }, { "x": 718, - "y": 2919.5 + "y": 1974 }, { "x": 802.0999755859375, - "y": 2919.5 + "y": 1974 }, { "x": 898.5, - "y": 2919.5 + "y": 1974 } ], "isCurve": true, @@ -1388,56 +1388,56 @@ "labelPercentage": 0, "route": [ { - "x": 152, - "y": 2054.5 + "x": 128, + "y": 1208.5 }, { - "x": 192, - "y": 2054.5 + "x": 168, + "y": 1208.5 }, { - "x": 212, - "y": 2054.5 + "x": 188, + "y": 1208.5 }, { - "x": 227, - "y": 2054.5 + "x": 203, + "y": 1208.5 }, { - "x": 242, - "y": 2054.5 + "x": 218, + "y": 1208.5 }, { - "x": 262, - "y": 1740.9000244140625 + "x": 238, + "y": 1057 }, { - "x": 277, - "y": 1270.5 + "x": 253, + "y": 829.75 }, { - "x": 292, - "y": 800.0989990234375 + "x": 268, + "y": 602.5 }, { - "x": 312, - "y": 486.5 + "x": 288, + "y": 451 }, { - "x": 327, - "y": 486.5 + "x": 303, + "y": 451 }, { - "x": 342, - "y": 486.5 + "x": 318, + "y": 451 }, { - "x": 414.20001220703125, - "y": 486.5 + "x": 395, + "y": 451 }, { "x": 463, - "y": 486.5 + "y": 451 } ], "isCurve": true, @@ -1472,55 +1472,55 @@ "route": [ { "x": 528, - "y": 602 + "y": 621 }, { "x": 568, - "y": 602 + "y": 621 }, { "x": 588, - "y": 602 + "y": 621 }, { "x": 603, - "y": 602 + "y": 621 }, { "x": 618, - "y": 602 + "y": 621 }, { "x": 638, - "y": 602 + "y": 621 }, { "x": 653, - "y": 602 + "y": 621 }, { "x": 668, - "y": 602 + "y": 621 }, { "x": 688, - "y": 602 + "y": 621 }, { "x": 703, - "y": 602 + "y": 621 }, { "x": 718, - "y": 602 + "y": 621 }, { - "x": 807, - "y": 1001.2000122070312 + "x": 806, + "y": 801.7999877929688 }, { - "x": 923, - "y": 2598 + "x": 918, + "y": 1525 } ], "isCurve": true, @@ -1555,55 +1555,55 @@ "route": [ { "x": 1023, - "y": 2842.5 + "y": 1848 }, { "x": 1063, - "y": 2842.5 + "y": 1848 }, { - "x": 1083, - "y": 2842.5 + "x": 1095, + "y": 1848 }, { - "x": 1098, - "y": 2842.5 + "x": 1128, + "y": 1848 }, { - "x": 1113, - "y": 2842.5 + "x": 1161, + "y": 1848 }, { - "x": 1133, - "y": 2685.699951171875 + "x": 1193, + "y": 1739.5999755859375 }, { - "x": 1148, - "y": 2450.5 + "x": 1208, + "y": 1577 }, { - "x": 1163, - "y": 2215.300048828125 + "x": 1223, + "y": 1414.4000244140625 }, { - "x": 1183, - "y": 2058.5 + "x": 1243, + "y": 1306 }, { - "x": 1198, - "y": 2058.5 + "x": 1258, + "y": 1306 }, { - "x": 1213, - "y": 2058.5 + "x": 1273, + "y": 1306 }, { - "x": 1283, - "y": 2058.5 + "x": 1343, + "y": 1306 }, { - "x": 1323, - "y": 2058.5 + "x": 1383, + "y": 1306 } ], "isCurve": true, @@ -1637,44 +1637,44 @@ "labelPercentage": 0, "route": [ { - "x": 1073, - "y": 1713.5 + "x": 981, + "y": 1172 }, { - "x": 1113, - "y": 1713.5 + "x": 1142.5999755859375, + "y": 1172 }, { - "x": 1133, - "y": 1713.5 + "x": 1193, + "y": 1172 }, { - "x": 1148, - "y": 1713.5 + "x": 1208, + "y": 1172 }, { - "x": 1163, - "y": 1713.5 + "x": 1223, + "y": 1172 }, { - "x": 1183, - "y": 1713.5 + "x": 1243, + "y": 1172 }, { - "x": 1198, - "y": 1713.5 + "x": 1258, + "y": 1172 }, { - "x": 1213, - "y": 1713.5 + "x": 1273, + "y": 1172 }, { - "x": 1287.4000244140625, - "y": 1608.0999755859375 + "x": 1345.5999755859375, + "y": 1117.4000244140625 }, { - "x": 1345, - "y": 1186.5 + "x": 1396, + "y": 899 } ], "isCurve": true, @@ -1708,44 +1708,44 @@ "labelPercentage": 0, "route": [ { - "x": 1375, - "y": 1162.5 + "x": 1435, + "y": 866 }, { - "x": 1415.800048828125, - "y": 1162.5 + "x": 1475.800048828125, + "y": 866 }, { - "x": 1436, - "y": 1162.5 + "x": 1496, + "y": 866 }, { - "x": 1451, - "y": 1162.5 + "x": 1511, + "y": 866 }, { - "x": 1466, - "y": 1162.5 + "x": 1526, + "y": 866 }, { - "x": 1486.9000244140625, - "y": 1026.800048828125 + "x": 1546.9000244140625, + "y": 784 }, { - "x": 1503.25, - "y": 823.25 + "x": 1563.25, + "y": 661 }, { - "x": 1519.5999755859375, - "y": 619.698974609375 + "x": 1579.5999755859375, + "y": 538 }, { - "x": 1595, - "y": 484 + "x": 1655, + "y": 456 }, { - "x": 1635, - "y": 484 + "x": 1695, + "y": 456 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg index a78e8ff11..ed3215288 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-4237444760 .fill-N1{fill:#0A0F25;} + .d2-4237444760 .fill-N2{fill:#676C7E;} + .d2-4237444760 .fill-N3{fill:#9499AB;} + .d2-4237444760 .fill-N4{fill:#CFD2DD;} + .d2-4237444760 .fill-N5{fill:#DEE1EB;} + .d2-4237444760 .fill-N6{fill:#EEF1F8;} + .d2-4237444760 .fill-N7{fill:#FFFFFF;} + .d2-4237444760 .fill-B1{fill:#0D32B2;} + .d2-4237444760 .fill-B2{fill:#0D32B2;} + .d2-4237444760 .fill-B3{fill:#E3E9FD;} + .d2-4237444760 .fill-B4{fill:#E3E9FD;} + .d2-4237444760 .fill-B5{fill:#EDF0FD;} + .d2-4237444760 .fill-B6{fill:#F7F8FE;} + .d2-4237444760 .fill-AA2{fill:#4A6FF3;} + .d2-4237444760 .fill-AA4{fill:#EDF0FD;} + .d2-4237444760 .fill-AA5{fill:#F7F8FE;} + .d2-4237444760 .fill-AB4{fill:#EDF0FD;} + .d2-4237444760 .fill-AB5{fill:#F7F8FE;} + .d2-4237444760 .stroke-N1{stroke:#0A0F25;} + .d2-4237444760 .stroke-N2{stroke:#676C7E;} + .d2-4237444760 .stroke-N3{stroke:#9499AB;} + .d2-4237444760 .stroke-N4{stroke:#CFD2DD;} + .d2-4237444760 .stroke-N5{stroke:#DEE1EB;} + .d2-4237444760 .stroke-N6{stroke:#EEF1F8;} + .d2-4237444760 .stroke-N7{stroke:#FFFFFF;} + .d2-4237444760 .stroke-B1{stroke:#0D32B2;} + .d2-4237444760 .stroke-B2{stroke:#0D32B2;} + .d2-4237444760 .stroke-B3{stroke:#E3E9FD;} + .d2-4237444760 .stroke-B4{stroke:#E3E9FD;} + .d2-4237444760 .stroke-B5{stroke:#EDF0FD;} + .d2-4237444760 .stroke-B6{stroke:#F7F8FE;} + .d2-4237444760 .stroke-AA2{stroke:#4A6FF3;} + .d2-4237444760 .stroke-AA4{stroke:#EDF0FD;} + .d2-4237444760 .stroke-AA5{stroke:#F7F8FE;} + .d2-4237444760 .stroke-AB4{stroke:#EDF0FD;} + .d2-4237444760 .stroke-AB5{stroke:#F7F8FE;} + .d2-4237444760 .background-color-N1{background-color:#0A0F25;} + .d2-4237444760 .background-color-N2{background-color:#676C7E;} + .d2-4237444760 .background-color-N3{background-color:#9499AB;} + .d2-4237444760 .background-color-N4{background-color:#CFD2DD;} + .d2-4237444760 .background-color-N5{background-color:#DEE1EB;} + .d2-4237444760 .background-color-N6{background-color:#EEF1F8;} + .d2-4237444760 .background-color-N7{background-color:#FFFFFF;} + .d2-4237444760 .background-color-B1{background-color:#0D32B2;} + .d2-4237444760 .background-color-B2{background-color:#0D32B2;} + .d2-4237444760 .background-color-B3{background-color:#E3E9FD;} + .d2-4237444760 .background-color-B4{background-color:#E3E9FD;} + .d2-4237444760 .background-color-B5{background-color:#EDF0FD;} + .d2-4237444760 .background-color-B6{background-color:#F7F8FE;} + .d2-4237444760 .background-color-AA2{background-color:#4A6FF3;} + .d2-4237444760 .background-color-AA4{background-color:#EDF0FD;} + .d2-4237444760 .background-color-AA5{background-color:#F7F8FE;} + .d2-4237444760 .background-color-AB4{background-color:#EDF0FD;} + .d2-4237444760 .background-color-AB5{background-color:#F7F8FE;} + .d2-4237444760 .color-N1{color:#0A0F25;} + .d2-4237444760 .color-N2{color:#676C7E;} + .d2-4237444760 .color-N3{color:#9499AB;} + .d2-4237444760 .color-N4{color:#CFD2DD;} + .d2-4237444760 .color-N5{color:#DEE1EB;} + .d2-4237444760 .color-N6{color:#EEF1F8;} + .d2-4237444760 .color-N7{color:#FFFFFF;} + .d2-4237444760 .color-B1{color:#0D32B2;} + .d2-4237444760 .color-B2{color:#0D32B2;} + .d2-4237444760 .color-B3{color:#E3E9FD;} + .d2-4237444760 .color-B4{color:#E3E9FD;} + .d2-4237444760 .color-B5{color:#EDF0FD;} + .d2-4237444760 .color-B6{color:#F7F8FE;} + .d2-4237444760 .color-AA2{color:#4A6FF3;} + .d2-4237444760 .color-AA4{color:#EDF0FD;} + .d2-4237444760 .color-AA5{color:#F7F8FE;} + .d2-4237444760 .color-AB4{color:#EDF0FD;} + .d2-4237444760 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json index 635647da1..3cb0c0cf7 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json @@ -1177,7 +1177,7 @@ "labelPercentage": 0, "route": [ { - "x": 799.5, + "x": 799, "y": 439.5 }, { @@ -1197,7 +1197,7 @@ "y": 464.5 }, { - "x": 1683.5, + "x": 1684, "y": 464.5 } ], @@ -1289,7 +1289,7 @@ "y": 439.5 }, { - "x": 745.5, + "x": 746, "y": 439.5 } ], @@ -1407,7 +1407,7 @@ "labelPercentage": 0, "route": [ { - "x": 1834.5, + "x": 1834, "y": 464.5 }, { diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg index 074572c31..328f70ce5 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-2275681348 .fill-N1{fill:#0A0F25;} + .d2-2275681348 .fill-N2{fill:#676C7E;} + .d2-2275681348 .fill-N3{fill:#9499AB;} + .d2-2275681348 .fill-N4{fill:#CFD2DD;} + .d2-2275681348 .fill-N5{fill:#DEE1EB;} + .d2-2275681348 .fill-N6{fill:#EEF1F8;} + .d2-2275681348 .fill-N7{fill:#FFFFFF;} + .d2-2275681348 .fill-B1{fill:#0D32B2;} + .d2-2275681348 .fill-B2{fill:#0D32B2;} + .d2-2275681348 .fill-B3{fill:#E3E9FD;} + .d2-2275681348 .fill-B4{fill:#E3E9FD;} + .d2-2275681348 .fill-B5{fill:#EDF0FD;} + .d2-2275681348 .fill-B6{fill:#F7F8FE;} + .d2-2275681348 .fill-AA2{fill:#4A6FF3;} + .d2-2275681348 .fill-AA4{fill:#EDF0FD;} + .d2-2275681348 .fill-AA5{fill:#F7F8FE;} + .d2-2275681348 .fill-AB4{fill:#EDF0FD;} + .d2-2275681348 .fill-AB5{fill:#F7F8FE;} + .d2-2275681348 .stroke-N1{stroke:#0A0F25;} + .d2-2275681348 .stroke-N2{stroke:#676C7E;} + .d2-2275681348 .stroke-N3{stroke:#9499AB;} + .d2-2275681348 .stroke-N4{stroke:#CFD2DD;} + .d2-2275681348 .stroke-N5{stroke:#DEE1EB;} + .d2-2275681348 .stroke-N6{stroke:#EEF1F8;} + .d2-2275681348 .stroke-N7{stroke:#FFFFFF;} + .d2-2275681348 .stroke-B1{stroke:#0D32B2;} + .d2-2275681348 .stroke-B2{stroke:#0D32B2;} + .d2-2275681348 .stroke-B3{stroke:#E3E9FD;} + .d2-2275681348 .stroke-B4{stroke:#E3E9FD;} + .d2-2275681348 .stroke-B5{stroke:#EDF0FD;} + .d2-2275681348 .stroke-B6{stroke:#F7F8FE;} + .d2-2275681348 .stroke-AA2{stroke:#4A6FF3;} + .d2-2275681348 .stroke-AA4{stroke:#EDF0FD;} + .d2-2275681348 .stroke-AA5{stroke:#F7F8FE;} + .d2-2275681348 .stroke-AB4{stroke:#EDF0FD;} + .d2-2275681348 .stroke-AB5{stroke:#F7F8FE;} + .d2-2275681348 .background-color-N1{background-color:#0A0F25;} + .d2-2275681348 .background-color-N2{background-color:#676C7E;} + .d2-2275681348 .background-color-N3{background-color:#9499AB;} + .d2-2275681348 .background-color-N4{background-color:#CFD2DD;} + .d2-2275681348 .background-color-N5{background-color:#DEE1EB;} + .d2-2275681348 .background-color-N6{background-color:#EEF1F8;} + .d2-2275681348 .background-color-N7{background-color:#FFFFFF;} + .d2-2275681348 .background-color-B1{background-color:#0D32B2;} + .d2-2275681348 .background-color-B2{background-color:#0D32B2;} + .d2-2275681348 .background-color-B3{background-color:#E3E9FD;} + .d2-2275681348 .background-color-B4{background-color:#E3E9FD;} + .d2-2275681348 .background-color-B5{background-color:#EDF0FD;} + .d2-2275681348 .background-color-B6{background-color:#F7F8FE;} + .d2-2275681348 .background-color-AA2{background-color:#4A6FF3;} + .d2-2275681348 .background-color-AA4{background-color:#EDF0FD;} + .d2-2275681348 .background-color-AA5{background-color:#F7F8FE;} + .d2-2275681348 .background-color-AB4{background-color:#EDF0FD;} + .d2-2275681348 .background-color-AB5{background-color:#F7F8FE;} + .d2-2275681348 .color-N1{color:#0A0F25;} + .d2-2275681348 .color-N2{color:#676C7E;} + .d2-2275681348 .color-N3{color:#9499AB;} + .d2-2275681348 .color-N4{color:#CFD2DD;} + .d2-2275681348 .color-N5{color:#DEE1EB;} + .d2-2275681348 .color-N6{color:#EEF1F8;} + .d2-2275681348 .color-N7{color:#FFFFFF;} + .d2-2275681348 .color-B1{color:#0D32B2;} + .d2-2275681348 .color-B2{color:#0D32B2;} + .d2-2275681348 .color-B3{color:#E3E9FD;} + .d2-2275681348 .color-B4{color:#E3E9FD;} + .d2-2275681348 .color-B5{color:#EDF0FD;} + .d2-2275681348 .color-B6{color:#F7F8FE;} + .d2-2275681348 .color-AA2{color:#4A6FF3;} + .d2-2275681348 .color-AA4{color:#EDF0FD;} + .d2-2275681348 .color-AA5{color:#F7F8FE;} + .d2-2275681348 .color-AB4{color:#EDF0FD;} + .d2-2275681348 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json index a38d85848..1e0ce8804 100644 --- a/e2etests/testdata/stable/dense/dagre/board.exp.json +++ b/e2etests/testdata/stable/dense/dagre/board.exp.json @@ -775,11 +775,11 @@ "route": [ { "x": 117, - "y": 511.447998046875 + "y": 511 }, { "x": 185.8000030517578, - "y": 460.6889953613281 + "y": 460.6000061035156 }, { "x": 203, @@ -951,12 +951,12 @@ "labelPercentage": 0, "route": [ { - "x": 340, - "y": 210.01100158691406 + "x": 340.25, + "y": 210 }, { - "x": 478.6000061035156, - "y": 267.60198974609375 + "x": 478.6499938964844, + "y": 267.6000061035156 }, { "x": 513.25, @@ -1010,12 +1010,12 @@ "labelPercentage": 0, "route": [ { - "x": 340, - "y": 206.61000061035156 + "x": 339.5, + "y": 207 }, { - "x": 550, - "y": 266.9219970703125 + "x": 549.9000244140625, + "y": 267 }, { "x": 602.5, @@ -1104,12 +1104,12 @@ "labelPercentage": 0, "route": [ { - "x": 287, - "y": 211.42599487304688 + "x": 287.5, + "y": 211 }, { - "x": 166.60000610351562, - "y": 267.885009765625 + "x": 166.6999969482422, + "y": 267.79998779296875 }, { "x": 136.5, @@ -1151,11 +1151,11 @@ "labelPercentage": 0, "route": [ { - "x": 322.8429870605469, + "x": 323, "y": 232 }, { - "x": 334.1679992675781, + "x": 334.20001220703125, "y": 272 }, { @@ -1259,11 +1259,11 @@ "route": [ { "x": 340, - "y": 212.2100067138672 + "y": 212 }, { "x": 452, - "y": 268.0419921875 + "y": 268 }, { "x": 480, @@ -1364,11 +1364,11 @@ "labelPercentage": 0, "route": [ { - "x": 37.92100143432617, + "x": 37.5, "y": 332 }, { - "x": 53.58399963378906, + "x": 53.5, "y": 292 }, { @@ -1424,11 +1424,11 @@ "route": [ { "x": 287, - "y": 206.6230010986328 + "y": 207 }, { "x": 77.39900207519531, - "y": 266.92401123046875 + "y": 267 }, { "x": 25, @@ -1517,12 +1517,12 @@ "labelPercentage": 0, "route": [ { - "x": 507, - "y": 544.2210083007812 + "x": 506.5, + "y": 544 }, { - "x": 621, - "y": 600.0440063476562 + "x": 620.9000244140625, + "y": 600 }, { "x": 666.5, @@ -1611,11 +1611,11 @@ "labelPercentage": 0, "route": [ { - "x": 710.4749755859375, + "x": 710.5, "y": 564 }, { - "x": 715.2949829101562, + "x": 715.2999877929688, "y": 604 }, { @@ -1658,12 +1658,12 @@ "labelPercentage": 0, "route": [ { - "x": 678, - "y": 538.47900390625 + "x": 678.25, + "y": 538 }, { - "x": 447.79901123046875, - "y": 598.89501953125 + "x": 447.8500061035156, + "y": 598.7999877929688 }, { "x": 393.04998779296875, @@ -1752,11 +1752,11 @@ "labelPercentage": 0, "route": [ { - "x": 453.55999755859375, + "x": 453.5, "y": 564 }, { - "x": 421.5119934082031, + "x": 421.5, "y": 604 }, { @@ -1799,12 +1799,12 @@ "labelPercentage": 0, "route": [ { - "x": 567, - "y": 544.5889892578125 + "x": 566.75, + "y": 545 }, { - "x": 462.79998779296875, - "y": 600.1170043945312 + "x": 462.75, + "y": 600.2000122070312 }, { "x": 433.95001220703125, @@ -1846,11 +1846,11 @@ "labelPercentage": 0, "route": [ { - "x": 296.2040100097656, + "x": 296, "y": 232 }, { - "x": 275.239990234375, + "x": 275.20001220703125, "y": 272 }, { @@ -1902,11 +1902,11 @@ }, { "x": 817.9000244140625, - "y": 624.4000244140625 + "y": 624.2000122070312 }, { "x": 783.5, - "y": 666 + "y": 665 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg index 6aedcc551..9fe3aa58f 100644 --- a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopq + .d2-1170671173 .fill-N1{fill:#0A0F25;} + .d2-1170671173 .fill-N2{fill:#676C7E;} + .d2-1170671173 .fill-N3{fill:#9499AB;} + .d2-1170671173 .fill-N4{fill:#CFD2DD;} + .d2-1170671173 .fill-N5{fill:#DEE1EB;} + .d2-1170671173 .fill-N6{fill:#EEF1F8;} + .d2-1170671173 .fill-N7{fill:#FFFFFF;} + .d2-1170671173 .fill-B1{fill:#0D32B2;} + .d2-1170671173 .fill-B2{fill:#0D32B2;} + .d2-1170671173 .fill-B3{fill:#E3E9FD;} + .d2-1170671173 .fill-B4{fill:#E3E9FD;} + .d2-1170671173 .fill-B5{fill:#EDF0FD;} + .d2-1170671173 .fill-B6{fill:#F7F8FE;} + .d2-1170671173 .fill-AA2{fill:#4A6FF3;} + .d2-1170671173 .fill-AA4{fill:#EDF0FD;} + .d2-1170671173 .fill-AA5{fill:#F7F8FE;} + .d2-1170671173 .fill-AB4{fill:#EDF0FD;} + .d2-1170671173 .fill-AB5{fill:#F7F8FE;} + .d2-1170671173 .stroke-N1{stroke:#0A0F25;} + .d2-1170671173 .stroke-N2{stroke:#676C7E;} + .d2-1170671173 .stroke-N3{stroke:#9499AB;} + .d2-1170671173 .stroke-N4{stroke:#CFD2DD;} + .d2-1170671173 .stroke-N5{stroke:#DEE1EB;} + .d2-1170671173 .stroke-N6{stroke:#EEF1F8;} + .d2-1170671173 .stroke-N7{stroke:#FFFFFF;} + .d2-1170671173 .stroke-B1{stroke:#0D32B2;} + .d2-1170671173 .stroke-B2{stroke:#0D32B2;} + .d2-1170671173 .stroke-B3{stroke:#E3E9FD;} + .d2-1170671173 .stroke-B4{stroke:#E3E9FD;} + .d2-1170671173 .stroke-B5{stroke:#EDF0FD;} + .d2-1170671173 .stroke-B6{stroke:#F7F8FE;} + .d2-1170671173 .stroke-AA2{stroke:#4A6FF3;} + .d2-1170671173 .stroke-AA4{stroke:#EDF0FD;} + .d2-1170671173 .stroke-AA5{stroke:#F7F8FE;} + .d2-1170671173 .stroke-AB4{stroke:#EDF0FD;} + .d2-1170671173 .stroke-AB5{stroke:#F7F8FE;} + .d2-1170671173 .background-color-N1{background-color:#0A0F25;} + .d2-1170671173 .background-color-N2{background-color:#676C7E;} + .d2-1170671173 .background-color-N3{background-color:#9499AB;} + .d2-1170671173 .background-color-N4{background-color:#CFD2DD;} + .d2-1170671173 .background-color-N5{background-color:#DEE1EB;} + .d2-1170671173 .background-color-N6{background-color:#EEF1F8;} + .d2-1170671173 .background-color-N7{background-color:#FFFFFF;} + .d2-1170671173 .background-color-B1{background-color:#0D32B2;} + .d2-1170671173 .background-color-B2{background-color:#0D32B2;} + .d2-1170671173 .background-color-B3{background-color:#E3E9FD;} + .d2-1170671173 .background-color-B4{background-color:#E3E9FD;} + .d2-1170671173 .background-color-B5{background-color:#EDF0FD;} + .d2-1170671173 .background-color-B6{background-color:#F7F8FE;} + .d2-1170671173 .background-color-AA2{background-color:#4A6FF3;} + .d2-1170671173 .background-color-AA4{background-color:#EDF0FD;} + .d2-1170671173 .background-color-AA5{background-color:#F7F8FE;} + .d2-1170671173 .background-color-AB4{background-color:#EDF0FD;} + .d2-1170671173 .background-color-AB5{background-color:#F7F8FE;} + .d2-1170671173 .color-N1{color:#0A0F25;} + .d2-1170671173 .color-N2{color:#676C7E;} + .d2-1170671173 .color-N3{color:#9499AB;} + .d2-1170671173 .color-N4{color:#CFD2DD;} + .d2-1170671173 .color-N5{color:#DEE1EB;} + .d2-1170671173 .color-N6{color:#EEF1F8;} + .d2-1170671173 .color-N7{color:#FFFFFF;} + .d2-1170671173 .color-B1{color:#0D32B2;} + .d2-1170671173 .color-B2{color:#0D32B2;} + .d2-1170671173 .color-B3{color:#E3E9FD;} + .d2-1170671173 .color-B4{color:#E3E9FD;} + .d2-1170671173 .color-B5{color:#EDF0FD;} + .d2-1170671173 .color-B6{color:#F7F8FE;} + .d2-1170671173 .color-AA2{color:#4A6FF3;} + .d2-1170671173 .color-AA4{color:#EDF0FD;} + .d2-1170671173 .color-AA5{color:#F7F8FE;} + .d2-1170671173 .color-AB4{color:#EDF0FD;} + .d2-1170671173 .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}]]>abcdefghijklmnopq diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json index 6fd0f433d..641c7ddcd 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json @@ -499,11 +499,11 @@ "id": "finally", "type": "rectangle", "pos": { - "x": 863, - "y": 41 + "x": 873, + "y": 20 }, - "width": 312, - "height": 623, + "width": 288, + "height": 624, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 1000, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": 922, - "y": 402 + "y": 382 }, "width": 74, "height": 66, @@ -787,7 +787,7 @@ "type": "rectangle", "pos": { "x": 982, - "y": 70 + "y": 50 }, "width": 88, "height": 66, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 903, - "y": 568 + "y": 548 }, "width": 113, "height": 66, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 1056, - "y": 402 + "y": 382 }, "width": 75, "height": 66, @@ -933,11 +933,11 @@ "route": [ { "x": 301, - "y": 93.20600128173828 + "y": 93 }, { "x": 149.7989959716797, - "y": 151.4409942626953 + "y": 151.39999389648438 }, { "x": 112, @@ -1027,11 +1027,11 @@ "route": [ { "x": 354, - "y": 98.76699829101562 + "y": 99 }, { "x": 444.3999938964844, - "y": 152.55299377441406 + "y": 152.60000610351562 }, { "x": 467, @@ -1120,11 +1120,11 @@ "labelPercentage": 0, "route": [ { - "x": 83.5719985961914, + "x": 83.5, "y": 282 }, { - "x": 49.11399841308594, + "x": 49.099998474121094, "y": 322 }, { @@ -1167,11 +1167,11 @@ "labelPercentage": 0, "route": [ { - "x": 140.427001953125, + "x": 140.5, "y": 282 }, { - "x": 174.88499450683594, + "x": 174.89999389648438, "y": 322 }, { @@ -1214,11 +1214,11 @@ "labelPercentage": 0, "route": [ { - "x": 614.5239868164062, + "x": 614.5, "y": 116 }, { - "x": 609.7039794921875, + "x": 609.7000122070312, "y": 156 }, { @@ -1355,11 +1355,11 @@ "labelPercentage": 0, "route": [ { - "x": 649.2130126953125, + "x": 648.75, "y": 116 }, { - "x": 686.4420166015625, + "x": 686.3499755859375, "y": 156 }, { @@ -1403,11 +1403,11 @@ "route": [ { "x": 930.75, - "y": 664 + "y": 644 }, { "x": 930.75, - "y": 704 + "y": 700 }, { "x": 930.75, @@ -1544,11 +1544,11 @@ "route": [ { "x": 1055, - "y": 664 + "y": 644 }, { "x": 1055, - "y": 704 + "y": 700 }, { "x": 1077.550048828125, @@ -1591,19 +1591,19 @@ "route": [ { "x": 999.75, - "y": 302.20599365234375 + "y": 281.70599365234375 }, { "x": 967.1500244140625, - "y": 342.4410095214844 + "y": 321.9410095214844 }, { "x": 959, - "y": 362.5 + "y": 342 }, { "x": 959, - "y": 402.5 + "y": 382 } ], "isCurve": true, @@ -1638,19 +1638,19 @@ "route": [ { "x": 1026.25, - "y": 136.5 + "y": 116 }, { "x": 1026.25, - "y": 176.5 + "y": 156 }, { "x": 1026.25, - "y": 196.5 + "y": 176 }, { "x": 1026.25, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -1685,19 +1685,19 @@ "route": [ { "x": 959, - "y": 468.5 + "y": 448 }, { "x": 959, - "y": 508.5 + "y": 488 }, { "x": 959, - "y": 528.5 + "y": 508 }, { "x": 959, - "y": 568.5 + "y": 548 } ], "isCurve": true, @@ -1731,20 +1731,20 @@ "labelPercentage": 0, "route": [ { - "x": 1052.75, - "y": 302.20599365234375 + "x": 1052.5, + "y": 282 }, { - "x": 1085.3499755859375, - "y": 342.4410095214844 + "x": 1085.300048828125, + "y": 322 }, { "x": 1093.5, - "y": 362.5 + "y": 342 }, { "x": 1093.5, - "y": 402.5 + "y": 382 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg index c555a97a2..adcda8c80 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot - + .d2-2884768994 .fill-N1{fill:#0A0F25;} + .d2-2884768994 .fill-N2{fill:#676C7E;} + .d2-2884768994 .fill-N3{fill:#9499AB;} + .d2-2884768994 .fill-N4{fill:#CFD2DD;} + .d2-2884768994 .fill-N5{fill:#DEE1EB;} + .d2-2884768994 .fill-N6{fill:#EEF1F8;} + .d2-2884768994 .fill-N7{fill:#FFFFFF;} + .d2-2884768994 .fill-B1{fill:#0D32B2;} + .d2-2884768994 .fill-B2{fill:#0D32B2;} + .d2-2884768994 .fill-B3{fill:#E3E9FD;} + .d2-2884768994 .fill-B4{fill:#E3E9FD;} + .d2-2884768994 .fill-B5{fill:#EDF0FD;} + .d2-2884768994 .fill-B6{fill:#F7F8FE;} + .d2-2884768994 .fill-AA2{fill:#4A6FF3;} + .d2-2884768994 .fill-AA4{fill:#EDF0FD;} + .d2-2884768994 .fill-AA5{fill:#F7F8FE;} + .d2-2884768994 .fill-AB4{fill:#EDF0FD;} + .d2-2884768994 .fill-AB5{fill:#F7F8FE;} + .d2-2884768994 .stroke-N1{stroke:#0A0F25;} + .d2-2884768994 .stroke-N2{stroke:#676C7E;} + .d2-2884768994 .stroke-N3{stroke:#9499AB;} + .d2-2884768994 .stroke-N4{stroke:#CFD2DD;} + .d2-2884768994 .stroke-N5{stroke:#DEE1EB;} + .d2-2884768994 .stroke-N6{stroke:#EEF1F8;} + .d2-2884768994 .stroke-N7{stroke:#FFFFFF;} + .d2-2884768994 .stroke-B1{stroke:#0D32B2;} + .d2-2884768994 .stroke-B2{stroke:#0D32B2;} + .d2-2884768994 .stroke-B3{stroke:#E3E9FD;} + .d2-2884768994 .stroke-B4{stroke:#E3E9FD;} + .d2-2884768994 .stroke-B5{stroke:#EDF0FD;} + .d2-2884768994 .stroke-B6{stroke:#F7F8FE;} + .d2-2884768994 .stroke-AA2{stroke:#4A6FF3;} + .d2-2884768994 .stroke-AA4{stroke:#EDF0FD;} + .d2-2884768994 .stroke-AA5{stroke:#F7F8FE;} + .d2-2884768994 .stroke-AB4{stroke:#EDF0FD;} + .d2-2884768994 .stroke-AB5{stroke:#F7F8FE;} + .d2-2884768994 .background-color-N1{background-color:#0A0F25;} + .d2-2884768994 .background-color-N2{background-color:#676C7E;} + .d2-2884768994 .background-color-N3{background-color:#9499AB;} + .d2-2884768994 .background-color-N4{background-color:#CFD2DD;} + .d2-2884768994 .background-color-N5{background-color:#DEE1EB;} + .d2-2884768994 .background-color-N6{background-color:#EEF1F8;} + .d2-2884768994 .background-color-N7{background-color:#FFFFFF;} + .d2-2884768994 .background-color-B1{background-color:#0D32B2;} + .d2-2884768994 .background-color-B2{background-color:#0D32B2;} + .d2-2884768994 .background-color-B3{background-color:#E3E9FD;} + .d2-2884768994 .background-color-B4{background-color:#E3E9FD;} + .d2-2884768994 .background-color-B5{background-color:#EDF0FD;} + .d2-2884768994 .background-color-B6{background-color:#F7F8FE;} + .d2-2884768994 .background-color-AA2{background-color:#4A6FF3;} + .d2-2884768994 .background-color-AA4{background-color:#EDF0FD;} + .d2-2884768994 .background-color-AA5{background-color:#F7F8FE;} + .d2-2884768994 .background-color-AB4{background-color:#EDF0FD;} + .d2-2884768994 .background-color-AB5{background-color:#F7F8FE;} + .d2-2884768994 .color-N1{color:#0A0F25;} + .d2-2884768994 .color-N2{color:#676C7E;} + .d2-2884768994 .color-N3{color:#9499AB;} + .d2-2884768994 .color-N4{color:#CFD2DD;} + .d2-2884768994 .color-N5{color:#DEE1EB;} + .d2-2884768994 .color-N6{color:#EEF1F8;} + .d2-2884768994 .color-N7{color:#FFFFFF;} + .d2-2884768994 .color-B1{color:#0D32B2;} + .d2-2884768994 .color-B2{color:#0D32B2;} + .d2-2884768994 .color-B3{color:#E3E9FD;} + .d2-2884768994 .color-B4{color:#E3E9FD;} + .d2-2884768994 .color-B5{color:#EDF0FD;} + .d2-2884768994 .color-B6{color:#F7F8FE;} + .d2-2884768994 .color-AA2{color:#4A6FF3;} + .d2-2884768994 .color-AA4{color:#EDF0FD;} + .d2-2884768994 .color-AA5{color:#F7F8FE;} + .d2-2884768994 .color-AB4{color:#EDF0FD;} + .d2-2884768994 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot + @@ -110,14 +110,14 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json index 26c15544e..51c75f9e1 100644 --- a/e2etests/testdata/stable/direction/dagre/board.exp.json +++ b/e2etests/testdata/stable/direction/dagre/board.exp.json @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 207 + "y": 186 }, "width": 174, - "height": 1553, + "height": 1554, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 236 + "y": 216 }, "width": 52, "height": 66, @@ -253,11 +253,11 @@ "id": "b.2", "type": "rectangle", "pos": { - "x": 20, - "y": 438 + "x": 30, + "y": 402 }, - "width": 134, - "height": 794, + "width": 114, + "height": 790, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 1332 + "y": 1312 }, "width": 53, "height": 66, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 1498 + "y": 1478 }, "width": 54, "height": 66, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 1664 + "y": 1644 }, "width": 53, "height": 66, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 470 + "y": 432 }, "width": 53, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 636 + "y": 598 }, "width": 53, "height": 66, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 802 + "y": 764 }, "width": 53, "height": 66, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 968 + "y": 930 }, "width": 54, "height": 66, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 1134 + "y": 1096 }, "width": 53, "height": 66, @@ -654,11 +654,11 @@ }, { "x": 87, - "y": 126 + "y": 121.80000305175781 }, { "x": 87, - "y": 166 + "y": 145 } ], "isCurve": true, @@ -693,11 +693,11 @@ "route": [ { "x": 87, - "y": 1760 + "y": 1740 }, { "x": 87, - "y": 1800 + "y": 1796 }, { "x": 87, @@ -834,19 +834,19 @@ "route": [ { "x": 87, - "y": 302.5 + "y": 282 }, { "x": 87, - "y": 342.5 + "y": 322 }, { "x": 87, - "y": 362.5 + "y": 338.79998779296875 }, { "x": 87, - "y": 402.5 + "y": 366 } ], "isCurve": true, @@ -881,19 +881,19 @@ "route": [ { "x": 87, - "y": 1232.5 + "y": 1192 }, { "x": 87, - "y": 1272.5 + "y": 1248 }, { "x": 87, - "y": 1292.5 + "y": 1272 }, { "x": 87, - "y": 1332.5 + "y": 1312 } ], "isCurve": true, @@ -928,19 +928,19 @@ "route": [ { "x": 87, - "y": 1398.5 + "y": 1378 }, { "x": 87, - "y": 1438.5 + "y": 1418 }, { "x": 87, - "y": 1458.5 + "y": 1438 }, { "x": 87, - "y": 1498.5 + "y": 1478 } ], "isCurve": true, @@ -975,19 +975,19 @@ "route": [ { "x": 87, - "y": 1564.5 + "y": 1544 }, { "x": 87, - "y": 1604.5 + "y": 1584 }, { "x": 87, - "y": 1624.5 + "y": 1604 }, { "x": 87, - "y": 1664.5 + "y": 1644 } ], "isCurve": true, @@ -1022,19 +1022,19 @@ "route": [ { "x": 87, - "y": 536.5 + "y": 498 }, { "x": 87, - "y": 576.5 + "y": 538 }, { "x": 87, - "y": 596.5 + "y": 558 }, { "x": 87, - "y": 636.5 + "y": 598 } ], "isCurve": true, @@ -1069,19 +1069,19 @@ "route": [ { "x": 87, - "y": 702.5 + "y": 664 }, { "x": 87, - "y": 742.5 + "y": 704 }, { "x": 87, - "y": 762.5 + "y": 724 }, { "x": 87, - "y": 802.5 + "y": 764 } ], "isCurve": true, @@ -1116,19 +1116,19 @@ "route": [ { "x": 87, - "y": 868.5 + "y": 830 }, { "x": 87, - "y": 908.5 + "y": 870 }, { "x": 87, - "y": 928.5 + "y": 890 }, { "x": 87, - "y": 968.5 + "y": 930 } ], "isCurve": true, @@ -1163,19 +1163,19 @@ "route": [ { "x": 87, - "y": 1034.5 + "y": 996 }, { "x": 87, - "y": 1074.5 + "y": 1036 }, { "x": 87, - "y": 1094.5 + "y": 1056 }, { "x": 87, - "y": 1134.5 + "y": 1096 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg index 40417f25e..353ba9373 100644 --- a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcde12345abcde + .d2-2837767531 .fill-N1{fill:#0A0F25;} + .d2-2837767531 .fill-N2{fill:#676C7E;} + .d2-2837767531 .fill-N3{fill:#9499AB;} + .d2-2837767531 .fill-N4{fill:#CFD2DD;} + .d2-2837767531 .fill-N5{fill:#DEE1EB;} + .d2-2837767531 .fill-N6{fill:#EEF1F8;} + .d2-2837767531 .fill-N7{fill:#FFFFFF;} + .d2-2837767531 .fill-B1{fill:#0D32B2;} + .d2-2837767531 .fill-B2{fill:#0D32B2;} + .d2-2837767531 .fill-B3{fill:#E3E9FD;} + .d2-2837767531 .fill-B4{fill:#E3E9FD;} + .d2-2837767531 .fill-B5{fill:#EDF0FD;} + .d2-2837767531 .fill-B6{fill:#F7F8FE;} + .d2-2837767531 .fill-AA2{fill:#4A6FF3;} + .d2-2837767531 .fill-AA4{fill:#EDF0FD;} + .d2-2837767531 .fill-AA5{fill:#F7F8FE;} + .d2-2837767531 .fill-AB4{fill:#EDF0FD;} + .d2-2837767531 .fill-AB5{fill:#F7F8FE;} + .d2-2837767531 .stroke-N1{stroke:#0A0F25;} + .d2-2837767531 .stroke-N2{stroke:#676C7E;} + .d2-2837767531 .stroke-N3{stroke:#9499AB;} + .d2-2837767531 .stroke-N4{stroke:#CFD2DD;} + .d2-2837767531 .stroke-N5{stroke:#DEE1EB;} + .d2-2837767531 .stroke-N6{stroke:#EEF1F8;} + .d2-2837767531 .stroke-N7{stroke:#FFFFFF;} + .d2-2837767531 .stroke-B1{stroke:#0D32B2;} + .d2-2837767531 .stroke-B2{stroke:#0D32B2;} + .d2-2837767531 .stroke-B3{stroke:#E3E9FD;} + .d2-2837767531 .stroke-B4{stroke:#E3E9FD;} + .d2-2837767531 .stroke-B5{stroke:#EDF0FD;} + .d2-2837767531 .stroke-B6{stroke:#F7F8FE;} + .d2-2837767531 .stroke-AA2{stroke:#4A6FF3;} + .d2-2837767531 .stroke-AA4{stroke:#EDF0FD;} + .d2-2837767531 .stroke-AA5{stroke:#F7F8FE;} + .d2-2837767531 .stroke-AB4{stroke:#EDF0FD;} + .d2-2837767531 .stroke-AB5{stroke:#F7F8FE;} + .d2-2837767531 .background-color-N1{background-color:#0A0F25;} + .d2-2837767531 .background-color-N2{background-color:#676C7E;} + .d2-2837767531 .background-color-N3{background-color:#9499AB;} + .d2-2837767531 .background-color-N4{background-color:#CFD2DD;} + .d2-2837767531 .background-color-N5{background-color:#DEE1EB;} + .d2-2837767531 .background-color-N6{background-color:#EEF1F8;} + .d2-2837767531 .background-color-N7{background-color:#FFFFFF;} + .d2-2837767531 .background-color-B1{background-color:#0D32B2;} + .d2-2837767531 .background-color-B2{background-color:#0D32B2;} + .d2-2837767531 .background-color-B3{background-color:#E3E9FD;} + .d2-2837767531 .background-color-B4{background-color:#E3E9FD;} + .d2-2837767531 .background-color-B5{background-color:#EDF0FD;} + .d2-2837767531 .background-color-B6{background-color:#F7F8FE;} + .d2-2837767531 .background-color-AA2{background-color:#4A6FF3;} + .d2-2837767531 .background-color-AA4{background-color:#EDF0FD;} + .d2-2837767531 .background-color-AA5{background-color:#F7F8FE;} + .d2-2837767531 .background-color-AB4{background-color:#EDF0FD;} + .d2-2837767531 .background-color-AB5{background-color:#F7F8FE;} + .d2-2837767531 .color-N1{color:#0A0F25;} + .d2-2837767531 .color-N2{color:#676C7E;} + .d2-2837767531 .color-N3{color:#9499AB;} + .d2-2837767531 .color-N4{color:#CFD2DD;} + .d2-2837767531 .color-N5{color:#DEE1EB;} + .d2-2837767531 .color-N6{color:#EEF1F8;} + .d2-2837767531 .color-N7{color:#FFFFFF;} + .d2-2837767531 .color-B1{color:#0D32B2;} + .d2-2837767531 .color-B2{color:#0D32B2;} + .d2-2837767531 .color-B3{color:#E3E9FD;} + .d2-2837767531 .color-B4{color:#E3E9FD;} + .d2-2837767531 .color-B5{color:#EDF0FD;} + .d2-2837767531 .color-B6{color:#F7F8FE;} + .d2-2837767531 .color-AA2{color:#4A6FF3;} + .d2-2837767531 .color-AA4{color:#EDF0FD;} + .d2-2837767531 .color-AA5{color:#F7F8FE;} + .d2-2837767531 .color-AB4{color:#EDF0FD;} + .d2-2837767531 .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}]]>abcde12345abcde - + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json b/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json index e813748fb..4b3264707 100644 --- a/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json +++ b/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json @@ -153,19 +153,19 @@ "labelPercentage": 0, "route": [ { - "x": 126.13200378417969, - "y": 66 - }, - { - "x": 76.82599639892578, - "y": 114.4000015258789 + "x": 126.5, + "y": 65.5 }, { "x": 76.9000015258789, + "y": 114.30000305175781 + }, + { + "x": 76.69999694824219, "y": 138.6999969482422 }, { - "x": 126.5, + "x": 125.5, "y": 187.5 } ], @@ -200,19 +200,19 @@ "labelPercentage": 0, "route": [ { - "x": 193.36700439453125, - "y": 66 - }, - { - "x": 242.67300415039062, - "y": 114.4000015258789 + "x": 193, + "y": 65.5 }, { "x": 242.60000610351562, + "y": 114.30000305175781 + }, + { + "x": 242.8000030517578, "y": 138.6999969482422 }, { - "x": 193, + "x": 194, "y": 187.5 } ], @@ -248,11 +248,11 @@ "route": [ { "x": 159.75, - "y": 253 + "y": 252.5 }, { "x": 159.75, - "y": 301.3999938964844 + "y": 301.29998779296875 }, { "x": 159.75, 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 ec8c7d7b3..83e3cf3c9 100644 --- a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal + .d2-2039273444 .fill-N1{fill:#0A0F25;} + .d2-2039273444 .fill-N2{fill:#676C7E;} + .d2-2039273444 .fill-N3{fill:#9499AB;} + .d2-2039273444 .fill-N4{fill:#CFD2DD;} + .d2-2039273444 .fill-N5{fill:#DEE1EB;} + .d2-2039273444 .fill-N6{fill:#EEF1F8;} + .d2-2039273444 .fill-N7{fill:#FFFFFF;} + .d2-2039273444 .fill-B1{fill:#0D32B2;} + .d2-2039273444 .fill-B2{fill:#0D32B2;} + .d2-2039273444 .fill-B3{fill:#E3E9FD;} + .d2-2039273444 .fill-B4{fill:#E3E9FD;} + .d2-2039273444 .fill-B5{fill:#EDF0FD;} + .d2-2039273444 .fill-B6{fill:#F7F8FE;} + .d2-2039273444 .fill-AA2{fill:#4A6FF3;} + .d2-2039273444 .fill-AA4{fill:#EDF0FD;} + .d2-2039273444 .fill-AA5{fill:#F7F8FE;} + .d2-2039273444 .fill-AB4{fill:#EDF0FD;} + .d2-2039273444 .fill-AB5{fill:#F7F8FE;} + .d2-2039273444 .stroke-N1{stroke:#0A0F25;} + .d2-2039273444 .stroke-N2{stroke:#676C7E;} + .d2-2039273444 .stroke-N3{stroke:#9499AB;} + .d2-2039273444 .stroke-N4{stroke:#CFD2DD;} + .d2-2039273444 .stroke-N5{stroke:#DEE1EB;} + .d2-2039273444 .stroke-N6{stroke:#EEF1F8;} + .d2-2039273444 .stroke-N7{stroke:#FFFFFF;} + .d2-2039273444 .stroke-B1{stroke:#0D32B2;} + .d2-2039273444 .stroke-B2{stroke:#0D32B2;} + .d2-2039273444 .stroke-B3{stroke:#E3E9FD;} + .d2-2039273444 .stroke-B4{stroke:#E3E9FD;} + .d2-2039273444 .stroke-B5{stroke:#EDF0FD;} + .d2-2039273444 .stroke-B6{stroke:#F7F8FE;} + .d2-2039273444 .stroke-AA2{stroke:#4A6FF3;} + .d2-2039273444 .stroke-AA4{stroke:#EDF0FD;} + .d2-2039273444 .stroke-AA5{stroke:#F7F8FE;} + .d2-2039273444 .stroke-AB4{stroke:#EDF0FD;} + .d2-2039273444 .stroke-AB5{stroke:#F7F8FE;} + .d2-2039273444 .background-color-N1{background-color:#0A0F25;} + .d2-2039273444 .background-color-N2{background-color:#676C7E;} + .d2-2039273444 .background-color-N3{background-color:#9499AB;} + .d2-2039273444 .background-color-N4{background-color:#CFD2DD;} + .d2-2039273444 .background-color-N5{background-color:#DEE1EB;} + .d2-2039273444 .background-color-N6{background-color:#EEF1F8;} + .d2-2039273444 .background-color-N7{background-color:#FFFFFF;} + .d2-2039273444 .background-color-B1{background-color:#0D32B2;} + .d2-2039273444 .background-color-B2{background-color:#0D32B2;} + .d2-2039273444 .background-color-B3{background-color:#E3E9FD;} + .d2-2039273444 .background-color-B4{background-color:#E3E9FD;} + .d2-2039273444 .background-color-B5{background-color:#EDF0FD;} + .d2-2039273444 .background-color-B6{background-color:#F7F8FE;} + .d2-2039273444 .background-color-AA2{background-color:#4A6FF3;} + .d2-2039273444 .background-color-AA4{background-color:#EDF0FD;} + .d2-2039273444 .background-color-AA5{background-color:#F7F8FE;} + .d2-2039273444 .background-color-AB4{background-color:#EDF0FD;} + .d2-2039273444 .background-color-AB5{background-color:#F7F8FE;} + .d2-2039273444 .color-N1{color:#0A0F25;} + .d2-2039273444 .color-N2{color:#676C7E;} + .d2-2039273444 .color-N3{color:#9499AB;} + .d2-2039273444 .color-N4{color:#CFD2DD;} + .d2-2039273444 .color-N5{color:#DEE1EB;} + .d2-2039273444 .color-N6{color:#EEF1F8;} + .d2-2039273444 .color-N7{color:#FFFFFF;} + .d2-2039273444 .color-B1{color:#0D32B2;} + .d2-2039273444 .color-B2{color:#0D32B2;} + .d2-2039273444 .color-B3{color:#E3E9FD;} + .d2-2039273444 .color-B4{color:#E3E9FD;} + .d2-2039273444 .color-B5{color:#EDF0FD;} + .d2-2039273444 .color-B6{color:#F7F8FE;} + .d2-2039273444 .color-AA2{color:#4A6FF3;} + .d2-2039273444 .color-AA4{color:#EDF0FD;} + .d2-2039273444 .color-AA5{color:#F7F8FE;} + .d2-2039273444 .color-AB4{color:#EDF0FD;} + .d2-2039273444 .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}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal diff --git a/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json b/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json index a37440eb6..8539ce287 100644 --- a/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json @@ -276,12 +276,12 @@ "labelPercentage": 0, "route": [ { - "x": 226, - "y": 42.731998443603516 + "x": 226.5, + "y": 43 }, { - "x": 66.39900207519531, - "y": 101.34600067138672 + "x": 66.5, + "y": 101.4000015258789 }, { "x": 26.5, @@ -322,12 +322,12 @@ "labelPercentage": 0, "route": [ { - "x": 226, - "y": 52.4640007019043 + "x": 226.5, + "y": 52 }, { - "x": 156.8000030517578, - "y": 103.29199981689453 + "x": 156.8990020751953, + "y": 103.19999694824219 }, { "x": 139.5, @@ -416,12 +416,12 @@ "labelPercentage": 0, "route": [ { - "x": 279, - "y": 52.63800048828125 + "x": 278.5, + "y": 53 }, { - "x": 347.3999938964844, - "y": 103.3270034790039 + "x": 347.29998779296875, + "y": 103.4000015258789 }, { "x": 364.5, @@ -464,11 +464,11 @@ "route": [ { "x": 279, - "y": 42.797000885009766 + "y": 43 }, { "x": 437.3999938964844, - "y": 101.35900115966797 + "y": 101.4000015258789 }, { "x": 477, 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 d203f3c31..f775458a0 100644 --- a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcefg + .d2-1096767771 .fill-N1{fill:#0A0F25;} + .d2-1096767771 .fill-N2{fill:#676C7E;} + .d2-1096767771 .fill-N3{fill:#9499AB;} + .d2-1096767771 .fill-N4{fill:#CFD2DD;} + .d2-1096767771 .fill-N5{fill:#DEE1EB;} + .d2-1096767771 .fill-N6{fill:#EEF1F8;} + .d2-1096767771 .fill-N7{fill:#FFFFFF;} + .d2-1096767771 .fill-B1{fill:#0D32B2;} + .d2-1096767771 .fill-B2{fill:#0D32B2;} + .d2-1096767771 .fill-B3{fill:#E3E9FD;} + .d2-1096767771 .fill-B4{fill:#E3E9FD;} + .d2-1096767771 .fill-B5{fill:#EDF0FD;} + .d2-1096767771 .fill-B6{fill:#F7F8FE;} + .d2-1096767771 .fill-AA2{fill:#4A6FF3;} + .d2-1096767771 .fill-AA4{fill:#EDF0FD;} + .d2-1096767771 .fill-AA5{fill:#F7F8FE;} + .d2-1096767771 .fill-AB4{fill:#EDF0FD;} + .d2-1096767771 .fill-AB5{fill:#F7F8FE;} + .d2-1096767771 .stroke-N1{stroke:#0A0F25;} + .d2-1096767771 .stroke-N2{stroke:#676C7E;} + .d2-1096767771 .stroke-N3{stroke:#9499AB;} + .d2-1096767771 .stroke-N4{stroke:#CFD2DD;} + .d2-1096767771 .stroke-N5{stroke:#DEE1EB;} + .d2-1096767771 .stroke-N6{stroke:#EEF1F8;} + .d2-1096767771 .stroke-N7{stroke:#FFFFFF;} + .d2-1096767771 .stroke-B1{stroke:#0D32B2;} + .d2-1096767771 .stroke-B2{stroke:#0D32B2;} + .d2-1096767771 .stroke-B3{stroke:#E3E9FD;} + .d2-1096767771 .stroke-B4{stroke:#E3E9FD;} + .d2-1096767771 .stroke-B5{stroke:#EDF0FD;} + .d2-1096767771 .stroke-B6{stroke:#F7F8FE;} + .d2-1096767771 .stroke-AA2{stroke:#4A6FF3;} + .d2-1096767771 .stroke-AA4{stroke:#EDF0FD;} + .d2-1096767771 .stroke-AA5{stroke:#F7F8FE;} + .d2-1096767771 .stroke-AB4{stroke:#EDF0FD;} + .d2-1096767771 .stroke-AB5{stroke:#F7F8FE;} + .d2-1096767771 .background-color-N1{background-color:#0A0F25;} + .d2-1096767771 .background-color-N2{background-color:#676C7E;} + .d2-1096767771 .background-color-N3{background-color:#9499AB;} + .d2-1096767771 .background-color-N4{background-color:#CFD2DD;} + .d2-1096767771 .background-color-N5{background-color:#DEE1EB;} + .d2-1096767771 .background-color-N6{background-color:#EEF1F8;} + .d2-1096767771 .background-color-N7{background-color:#FFFFFF;} + .d2-1096767771 .background-color-B1{background-color:#0D32B2;} + .d2-1096767771 .background-color-B2{background-color:#0D32B2;} + .d2-1096767771 .background-color-B3{background-color:#E3E9FD;} + .d2-1096767771 .background-color-B4{background-color:#E3E9FD;} + .d2-1096767771 .background-color-B5{background-color:#EDF0FD;} + .d2-1096767771 .background-color-B6{background-color:#F7F8FE;} + .d2-1096767771 .background-color-AA2{background-color:#4A6FF3;} + .d2-1096767771 .background-color-AA4{background-color:#EDF0FD;} + .d2-1096767771 .background-color-AA5{background-color:#F7F8FE;} + .d2-1096767771 .background-color-AB4{background-color:#EDF0FD;} + .d2-1096767771 .background-color-AB5{background-color:#F7F8FE;} + .d2-1096767771 .color-N1{color:#0A0F25;} + .d2-1096767771 .color-N2{color:#676C7E;} + .d2-1096767771 .color-N3{color:#9499AB;} + .d2-1096767771 .color-N4{color:#CFD2DD;} + .d2-1096767771 .color-N5{color:#DEE1EB;} + .d2-1096767771 .color-N6{color:#EEF1F8;} + .d2-1096767771 .color-N7{color:#FFFFFF;} + .d2-1096767771 .color-B1{color:#0D32B2;} + .d2-1096767771 .color-B2{color:#0D32B2;} + .d2-1096767771 .color-B3{color:#E3E9FD;} + .d2-1096767771 .color-B4{color:#E3E9FD;} + .d2-1096767771 .color-B5{color:#EDF0FD;} + .d2-1096767771 .color-B6{color:#F7F8FE;} + .d2-1096767771 .color-AA2{color:#4A6FF3;} + .d2-1096767771 .color-AA4{color:#EDF0FD;} + .d2-1096767771 .color-AA5{color:#F7F8FE;} + .d2-1096767771 .color-AB4{color:#EDF0FD;} + .d2-1096767771 .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}]]>abcefg diff --git a/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json b/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json index 864aefcf0..33cdbc41a 100644 --- a/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "cylinder", "pos": { "x": 0, - "y": 41 + "y": 0 }, "width": 133, - "height": 125, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, 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 63f9fc52e..b75d9c311 100644 --- a/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -i can not see the titlex - - - + .d2-2887000715 .fill-N1{fill:#0A0F25;} + .d2-2887000715 .fill-N2{fill:#676C7E;} + .d2-2887000715 .fill-N3{fill:#9499AB;} + .d2-2887000715 .fill-N4{fill:#CFD2DD;} + .d2-2887000715 .fill-N5{fill:#DEE1EB;} + .d2-2887000715 .fill-N6{fill:#EEF1F8;} + .d2-2887000715 .fill-N7{fill:#FFFFFF;} + .d2-2887000715 .fill-B1{fill:#0D32B2;} + .d2-2887000715 .fill-B2{fill:#0D32B2;} + .d2-2887000715 .fill-B3{fill:#E3E9FD;} + .d2-2887000715 .fill-B4{fill:#E3E9FD;} + .d2-2887000715 .fill-B5{fill:#EDF0FD;} + .d2-2887000715 .fill-B6{fill:#F7F8FE;} + .d2-2887000715 .fill-AA2{fill:#4A6FF3;} + .d2-2887000715 .fill-AA4{fill:#EDF0FD;} + .d2-2887000715 .fill-AA5{fill:#F7F8FE;} + .d2-2887000715 .fill-AB4{fill:#EDF0FD;} + .d2-2887000715 .fill-AB5{fill:#F7F8FE;} + .d2-2887000715 .stroke-N1{stroke:#0A0F25;} + .d2-2887000715 .stroke-N2{stroke:#676C7E;} + .d2-2887000715 .stroke-N3{stroke:#9499AB;} + .d2-2887000715 .stroke-N4{stroke:#CFD2DD;} + .d2-2887000715 .stroke-N5{stroke:#DEE1EB;} + .d2-2887000715 .stroke-N6{stroke:#EEF1F8;} + .d2-2887000715 .stroke-N7{stroke:#FFFFFF;} + .d2-2887000715 .stroke-B1{stroke:#0D32B2;} + .d2-2887000715 .stroke-B2{stroke:#0D32B2;} + .d2-2887000715 .stroke-B3{stroke:#E3E9FD;} + .d2-2887000715 .stroke-B4{stroke:#E3E9FD;} + .d2-2887000715 .stroke-B5{stroke:#EDF0FD;} + .d2-2887000715 .stroke-B6{stroke:#F7F8FE;} + .d2-2887000715 .stroke-AA2{stroke:#4A6FF3;} + .d2-2887000715 .stroke-AA4{stroke:#EDF0FD;} + .d2-2887000715 .stroke-AA5{stroke:#F7F8FE;} + .d2-2887000715 .stroke-AB4{stroke:#EDF0FD;} + .d2-2887000715 .stroke-AB5{stroke:#F7F8FE;} + .d2-2887000715 .background-color-N1{background-color:#0A0F25;} + .d2-2887000715 .background-color-N2{background-color:#676C7E;} + .d2-2887000715 .background-color-N3{background-color:#9499AB;} + .d2-2887000715 .background-color-N4{background-color:#CFD2DD;} + .d2-2887000715 .background-color-N5{background-color:#DEE1EB;} + .d2-2887000715 .background-color-N6{background-color:#EEF1F8;} + .d2-2887000715 .background-color-N7{background-color:#FFFFFF;} + .d2-2887000715 .background-color-B1{background-color:#0D32B2;} + .d2-2887000715 .background-color-B2{background-color:#0D32B2;} + .d2-2887000715 .background-color-B3{background-color:#E3E9FD;} + .d2-2887000715 .background-color-B4{background-color:#E3E9FD;} + .d2-2887000715 .background-color-B5{background-color:#EDF0FD;} + .d2-2887000715 .background-color-B6{background-color:#F7F8FE;} + .d2-2887000715 .background-color-AA2{background-color:#4A6FF3;} + .d2-2887000715 .background-color-AA4{background-color:#EDF0FD;} + .d2-2887000715 .background-color-AA5{background-color:#F7F8FE;} + .d2-2887000715 .background-color-AB4{background-color:#EDF0FD;} + .d2-2887000715 .background-color-AB5{background-color:#F7F8FE;} + .d2-2887000715 .color-N1{color:#0A0F25;} + .d2-2887000715 .color-N2{color:#676C7E;} + .d2-2887000715 .color-N3{color:#9499AB;} + .d2-2887000715 .color-N4{color:#CFD2DD;} + .d2-2887000715 .color-N5{color:#DEE1EB;} + .d2-2887000715 .color-N6{color:#EEF1F8;} + .d2-2887000715 .color-N7{color:#FFFFFF;} + .d2-2887000715 .color-B1{color:#0D32B2;} + .d2-2887000715 .color-B2{color:#0D32B2;} + .d2-2887000715 .color-B3{color:#E3E9FD;} + .d2-2887000715 .color-B4{color:#E3E9FD;} + .d2-2887000715 .color-B5{color:#EDF0FD;} + .d2-2887000715 .color-B6{color:#F7F8FE;} + .d2-2887000715 .color-AA2{color:#4A6FF3;} + .d2-2887000715 .color-AA4{color:#EDF0FD;} + .d2-2887000715 .color-AA5{color:#F7F8FE;} + .d2-2887000715 .color-AB4{color:#EDF0FD;} + .d2-2887000715 .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}]]>i can not see the titlex + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json index ca89deedb..cd266dc7a 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "network", "type": "rectangle", "pos": { - "x": 0, - "y": 275 + "x": 7, + "y": 227 }, - "width": 418, - "height": 1245, + "width": 379, + "height": 1188, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 95, - "y": 340 + "x": 146, + "y": 268 }, - "width": 303, - "height": 317, + "width": 210, + "height": 313, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,8 +89,8 @@ "id": "network.cell tower.satellites", "type": "stored_data", "pos": { - "x": 171, - "y": 382 + "x": 176, + "y": 308 }, "width": 140, "height": 61, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 176, - "y": 564 + "y": 490 }, "width": 140, "height": 61, @@ -171,11 +171,11 @@ "id": "network.online portal", "type": "rectangle", "pos": { - "x": 20, - "y": 1329 + "x": 37, + "y": 1256 }, - "width": 144, - "height": 161, + "width": 119, + "height": 129, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -212,8 +212,8 @@ "id": "network.online portal.ui", "type": "hexagon", "pos": { - "x": 65, - "y": 1375 + "x": 67, + "y": 1286 }, "width": 59, "height": 69, @@ -253,11 +253,11 @@ "id": "network.data processor", "type": "rectangle", "pos": { - "x": 152, - "y": 814 + "x": 167, + "y": 732 }, - "width": 189, - "height": 192, + "width": 169, + "height": 188, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "network.data processor.storage", "type": "cylinder", "pos": { - "x": 192, - "y": 856 + "x": 197, + "y": 772 }, "width": 99, "height": 118, @@ -376,8 +376,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 457, - "y": 1086 + "x": 477, + "y": 1040 }, "width": 116, "height": 66, @@ -417,8 +417,8 @@ "id": "logs", "type": "page", "pos": { - "x": 474, - "y": 1333 + "x": 499, + "y": 1277 }, "width": 73, "height": 87, @@ -481,20 +481,20 @@ "labelPercentage": 0, "route": [ { - "x": 219, - "y": 444 - }, - { - "x": 182.1999969482422, - "y": 492 + "x": 222, + "y": 369 }, { "x": 182.8000030517578, - "y": 516.2000122070312 + "y": 417.3999938964844 + }, + { + "x": 182.8000030517578, + "y": 441.70001220703125 }, { "x": 222, - "y": 565 + "y": 490.5 } ], "isCurve": true, @@ -529,19 +529,19 @@ "route": [ { "x": 246, - "y": 444 + "y": 369 }, { "x": 246, - "y": 492 + "y": 417.3999938964844 }, { "x": 246, - "y": 516.2000122070312 + "y": 441.70001220703125 }, { "x": 246, - "y": 565 + "y": 490.5 } ], "isCurve": true, @@ -575,20 +575,20 @@ "labelPercentage": 0, "route": [ { - "x": 273, - "y": 444 + "x": 270, + "y": 369 }, { - "x": 309.79998779296875, - "y": 492 + "x": 317.20001220703125, + "y": 417.3999938964844 }, { - "x": 309.20001220703125, - "y": 516.2000122070312 + "x": 317.20001220703125, + "y": 441.70001220703125 }, { "x": 270, - "y": 565 + "y": 490.5 } ], "isCurve": true, @@ -623,31 +623,31 @@ "route": [ { "x": 246, - "y": 625.5 + "y": 551 }, { "x": 246, - "y": 651.0999755859375 + "y": 591 }, { "x": 246, - "y": 669.5999755859375 + "y": 613.0999755859375 }, { "x": 246, - "y": 687.75 + "y": 631.25 }, { "x": 246, - "y": 705.9000244140625 + "y": 649.4000244140625 }, { "x": 246, - "y": 792.2000122070312 + "y": 730 }, { "x": 246, - "y": 847 + "y": 762 } ], "isCurve": true, @@ -681,20 +681,20 @@ "labelPercentage": 0, "route": [ { - "x": 171, + "x": 187, "y": 87 }, { - "x": 231, - "y": 156.1999969482422 + "x": 234.1999969482422, + "y": 135.39999389648438 }, { "x": 246, - "y": 248.1999969482422 + "y": 212.8000030517578 }, { "x": 246, - "y": 305 + "y": 232 } ], "isCurve": true, @@ -728,176 +728,176 @@ "labelPercentage": 0, "route": [ { - "x": 126, + "x": 115, "y": 87 }, { - "x": 85, - "y": 156.1999969482422 + "x": 82.80000305175781, + "y": 135.39999389648438 }, { "x": 74.75, - "y": 185.60000610351562 + "y": 159.60000610351562 }, { "x": 74.75, - "y": 203.75 + "y": 177.75 }, { "x": 74.75, - "y": 221.89999389648438 + "y": 195.89999389648438 }, { "x": 74.75, - "y": 244 + "y": 218 }, { "x": 74.75, - "y": 259 + "y": 233 }, { "x": 74.75, - "y": 274 + "y": 248 }, { "x": 74.75, - "y": 301.1000061035156 + "y": 274.1000061035156 }, { "x": 74.75, - "y": 326.75 + "y": 298.25 }, { "x": 74.75, - "y": 352.3999938964844 + "y": 322.3999938964844 }, { "x": 74.75, - "y": 388.70001220703125 + "y": 356.70001220703125 }, { "x": 74.75, - "y": 417.5 + "y": 384 }, { "x": 74.75, - "y": 446.29998779296875 + "y": 411.29998779296875 }, { "x": 74.75, - "y": 483.70001220703125 + "y": 447.70001220703125 }, { "x": 74.75, - "y": 511 + "y": 475 }, { "x": 74.75, - "y": 538.2999877929688 + "y": 502.29998779296875 }, { "x": 74.75, - "y": 572.5999755859375 + "y": 536.5999755859375 }, { "x": 74.75, - "y": 596.75 + "y": 560.75 }, { "x": 74.75, - "y": 620.9000244140625 + "y": 584.9000244140625 }, { "x": 74.75, - "y": 649.0999755859375 + "y": 613.0999755859375 }, { "x": 74.75, - "y": 667.25 + "y": 631.25 }, { "x": 74.75, - "y": 685.4000244140625 + "y": 649.4000244140625 }, { "x": 74.75, - "y": 709.5999755859375 + "y": 673.5999755859375 }, { "x": 74.75, - "y": 727.75 + "y": 691.75 }, { "x": 74.75, - "y": 745.9000244140625 + "y": 709.9000244140625 }, { "x": 74.75, - "y": 780.7999877929688 + "y": 743.7999877929688 }, { "x": 74.75, - "y": 815 + "y": 776.5 }, { "x": 74.75, - "y": 849.2000122070312 + "y": 809.2000122070312 }, { "x": 74.75, - "y": 894.7999877929688 + "y": 852.7999877929688 }, { "x": 74.75, - "y": 929 + "y": 885.5 }, { "x": 74.75, - "y": 963.2000122070312 + "y": 918.2000122070312 }, { "x": 74.75, - "y": 996 + "y": 950 }, { "x": 74.75, - "y": 1011 + "y": 965 }, { "x": 74.75, - "y": 1026 + "y": 980 }, { "x": 74.75, - "y": 1052.5999755859375 + "y": 1006.5999755859375 }, { "x": 74.75, - "y": 1077.5 + "y": 1031.5 }, { "x": 74.75, - "y": 1102.4000244140625 + "y": 1056.4000244140625 }, { "x": 74.75, - "y": 1137.699951171875 + "y": 1091.699951171875 }, { "x": 74.75, - "y": 1165.75 + "y": 1119.75 }, { "x": 74.75, - "y": 1193.800048828125 + "y": 1147.800048828125 }, { - "x": 77.4000015258789, - "y": 1293.5999755859375 + "x": 77.5999984741211, + "y": 1238.800048828125 }, { - "x": 88, - "y": 1376 + "x": 89, + "y": 1286 } ], "isCurve": true, @@ -931,20 +931,20 @@ "labelPercentage": 0, "route": [ { - "x": 457.25, - "y": 1132.77197265625 + "x": 477.5, + "y": 1086.5 }, { - "x": 188.6490020751953, - "y": 1196.553955078125 + "x": 192.6999969482422, + "y": 1150.5 }, { - "x": 117.80000305175781, - "y": 1293.5999755859375 + "x": 118.4000015258789, + "y": 1238.800048828125 }, { - "x": 103, - "y": 1376 + "x": 106, + "y": 1286 } ], "isCurve": true, @@ -978,20 +978,20 @@ "labelPercentage": 0, "route": [ { - "x": 515.25, - "y": 1152 + "x": 535.25, + "y": 1105.5 }, { - "x": 515.25, - "y": 1200.4000244140625 + "x": 535.25, + "y": 1154.300048828125 }, { - "x": 515.2000122070312, - "y": 1283 + "x": 535.2000122070312, + "y": 1235 }, { - "x": 515, - "y": 1323 + "x": 535, + "y": 1267 } ], "isCurve": true, @@ -1026,19 +1026,19 @@ "route": [ { "x": 246, - "y": 1006.5 + "y": 920 }, { "x": 246, - "y": 1030.0989990234375 + "y": 976 }, { - "x": 288.20001220703125, - "y": 1049 + "x": 292.20001220703125, + "y": 1003 }, { - "x": 457, - "y": 1101 + "x": 477, + "y": 1055 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg index 74064c23d..a8a3410c3 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - - + .d2-2108133679 .fill-N1{fill:#0A0F25;} + .d2-2108133679 .fill-N2{fill:#676C7E;} + .d2-2108133679 .fill-N3{fill:#9499AB;} + .d2-2108133679 .fill-N4{fill:#CFD2DD;} + .d2-2108133679 .fill-N5{fill:#DEE1EB;} + .d2-2108133679 .fill-N6{fill:#EEF1F8;} + .d2-2108133679 .fill-N7{fill:#FFFFFF;} + .d2-2108133679 .fill-B1{fill:#0D32B2;} + .d2-2108133679 .fill-B2{fill:#0D32B2;} + .d2-2108133679 .fill-B3{fill:#E3E9FD;} + .d2-2108133679 .fill-B4{fill:#E3E9FD;} + .d2-2108133679 .fill-B5{fill:#EDF0FD;} + .d2-2108133679 .fill-B6{fill:#F7F8FE;} + .d2-2108133679 .fill-AA2{fill:#4A6FF3;} + .d2-2108133679 .fill-AA4{fill:#EDF0FD;} + .d2-2108133679 .fill-AA5{fill:#F7F8FE;} + .d2-2108133679 .fill-AB4{fill:#EDF0FD;} + .d2-2108133679 .fill-AB5{fill:#F7F8FE;} + .d2-2108133679 .stroke-N1{stroke:#0A0F25;} + .d2-2108133679 .stroke-N2{stroke:#676C7E;} + .d2-2108133679 .stroke-N3{stroke:#9499AB;} + .d2-2108133679 .stroke-N4{stroke:#CFD2DD;} + .d2-2108133679 .stroke-N5{stroke:#DEE1EB;} + .d2-2108133679 .stroke-N6{stroke:#EEF1F8;} + .d2-2108133679 .stroke-N7{stroke:#FFFFFF;} + .d2-2108133679 .stroke-B1{stroke:#0D32B2;} + .d2-2108133679 .stroke-B2{stroke:#0D32B2;} + .d2-2108133679 .stroke-B3{stroke:#E3E9FD;} + .d2-2108133679 .stroke-B4{stroke:#E3E9FD;} + .d2-2108133679 .stroke-B5{stroke:#EDF0FD;} + .d2-2108133679 .stroke-B6{stroke:#F7F8FE;} + .d2-2108133679 .stroke-AA2{stroke:#4A6FF3;} + .d2-2108133679 .stroke-AA4{stroke:#EDF0FD;} + .d2-2108133679 .stroke-AA5{stroke:#F7F8FE;} + .d2-2108133679 .stroke-AB4{stroke:#EDF0FD;} + .d2-2108133679 .stroke-AB5{stroke:#F7F8FE;} + .d2-2108133679 .background-color-N1{background-color:#0A0F25;} + .d2-2108133679 .background-color-N2{background-color:#676C7E;} + .d2-2108133679 .background-color-N3{background-color:#9499AB;} + .d2-2108133679 .background-color-N4{background-color:#CFD2DD;} + .d2-2108133679 .background-color-N5{background-color:#DEE1EB;} + .d2-2108133679 .background-color-N6{background-color:#EEF1F8;} + .d2-2108133679 .background-color-N7{background-color:#FFFFFF;} + .d2-2108133679 .background-color-B1{background-color:#0D32B2;} + .d2-2108133679 .background-color-B2{background-color:#0D32B2;} + .d2-2108133679 .background-color-B3{background-color:#E3E9FD;} + .d2-2108133679 .background-color-B4{background-color:#E3E9FD;} + .d2-2108133679 .background-color-B5{background-color:#EDF0FD;} + .d2-2108133679 .background-color-B6{background-color:#F7F8FE;} + .d2-2108133679 .background-color-AA2{background-color:#4A6FF3;} + .d2-2108133679 .background-color-AA4{background-color:#EDF0FD;} + .d2-2108133679 .background-color-AA5{background-color:#F7F8FE;} + .d2-2108133679 .background-color-AB4{background-color:#EDF0FD;} + .d2-2108133679 .background-color-AB5{background-color:#F7F8FE;} + .d2-2108133679 .color-N1{color:#0A0F25;} + .d2-2108133679 .color-N2{color:#676C7E;} + .d2-2108133679 .color-N3{color:#9499AB;} + .d2-2108133679 .color-N4{color:#CFD2DD;} + .d2-2108133679 .color-N5{color:#DEE1EB;} + .d2-2108133679 .color-N6{color:#EEF1F8;} + .d2-2108133679 .color-N7{color:#FFFFFF;} + .d2-2108133679 .color-B1{color:#0D32B2;} + .d2-2108133679 .color-B2{color:#0D32B2;} + .d2-2108133679 .color-B3{color:#E3E9FD;} + .d2-2108133679 .color-B4{color:#E3E9FD;} + .d2-2108133679 .color-B5{color:#EDF0FD;} + .d2-2108133679 .color-B6{color:#F7F8FE;} + .d2-2108133679 .color-AA2{color:#4A6FF3;} + .d2-2108133679 .color-AA4{color:#EDF0FD;} + .d2-2108133679 .color-AA5{color:#F7F8FE;} + .d2-2108133679 .color-AB4{color:#EDF0FD;} + .d2-2108133679 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json index 24467c27a..50be0ee60 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json @@ -708,12 +708,12 @@ "labelPercentage": 0, "route": [ { - "x": 719.5, - "y": 23.70599937438965 + "x": 719.8330078125, + "y": 23 }, { - "x": 758.9660034179688, - "y": 4.741000175476074 + "x": 759.0330200195312, + "y": 4.598999977111816 }, { "x": 771.2999877929688, @@ -752,12 +752,12 @@ "y": 129.60000610351562 }, { - "x": 758.9660034179688, - "y": 139.25799560546875 + "x": 759.0330200195312, + "y": 139.39999389648438 }, { - "x": 719.5, - "y": 120.29299926757812 + "x": 719.8330078125, + "y": 121 } ], "isCurve": true, @@ -791,12 +791,12 @@ "labelPercentage": 0, "route": [ { - "x": 719.5, - "y": 42.84199905395508 + "x": 720.166015625, + "y": 43 }, { - "x": 837.6329956054688, - "y": 8.567999839782715 + "x": 837.7659912109375, + "y": 8.600000381469727 }, { "x": 874.5499877929688, @@ -835,12 +835,12 @@ "y": 129.60000610351562 }, { - "x": 837.6329956054688, - "y": 135.43099975585938 + "x": 837.7659912109375, + "y": 135.39999389648438 }, { - "x": 719.5, - "y": 101.15699768066406 + "x": 720.166015625, + "y": 101 } ], "isCurve": true, @@ -969,11 +969,11 @@ "route": [ { "x": 619, - "y": 144 + "y": 143.5 }, { "x": 619, - "y": 192.39999389648438 + "y": 192.3000030517578 }, { "x": 619, diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 80984ab8e..6c17ecaec 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-850790161 .fill-N1{fill:#0A0F25;} + .d2-850790161 .fill-N2{fill:#676C7E;} + .d2-850790161 .fill-N3{fill:#9499AB;} + .d2-850790161 .fill-N4{fill:#CFD2DD;} + .d2-850790161 .fill-N5{fill:#DEE1EB;} + .d2-850790161 .fill-N6{fill:#EEF1F8;} + .d2-850790161 .fill-N7{fill:#FFFFFF;} + .d2-850790161 .fill-B1{fill:#0D32B2;} + .d2-850790161 .fill-B2{fill:#0D32B2;} + .d2-850790161 .fill-B3{fill:#E3E9FD;} + .d2-850790161 .fill-B4{fill:#E3E9FD;} + .d2-850790161 .fill-B5{fill:#EDF0FD;} + .d2-850790161 .fill-B6{fill:#F7F8FE;} + .d2-850790161 .fill-AA2{fill:#4A6FF3;} + .d2-850790161 .fill-AA4{fill:#EDF0FD;} + .d2-850790161 .fill-AA5{fill:#F7F8FE;} + .d2-850790161 .fill-AB4{fill:#EDF0FD;} + .d2-850790161 .fill-AB5{fill:#F7F8FE;} + .d2-850790161 .stroke-N1{stroke:#0A0F25;} + .d2-850790161 .stroke-N2{stroke:#676C7E;} + .d2-850790161 .stroke-N3{stroke:#9499AB;} + .d2-850790161 .stroke-N4{stroke:#CFD2DD;} + .d2-850790161 .stroke-N5{stroke:#DEE1EB;} + .d2-850790161 .stroke-N6{stroke:#EEF1F8;} + .d2-850790161 .stroke-N7{stroke:#FFFFFF;} + .d2-850790161 .stroke-B1{stroke:#0D32B2;} + .d2-850790161 .stroke-B2{stroke:#0D32B2;} + .d2-850790161 .stroke-B3{stroke:#E3E9FD;} + .d2-850790161 .stroke-B4{stroke:#E3E9FD;} + .d2-850790161 .stroke-B5{stroke:#EDF0FD;} + .d2-850790161 .stroke-B6{stroke:#F7F8FE;} + .d2-850790161 .stroke-AA2{stroke:#4A6FF3;} + .d2-850790161 .stroke-AA4{stroke:#EDF0FD;} + .d2-850790161 .stroke-AA5{stroke:#F7F8FE;} + .d2-850790161 .stroke-AB4{stroke:#EDF0FD;} + .d2-850790161 .stroke-AB5{stroke:#F7F8FE;} + .d2-850790161 .background-color-N1{background-color:#0A0F25;} + .d2-850790161 .background-color-N2{background-color:#676C7E;} + .d2-850790161 .background-color-N3{background-color:#9499AB;} + .d2-850790161 .background-color-N4{background-color:#CFD2DD;} + .d2-850790161 .background-color-N5{background-color:#DEE1EB;} + .d2-850790161 .background-color-N6{background-color:#EEF1F8;} + .d2-850790161 .background-color-N7{background-color:#FFFFFF;} + .d2-850790161 .background-color-B1{background-color:#0D32B2;} + .d2-850790161 .background-color-B2{background-color:#0D32B2;} + .d2-850790161 .background-color-B3{background-color:#E3E9FD;} + .d2-850790161 .background-color-B4{background-color:#E3E9FD;} + .d2-850790161 .background-color-B5{background-color:#EDF0FD;} + .d2-850790161 .background-color-B6{background-color:#F7F8FE;} + .d2-850790161 .background-color-AA2{background-color:#4A6FF3;} + .d2-850790161 .background-color-AA4{background-color:#EDF0FD;} + .d2-850790161 .background-color-AA5{background-color:#F7F8FE;} + .d2-850790161 .background-color-AB4{background-color:#EDF0FD;} + .d2-850790161 .background-color-AB5{background-color:#F7F8FE;} + .d2-850790161 .color-N1{color:#0A0F25;} + .d2-850790161 .color-N2{color:#676C7E;} + .d2-850790161 .color-N3{color:#9499AB;} + .d2-850790161 .color-N4{color:#CFD2DD;} + .d2-850790161 .color-N5{color:#DEE1EB;} + .d2-850790161 .color-N6{color:#EEF1F8;} + .d2-850790161 .color-N7{color:#FFFFFF;} + .d2-850790161 .color-B1{color:#0D32B2;} + .d2-850790161 .color-B2{color:#0D32B2;} + .d2-850790161 .color-B3{color:#E3E9FD;} + .d2-850790161 .color-B4{color:#E3E9FD;} + .d2-850790161 .color-B5{color:#EDF0FD;} + .d2-850790161 .color-B6{color:#F7F8FE;} + .d2-850790161 .color-AA2{color:#4A6FF3;} + .d2-850790161 .color-AA4{color:#EDF0FD;} + .d2-850790161 .color-AA5{color:#F7F8FE;} + .d2-850790161 .color-AB4{color:#EDF0FD;} + .d2-850790161 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index 298ceb0cf..04c9f6208 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "sql_table", "pos": { "x": 0, - "y": 231 + "y": 336 }, "width": 201, "height": 144, @@ -246,7 +246,7 @@ "type": "sql_table", "pos": { "x": 500, - "y": 146 + "y": 168 }, "width": 194, "height": 108, @@ -350,7 +350,7 @@ "type": "sql_table", "pos": { "x": 486, - "y": 274 + "y": 336 }, "width": 222, "height": 144, @@ -482,7 +482,7 @@ "type": "sql_table", "pos": { "x": 524, - "y": 438 + "y": 540 }, "width": 146, "height": 108, @@ -584,7 +584,7 @@ "type": "sql_table", "pos": { "x": 443, - "y": 584 + "y": 708 }, "width": 308, "height": 108, @@ -708,56 +708,56 @@ "labelPercentage": 0, "route": [ { - "x": 48.566001892089844, - "y": 374.5 + "x": 39, + "y": 479.6659851074219 }, { - "x": 9.713000297546387, - "y": 428.3659973144531 + "x": 7.798999786376953, + "y": 516.4660034179688 }, { "x": 0, - "y": 445.20001220703125 + "y": 527.9500122070312 }, { "x": 0, - "y": 450.25 + "y": 531.375 }, { "x": 0, - "y": 455.29998779296875 + "y": 534.7999877929688 }, { "x": 20.100000381469727, - "y": 462.0329895019531 + "y": 539.3660278320312 }, { "x": 50.25, - "y": 467.0830078125 + "y": 542.791015625 }, { "x": 80.4000015258789, - "y": 472.13299560546875 + "y": 546.2160034179688 }, { "x": 120.5999984741211, - "y": 472.13299560546875 + "y": 546.2160034179688 }, { "x": 150.75, - "y": 467.0830078125 + "y": 542.791015625 }, { "x": 180.89999389648438, - "y": 462.0329895019531 + "y": 539.3660278320312 }, { - "x": 191.28599548339844, - "y": 428.3659973144531 + "x": 193.1999969482422, + "y": 516.4660034179688 }, { - "x": 152.43299865722656, - "y": 374.5 + "x": 162, + "y": 479.6659851074219 } ], "isCurve": true, @@ -791,56 +791,56 @@ "labelPercentage": 0, "route": [ { - "x": 74.34500122070312, - "y": 374.5 + "x": 61, + "y": 480 }, { - "x": 14.869000434875488, - "y": 538.2329711914062 + "x": 12.199000358581543, + "y": 570.4000244140625 }, { "x": 0, - "y": 589.4000244140625 + "y": 598.6500244140625 }, { "x": 0, - "y": 604.75 + "y": 607.125 }, { "x": 0, - "y": 620.0999755859375 + "y": 615.5999755859375 }, { "x": 20.100000381469727, - "y": 640.5659790039062 + "y": 626.9000244140625 }, { "x": 50.25, - "y": 655.916015625 + "y": 635.375 }, { "x": 80.4000015258789, - "y": 671.2659912109375 + "y": 643.8499755859375 }, { "x": 120.5999984741211, - "y": 671.2659912109375 + "y": 643.8499755859375 }, { "x": 150.75, - "y": 655.916015625 + "y": 635.375 }, { "x": 180.89999389648438, - "y": 640.5659790039062 + "y": 626.9000244140625 }, { - "x": 186.1300048828125, - "y": 538.2329711914062 + "x": 188.8000030517578, + "y": 570.4000244140625 }, { - "x": 126.65399932861328, - "y": 374.5 + "x": 140, + "y": 480 } ], "isCurve": true, @@ -874,12 +874,12 @@ "labelPercentage": 0, "route": [ { - "x": 164.677001953125, - "y": 230.5 + "x": 146, + "y": 336 }, { - "x": 290.5350036621094, - "y": 89.29900360107422 + "x": 286.79998779296875, + "y": 110.39900207519531 }, { "x": 357.6000061035156, @@ -921,20 +921,20 @@ "labelPercentage": 0, "route": [ { - "x": 201, - "y": 255.9929962158203 + "x": 186, + "y": 336 }, { - "x": 297.79998779296875, - "y": 211.197998046875 + "x": 294.79998779296875, + "y": 244.8000030517578 }, { "x": 357.6000061035156, - "y": 200 + "y": 222 }, { "x": 500, - "y": 200 + "y": 222 } ], "isCurve": true, @@ -969,19 +969,19 @@ "route": [ { "x": 201, - "y": 322.23699951171875 + "y": 408 }, { "x": 297.79998779296875, - "y": 341.24700927734375 + "y": 408 }, { "x": 354.79998779296875, - "y": 346 + "y": 408 }, { "x": 486, - "y": 346 + "y": 408 } ], "isCurve": true, @@ -1015,20 +1015,20 @@ "labelPercentage": 0, "route": [ { - "x": 185.6580047607422, - "y": 375.5 + "x": 186, + "y": 480 }, { - "x": 294.7309875488281, - "y": 468.70001220703125 + "x": 294.79998779296875, + "y": 571.2000122070312 }, { "x": 362.3999938964844, - "y": 492 + "y": 594 }, { "x": 524, - "y": 492 + "y": 594 } ], "isCurve": true, @@ -1062,20 +1062,20 @@ "labelPercentage": 0, "route": [ { - "x": 148.03500366210938, - "y": 375.5 + "x": 146, + "y": 480 }, { - "x": 287.2070007324219, - "y": 585.5 + "x": 286.79998779296875, + "y": 705.5999755859375 }, { "x": 346.20001220703125, - "y": 638 + "y": 762 }, { "x": 443, - "y": 638 + "y": 762 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index 177d8bb00..3172e1a35 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-1210356354 .fill-N1{fill:#0A0F25;} + .d2-1210356354 .fill-N2{fill:#676C7E;} + .d2-1210356354 .fill-N3{fill:#9499AB;} + .d2-1210356354 .fill-N4{fill:#CFD2DD;} + .d2-1210356354 .fill-N5{fill:#DEE1EB;} + .d2-1210356354 .fill-N6{fill:#EEF1F8;} + .d2-1210356354 .fill-N7{fill:#FFFFFF;} + .d2-1210356354 .fill-B1{fill:#0D32B2;} + .d2-1210356354 .fill-B2{fill:#0D32B2;} + .d2-1210356354 .fill-B3{fill:#E3E9FD;} + .d2-1210356354 .fill-B4{fill:#E3E9FD;} + .d2-1210356354 .fill-B5{fill:#EDF0FD;} + .d2-1210356354 .fill-B6{fill:#F7F8FE;} + .d2-1210356354 .fill-AA2{fill:#4A6FF3;} + .d2-1210356354 .fill-AA4{fill:#EDF0FD;} + .d2-1210356354 .fill-AA5{fill:#F7F8FE;} + .d2-1210356354 .fill-AB4{fill:#EDF0FD;} + .d2-1210356354 .fill-AB5{fill:#F7F8FE;} + .d2-1210356354 .stroke-N1{stroke:#0A0F25;} + .d2-1210356354 .stroke-N2{stroke:#676C7E;} + .d2-1210356354 .stroke-N3{stroke:#9499AB;} + .d2-1210356354 .stroke-N4{stroke:#CFD2DD;} + .d2-1210356354 .stroke-N5{stroke:#DEE1EB;} + .d2-1210356354 .stroke-N6{stroke:#EEF1F8;} + .d2-1210356354 .stroke-N7{stroke:#FFFFFF;} + .d2-1210356354 .stroke-B1{stroke:#0D32B2;} + .d2-1210356354 .stroke-B2{stroke:#0D32B2;} + .d2-1210356354 .stroke-B3{stroke:#E3E9FD;} + .d2-1210356354 .stroke-B4{stroke:#E3E9FD;} + .d2-1210356354 .stroke-B5{stroke:#EDF0FD;} + .d2-1210356354 .stroke-B6{stroke:#F7F8FE;} + .d2-1210356354 .stroke-AA2{stroke:#4A6FF3;} + .d2-1210356354 .stroke-AA4{stroke:#EDF0FD;} + .d2-1210356354 .stroke-AA5{stroke:#F7F8FE;} + .d2-1210356354 .stroke-AB4{stroke:#EDF0FD;} + .d2-1210356354 .stroke-AB5{stroke:#F7F8FE;} + .d2-1210356354 .background-color-N1{background-color:#0A0F25;} + .d2-1210356354 .background-color-N2{background-color:#676C7E;} + .d2-1210356354 .background-color-N3{background-color:#9499AB;} + .d2-1210356354 .background-color-N4{background-color:#CFD2DD;} + .d2-1210356354 .background-color-N5{background-color:#DEE1EB;} + .d2-1210356354 .background-color-N6{background-color:#EEF1F8;} + .d2-1210356354 .background-color-N7{background-color:#FFFFFF;} + .d2-1210356354 .background-color-B1{background-color:#0D32B2;} + .d2-1210356354 .background-color-B2{background-color:#0D32B2;} + .d2-1210356354 .background-color-B3{background-color:#E3E9FD;} + .d2-1210356354 .background-color-B4{background-color:#E3E9FD;} + .d2-1210356354 .background-color-B5{background-color:#EDF0FD;} + .d2-1210356354 .background-color-B6{background-color:#F7F8FE;} + .d2-1210356354 .background-color-AA2{background-color:#4A6FF3;} + .d2-1210356354 .background-color-AA4{background-color:#EDF0FD;} + .d2-1210356354 .background-color-AA5{background-color:#F7F8FE;} + .d2-1210356354 .background-color-AB4{background-color:#EDF0FD;} + .d2-1210356354 .background-color-AB5{background-color:#F7F8FE;} + .d2-1210356354 .color-N1{color:#0A0F25;} + .d2-1210356354 .color-N2{color:#676C7E;} + .d2-1210356354 .color-N3{color:#9499AB;} + .d2-1210356354 .color-N4{color:#CFD2DD;} + .d2-1210356354 .color-N5{color:#DEE1EB;} + .d2-1210356354 .color-N6{color:#EEF1F8;} + .d2-1210356354 .color-N7{color:#FFFFFF;} + .d2-1210356354 .color-B1{color:#0D32B2;} + .d2-1210356354 .color-B2{color:#0D32B2;} + .d2-1210356354 .color-B3{color:#E3E9FD;} + .d2-1210356354 .color-B4{color:#E3E9FD;} + .d2-1210356354 .color-B5{color:#EDF0FD;} + .d2-1210356354 .color-B6{color:#F7F8FE;} + .d2-1210356354 .color-AA2{color:#4A6FF3;} + .d2-1210356354 .color-AA4{color:#EDF0FD;} + .d2-1210356354 .color-AA5{color:#F7F8FE;} + .d2-1210356354 .color-AB4{color:#EDF0FD;} + .d2-1210356354 .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/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json index fd3b8c496..837aadec2 100644 --- a/e2etests/testdata/stable/font_colors/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_colors/dagre/board.exp.json @@ -113,11 +113,11 @@ "route": [ { "x": 42.5, - "y": 66 + "y": 65.5 }, { "x": 42.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 42.5, diff --git a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg index 1cc9e0b00..24f6fbed3 100644 --- a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -alphabeta gamma + .d2-3061220014 .fill-N1{fill:#0A0F25;} + .d2-3061220014 .fill-N2{fill:#676C7E;} + .d2-3061220014 .fill-N3{fill:#9499AB;} + .d2-3061220014 .fill-N4{fill:#CFD2DD;} + .d2-3061220014 .fill-N5{fill:#DEE1EB;} + .d2-3061220014 .fill-N6{fill:#EEF1F8;} + .d2-3061220014 .fill-N7{fill:#FFFFFF;} + .d2-3061220014 .fill-B1{fill:#0D32B2;} + .d2-3061220014 .fill-B2{fill:#0D32B2;} + .d2-3061220014 .fill-B3{fill:#E3E9FD;} + .d2-3061220014 .fill-B4{fill:#E3E9FD;} + .d2-3061220014 .fill-B5{fill:#EDF0FD;} + .d2-3061220014 .fill-B6{fill:#F7F8FE;} + .d2-3061220014 .fill-AA2{fill:#4A6FF3;} + .d2-3061220014 .fill-AA4{fill:#EDF0FD;} + .d2-3061220014 .fill-AA5{fill:#F7F8FE;} + .d2-3061220014 .fill-AB4{fill:#EDF0FD;} + .d2-3061220014 .fill-AB5{fill:#F7F8FE;} + .d2-3061220014 .stroke-N1{stroke:#0A0F25;} + .d2-3061220014 .stroke-N2{stroke:#676C7E;} + .d2-3061220014 .stroke-N3{stroke:#9499AB;} + .d2-3061220014 .stroke-N4{stroke:#CFD2DD;} + .d2-3061220014 .stroke-N5{stroke:#DEE1EB;} + .d2-3061220014 .stroke-N6{stroke:#EEF1F8;} + .d2-3061220014 .stroke-N7{stroke:#FFFFFF;} + .d2-3061220014 .stroke-B1{stroke:#0D32B2;} + .d2-3061220014 .stroke-B2{stroke:#0D32B2;} + .d2-3061220014 .stroke-B3{stroke:#E3E9FD;} + .d2-3061220014 .stroke-B4{stroke:#E3E9FD;} + .d2-3061220014 .stroke-B5{stroke:#EDF0FD;} + .d2-3061220014 .stroke-B6{stroke:#F7F8FE;} + .d2-3061220014 .stroke-AA2{stroke:#4A6FF3;} + .d2-3061220014 .stroke-AA4{stroke:#EDF0FD;} + .d2-3061220014 .stroke-AA5{stroke:#F7F8FE;} + .d2-3061220014 .stroke-AB4{stroke:#EDF0FD;} + .d2-3061220014 .stroke-AB5{stroke:#F7F8FE;} + .d2-3061220014 .background-color-N1{background-color:#0A0F25;} + .d2-3061220014 .background-color-N2{background-color:#676C7E;} + .d2-3061220014 .background-color-N3{background-color:#9499AB;} + .d2-3061220014 .background-color-N4{background-color:#CFD2DD;} + .d2-3061220014 .background-color-N5{background-color:#DEE1EB;} + .d2-3061220014 .background-color-N6{background-color:#EEF1F8;} + .d2-3061220014 .background-color-N7{background-color:#FFFFFF;} + .d2-3061220014 .background-color-B1{background-color:#0D32B2;} + .d2-3061220014 .background-color-B2{background-color:#0D32B2;} + .d2-3061220014 .background-color-B3{background-color:#E3E9FD;} + .d2-3061220014 .background-color-B4{background-color:#E3E9FD;} + .d2-3061220014 .background-color-B5{background-color:#EDF0FD;} + .d2-3061220014 .background-color-B6{background-color:#F7F8FE;} + .d2-3061220014 .background-color-AA2{background-color:#4A6FF3;} + .d2-3061220014 .background-color-AA4{background-color:#EDF0FD;} + .d2-3061220014 .background-color-AA5{background-color:#F7F8FE;} + .d2-3061220014 .background-color-AB4{background-color:#EDF0FD;} + .d2-3061220014 .background-color-AB5{background-color:#F7F8FE;} + .d2-3061220014 .color-N1{color:#0A0F25;} + .d2-3061220014 .color-N2{color:#676C7E;} + .d2-3061220014 .color-N3{color:#9499AB;} + .d2-3061220014 .color-N4{color:#CFD2DD;} + .d2-3061220014 .color-N5{color:#DEE1EB;} + .d2-3061220014 .color-N6{color:#EEF1F8;} + .d2-3061220014 .color-N7{color:#FFFFFF;} + .d2-3061220014 .color-B1{color:#0D32B2;} + .d2-3061220014 .color-B2{color:#0D32B2;} + .d2-3061220014 .color-B3{color:#E3E9FD;} + .d2-3061220014 .color-B4{color:#E3E9FD;} + .d2-3061220014 .color-B5{color:#EDF0FD;} + .d2-3061220014 .color-B6{color:#F7F8FE;} + .d2-3061220014 .color-AA2{color:#4A6FF3;} + .d2-3061220014 .color-AA4{color:#EDF0FD;} + .d2-3061220014 .color-AA5{color:#F7F8FE;} + .d2-3061220014 .color-AB4{color:#EDF0FD;} + .d2-3061220014 .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}]]>alphabeta gamma diff --git a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json index ddc9702b0..20ed6b86e 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 50 + "y": -3 }, "width": 264, - "height": 406, + "height": 379, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 125 + "y": 88 }, "width": 224, - "height": 306, + "height": 258, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,10 +90,10 @@ "type": "rectangle", "pos": { "x": 40, - "y": 196 + "y": 139 }, "width": 184, - "height": 210, + "height": 177, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -130,11 +130,11 @@ "id": "ninety nine.sixty four.thirty two.sixteen", "type": "rectangle", "pos": { - "x": 60, - "y": 249 + "x": 70, + "y": 170 }, - "width": 144, - "height": 130, + "width": 124, + "height": 116, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 100, - "y": 286 + "y": 200 }, "width": 64, "height": 56, 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 f0e77a7ad..851de605f 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,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight - - - - - - + .d2-2302067261 .fill-N1{fill:#0A0F25;} + .d2-2302067261 .fill-N2{fill:#676C7E;} + .d2-2302067261 .fill-N3{fill:#9499AB;} + .d2-2302067261 .fill-N4{fill:#CFD2DD;} + .d2-2302067261 .fill-N5{fill:#DEE1EB;} + .d2-2302067261 .fill-N6{fill:#EEF1F8;} + .d2-2302067261 .fill-N7{fill:#FFFFFF;} + .d2-2302067261 .fill-B1{fill:#0D32B2;} + .d2-2302067261 .fill-B2{fill:#0D32B2;} + .d2-2302067261 .fill-B3{fill:#E3E9FD;} + .d2-2302067261 .fill-B4{fill:#E3E9FD;} + .d2-2302067261 .fill-B5{fill:#EDF0FD;} + .d2-2302067261 .fill-B6{fill:#F7F8FE;} + .d2-2302067261 .fill-AA2{fill:#4A6FF3;} + .d2-2302067261 .fill-AA4{fill:#EDF0FD;} + .d2-2302067261 .fill-AA5{fill:#F7F8FE;} + .d2-2302067261 .fill-AB4{fill:#EDF0FD;} + .d2-2302067261 .fill-AB5{fill:#F7F8FE;} + .d2-2302067261 .stroke-N1{stroke:#0A0F25;} + .d2-2302067261 .stroke-N2{stroke:#676C7E;} + .d2-2302067261 .stroke-N3{stroke:#9499AB;} + .d2-2302067261 .stroke-N4{stroke:#CFD2DD;} + .d2-2302067261 .stroke-N5{stroke:#DEE1EB;} + .d2-2302067261 .stroke-N6{stroke:#EEF1F8;} + .d2-2302067261 .stroke-N7{stroke:#FFFFFF;} + .d2-2302067261 .stroke-B1{stroke:#0D32B2;} + .d2-2302067261 .stroke-B2{stroke:#0D32B2;} + .d2-2302067261 .stroke-B3{stroke:#E3E9FD;} + .d2-2302067261 .stroke-B4{stroke:#E3E9FD;} + .d2-2302067261 .stroke-B5{stroke:#EDF0FD;} + .d2-2302067261 .stroke-B6{stroke:#F7F8FE;} + .d2-2302067261 .stroke-AA2{stroke:#4A6FF3;} + .d2-2302067261 .stroke-AA4{stroke:#EDF0FD;} + .d2-2302067261 .stroke-AA5{stroke:#F7F8FE;} + .d2-2302067261 .stroke-AB4{stroke:#EDF0FD;} + .d2-2302067261 .stroke-AB5{stroke:#F7F8FE;} + .d2-2302067261 .background-color-N1{background-color:#0A0F25;} + .d2-2302067261 .background-color-N2{background-color:#676C7E;} + .d2-2302067261 .background-color-N3{background-color:#9499AB;} + .d2-2302067261 .background-color-N4{background-color:#CFD2DD;} + .d2-2302067261 .background-color-N5{background-color:#DEE1EB;} + .d2-2302067261 .background-color-N6{background-color:#EEF1F8;} + .d2-2302067261 .background-color-N7{background-color:#FFFFFF;} + .d2-2302067261 .background-color-B1{background-color:#0D32B2;} + .d2-2302067261 .background-color-B2{background-color:#0D32B2;} + .d2-2302067261 .background-color-B3{background-color:#E3E9FD;} + .d2-2302067261 .background-color-B4{background-color:#E3E9FD;} + .d2-2302067261 .background-color-B5{background-color:#EDF0FD;} + .d2-2302067261 .background-color-B6{background-color:#F7F8FE;} + .d2-2302067261 .background-color-AA2{background-color:#4A6FF3;} + .d2-2302067261 .background-color-AA4{background-color:#EDF0FD;} + .d2-2302067261 .background-color-AA5{background-color:#F7F8FE;} + .d2-2302067261 .background-color-AB4{background-color:#EDF0FD;} + .d2-2302067261 .background-color-AB5{background-color:#F7F8FE;} + .d2-2302067261 .color-N1{color:#0A0F25;} + .d2-2302067261 .color-N2{color:#676C7E;} + .d2-2302067261 .color-N3{color:#9499AB;} + .d2-2302067261 .color-N4{color:#CFD2DD;} + .d2-2302067261 .color-N5{color:#DEE1EB;} + .d2-2302067261 .color-N6{color:#EEF1F8;} + .d2-2302067261 .color-N7{color:#FFFFFF;} + .d2-2302067261 .color-B1{color:#0D32B2;} + .d2-2302067261 .color-B2{color:#0D32B2;} + .d2-2302067261 .color-B3{color:#E3E9FD;} + .d2-2302067261 .color-B4{color:#E3E9FD;} + .d2-2302067261 .color-B5{color:#EDF0FD;} + .d2-2302067261 .color-B6{color:#F7F8FE;} + .d2-2302067261 .color-AA2{color:#4A6FF3;} + .d2-2302067261 .color-AA4{color:#EDF0FD;} + .d2-2302067261 .color-AA5{color:#F7F8FE;} + .d2-2302067261 .color-AB4{color:#EDF0FD;} + .d2-2302067261 .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}]]>ninety ninesixty fourthirty twosixteeneight + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json index 59d5c73b6..dadeae729 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "ninety nine", "type": "rectangle", "pos": { - "x": 0, - "y": 50 + "x": 80, + "y": 205 }, - "width": 464, - "height": 638, + "width": 304, + "height": 359, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "ninety nine.sixty four", "type": "rectangle", "pos": { - "x": 50, - "y": 161 + "x": 110, + "y": 296 }, - "width": 364, - "height": 466, + "width": 244, + "height": 248, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,11 +89,11 @@ "id": "ninety nine.sixty four.thirty two", "type": "rectangle", "pos": { - "x": 100, - "y": 268 + "x": 140, + "y": 347 }, - "width": 264, - "height": 298, + "width": 184, + "height": 177, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -130,11 +130,11 @@ "id": "ninety nine.sixty four.thirty two.sixteen", "type": "rectangle", "pos": { - "x": 150, - "y": 357 + "x": 170, + "y": 378 }, - "width": 164, - "height": 146, + "width": 124, + "height": 116, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 200, - "y": 402 + "y": 408 }, "width": 64, "height": 56, 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 aab74ad41..d742b2075 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,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight - - - - - - + .d2-1522392309 .fill-N1{fill:#0A0F25;} + .d2-1522392309 .fill-N2{fill:#676C7E;} + .d2-1522392309 .fill-N3{fill:#9499AB;} + .d2-1522392309 .fill-N4{fill:#CFD2DD;} + .d2-1522392309 .fill-N5{fill:#DEE1EB;} + .d2-1522392309 .fill-N6{fill:#EEF1F8;} + .d2-1522392309 .fill-N7{fill:#FFFFFF;} + .d2-1522392309 .fill-B1{fill:#0D32B2;} + .d2-1522392309 .fill-B2{fill:#0D32B2;} + .d2-1522392309 .fill-B3{fill:#E3E9FD;} + .d2-1522392309 .fill-B4{fill:#E3E9FD;} + .d2-1522392309 .fill-B5{fill:#EDF0FD;} + .d2-1522392309 .fill-B6{fill:#F7F8FE;} + .d2-1522392309 .fill-AA2{fill:#4A6FF3;} + .d2-1522392309 .fill-AA4{fill:#EDF0FD;} + .d2-1522392309 .fill-AA5{fill:#F7F8FE;} + .d2-1522392309 .fill-AB4{fill:#EDF0FD;} + .d2-1522392309 .fill-AB5{fill:#F7F8FE;} + .d2-1522392309 .stroke-N1{stroke:#0A0F25;} + .d2-1522392309 .stroke-N2{stroke:#676C7E;} + .d2-1522392309 .stroke-N3{stroke:#9499AB;} + .d2-1522392309 .stroke-N4{stroke:#CFD2DD;} + .d2-1522392309 .stroke-N5{stroke:#DEE1EB;} + .d2-1522392309 .stroke-N6{stroke:#EEF1F8;} + .d2-1522392309 .stroke-N7{stroke:#FFFFFF;} + .d2-1522392309 .stroke-B1{stroke:#0D32B2;} + .d2-1522392309 .stroke-B2{stroke:#0D32B2;} + .d2-1522392309 .stroke-B3{stroke:#E3E9FD;} + .d2-1522392309 .stroke-B4{stroke:#E3E9FD;} + .d2-1522392309 .stroke-B5{stroke:#EDF0FD;} + .d2-1522392309 .stroke-B6{stroke:#F7F8FE;} + .d2-1522392309 .stroke-AA2{stroke:#4A6FF3;} + .d2-1522392309 .stroke-AA4{stroke:#EDF0FD;} + .d2-1522392309 .stroke-AA5{stroke:#F7F8FE;} + .d2-1522392309 .stroke-AB4{stroke:#EDF0FD;} + .d2-1522392309 .stroke-AB5{stroke:#F7F8FE;} + .d2-1522392309 .background-color-N1{background-color:#0A0F25;} + .d2-1522392309 .background-color-N2{background-color:#676C7E;} + .d2-1522392309 .background-color-N3{background-color:#9499AB;} + .d2-1522392309 .background-color-N4{background-color:#CFD2DD;} + .d2-1522392309 .background-color-N5{background-color:#DEE1EB;} + .d2-1522392309 .background-color-N6{background-color:#EEF1F8;} + .d2-1522392309 .background-color-N7{background-color:#FFFFFF;} + .d2-1522392309 .background-color-B1{background-color:#0D32B2;} + .d2-1522392309 .background-color-B2{background-color:#0D32B2;} + .d2-1522392309 .background-color-B3{background-color:#E3E9FD;} + .d2-1522392309 .background-color-B4{background-color:#E3E9FD;} + .d2-1522392309 .background-color-B5{background-color:#EDF0FD;} + .d2-1522392309 .background-color-B6{background-color:#F7F8FE;} + .d2-1522392309 .background-color-AA2{background-color:#4A6FF3;} + .d2-1522392309 .background-color-AA4{background-color:#EDF0FD;} + .d2-1522392309 .background-color-AA5{background-color:#F7F8FE;} + .d2-1522392309 .background-color-AB4{background-color:#EDF0FD;} + .d2-1522392309 .background-color-AB5{background-color:#F7F8FE;} + .d2-1522392309 .color-N1{color:#0A0F25;} + .d2-1522392309 .color-N2{color:#676C7E;} + .d2-1522392309 .color-N3{color:#9499AB;} + .d2-1522392309 .color-N4{color:#CFD2DD;} + .d2-1522392309 .color-N5{color:#DEE1EB;} + .d2-1522392309 .color-N6{color:#EEF1F8;} + .d2-1522392309 .color-N7{color:#FFFFFF;} + .d2-1522392309 .color-B1{color:#0D32B2;} + .d2-1522392309 .color-B2{color:#0D32B2;} + .d2-1522392309 .color-B3{color:#E3E9FD;} + .d2-1522392309 .color-B4{color:#E3E9FD;} + .d2-1522392309 .color-B5{color:#EDF0FD;} + .d2-1522392309 .color-B6{color:#F7F8FE;} + .d2-1522392309 .color-AA2{color:#4A6FF3;} + .d2-1522392309 .color-AA4{color:#EDF0FD;} + .d2-1522392309 .color-AA5{color:#F7F8FE;} + .d2-1522392309 .color-AB4{color:#EDF0FD;} + .d2-1522392309 .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}]]>ninety ninesixty fourthirty twosixteeneight + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json index 4ad3f73ef..e8b5da641 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json @@ -11,10 +11,10 @@ ], "pos": { "x": 0, - "y": 18 + "y": 0 }, - "width": 384, - "height": 421, + "width": 364, + "height": 417, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,10 +52,10 @@ "type": "rectangle", "pos": { "x": 60, - "y": 143 + "y": 125 }, "width": 53, - "height": 130, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -93,10 +93,10 @@ "type": "rectangle", "pos": { "x": 153, - "y": 143 + "y": 125 }, - "width": 171, - "height": 130, + "width": 151, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -145,8 +145,8 @@ "id": "grid w/ container + icon.b.b child", "type": "rectangle", "pos": { - "x": 193, - "y": 175 + "x": 183, + "y": 155 }, "width": 91, "height": 66, @@ -187,7 +187,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 313 + "y": 291 }, "width": 53, "height": 66, @@ -228,9 +228,9 @@ "type": "rectangle", "pos": { "x": 153, - "y": 313 + "y": 291 }, - "width": 171, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -271,11 +271,11 @@ "2x2" ], "pos": { - "x": 444, - "y": 55 + "x": 424, + "y": 56 }, "width": 278, - "height": 347, + "height": 306, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -324,8 +324,8 @@ "id": "grid + icon.a", "type": "rectangle", "pos": { - "x": 509, - "y": 129 + "x": 489, + "y": 130 }, "width": 53, "height": 66, @@ -365,8 +365,8 @@ "id": "grid + icon.b", "type": "rectangle", "pos": { - "x": 602, - "y": 129 + "x": 582, + "y": 130 }, "width": 54, "height": 66, @@ -406,8 +406,8 @@ "id": "grid + icon.c", "type": "rectangle", "pos": { - "x": 509, - "y": 235 + "x": 489, + "y": 236 }, "width": 53, "height": 66, @@ -447,8 +447,8 @@ "id": "grid + icon.d", "type": "rectangle", "pos": { - "x": 602, - "y": 235 + "x": 582, + "y": 236 }, "width": 54, "height": 66, @@ -491,11 +491,11 @@ "2x2" ], "pos": { - "x": 782, - "y": 0 + "x": 762, + "y": 3 }, "width": 433, - "height": 457, + "height": 412, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -544,11 +544,11 @@ "id": "grid + icon w/ container.a", "type": "rectangle", "pos": { - "x": 866, - "y": 120 + "x": 856, + "y": 123 }, "width": 53, - "height": 130, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -585,11 +585,11 @@ "id": "grid + icon w/ container.b", "type": "rectangle", "pos": { - "x": 959, - "y": 120 + "x": 949, + "y": 123 }, - "width": 171, - "height": 130, + "width": 151, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -626,8 +626,8 @@ "id": "grid + icon w/ container.b.b child", "type": "rectangle", "pos": { - "x": 999, - "y": 152 + "x": 979, + "y": 153 }, "width": 91, "height": 66, @@ -667,8 +667,8 @@ "id": "grid + icon w/ container.c", "type": "rectangle", "pos": { - "x": 866, - "y": 290 + "x": 856, + "y": 289 }, "width": 53, "height": 66, @@ -708,10 +708,10 @@ "id": "grid + icon w/ container.d", "type": "rectangle", "pos": { - "x": 959, - "y": 290 + "x": 949, + "y": 289 }, - "width": 171, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -752,11 +752,11 @@ "2x2" ], "pos": { - "x": 1275, - "y": 41 + "x": 1255, + "y": 23 }, - "width": 384, - "height": 375, + "width": 364, + "height": 371, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -793,11 +793,11 @@ "id": "no label grid w/ container + icon.a", "type": "rectangle", "pos": { - "x": 1335, - "y": 120 + "x": 1315, + "y": 102 }, "width": 53, - "height": 130, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -834,11 +834,11 @@ "id": "no label grid w/ container + icon.b", "type": "rectangle", "pos": { - "x": 1428, - "y": 120 + "x": 1408, + "y": 102 }, - "width": 171, - "height": 130, + "width": 151, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -887,8 +887,8 @@ "id": "no label grid w/ container + icon.b.b child", "type": "rectangle", "pos": { - "x": 1468, - "y": 152 + "x": 1438, + "y": 132 }, "width": 91, "height": 66, @@ -928,8 +928,8 @@ "id": "no label grid w/ container + icon.c", "type": "rectangle", "pos": { - "x": 1335, - "y": 290 + "x": 1315, + "y": 268 }, "width": 53, "height": 66, @@ -969,10 +969,10 @@ "id": "no label grid w/ container + icon.d", "type": "rectangle", "pos": { - "x": 1428, - "y": 290 + "x": 1408, + "y": 268 }, - "width": 171, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1013,8 +1013,8 @@ "2x2" ], "pos": { - "x": 1719, - "y": 76 + "x": 1679, + "y": 56 }, "width": 267, "height": 306, @@ -1066,8 +1066,8 @@ "id": "no label grid + icon.a", "type": "rectangle", "pos": { - "x": 1779, - "y": 150 + "x": 1739, + "y": 130 }, "width": 53, "height": 66, @@ -1107,8 +1107,8 @@ "id": "no label grid + icon.b", "type": "rectangle", "pos": { - "x": 1872, - "y": 150 + "x": 1832, + "y": 130 }, "width": 54, "height": 66, @@ -1148,8 +1148,8 @@ "id": "no label grid + icon.c", "type": "rectangle", "pos": { - "x": 1779, - "y": 256 + "x": 1739, + "y": 236 }, "width": 53, "height": 66, @@ -1189,8 +1189,8 @@ "id": "no label grid + icon.d", "type": "rectangle", "pos": { - "x": 1872, - "y": 256 + "x": 1832, + "y": 236 }, "width": 54, "height": 66, diff --git a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg index b99a5e2d2..08b554136 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3851636847 .fill-N1{fill:#0A0F25;} + .d2-3851636847 .fill-N2{fill:#676C7E;} + .d2-3851636847 .fill-N3{fill:#9499AB;} + .d2-3851636847 .fill-N4{fill:#CFD2DD;} + .d2-3851636847 .fill-N5{fill:#DEE1EB;} + .d2-3851636847 .fill-N6{fill:#EEF1F8;} + .d2-3851636847 .fill-N7{fill:#FFFFFF;} + .d2-3851636847 .fill-B1{fill:#0D32B2;} + .d2-3851636847 .fill-B2{fill:#0D32B2;} + .d2-3851636847 .fill-B3{fill:#E3E9FD;} + .d2-3851636847 .fill-B4{fill:#E3E9FD;} + .d2-3851636847 .fill-B5{fill:#EDF0FD;} + .d2-3851636847 .fill-B6{fill:#F7F8FE;} + .d2-3851636847 .fill-AA2{fill:#4A6FF3;} + .d2-3851636847 .fill-AA4{fill:#EDF0FD;} + .d2-3851636847 .fill-AA5{fill:#F7F8FE;} + .d2-3851636847 .fill-AB4{fill:#EDF0FD;} + .d2-3851636847 .fill-AB5{fill:#F7F8FE;} + .d2-3851636847 .stroke-N1{stroke:#0A0F25;} + .d2-3851636847 .stroke-N2{stroke:#676C7E;} + .d2-3851636847 .stroke-N3{stroke:#9499AB;} + .d2-3851636847 .stroke-N4{stroke:#CFD2DD;} + .d2-3851636847 .stroke-N5{stroke:#DEE1EB;} + .d2-3851636847 .stroke-N6{stroke:#EEF1F8;} + .d2-3851636847 .stroke-N7{stroke:#FFFFFF;} + .d2-3851636847 .stroke-B1{stroke:#0D32B2;} + .d2-3851636847 .stroke-B2{stroke:#0D32B2;} + .d2-3851636847 .stroke-B3{stroke:#E3E9FD;} + .d2-3851636847 .stroke-B4{stroke:#E3E9FD;} + .d2-3851636847 .stroke-B5{stroke:#EDF0FD;} + .d2-3851636847 .stroke-B6{stroke:#F7F8FE;} + .d2-3851636847 .stroke-AA2{stroke:#4A6FF3;} + .d2-3851636847 .stroke-AA4{stroke:#EDF0FD;} + .d2-3851636847 .stroke-AA5{stroke:#F7F8FE;} + .d2-3851636847 .stroke-AB4{stroke:#EDF0FD;} + .d2-3851636847 .stroke-AB5{stroke:#F7F8FE;} + .d2-3851636847 .background-color-N1{background-color:#0A0F25;} + .d2-3851636847 .background-color-N2{background-color:#676C7E;} + .d2-3851636847 .background-color-N3{background-color:#9499AB;} + .d2-3851636847 .background-color-N4{background-color:#CFD2DD;} + .d2-3851636847 .background-color-N5{background-color:#DEE1EB;} + .d2-3851636847 .background-color-N6{background-color:#EEF1F8;} + .d2-3851636847 .background-color-N7{background-color:#FFFFFF;} + .d2-3851636847 .background-color-B1{background-color:#0D32B2;} + .d2-3851636847 .background-color-B2{background-color:#0D32B2;} + .d2-3851636847 .background-color-B3{background-color:#E3E9FD;} + .d2-3851636847 .background-color-B4{background-color:#E3E9FD;} + .d2-3851636847 .background-color-B5{background-color:#EDF0FD;} + .d2-3851636847 .background-color-B6{background-color:#F7F8FE;} + .d2-3851636847 .background-color-AA2{background-color:#4A6FF3;} + .d2-3851636847 .background-color-AA4{background-color:#EDF0FD;} + .d2-3851636847 .background-color-AA5{background-color:#F7F8FE;} + .d2-3851636847 .background-color-AB4{background-color:#EDF0FD;} + .d2-3851636847 .background-color-AB5{background-color:#F7F8FE;} + .d2-3851636847 .color-N1{color:#0A0F25;} + .d2-3851636847 .color-N2{color:#676C7E;} + .d2-3851636847 .color-N3{color:#9499AB;} + .d2-3851636847 .color-N4{color:#CFD2DD;} + .d2-3851636847 .color-N5{color:#DEE1EB;} + .d2-3851636847 .color-N6{color:#EEF1F8;} + .d2-3851636847 .color-N7{color:#FFFFFF;} + .d2-3851636847 .color-B1{color:#0D32B2;} + .d2-3851636847 .color-B2{color:#0D32B2;} + .d2-3851636847 .color-B3{color:#E3E9FD;} + .d2-3851636847 .color-B4{color:#E3E9FD;} + .d2-3851636847 .color-B5{color:#EDF0FD;} + .d2-3851636847 .color-B6{color:#F7F8FE;} + .d2-3851636847 .color-AA2{color:#4A6FF3;} + .d2-3851636847 .color-AA4{color:#EDF0FD;} + .d2-3851636847 .color-AA5{color:#F7F8FE;} + .d2-3851636847 .color-AB4{color:#EDF0FD;} + .d2-3851636847 .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/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json index fd1b4b77b..4d4abbc98 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json @@ -11,10 +11,10 @@ ], "pos": { "x": 0, - "y": 150 + "y": 99 }, - "width": 384, - "height": 388, + "width": 364, + "height": 384, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,10 +52,10 @@ "type": "rectangle", "pos": { "x": 60, - "y": 242 + "y": 191 }, "width": 53, - "height": 130, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -93,10 +93,10 @@ "type": "rectangle", "pos": { "x": 153, - "y": 242 + "y": 191 }, - "width": 171, - "height": 130, + "width": 151, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -133,8 +133,8 @@ "id": "grid w/ container.b.b child", "type": "rectangle", "pos": { - "x": 193, - "y": 274 + "x": 183, + "y": 221 }, "width": 91, "height": 66, @@ -175,7 +175,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 412 + "y": 357 }, "width": 53, "height": 66, @@ -216,9 +216,9 @@ "type": "rectangle", "pos": { "x": 153, - "y": 412 + "y": 357 }, - "width": 171, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -259,11 +259,11 @@ "2x2" ], "pos": { - "x": 444, - "y": 0 + "x": 424, + "y": 5 }, "width": 692, - "height": 688, + "height": 572, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -300,11 +300,11 @@ "id": "grid w/ nested containers.a", "type": "rectangle", "pos": { - "x": 504, - "y": 92 + "x": 484, + "y": 97 }, "width": 53, - "height": 430, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,11 +341,11 @@ "id": "grid w/ nested containers.b", "type": "rectangle", "pos": { - "x": 597, - "y": 92 + "x": 577, + "y": 97 }, "width": 479, - "height": 430, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -382,11 +382,11 @@ "id": "grid w/ nested containers.b.b 1", "type": "rectangle", "pos": { - "x": 617, - "y": 155 + "x": 597, + "y": 133 }, "width": 439, - "height": 335, + "height": 248, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -423,11 +423,11 @@ "id": "grid w/ nested containers.b.b 1.b 2", "type": "rectangle", "pos": { - "x": 637, - "y": 215 + "x": 617, + "y": 164 }, "width": 186, - "height": 240, + "height": 187, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -464,11 +464,11 @@ "id": "grid w/ nested containers.b.b 1.b 2.b 3", "type": "rectangle", "pos": { - "x": 657, - "y": 278 + "x": 647, + "y": 195 }, - "width": 146, - "height": 140, + "width": 126, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -505,8 +505,8 @@ "id": "grid w/ nested containers.b.b 1.b 2.b 3.b 4", "type": "rectangle", "pos": { - "x": 697, - "y": 315 + "x": 677, + "y": 225 }, "width": 66, "height": 66, @@ -546,11 +546,11 @@ "id": "grid w/ nested containers.b.b 1.b 2a", "type": "rectangle", "pos": { - "x": 843, - "y": 215 + "x": 823, + "y": 164 }, "width": 193, - "height": 240, + "height": 187, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -587,11 +587,11 @@ "id": "grid w/ nested containers.b.b 1.b 2a.b 3a", "type": "rectangle", "pos": { - "x": 863, - "y": 278 + "x": 853, + "y": 195 }, - "width": 153, - "height": 140, + "width": 133, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -628,8 +628,8 @@ "id": "grid w/ nested containers.b.b 1.b 2a.b 3a.b 3a", "type": "rectangle", "pos": { - "x": 903, - "y": 315 + "x": 883, + "y": 225 }, "width": 73, "height": 66, @@ -669,8 +669,8 @@ "id": "grid w/ nested containers.c", "type": "rectangle", "pos": { - "x": 504, - "y": 562 + "x": 484, + "y": 451 }, "width": 53, "height": 66, @@ -710,8 +710,8 @@ "id": "grid w/ nested containers.d", "type": "rectangle", "pos": { - "x": 597, - "y": 562 + "x": 577, + "y": 451 }, "width": 479, "height": 66, @@ -754,8 +754,8 @@ "2x2" ], "pos": { - "x": 1196, - "y": 85 + "x": 1176, + "y": 32 }, "width": 480, "height": 518, @@ -795,8 +795,8 @@ "id": "grid in grid.a", "type": "rectangle", "pos": { - "x": 1256, - "y": 145 + "x": 1236, + "y": 92 }, "width": 53, "height": 292, @@ -839,8 +839,8 @@ "2x2" ], "pos": { - "x": 1349, - "y": 145 + "x": 1329, + "y": 92 }, "width": 267, "height": 292, @@ -880,8 +880,8 @@ "id": "grid in grid.b.a", "type": "rectangle", "pos": { - "x": 1409, - "y": 205 + "x": 1389, + "y": 152 }, "width": 53, "height": 66, @@ -921,8 +921,8 @@ "id": "grid in grid.b.b", "type": "rectangle", "pos": { - "x": 1502, - "y": 205 + "x": 1482, + "y": 152 }, "width": 54, "height": 66, @@ -962,8 +962,8 @@ "id": "grid in grid.b.c", "type": "rectangle", "pos": { - "x": 1409, - "y": 311 + "x": 1389, + "y": 258 }, "width": 53, "height": 66, @@ -1003,8 +1003,8 @@ "id": "grid in grid.b.d", "type": "rectangle", "pos": { - "x": 1502, - "y": 311 + "x": 1482, + "y": 258 }, "width": 54, "height": 66, @@ -1044,8 +1044,8 @@ "id": "grid in grid.c", "type": "rectangle", "pos": { - "x": 1256, - "y": 477 + "x": 1236, + "y": 424 }, "width": 53, "height": 66, @@ -1085,8 +1085,8 @@ "id": "grid in grid.d", "type": "rectangle", "pos": { - "x": 1349, - "y": 477 + "x": 1329, + "y": 424 }, "width": 267, "height": 66, @@ -1130,8 +1130,8 @@ "gap0" ], "pos": { - "x": 1736, - "y": 54 + "x": 1716, + "y": 0 }, "width": 321, "height": 581, @@ -1171,8 +1171,8 @@ "id": "grid w/ grid w/ grid.a", "type": "rectangle", "pos": { - "x": 1736, - "y": 100 + "x": 1716, + "y": 46 }, "width": 53, "height": 469, @@ -1216,8 +1216,8 @@ "gap0" ], "pos": { - "x": 1789, - "y": 100 + "x": 1769, + "y": 46 }, "width": 268, "height": 469, @@ -1257,8 +1257,8 @@ "id": "grid w/ grid w/ grid.b.a", "type": "rectangle", "pos": { - "x": 1789, - "y": 141 + "x": 1769, + "y": 87 }, "width": 214, "height": 66, @@ -1298,8 +1298,8 @@ "id": "grid w/ grid w/ grid.b.b", "type": "rectangle", "pos": { - "x": 2003, - "y": 141 + "x": 1983, + "y": 87 }, "width": 54, "height": 66, @@ -1343,8 +1343,8 @@ "gap0" ], "pos": { - "x": 1789, - "y": 207 + "x": 1769, + "y": 153 }, "width": 214, "height": 362, @@ -1384,8 +1384,8 @@ "id": "grid w/ grid w/ grid.b.c.a", "type": "rectangle", "pos": { - "x": 1789, - "y": 243 + "x": 1769, + "y": 189 }, "width": 53, "height": 66, @@ -1425,8 +1425,8 @@ "id": "grid w/ grid w/ grid.b.c.b", "type": "rectangle", "pos": { - "x": 1842, - "y": 243 + "x": 1822, + "y": 189 }, "width": 161, "height": 66, @@ -1466,8 +1466,8 @@ "id": "grid w/ grid w/ grid.b.c.c", "type": "rectangle", "pos": { - "x": 1789, - "y": 309 + "x": 1769, + "y": 255 }, "width": 53, "height": 260, @@ -1511,8 +1511,8 @@ "gap0" ], "pos": { - "x": 1842, - "y": 309 + "x": 1822, + "y": 255 }, "width": 161, "height": 260, @@ -1556,8 +1556,8 @@ "gap0" ], "pos": { - "x": 1842, - "y": 340 + "x": 1822, + "y": 286 }, "width": 107, "height": 163, @@ -1597,8 +1597,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.a", "type": "rectangle", "pos": { - "x": 1842, - "y": 371 + "x": 1822, + "y": 317 }, "width": 53, "height": 66, @@ -1638,8 +1638,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.b", "type": "rectangle", "pos": { - "x": 1895, - "y": 371 + "x": 1875, + "y": 317 }, "width": 54, "height": 66, @@ -1679,8 +1679,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.c", "type": "rectangle", "pos": { - "x": 1842, - "y": 437 + "x": 1822, + "y": 383 }, "width": 53, "height": 66, @@ -1720,8 +1720,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.d", "type": "rectangle", "pos": { - "x": 1895, - "y": 437 + "x": 1875, + "y": 383 }, "width": 54, "height": 66, @@ -1761,8 +1761,8 @@ "id": "grid w/ grid w/ grid.b.c.d.b", "type": "rectangle", "pos": { - "x": 1949, - "y": 340 + "x": 1929, + "y": 286 }, "width": 54, "height": 163, @@ -1802,8 +1802,8 @@ "id": "grid w/ grid w/ grid.b.c.d.c", "type": "rectangle", "pos": { - "x": 1842, - "y": 503 + "x": 1822, + "y": 449 }, "width": 107, "height": 66, @@ -1843,8 +1843,8 @@ "id": "grid w/ grid w/ grid.b.c.d.d", "type": "rectangle", "pos": { - "x": 1949, - "y": 503 + "x": 1929, + "y": 449 }, "width": 54, "height": 66, @@ -1884,8 +1884,8 @@ "id": "grid w/ grid w/ grid.b.d", "type": "rectangle", "pos": { - "x": 2003, - "y": 207 + "x": 1983, + "y": 153 }, "width": 54, "height": 362, @@ -1925,8 +1925,8 @@ "id": "grid w/ grid w/ grid.c", "type": "rectangle", "pos": { - "x": 1736, - "y": 569 + "x": 1716, + "y": 515 }, "width": 53, "height": 66, @@ -1966,8 +1966,8 @@ "id": "grid w/ grid w/ grid.d", "type": "rectangle", "pos": { - "x": 1789, - "y": 569 + "x": 1769, + "y": 515 }, "width": 268, "height": 66, diff --git a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg index 9e3b4d904..85cdee992 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-475147087 .fill-N1{fill:#0A0F25;} + .d2-475147087 .fill-N2{fill:#676C7E;} + .d2-475147087 .fill-N3{fill:#9499AB;} + .d2-475147087 .fill-N4{fill:#CFD2DD;} + .d2-475147087 .fill-N5{fill:#DEE1EB;} + .d2-475147087 .fill-N6{fill:#EEF1F8;} + .d2-475147087 .fill-N7{fill:#FFFFFF;} + .d2-475147087 .fill-B1{fill:#0D32B2;} + .d2-475147087 .fill-B2{fill:#0D32B2;} + .d2-475147087 .fill-B3{fill:#E3E9FD;} + .d2-475147087 .fill-B4{fill:#E3E9FD;} + .d2-475147087 .fill-B5{fill:#EDF0FD;} + .d2-475147087 .fill-B6{fill:#F7F8FE;} + .d2-475147087 .fill-AA2{fill:#4A6FF3;} + .d2-475147087 .fill-AA4{fill:#EDF0FD;} + .d2-475147087 .fill-AA5{fill:#F7F8FE;} + .d2-475147087 .fill-AB4{fill:#EDF0FD;} + .d2-475147087 .fill-AB5{fill:#F7F8FE;} + .d2-475147087 .stroke-N1{stroke:#0A0F25;} + .d2-475147087 .stroke-N2{stroke:#676C7E;} + .d2-475147087 .stroke-N3{stroke:#9499AB;} + .d2-475147087 .stroke-N4{stroke:#CFD2DD;} + .d2-475147087 .stroke-N5{stroke:#DEE1EB;} + .d2-475147087 .stroke-N6{stroke:#EEF1F8;} + .d2-475147087 .stroke-N7{stroke:#FFFFFF;} + .d2-475147087 .stroke-B1{stroke:#0D32B2;} + .d2-475147087 .stroke-B2{stroke:#0D32B2;} + .d2-475147087 .stroke-B3{stroke:#E3E9FD;} + .d2-475147087 .stroke-B4{stroke:#E3E9FD;} + .d2-475147087 .stroke-B5{stroke:#EDF0FD;} + .d2-475147087 .stroke-B6{stroke:#F7F8FE;} + .d2-475147087 .stroke-AA2{stroke:#4A6FF3;} + .d2-475147087 .stroke-AA4{stroke:#EDF0FD;} + .d2-475147087 .stroke-AA5{stroke:#F7F8FE;} + .d2-475147087 .stroke-AB4{stroke:#EDF0FD;} + .d2-475147087 .stroke-AB5{stroke:#F7F8FE;} + .d2-475147087 .background-color-N1{background-color:#0A0F25;} + .d2-475147087 .background-color-N2{background-color:#676C7E;} + .d2-475147087 .background-color-N3{background-color:#9499AB;} + .d2-475147087 .background-color-N4{background-color:#CFD2DD;} + .d2-475147087 .background-color-N5{background-color:#DEE1EB;} + .d2-475147087 .background-color-N6{background-color:#EEF1F8;} + .d2-475147087 .background-color-N7{background-color:#FFFFFF;} + .d2-475147087 .background-color-B1{background-color:#0D32B2;} + .d2-475147087 .background-color-B2{background-color:#0D32B2;} + .d2-475147087 .background-color-B3{background-color:#E3E9FD;} + .d2-475147087 .background-color-B4{background-color:#E3E9FD;} + .d2-475147087 .background-color-B5{background-color:#EDF0FD;} + .d2-475147087 .background-color-B6{background-color:#F7F8FE;} + .d2-475147087 .background-color-AA2{background-color:#4A6FF3;} + .d2-475147087 .background-color-AA4{background-color:#EDF0FD;} + .d2-475147087 .background-color-AA5{background-color:#F7F8FE;} + .d2-475147087 .background-color-AB4{background-color:#EDF0FD;} + .d2-475147087 .background-color-AB5{background-color:#F7F8FE;} + .d2-475147087 .color-N1{color:#0A0F25;} + .d2-475147087 .color-N2{color:#676C7E;} + .d2-475147087 .color-N3{color:#9499AB;} + .d2-475147087 .color-N4{color:#CFD2DD;} + .d2-475147087 .color-N5{color:#DEE1EB;} + .d2-475147087 .color-N6{color:#EEF1F8;} + .d2-475147087 .color-N7{color:#FFFFFF;} + .d2-475147087 .color-B1{color:#0D32B2;} + .d2-475147087 .color-B2{color:#0D32B2;} + .d2-475147087 .color-B3{color:#E3E9FD;} + .d2-475147087 .color-B4{color:#E3E9FD;} + .d2-475147087 .color-B5{color:#EDF0FD;} + .d2-475147087 .color-B6{color:#F7F8FE;} + .d2-475147087 .color-AA2{color:#4A6FF3;} + .d2-475147087 .color-AA4{color:#EDF0FD;} + .d2-475147087 .color-AA5{color:#F7F8FE;} + .d2-475147087 .color-AB4{color:#EDF0FD;} + .d2-475147087 .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/hexagon_3d/dagre/board.exp.json b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json index 7c7767d43..2cfd1d39c 100644 --- a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "hexagon", "pos": { "x": 0, - "y": 7 + "y": 0 }, "width": 128, "height": 69, diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg index f51ab8728..f2fdac93d 100644 --- a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - - -hexagon - - + .d2-593352307 .fill-N1{fill:#0A0F25;} + .d2-593352307 .fill-N2{fill:#676C7E;} + .d2-593352307 .fill-N3{fill:#9499AB;} + .d2-593352307 .fill-N4{fill:#CFD2DD;} + .d2-593352307 .fill-N5{fill:#DEE1EB;} + .d2-593352307 .fill-N6{fill:#EEF1F8;} + .d2-593352307 .fill-N7{fill:#FFFFFF;} + .d2-593352307 .fill-B1{fill:#0D32B2;} + .d2-593352307 .fill-B2{fill:#0D32B2;} + .d2-593352307 .fill-B3{fill:#E3E9FD;} + .d2-593352307 .fill-B4{fill:#E3E9FD;} + .d2-593352307 .fill-B5{fill:#EDF0FD;} + .d2-593352307 .fill-B6{fill:#F7F8FE;} + .d2-593352307 .fill-AA2{fill:#4A6FF3;} + .d2-593352307 .fill-AA4{fill:#EDF0FD;} + .d2-593352307 .fill-AA5{fill:#F7F8FE;} + .d2-593352307 .fill-AB4{fill:#EDF0FD;} + .d2-593352307 .fill-AB5{fill:#F7F8FE;} + .d2-593352307 .stroke-N1{stroke:#0A0F25;} + .d2-593352307 .stroke-N2{stroke:#676C7E;} + .d2-593352307 .stroke-N3{stroke:#9499AB;} + .d2-593352307 .stroke-N4{stroke:#CFD2DD;} + .d2-593352307 .stroke-N5{stroke:#DEE1EB;} + .d2-593352307 .stroke-N6{stroke:#EEF1F8;} + .d2-593352307 .stroke-N7{stroke:#FFFFFF;} + .d2-593352307 .stroke-B1{stroke:#0D32B2;} + .d2-593352307 .stroke-B2{stroke:#0D32B2;} + .d2-593352307 .stroke-B3{stroke:#E3E9FD;} + .d2-593352307 .stroke-B4{stroke:#E3E9FD;} + .d2-593352307 .stroke-B5{stroke:#EDF0FD;} + .d2-593352307 .stroke-B6{stroke:#F7F8FE;} + .d2-593352307 .stroke-AA2{stroke:#4A6FF3;} + .d2-593352307 .stroke-AA4{stroke:#EDF0FD;} + .d2-593352307 .stroke-AA5{stroke:#F7F8FE;} + .d2-593352307 .stroke-AB4{stroke:#EDF0FD;} + .d2-593352307 .stroke-AB5{stroke:#F7F8FE;} + .d2-593352307 .background-color-N1{background-color:#0A0F25;} + .d2-593352307 .background-color-N2{background-color:#676C7E;} + .d2-593352307 .background-color-N3{background-color:#9499AB;} + .d2-593352307 .background-color-N4{background-color:#CFD2DD;} + .d2-593352307 .background-color-N5{background-color:#DEE1EB;} + .d2-593352307 .background-color-N6{background-color:#EEF1F8;} + .d2-593352307 .background-color-N7{background-color:#FFFFFF;} + .d2-593352307 .background-color-B1{background-color:#0D32B2;} + .d2-593352307 .background-color-B2{background-color:#0D32B2;} + .d2-593352307 .background-color-B3{background-color:#E3E9FD;} + .d2-593352307 .background-color-B4{background-color:#E3E9FD;} + .d2-593352307 .background-color-B5{background-color:#EDF0FD;} + .d2-593352307 .background-color-B6{background-color:#F7F8FE;} + .d2-593352307 .background-color-AA2{background-color:#4A6FF3;} + .d2-593352307 .background-color-AA4{background-color:#EDF0FD;} + .d2-593352307 .background-color-AA5{background-color:#F7F8FE;} + .d2-593352307 .background-color-AB4{background-color:#EDF0FD;} + .d2-593352307 .background-color-AB5{background-color:#F7F8FE;} + .d2-593352307 .color-N1{color:#0A0F25;} + .d2-593352307 .color-N2{color:#676C7E;} + .d2-593352307 .color-N3{color:#9499AB;} + .d2-593352307 .color-N4{color:#CFD2DD;} + .d2-593352307 .color-N5{color:#DEE1EB;} + .d2-593352307 .color-N6{color:#EEF1F8;} + .d2-593352307 .color-N7{color:#FFFFFF;} + .d2-593352307 .color-B1{color:#0D32B2;} + .d2-593352307 .color-B2{color:#0D32B2;} + .d2-593352307 .color-B3{color:#E3E9FD;} + .d2-593352307 .color-B4{color:#E3E9FD;} + .d2-593352307 .color-B5{color:#EDF0FD;} + .d2-593352307 .color-B6{color:#F7F8FE;} + .d2-593352307 .color-AA2{color:#4A6FF3;} + .d2-593352307 .color-AA4{color:#EDF0FD;} + .d2-593352307 .color-AA5{color:#F7F8FE;} + .d2-593352307 .color-AB4{color:#EDF0FD;} + .d2-593352307 .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}]]> + +hexagon + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json index d80b1065f..0ea754bd6 100644 --- a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 5 }, "width": 320, - "height": 443, + "height": 327, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -61,10 +61,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 117 + "y": 46 }, "width": 280, - "height": 326, + "height": 256, "opacity": 1, "strokeDash": 3, "strokeWidth": 2, @@ -101,11 +101,11 @@ "id": "vpc.az.firewall", "type": "rectangle", "pos": { - "x": 40, - "y": 191 + "x": 50, + "y": 120 }, - "width": 240, - "height": 209, + "width": 220, + "height": 152, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -155,10 +155,10 @@ "type": "rectangle", "pos": { "x": 80, - "y": 237 + "y": 150 }, "width": 160, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg index 9293bde9d..9b1ea5646 100644 --- a/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance - - - - - + .d2-807654184 .fill-N1{fill:#0A0F25;} + .d2-807654184 .fill-N2{fill:#676C7E;} + .d2-807654184 .fill-N3{fill:#9499AB;} + .d2-807654184 .fill-N4{fill:#CFD2DD;} + .d2-807654184 .fill-N5{fill:#DEE1EB;} + .d2-807654184 .fill-N6{fill:#EEF1F8;} + .d2-807654184 .fill-N7{fill:#FFFFFF;} + .d2-807654184 .fill-B1{fill:#0D32B2;} + .d2-807654184 .fill-B2{fill:#0D32B2;} + .d2-807654184 .fill-B3{fill:#E3E9FD;} + .d2-807654184 .fill-B4{fill:#E3E9FD;} + .d2-807654184 .fill-B5{fill:#EDF0FD;} + .d2-807654184 .fill-B6{fill:#F7F8FE;} + .d2-807654184 .fill-AA2{fill:#4A6FF3;} + .d2-807654184 .fill-AA4{fill:#EDF0FD;} + .d2-807654184 .fill-AA5{fill:#F7F8FE;} + .d2-807654184 .fill-AB4{fill:#EDF0FD;} + .d2-807654184 .fill-AB5{fill:#F7F8FE;} + .d2-807654184 .stroke-N1{stroke:#0A0F25;} + .d2-807654184 .stroke-N2{stroke:#676C7E;} + .d2-807654184 .stroke-N3{stroke:#9499AB;} + .d2-807654184 .stroke-N4{stroke:#CFD2DD;} + .d2-807654184 .stroke-N5{stroke:#DEE1EB;} + .d2-807654184 .stroke-N6{stroke:#EEF1F8;} + .d2-807654184 .stroke-N7{stroke:#FFFFFF;} + .d2-807654184 .stroke-B1{stroke:#0D32B2;} + .d2-807654184 .stroke-B2{stroke:#0D32B2;} + .d2-807654184 .stroke-B3{stroke:#E3E9FD;} + .d2-807654184 .stroke-B4{stroke:#E3E9FD;} + .d2-807654184 .stroke-B5{stroke:#EDF0FD;} + .d2-807654184 .stroke-B6{stroke:#F7F8FE;} + .d2-807654184 .stroke-AA2{stroke:#4A6FF3;} + .d2-807654184 .stroke-AA4{stroke:#EDF0FD;} + .d2-807654184 .stroke-AA5{stroke:#F7F8FE;} + .d2-807654184 .stroke-AB4{stroke:#EDF0FD;} + .d2-807654184 .stroke-AB5{stroke:#F7F8FE;} + .d2-807654184 .background-color-N1{background-color:#0A0F25;} + .d2-807654184 .background-color-N2{background-color:#676C7E;} + .d2-807654184 .background-color-N3{background-color:#9499AB;} + .d2-807654184 .background-color-N4{background-color:#CFD2DD;} + .d2-807654184 .background-color-N5{background-color:#DEE1EB;} + .d2-807654184 .background-color-N6{background-color:#EEF1F8;} + .d2-807654184 .background-color-N7{background-color:#FFFFFF;} + .d2-807654184 .background-color-B1{background-color:#0D32B2;} + .d2-807654184 .background-color-B2{background-color:#0D32B2;} + .d2-807654184 .background-color-B3{background-color:#E3E9FD;} + .d2-807654184 .background-color-B4{background-color:#E3E9FD;} + .d2-807654184 .background-color-B5{background-color:#EDF0FD;} + .d2-807654184 .background-color-B6{background-color:#F7F8FE;} + .d2-807654184 .background-color-AA2{background-color:#4A6FF3;} + .d2-807654184 .background-color-AA4{background-color:#EDF0FD;} + .d2-807654184 .background-color-AA5{background-color:#F7F8FE;} + .d2-807654184 .background-color-AB4{background-color:#EDF0FD;} + .d2-807654184 .background-color-AB5{background-color:#F7F8FE;} + .d2-807654184 .color-N1{color:#0A0F25;} + .d2-807654184 .color-N2{color:#676C7E;} + .d2-807654184 .color-N3{color:#9499AB;} + .d2-807654184 .color-N4{color:#CFD2DD;} + .d2-807654184 .color-N5{color:#DEE1EB;} + .d2-807654184 .color-N6{color:#EEF1F8;} + .d2-807654184 .color-N7{color:#FFFFFF;} + .d2-807654184 .color-B1{color:#0D32B2;} + .d2-807654184 .color-B2{color:#0D32B2;} + .d2-807654184 .color-B3{color:#E3E9FD;} + .d2-807654184 .color-B4{color:#E3E9FD;} + .d2-807654184 .color-B5{color:#EDF0FD;} + .d2-807654184 .color-B6{color:#F7F8FE;} + .d2-807654184 .color-AA2{color:#4A6FF3;} + .d2-807654184 .color-AA4{color:#EDF0FD;} + .d2-807654184 .color-AA5{color:#F7F8FE;} + .d2-807654184 .color-AB4{color:#EDF0FD;} + .d2-807654184 .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}]]>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/board.exp.json b/e2etests/testdata/stable/icon-label/dagre/board.exp.json index 45663531c..7592012a6 100644 --- a/e2etests/testdata/stable/icon-label/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon-label/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 0 }, "width": 106, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg index 31b45f743..bc32ef22e 100644 --- a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -hello - + .d2-3196172804 .fill-N1{fill:#0A0F25;} + .d2-3196172804 .fill-N2{fill:#676C7E;} + .d2-3196172804 .fill-N3{fill:#9499AB;} + .d2-3196172804 .fill-N4{fill:#CFD2DD;} + .d2-3196172804 .fill-N5{fill:#DEE1EB;} + .d2-3196172804 .fill-N6{fill:#EEF1F8;} + .d2-3196172804 .fill-N7{fill:#FFFFFF;} + .d2-3196172804 .fill-B1{fill:#0D32B2;} + .d2-3196172804 .fill-B2{fill:#0D32B2;} + .d2-3196172804 .fill-B3{fill:#E3E9FD;} + .d2-3196172804 .fill-B4{fill:#E3E9FD;} + .d2-3196172804 .fill-B5{fill:#EDF0FD;} + .d2-3196172804 .fill-B6{fill:#F7F8FE;} + .d2-3196172804 .fill-AA2{fill:#4A6FF3;} + .d2-3196172804 .fill-AA4{fill:#EDF0FD;} + .d2-3196172804 .fill-AA5{fill:#F7F8FE;} + .d2-3196172804 .fill-AB4{fill:#EDF0FD;} + .d2-3196172804 .fill-AB5{fill:#F7F8FE;} + .d2-3196172804 .stroke-N1{stroke:#0A0F25;} + .d2-3196172804 .stroke-N2{stroke:#676C7E;} + .d2-3196172804 .stroke-N3{stroke:#9499AB;} + .d2-3196172804 .stroke-N4{stroke:#CFD2DD;} + .d2-3196172804 .stroke-N5{stroke:#DEE1EB;} + .d2-3196172804 .stroke-N6{stroke:#EEF1F8;} + .d2-3196172804 .stroke-N7{stroke:#FFFFFF;} + .d2-3196172804 .stroke-B1{stroke:#0D32B2;} + .d2-3196172804 .stroke-B2{stroke:#0D32B2;} + .d2-3196172804 .stroke-B3{stroke:#E3E9FD;} + .d2-3196172804 .stroke-B4{stroke:#E3E9FD;} + .d2-3196172804 .stroke-B5{stroke:#EDF0FD;} + .d2-3196172804 .stroke-B6{stroke:#F7F8FE;} + .d2-3196172804 .stroke-AA2{stroke:#4A6FF3;} + .d2-3196172804 .stroke-AA4{stroke:#EDF0FD;} + .d2-3196172804 .stroke-AA5{stroke:#F7F8FE;} + .d2-3196172804 .stroke-AB4{stroke:#EDF0FD;} + .d2-3196172804 .stroke-AB5{stroke:#F7F8FE;} + .d2-3196172804 .background-color-N1{background-color:#0A0F25;} + .d2-3196172804 .background-color-N2{background-color:#676C7E;} + .d2-3196172804 .background-color-N3{background-color:#9499AB;} + .d2-3196172804 .background-color-N4{background-color:#CFD2DD;} + .d2-3196172804 .background-color-N5{background-color:#DEE1EB;} + .d2-3196172804 .background-color-N6{background-color:#EEF1F8;} + .d2-3196172804 .background-color-N7{background-color:#FFFFFF;} + .d2-3196172804 .background-color-B1{background-color:#0D32B2;} + .d2-3196172804 .background-color-B2{background-color:#0D32B2;} + .d2-3196172804 .background-color-B3{background-color:#E3E9FD;} + .d2-3196172804 .background-color-B4{background-color:#E3E9FD;} + .d2-3196172804 .background-color-B5{background-color:#EDF0FD;} + .d2-3196172804 .background-color-B6{background-color:#F7F8FE;} + .d2-3196172804 .background-color-AA2{background-color:#4A6FF3;} + .d2-3196172804 .background-color-AA4{background-color:#EDF0FD;} + .d2-3196172804 .background-color-AA5{background-color:#F7F8FE;} + .d2-3196172804 .background-color-AB4{background-color:#EDF0FD;} + .d2-3196172804 .background-color-AB5{background-color:#F7F8FE;} + .d2-3196172804 .color-N1{color:#0A0F25;} + .d2-3196172804 .color-N2{color:#676C7E;} + .d2-3196172804 .color-N3{color:#9499AB;} + .d2-3196172804 .color-N4{color:#CFD2DD;} + .d2-3196172804 .color-N5{color:#DEE1EB;} + .d2-3196172804 .color-N6{color:#EEF1F8;} + .d2-3196172804 .color-N7{color:#FFFFFF;} + .d2-3196172804 .color-B1{color:#0D32B2;} + .d2-3196172804 .color-B2{color:#0D32B2;} + .d2-3196172804 .color-B3{color:#E3E9FD;} + .d2-3196172804 .color-B4{color:#E3E9FD;} + .d2-3196172804 .color-B5{color:#EDF0FD;} + .d2-3196172804 .color-B6{color:#F7F8FE;} + .d2-3196172804 .color-AA2{color:#4A6FF3;} + .d2-3196172804 .color-AA4{color:#EDF0FD;} + .d2-3196172804 .color-AA5{color:#F7F8FE;} + .d2-3196172804 .color-AB4{color:#EDF0FD;} + .d2-3196172804 .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}]]>hello + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon_positions/dagre/board.exp.json b/e2etests/testdata/stable/icon_positions/dagre/board.exp.json index 818345637..a2eecb56f 100644 --- a/e2etests/testdata/stable/icon_positions/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon_positions/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "non container", "type": "rectangle", "pos": { - "x": 161, - "y": 41 + "x": 171, + "y": -72 }, - "width": 5649, - "height": 209, + "width": 6221, + "height": 240, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,10 +52,10 @@ ], "pos": { "x": 201, - "y": 86 + "y": 2 }, "width": 122, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -109,10 +109,10 @@ ], "pos": { "x": 383, - "y": 86 + "y": 2 }, "width": 182, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -166,10 +166,10 @@ ], "pos": { "x": 625, - "y": 86 + "y": 2 }, "width": 202, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -223,10 +223,10 @@ ], "pos": { "x": 887, - "y": 86 + "y": 2 }, "width": 191, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -279,11 +279,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1138, - "y": 86 + "x": 1212, + "y": 2 }, "width": 182, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,11 +336,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1380, - "y": 86 + "x": 1528, + "y": 2 }, "width": 202, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -393,11 +393,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1642, - "y": 86 + "x": 1864, + "y": 2 }, "width": 207, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -450,11 +450,11 @@ "OutsideRightTop" ], "pos": { - "x": 1909, - "y": 86 + "x": 2131, + "y": 2 }, "width": 191, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -507,11 +507,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2160, - "y": 86 + "x": 2456, + "y": 2 }, "width": 212, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -564,11 +564,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2432, - "y": 86 + "x": 2802, + "y": 2 }, "width": 217, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -621,11 +621,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2709, - "y": 86 + "x": 3153, + "y": 2 }, "width": 208, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -678,11 +678,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2977, - "y": 86 + "x": 3421, + "y": 2 }, "width": 228, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -735,11 +735,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3265, - "y": 86 + "x": 3709, + "y": 2 }, "width": 218, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -792,11 +792,11 @@ "InsideTopLeft" ], "pos": { - "x": 3543, - "y": 86 + "x": 3987, + "y": 2 }, "width": 168, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -849,11 +849,11 @@ "InsideTopCenter" ], "pos": { - "x": 3771, - "y": 86 + "x": 4215, + "y": 2 }, "width": 189, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -906,11 +906,11 @@ "InsideTopRight" ], "pos": { - "x": 4020, - "y": 86 + "x": 4464, + "y": 2 }, "width": 178, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -963,11 +963,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4258, - "y": 86 + "x": 4702, + "y": 2 }, - "width": 189, - "height": 118, + "width": 263, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1020,11 +1020,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4507, - "y": 86 + "x": 5025, + "y": 2 }, "width": 209, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1077,11 +1077,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4776, - "y": 86 + "x": 5294, + "y": 2 }, - "width": 199, - "height": 118, + "width": 273, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1134,11 +1134,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5035, - "y": 86 + "x": 5627, + "y": 2 }, "width": 195, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1191,11 +1191,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5290, - "y": 86 + "x": 5882, + "y": 2 }, "width": 215, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1248,11 +1248,11 @@ "InsideBottomRight" ], "pos": { - "x": 5565, - "y": 86 + "x": 6157, + "y": 2 }, "width": 205, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1302,10 +1302,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 423 + "y": 301 }, - "width": 5957, - "height": 289, + "width": 6549, + "height": 285, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1345,11 +1345,11 @@ "icon" ], "pos": { - "x": 20, - "y": 504 + "x": 30, + "y": 386 }, - "width": 176, - "height": 162, + "width": 156, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1399,7 +1399,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 552 + "y": 416 }, "width": 96, "height": 66, @@ -1443,11 +1443,11 @@ "OutsideTopLeft" ], "pos": { - "x": 216, - "y": 504 + "x": 226, + "y": 386 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1500,11 +1500,11 @@ "OutsideTopCenter" ], "pos": { - "x": 472, - "y": 504 + "x": 482, + "y": 386 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1557,11 +1557,11 @@ "OutsideTopRight" ], "pos": { - "x": 748, - "y": 504 + "x": 758, + "y": 386 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1614,11 +1614,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1013, - "y": 504 + "x": 1097, + "y": 386 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1671,11 +1671,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1269, - "y": 504 + "x": 1427, + "y": 386 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1728,11 +1728,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1545, - "y": 504 + "x": 1777, + "y": 386 }, - "width": 261, - "height": 162, + "width": 241, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1785,11 +1785,11 @@ "OutsideRightTop" ], "pos": { - "x": 1826, - "y": 504 + "x": 2058, + "y": 386 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1842,11 +1842,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2091, - "y": 504 + "x": 2397, + "y": 386 }, - "width": 266, - "height": 162, + "width": 246, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1899,11 +1899,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2377, - "y": 504 + "x": 2757, + "y": 386 }, - "width": 271, - "height": 162, + "width": 251, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1956,11 +1956,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2668, - "y": 504 + "x": 3122, + "y": 386 }, - "width": 262, - "height": 162, + "width": 242, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2013,11 +2013,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2950, - "y": 504 + "x": 3404, + "y": 386 }, - "width": 282, - "height": 162, + "width": 262, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2070,11 +2070,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3252, - "y": 504 + "x": 3706, + "y": 386 }, - "width": 272, - "height": 162, + "width": 252, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2127,11 +2127,11 @@ "InsideTopLeft" ], "pos": { - "x": 3544, - "y": 504 + "x": 3998, + "y": 342 }, - "width": 222, - "height": 162, + "width": 202, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2184,11 +2184,11 @@ "InsideTopCenter" ], "pos": { - "x": 3786, - "y": 504 + "x": 4240, + "y": 342 }, - "width": 243, - "height": 162, + "width": 223, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2241,11 +2241,11 @@ "InsideTopRight" ], "pos": { - "x": 4049, - "y": 504 + "x": 4503, + "y": 342 }, - "width": 232, - "height": 162, + "width": 212, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2298,11 +2298,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4301, - "y": 504 + "x": 4785, + "y": 386 }, - "width": 243, - "height": 162, + "width": 267, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2355,11 +2355,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4564, - "y": 504 + "x": 5092, + "y": 386 }, - "width": 263, - "height": 162, + "width": 243, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2412,11 +2412,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4847, - "y": 504 + "x": 5375, + "y": 386 }, - "width": 253, - "height": 162, + "width": 277, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2469,11 +2469,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5120, - "y": 504 + "x": 5722, + "y": 386 }, - "width": 249, - "height": 162, + "width": 229, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2526,11 +2526,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5389, - "y": 504 + "x": 5991, + "y": 386 }, - "width": 269, - "height": 162, + "width": 249, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2583,11 +2583,11 @@ "InsideBottomRight" ], "pos": { - "x": 5678, - "y": 504 + "x": 6280, + "y": 386 }, - "width": 259, - "height": 162, + "width": 239, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2637,7 +2637,7 @@ "type": "rectangle", "pos": { "x": 256, - "y": 552 + "y": 416 }, "width": 156, "height": 66, @@ -2678,7 +2678,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 552 + "y": 416 }, "width": 176, "height": 66, @@ -2719,7 +2719,7 @@ "type": "rectangle", "pos": { "x": 788, - "y": 552 + "y": 416 }, "width": 165, "height": 66, @@ -2759,8 +2759,8 @@ "id": "container.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1053, - "y": 552 + "x": 1127, + "y": 416 }, "width": 156, "height": 66, @@ -2800,8 +2800,8 @@ "id": "container.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1309, - "y": 552 + "x": 1457, + "y": 416 }, "width": 176, "height": 66, @@ -2841,8 +2841,8 @@ "id": "container.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1585, - "y": 552 + "x": 1807, + "y": 416 }, "width": 181, "height": 66, @@ -2882,8 +2882,8 @@ "id": "container.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 1866, - "y": 552 + "x": 2088, + "y": 416 }, "width": 165, "height": 66, @@ -2923,8 +2923,8 @@ "id": "container.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2131, - "y": 552 + "x": 2427, + "y": 416 }, "width": 186, "height": 66, @@ -2964,8 +2964,8 @@ "id": "container.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2417, - "y": 552 + "x": 2787, + "y": 416 }, "width": 191, "height": 66, @@ -3005,8 +3005,8 @@ "id": "container.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2708, - "y": 552 + "x": 3152, + "y": 416 }, "width": 182, "height": 66, @@ -3046,8 +3046,8 @@ "id": "container.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 2990, - "y": 552 + "x": 3434, + "y": 416 }, "width": 202, "height": 66, @@ -3087,8 +3087,8 @@ "id": "container.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3292, - "y": 552 + "x": 3736, + "y": 416 }, "width": 192, "height": 66, @@ -3128,8 +3128,8 @@ "id": "container.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3584, - "y": 552 + "x": 4028, + "y": 416 }, "width": 142, "height": 66, @@ -3169,8 +3169,8 @@ "id": "container.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 3826, - "y": 552 + "x": 4270, + "y": 416 }, "width": 163, "height": 66, @@ -3210,8 +3210,8 @@ "id": "container.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4089, - "y": 552 + "x": 4533, + "y": 416 }, "width": 152, "height": 66, @@ -3251,8 +3251,8 @@ "id": "container.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4341, - "y": 552 + "x": 4859, + "y": 416 }, "width": 163, "height": 66, @@ -3292,8 +3292,8 @@ "id": "container.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 4604, - "y": 552 + "x": 5122, + "y": 416 }, "width": 183, "height": 66, @@ -3333,8 +3333,8 @@ "id": "container.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 4887, - "y": 552 + "x": 5405, + "y": 416 }, "width": 173, "height": 66, @@ -3374,8 +3374,8 @@ "id": "container.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5160, - "y": 552 + "x": 5752, + "y": 416 }, "width": 169, "height": 66, @@ -3415,8 +3415,8 @@ "id": "container.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5429, - "y": 552 + "x": 6021, + "y": 416 }, "width": 189, "height": 66, @@ -3456,8 +3456,8 @@ "id": "container.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 5718, - "y": 552 + "x": 6310, + "y": 416 }, "width": 179, "height": 66, @@ -3497,11 +3497,11 @@ "id": "image", "type": "rectangle", "pos": { - "x": 919, - "y": 885 + "x": 929, + "y": 750 }, - "width": 4156, - "height": 245, + "width": 4136, + "height": 189, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3543,7 +3543,7 @@ ], "pos": { "x": 959, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3601,7 +3601,7 @@ ], "pos": { "x": 1147, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3659,7 +3659,7 @@ ], "pos": { "x": 1335, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3717,7 +3717,7 @@ ], "pos": { "x": 1523, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3775,7 +3775,7 @@ ], "pos": { "x": 1711, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3833,7 +3833,7 @@ ], "pos": { "x": 1899, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3891,7 +3891,7 @@ ], "pos": { "x": 2087, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3949,7 +3949,7 @@ ], "pos": { "x": 2275, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4007,7 +4007,7 @@ ], "pos": { "x": 2463, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4065,7 +4065,7 @@ ], "pos": { "x": 2651, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4123,7 +4123,7 @@ ], "pos": { "x": 2839, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4181,7 +4181,7 @@ ], "pos": { "x": 3027, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4239,7 +4239,7 @@ ], "pos": { "x": 3215, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4297,7 +4297,7 @@ ], "pos": { "x": 3403, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4355,7 +4355,7 @@ ], "pos": { "x": 3591, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4413,7 +4413,7 @@ ], "pos": { "x": 3779, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4471,7 +4471,7 @@ ], "pos": { "x": 3967, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4529,7 +4529,7 @@ ], "pos": { "x": 4155, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4587,7 +4587,7 @@ ], "pos": { "x": 4343, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4645,7 +4645,7 @@ ], "pos": { "x": 4531, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4703,7 +4703,7 @@ ], "pos": { "x": 4719, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4761,7 +4761,7 @@ ], "pos": { "x": 4907, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4837,19 +4837,19 @@ "route": [ { "x": 3091, - "y": 250 + "y": 168 }, { "x": 3091, - "y": 302.79998779296875 + "y": 208 }, { "x": 3091, - "y": 337.3999938964844 + "y": 234.60000610351562 }, { "x": 3091, - "y": 423 + "y": 301 } ], "isCurve": true, @@ -4884,19 +4884,19 @@ "route": [ { "x": 3091, - "y": 712 + "y": 586 }, { "x": 3091, - "y": 764.7999877929688 + "y": 661.2000122070312 }, { "x": 3091, - "y": 799.4000244140625 + "y": 694 }, { "x": 3091, - "y": 885 + "y": 750 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg index ce2fbc65e..19bde0b9c 100644 --- a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-2106678569 .fill-N1{fill:#0A0F25;} + .d2-2106678569 .fill-N2{fill:#676C7E;} + .d2-2106678569 .fill-N3{fill:#9499AB;} + .d2-2106678569 .fill-N4{fill:#CFD2DD;} + .d2-2106678569 .fill-N5{fill:#DEE1EB;} + .d2-2106678569 .fill-N6{fill:#EEF1F8;} + .d2-2106678569 .fill-N7{fill:#FFFFFF;} + .d2-2106678569 .fill-B1{fill:#0D32B2;} + .d2-2106678569 .fill-B2{fill:#0D32B2;} + .d2-2106678569 .fill-B3{fill:#E3E9FD;} + .d2-2106678569 .fill-B4{fill:#E3E9FD;} + .d2-2106678569 .fill-B5{fill:#EDF0FD;} + .d2-2106678569 .fill-B6{fill:#F7F8FE;} + .d2-2106678569 .fill-AA2{fill:#4A6FF3;} + .d2-2106678569 .fill-AA4{fill:#EDF0FD;} + .d2-2106678569 .fill-AA5{fill:#F7F8FE;} + .d2-2106678569 .fill-AB4{fill:#EDF0FD;} + .d2-2106678569 .fill-AB5{fill:#F7F8FE;} + .d2-2106678569 .stroke-N1{stroke:#0A0F25;} + .d2-2106678569 .stroke-N2{stroke:#676C7E;} + .d2-2106678569 .stroke-N3{stroke:#9499AB;} + .d2-2106678569 .stroke-N4{stroke:#CFD2DD;} + .d2-2106678569 .stroke-N5{stroke:#DEE1EB;} + .d2-2106678569 .stroke-N6{stroke:#EEF1F8;} + .d2-2106678569 .stroke-N7{stroke:#FFFFFF;} + .d2-2106678569 .stroke-B1{stroke:#0D32B2;} + .d2-2106678569 .stroke-B2{stroke:#0D32B2;} + .d2-2106678569 .stroke-B3{stroke:#E3E9FD;} + .d2-2106678569 .stroke-B4{stroke:#E3E9FD;} + .d2-2106678569 .stroke-B5{stroke:#EDF0FD;} + .d2-2106678569 .stroke-B6{stroke:#F7F8FE;} + .d2-2106678569 .stroke-AA2{stroke:#4A6FF3;} + .d2-2106678569 .stroke-AA4{stroke:#EDF0FD;} + .d2-2106678569 .stroke-AA5{stroke:#F7F8FE;} + .d2-2106678569 .stroke-AB4{stroke:#EDF0FD;} + .d2-2106678569 .stroke-AB5{stroke:#F7F8FE;} + .d2-2106678569 .background-color-N1{background-color:#0A0F25;} + .d2-2106678569 .background-color-N2{background-color:#676C7E;} + .d2-2106678569 .background-color-N3{background-color:#9499AB;} + .d2-2106678569 .background-color-N4{background-color:#CFD2DD;} + .d2-2106678569 .background-color-N5{background-color:#DEE1EB;} + .d2-2106678569 .background-color-N6{background-color:#EEF1F8;} + .d2-2106678569 .background-color-N7{background-color:#FFFFFF;} + .d2-2106678569 .background-color-B1{background-color:#0D32B2;} + .d2-2106678569 .background-color-B2{background-color:#0D32B2;} + .d2-2106678569 .background-color-B3{background-color:#E3E9FD;} + .d2-2106678569 .background-color-B4{background-color:#E3E9FD;} + .d2-2106678569 .background-color-B5{background-color:#EDF0FD;} + .d2-2106678569 .background-color-B6{background-color:#F7F8FE;} + .d2-2106678569 .background-color-AA2{background-color:#4A6FF3;} + .d2-2106678569 .background-color-AA4{background-color:#EDF0FD;} + .d2-2106678569 .background-color-AA5{background-color:#F7F8FE;} + .d2-2106678569 .background-color-AB4{background-color:#EDF0FD;} + .d2-2106678569 .background-color-AB5{background-color:#F7F8FE;} + .d2-2106678569 .color-N1{color:#0A0F25;} + .d2-2106678569 .color-N2{color:#676C7E;} + .d2-2106678569 .color-N3{color:#9499AB;} + .d2-2106678569 .color-N4{color:#CFD2DD;} + .d2-2106678569 .color-N5{color:#DEE1EB;} + .d2-2106678569 .color-N6{color:#EEF1F8;} + .d2-2106678569 .color-N7{color:#FFFFFF;} + .d2-2106678569 .color-B1{color:#0D32B2;} + .d2-2106678569 .color-B2{color:#0D32B2;} + .d2-2106678569 .color-B3{color:#E3E9FD;} + .d2-2106678569 .color-B4{color:#E3E9FD;} + .d2-2106678569 .color-B5{color:#EDF0FD;} + .d2-2106678569 .color-B6{color:#F7F8FE;} + .d2-2106678569 .color-AA2{color:#4A6FF3;} + .d2-2106678569 .color-AA4{color:#EDF0FD;} + .d2-2106678569 .color-AA5{color:#F7F8FE;} + .d2-2106678569 .color-AB4{color:#EDF0FD;} + .d2-2106678569 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json index c4639550b..0bff6ddbc 100644 --- a/e2etests/testdata/stable/images/dagre/board.exp.json +++ b/e2etests/testdata/stable/images/dagre/board.exp.json @@ -61,7 +61,7 @@ "type": "image", "pos": { "x": 0, - "y": 254 + "y": 228 }, "width": 128, "height": 128, @@ -141,15 +141,15 @@ }, { "x": 64, - "y": 194 + "y": 173.1999969482422 }, { "x": 64, - "y": 214 + "y": 188 }, { "x": 64, - "y": 254 + "y": 228 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/images/dagre/sketch.exp.svg b/e2etests/testdata/stable/images/dagre/sketch.exp.svg index 6893f5c9d..3a49f6053 100644 --- a/e2etests/testdata/stable/images/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/images/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ab - + .d2-2741023511 .fill-N1{fill:#0A0F25;} + .d2-2741023511 .fill-N2{fill:#676C7E;} + .d2-2741023511 .fill-N3{fill:#9499AB;} + .d2-2741023511 .fill-N4{fill:#CFD2DD;} + .d2-2741023511 .fill-N5{fill:#DEE1EB;} + .d2-2741023511 .fill-N6{fill:#EEF1F8;} + .d2-2741023511 .fill-N7{fill:#FFFFFF;} + .d2-2741023511 .fill-B1{fill:#0D32B2;} + .d2-2741023511 .fill-B2{fill:#0D32B2;} + .d2-2741023511 .fill-B3{fill:#E3E9FD;} + .d2-2741023511 .fill-B4{fill:#E3E9FD;} + .d2-2741023511 .fill-B5{fill:#EDF0FD;} + .d2-2741023511 .fill-B6{fill:#F7F8FE;} + .d2-2741023511 .fill-AA2{fill:#4A6FF3;} + .d2-2741023511 .fill-AA4{fill:#EDF0FD;} + .d2-2741023511 .fill-AA5{fill:#F7F8FE;} + .d2-2741023511 .fill-AB4{fill:#EDF0FD;} + .d2-2741023511 .fill-AB5{fill:#F7F8FE;} + .d2-2741023511 .stroke-N1{stroke:#0A0F25;} + .d2-2741023511 .stroke-N2{stroke:#676C7E;} + .d2-2741023511 .stroke-N3{stroke:#9499AB;} + .d2-2741023511 .stroke-N4{stroke:#CFD2DD;} + .d2-2741023511 .stroke-N5{stroke:#DEE1EB;} + .d2-2741023511 .stroke-N6{stroke:#EEF1F8;} + .d2-2741023511 .stroke-N7{stroke:#FFFFFF;} + .d2-2741023511 .stroke-B1{stroke:#0D32B2;} + .d2-2741023511 .stroke-B2{stroke:#0D32B2;} + .d2-2741023511 .stroke-B3{stroke:#E3E9FD;} + .d2-2741023511 .stroke-B4{stroke:#E3E9FD;} + .d2-2741023511 .stroke-B5{stroke:#EDF0FD;} + .d2-2741023511 .stroke-B6{stroke:#F7F8FE;} + .d2-2741023511 .stroke-AA2{stroke:#4A6FF3;} + .d2-2741023511 .stroke-AA4{stroke:#EDF0FD;} + .d2-2741023511 .stroke-AA5{stroke:#F7F8FE;} + .d2-2741023511 .stroke-AB4{stroke:#EDF0FD;} + .d2-2741023511 .stroke-AB5{stroke:#F7F8FE;} + .d2-2741023511 .background-color-N1{background-color:#0A0F25;} + .d2-2741023511 .background-color-N2{background-color:#676C7E;} + .d2-2741023511 .background-color-N3{background-color:#9499AB;} + .d2-2741023511 .background-color-N4{background-color:#CFD2DD;} + .d2-2741023511 .background-color-N5{background-color:#DEE1EB;} + .d2-2741023511 .background-color-N6{background-color:#EEF1F8;} + .d2-2741023511 .background-color-N7{background-color:#FFFFFF;} + .d2-2741023511 .background-color-B1{background-color:#0D32B2;} + .d2-2741023511 .background-color-B2{background-color:#0D32B2;} + .d2-2741023511 .background-color-B3{background-color:#E3E9FD;} + .d2-2741023511 .background-color-B4{background-color:#E3E9FD;} + .d2-2741023511 .background-color-B5{background-color:#EDF0FD;} + .d2-2741023511 .background-color-B6{background-color:#F7F8FE;} + .d2-2741023511 .background-color-AA2{background-color:#4A6FF3;} + .d2-2741023511 .background-color-AA4{background-color:#EDF0FD;} + .d2-2741023511 .background-color-AA5{background-color:#F7F8FE;} + .d2-2741023511 .background-color-AB4{background-color:#EDF0FD;} + .d2-2741023511 .background-color-AB5{background-color:#F7F8FE;} + .d2-2741023511 .color-N1{color:#0A0F25;} + .d2-2741023511 .color-N2{color:#676C7E;} + .d2-2741023511 .color-N3{color:#9499AB;} + .d2-2741023511 .color-N4{color:#CFD2DD;} + .d2-2741023511 .color-N5{color:#DEE1EB;} + .d2-2741023511 .color-N6{color:#EEF1F8;} + .d2-2741023511 .color-N7{color:#FFFFFF;} + .d2-2741023511 .color-B1{color:#0D32B2;} + .d2-2741023511 .color-B2{color:#0D32B2;} + .d2-2741023511 .color-B3{color:#E3E9FD;} + .d2-2741023511 .color-B4{color:#E3E9FD;} + .d2-2741023511 .color-B5{color:#EDF0FD;} + .d2-2741023511 .color-B6{color:#F7F8FE;} + .d2-2741023511 .color-AA2{color:#4A6FF3;} + .d2-2741023511 .color-AA4{color:#EDF0FD;} + .d2-2741023511 .color-AA5{color:#F7F8FE;} + .d2-2741023511 .color-AB4{color:#EDF0FD;} + .d2-2741023511 .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}]]>ab + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json index a7fde78ea..763339562 100644 --- a/e2etests/testdata/stable/investigate/dagre/board.exp.json +++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json @@ -130,11 +130,11 @@ "id": "dd", "type": "rectangle", "pos": { - "x": 9, - "y": 686 + "x": 19, + "y": 665 }, - "width": 371, - "height": 151, + "width": 350, + "height": 152, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "diamond", "pos": { "x": 49, - "y": 715 + "y": 695 }, "width": 64, "height": 92, @@ -212,11 +212,11 @@ "id": "ff", "type": "rectangle", "pos": { - "x": 0, - "y": 1936 + "x": 10, + "y": 1889 }, - "width": 385, - "height": 332, + "width": 334, + "height": 333, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -254,7 +254,7 @@ "type": "diamond", "pos": { "x": 248, - "y": 1965 + "y": 1919 }, "width": 66, "height": 92, @@ -295,7 +295,7 @@ "type": "diamond", "pos": { "x": 273, - "y": 715 + "y": 695 }, "width": 66, "height": 92, @@ -458,11 +458,11 @@ "id": "ll", "type": "rectangle", "pos": { - "x": 0, - "y": 2409 + "x": 10, + "y": 2362 }, - "width": 353, - "height": 306, + "width": 333, + "height": 307, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -500,7 +500,7 @@ "type": "oval", "pos": { "x": 40, - "y": 2604 + "y": 2558 }, "width": 81, "height": 81, @@ -541,7 +541,7 @@ "type": "oval", "pos": { "x": 40, - "y": 2157 + "y": 2111 }, "width": 81, "height": 81, @@ -582,10 +582,10 @@ "type": "cylinder", "pos": { "x": 9, - "y": 3361 + "y": 3268 }, "width": 469, - "height": 125, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 49, - "y": 3390 + "y": 3318 }, "width": 63, "height": 66, @@ -664,7 +664,7 @@ "type": "rectangle", "pos": { "x": 249, - "y": 2165 + "y": 2119 }, "width": 63, "height": 66, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 249, - "y": 2438 + "y": 2392 }, "width": 64, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": 252, - "y": 2612 + "y": 2566 }, "width": 58, "height": 66, @@ -786,11 +786,11 @@ "id": "ss", "type": "rectangle", "pos": { - "x": 387, - "y": 1165 + "x": 397, + "y": 1144 }, - "width": 138, - "height": 125, + "width": 118, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 427, - "y": 1194 + "y": 1174 }, "width": 58, "height": 66, @@ -868,11 +868,11 @@ "id": "uu", "type": "rectangle", "pos": { - "x": 384, - "y": 1431 + "x": 394, + "y": 1410 }, - "width": 143, - "height": 125, + "width": 123, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 424, - "y": 1460 + "y": 1440 }, "width": 63, "height": 66, @@ -954,7 +954,7 @@ "y": 1656 }, "width": 149, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1004,7 +1004,7 @@ "type": "rectangle", "pos": { "x": 398, - "y": 2592 + "y": 2566 }, "width": 64, "height": 66, @@ -1045,7 +1045,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 3390 + "y": 3318 }, "width": 62, "height": 66, @@ -1085,11 +1085,11 @@ "id": "yy", "type": "rectangle", "pos": { - "x": 261, - "y": 2856 + "x": 308, + "y": 2809 }, - "width": 261, - "height": 364, + "width": 198, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1127,10 +1127,10 @@ "type": "queue", "pos": { "x": 338, - "y": 2885 + "y": 2839 }, "width": 138, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1180,7 +1180,7 @@ "type": "rectangle", "pos": { "x": 376, - "y": 3124 + "y": 3052 }, "width": 63, "height": 66, @@ -1221,7 +1221,7 @@ "type": "rectangle", "pos": { "x": 376, - "y": 3390 + "y": 3318 }, "width": 62, "height": 66, @@ -1262,7 +1262,7 @@ "type": "parallelogram", "pos": { "x": 350, - "y": 3586 + "y": 3534 }, "width": 115, "height": 66, @@ -1372,11 +1372,11 @@ "labelPercentage": 0, "route": [ { - "x": 332, + "x": 331, "y": 302 }, { - "x": 311.3999938964844, + "x": 311.20001220703125, "y": 350.3999938964844 }, { @@ -1419,11 +1419,11 @@ "labelPercentage": 0, "route": [ { - "x": 102, + "x": 101, "y": 101 }, { - "x": 84.80000305175781, + "x": 84.5999984741211, "y": 141 }, { @@ -1476,11 +1476,11 @@ }, { "x": 80.5999984741211, - "y": 659.2000122070312 + "y": 655 }, { "x": 81, - "y": 716 + "y": 695 } ], "isCurve": true, @@ -1515,11 +1515,11 @@ "route": [ { "x": 372, - "y": 298 + "y": 297 }, { "x": 393.79998779296875, - "y": 349.6000061035156 + "y": 349.3999938964844 }, { "x": 399.25, @@ -1715,35 +1715,35 @@ }, { "x": 232.25, - "y": 1627.800048828125 + "y": 1625.199951171875 }, { "x": 232.25, - "y": 1660.5 + "y": 1654 }, { "x": 232.25, - "y": 1693.199951171875 + "y": 1682.800048828125 }, { "x": 232.25, - "y": 1738.9000244140625 + "y": 1723.300048828125 }, { "x": 232.25, - "y": 1774.75 + "y": 1755.25 }, { "x": 232.25, - "y": 1810.5999755859375 + "y": 1787.199951171875 }, { - "x": 238.8000030517578, - "y": 1913.4000244140625 + "x": 239.1999969482422, + "y": 1882.800048828125 }, { - "x": 265, - "y": 1987 + "x": 267, + "y": 1938 } ], "isCurve": true, @@ -1786,11 +1786,11 @@ }, { "x": 306.20001220703125, - "y": 659.2000122070312 + "y": 655 }, { "x": 306, - "y": 716 + "y": 695 } ], "isCurve": true, @@ -1825,11 +1825,11 @@ "route": [ { "x": 81, - "y": 808 + "y": 787 }, { "x": 80.5999984741211, - "y": 831.2000122070312 + "y": 827 }, { "x": 80.5, @@ -1872,11 +1872,11 @@ "route": [ { "x": 80.5, - "y": 1003 + "y": 1002.5 }, { "x": 80.5, - "y": 1051.4000244140625 + "y": 1051.300048828125 }, { "x": 80.5, @@ -1998,59 +1998,59 @@ }, { "x": 80.5, - "y": 1627.800048828125 + "y": 1625.199951171875 }, { "x": 80.5, - "y": 1660.5 + "y": 1654 }, { "x": 80.5, - "y": 1693.199951171875 + "y": 1682.800048828125 }, { "x": 80.5, - "y": 1738.9000244140625 + "y": 1723.300048828125 }, { "x": 80.5, - "y": 1774.75 + "y": 1755.25 }, { "x": 80.5, - "y": 1810.5999755859375 + "y": 1787.199951171875 }, { "x": 80.5, - "y": 1846.5999755859375 + "y": 1820.5999755859375 }, { "x": 80.5, - "y": 1864.75 + "y": 1838.75 }, { "x": 80.5, - "y": 1882.9000244140625 + "y": 1856.9000244140625 }, { "x": 80.5, - "y": 1914.199951171875 + "y": 1888.199951171875 }, { "x": 80.5, - "y": 1943 + "y": 1917 }, { "x": 80.5, - "y": 1971.800048828125 + "y": 1945.800048828125 }, { "x": 80.5999984741211, - "y": 2101.199951171875 + "y": 2071 }, { "x": 81, - "y": 2158 + "y": 2111 } ], "isCurve": true, @@ -2085,55 +2085,55 @@ "route": [ { "x": 81, - "y": 2239 + "y": 2192 }, { "x": 80.5999984741211, - "y": 2262.199951171875 + "y": 2232 }, { "x": 80.5, - "y": 2278 + "y": 2252 }, { "x": 80.5, - "y": 2293 + "y": 2267 }, { "x": 80.5, - "y": 2308 + "y": 2282 }, { "x": 80.5, - "y": 2328 + "y": 2302 }, { "x": 80.5, - "y": 2343 + "y": 2317 }, { "x": 80.5, - "y": 2358 + "y": 2332 }, { "x": 80.5, - "y": 2384.60009765625 + "y": 2358.60009765625 }, { "x": 80.5, - "y": 2409.5 + "y": 2383.5 }, { "x": 80.5, - "y": 2434.39990234375 + "y": 2408.39990234375 }, { "x": 80.5999984741211, - "y": 2548.199951171875 + "y": 2518 }, { "x": 81, - "y": 2605 + "y": 2558 } ], "isCurve": true, @@ -2168,103 +2168,103 @@ "route": [ { "x": 81, - "y": 2686 + "y": 2639 }, { "x": 80.5999984741211, - "y": 2709.199951171875 + "y": 2679 }, { "x": 80.5, - "y": 2725 + "y": 2699 }, { "x": 80.5, - "y": 2740 + "y": 2714 }, { "x": 80.5, - "y": 2755 + "y": 2729 }, { "x": 80.5, - "y": 2775 + "y": 2749 }, { "x": 80.5, - "y": 2790 + "y": 2764 }, { "x": 80.5, - "y": 2805 + "y": 2779 }, { "x": 80.5, - "y": 2836.800048828125 + "y": 2808.199951171875 }, { "x": 80.5, - "y": 2869.5 + "y": 2837 }, { "x": 80.5, - "y": 2902.199951171875 + "y": 2865.800048828125 }, { "x": 80.5, - "y": 2947.89990234375 + "y": 2906.300048828125 }, { "x": 80.5, - "y": 2983.75 + "y": 2938.25 }, { "x": 80.5, - "y": 3019.60009765625 + "y": 2970.199951171875 }, { "x": 80.5, - "y": 3062.199951171875 + "y": 3010.199951171875 }, { "x": 80.5, - "y": 3090.25 + "y": 3038.25 }, { "x": 80.5, - "y": 3118.300048828125 + "y": 3066.300048828125 }, { "x": 80.5, - "y": 3153.60009765625 + "y": 3101.60009765625 }, { "x": 80.5, - "y": 3178.5 + "y": 3126.5 }, { "x": 80.5, - "y": 3203.39990234375 + "y": 3151.39990234375 }, { "x": 80.5, - "y": 3230 + "y": 3178 }, { "x": 80.5, - "y": 3245 + "y": 3193 }, { "x": 80.5, - "y": 3260 + "y": 3208 }, { "x": 80.5, - "y": 3334.10009765625 + "y": 3278 }, { "x": 80.5, - "y": 3390.5 + "y": 3318 } ], "isCurve": true, @@ -2299,19 +2299,19 @@ "route": [ { "x": 281, - "y": 2058 + "y": 2011 }, { "x": 280.79998779296875, - "y": 2097.60009765625 + "y": 2051 }, { "x": 280.75, - "y": 2119 + "y": 2072.5 }, { "x": 280.75, - "y": 2165 + "y": 2118.5 } ], "isCurve": true, @@ -2346,31 +2346,31 @@ "route": [ { "x": 280.75, - "y": 2232 + "y": 2185.5 }, { "x": 280.75, - "y": 2260.800048828125 + "y": 2230.699951171875 }, { "x": 280.75, - "y": 2278 + "y": 2252 }, { "x": 280.75, - "y": 2293 + "y": 2267 }, { "x": 280.75, - "y": 2308 + "y": 2282 }, { "x": 280.75, - "y": 2382.10009765625 + "y": 2352 }, { "x": 280.75, - "y": 2438.5 + "y": 2392 } ], "isCurve": true, @@ -2405,19 +2405,19 @@ "route": [ { "x": 280.75, - "y": 2504.5 + "y": 2458 }, { "x": 280.75, - "y": 2544.5 + "y": 2498 }, { "x": 280.75, - "y": 2566 + "y": 2519.5 }, { "x": 280.75, - "y": 2612 + "y": 2565.5 } ], "isCurve": true, @@ -2452,11 +2452,11 @@ "route": [ { "x": 306, - "y": 807 + "y": 787 }, { "x": 306.20001220703125, - "y": 831 + "y": 827 }, { "x": 336.1499938964844, @@ -2496,11 +2496,11 @@ }, { "x": 455.75, - "y": 1138.0999755859375 + "y": 1134 }, { "x": 455.75, - "y": 1194.5 + "y": 1174 } ], "isCurve": true, @@ -2535,11 +2535,11 @@ "route": [ { "x": 455.75, - "y": 1260.5 + "y": 1240 }, { "x": 455.75, - "y": 1284.0999755859375 + "y": 1280 }, { "x": 455.75, @@ -2555,11 +2555,11 @@ }, { "x": 455.75, - "y": 1404.0999755859375 + "y": 1400 }, { "x": 455.75, - "y": 1460.5 + "y": 1440 } ], "isCurve": true, @@ -2601,12 +2601,12 @@ "y": 1541.7490234375 }, { - "x": 310.20001220703125, - "y": 1616.4000244140625 + "x": 311.20001220703125, + "y": 1616 }, { - "x": 353, - "y": 1658 + "x": 358, + "y": 1656 } ], "isCurve": true, @@ -2641,18 +2641,18 @@ "route": [ { "x": 455.75, - "y": 1526.5 + "y": 1506 }, { "x": 455.75, - "y": 1550.0999755859375 + "y": 1546 }, { - "x": 451.6000061035156, + "x": 451, "y": 1616 }, { - "x": 435, + "x": 432, "y": 1656 } ], @@ -2687,116 +2687,116 @@ "labelPercentage": 0, "route": [ { - "x": 420, - "y": 1774 + "x": 419, + "y": 1748 }, { - "x": 428, - "y": 1822.4000244140625 + "x": 427.79998779296875, + "y": 1796.4000244140625 }, { "x": 430, - "y": 1846.5999755859375 + "y": 1820.5999755859375 }, { "x": 430, - "y": 1864.75 + "y": 1838.75 }, { "x": 430, - "y": 1882.9000244140625 + "y": 1856.9000244140625 }, { "x": 430, - "y": 1914.199951171875 + "y": 1888.199951171875 }, { "x": 430, - "y": 1943 + "y": 1917 }, { "x": 430, - "y": 1971.800048828125 + "y": 1945.800048828125 }, { "x": 430, - "y": 2010.199951171875 + "y": 1984.199951171875 }, { "x": 430, - "y": 2039 + "y": 2013 }, { "x": 430, - "y": 2067.800048828125 + "y": 2041.800048828125 }, { "x": 430, - "y": 2105.10009765625 + "y": 2079.10009765625 }, { "x": 430, - "y": 2132.25 + "y": 2106.25 }, { "x": 430, - "y": 2159.39990234375 + "y": 2133.39990234375 }, { "x": 430, - "y": 2195.60009765625 + "y": 2169.60009765625 }, { "x": 430, - "y": 2222.75 + "y": 2196.75 }, { "x": 430, - "y": 2249.89990234375 + "y": 2223.89990234375 }, { "x": 430, - "y": 2278 + "y": 2252 }, { "x": 430, - "y": 2293 + "y": 2267 }, { "x": 430, - "y": 2308 + "y": 2282 }, { "x": 430, - "y": 2328 + "y": 2302 }, { "x": 430, - "y": 2343 + "y": 2317 }, { "x": 430, - "y": 2358 + "y": 2332 }, { "x": 430, - "y": 2384.60009765625 + "y": 2358.60009765625 }, { "x": 430, - "y": 2409.5 + "y": 2383.5 }, { "x": 430, - "y": 2434.39990234375 + "y": 2408.39990234375 }, { "x": 430, - "y": 2545.5 + "y": 2519.5 }, { "x": 430, - "y": 2591.5 + "y": 2565.5 } ], "isCurve": true, @@ -2831,103 +2831,103 @@ "route": [ { "x": 420.5190124511719, - "y": 2658.5 + "y": 2632.5 }, { "x": 407.3030090332031, - "y": 2703.699951171875 + "y": 2677.699951171875 }, { "x": 371.29998779296875, - "y": 2725 + "y": 2699 }, { "x": 322.25, - "y": 2740 + "y": 2714 }, { "x": 273.20001220703125, - "y": 2755 + "y": 2729 }, { "x": 240.5, - "y": 2775 + "y": 2749 }, { "x": 240.5, - "y": 2790 + "y": 2764 }, { "x": 240.5, - "y": 2805 + "y": 2779 }, { "x": 240.5, - "y": 2836.800048828125 + "y": 2808.199951171875 }, { "x": 240.5, - "y": 2869.5 + "y": 2837 }, { "x": 240.5, - "y": 2902.199951171875 + "y": 2865.800048828125 }, { "x": 240.5, - "y": 2947.89990234375 + "y": 2906.300048828125 }, { "x": 240.5, - "y": 2983.75 + "y": 2938.25 }, { "x": 240.5, - "y": 3019.60009765625 + "y": 2970.199951171875 }, { "x": 240.5, - "y": 3062.199951171875 + "y": 3010.199951171875 }, { "x": 240.5, - "y": 3090.25 + "y": 3038.25 }, { "x": 240.5, - "y": 3118.300048828125 + "y": 3066.300048828125 }, { "x": 240.5, - "y": 3153.60009765625 + "y": 3101.60009765625 }, { "x": 240.5, - "y": 3178.5 + "y": 3126.5 }, { "x": 240.5, - "y": 3203.39990234375 + "y": 3151.39990234375 }, { "x": 240.5, - "y": 3230 + "y": 3178 }, { "x": 240.5, - "y": 3245 + "y": 3193 }, { "x": 240.5, - "y": 3260 + "y": 3208 }, { "x": 240.5, - "y": 3334.10009765625 + "y": 3278 }, { "x": 240.5, - "y": 3390.5 + "y": 3318 } ], "isCurve": true, @@ -2962,31 +2962,31 @@ "route": [ { "x": 280.75, - "y": 2679 + "y": 2632.5 }, { "x": 280.75, - "y": 2707.800048828125 + "y": 2677.699951171875 }, { "x": 291.6000061035156, - "y": 2725 + "y": 2699 }, { "x": 307.875, - "y": 2740 + "y": 2714 }, { "x": 324.1499938964844, - "y": 2755 + "y": 2729 }, { - "x": 341.6000061035156, - "y": 2829.199951171875 + "x": 342.6000061035156, + "y": 2799 }, { - "x": 368, - "y": 2886 + "x": 373, + "y": 2839 } ], "isCurve": true, @@ -3021,31 +3021,31 @@ "route": [ { "x": 439.7539978027344, - "y": 2658.5 + "y": 2632.5 }, { "x": 453.3500061035156, - "y": 2703.699951171875 + "y": 2677.699951171875 }, { "x": 456.75, - "y": 2725 + "y": 2699 }, { "x": 456.75, - "y": 2740 + "y": 2714 }, { "x": 456.75, - "y": 2755 + "y": 2729 }, { - "x": 452.20001220703125, - "y": 2829.199951171875 + "x": 451.6000061035156, + "y": 2799 }, { - "x": 434, - "y": 2886 + "x": 431, + "y": 2839 } ], "isCurve": true, @@ -3080,19 +3080,19 @@ "route": [ { "x": 407, - "y": 3004 + "y": 2931 }, { "x": 407, - "y": 3052 + "y": 2979.39990234375 }, { "x": 407, - "y": 3076.199951171875 + "y": 3003.699951171875 }, { "x": 407, - "y": 3125 + "y": 3052.5 } ], "isCurve": true, @@ -3127,31 +3127,31 @@ "route": [ { "x": 407, - "y": 3190.5 + "y": 3118 }, { "x": 407, - "y": 3214.10009765625 + "y": 3158 }, { "x": 407, - "y": 3230 + "y": 3178 }, { "x": 407, - "y": 3245 + "y": 3193 }, { "x": 407, - "y": 3260 + "y": 3208 }, { "x": 407, - "y": 3334.10009765625 + "y": 3278 }, { "x": 407, - "y": 3390.5 + "y": 3318 } ], "isCurve": true, @@ -3186,19 +3186,19 @@ "route": [ { "x": 407, - "y": 3456.5 + "y": 3384 }, { "x": 407, - "y": 3480.10009765625 + "y": 3424 }, { "x": 407, - "y": 3546 + "y": 3494 }, { "x": 407, - "y": 3586 + "y": 3534 } ], "isCurve": true, @@ -3232,20 +3232,20 @@ "labelPercentage": 0, "route": [ { - "x": 374, - "y": 1774 + "x": 379, + "y": 1748 }, { - "x": 345.20001220703125, - "y": 1822.4000244140625 + "x": 346.20001220703125, + "y": 1796.4000244140625 }, { - "x": 330, - "y": 1914 + "x": 329.6000061035156, + "y": 1883.199951171875 }, { - "x": 298, - "y": 1990 + "x": 296, + "y": 1940 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg index 2dc194b2f..c92f69459 100644 --- a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 - + .d2-1277959562 .fill-N1{fill:#0A0F25;} + .d2-1277959562 .fill-N2{fill:#676C7E;} + .d2-1277959562 .fill-N3{fill:#9499AB;} + .d2-1277959562 .fill-N4{fill:#CFD2DD;} + .d2-1277959562 .fill-N5{fill:#DEE1EB;} + .d2-1277959562 .fill-N6{fill:#EEF1F8;} + .d2-1277959562 .fill-N7{fill:#FFFFFF;} + .d2-1277959562 .fill-B1{fill:#0D32B2;} + .d2-1277959562 .fill-B2{fill:#0D32B2;} + .d2-1277959562 .fill-B3{fill:#E3E9FD;} + .d2-1277959562 .fill-B4{fill:#E3E9FD;} + .d2-1277959562 .fill-B5{fill:#EDF0FD;} + .d2-1277959562 .fill-B6{fill:#F7F8FE;} + .d2-1277959562 .fill-AA2{fill:#4A6FF3;} + .d2-1277959562 .fill-AA4{fill:#EDF0FD;} + .d2-1277959562 .fill-AA5{fill:#F7F8FE;} + .d2-1277959562 .fill-AB4{fill:#EDF0FD;} + .d2-1277959562 .fill-AB5{fill:#F7F8FE;} + .d2-1277959562 .stroke-N1{stroke:#0A0F25;} + .d2-1277959562 .stroke-N2{stroke:#676C7E;} + .d2-1277959562 .stroke-N3{stroke:#9499AB;} + .d2-1277959562 .stroke-N4{stroke:#CFD2DD;} + .d2-1277959562 .stroke-N5{stroke:#DEE1EB;} + .d2-1277959562 .stroke-N6{stroke:#EEF1F8;} + .d2-1277959562 .stroke-N7{stroke:#FFFFFF;} + .d2-1277959562 .stroke-B1{stroke:#0D32B2;} + .d2-1277959562 .stroke-B2{stroke:#0D32B2;} + .d2-1277959562 .stroke-B3{stroke:#E3E9FD;} + .d2-1277959562 .stroke-B4{stroke:#E3E9FD;} + .d2-1277959562 .stroke-B5{stroke:#EDF0FD;} + .d2-1277959562 .stroke-B6{stroke:#F7F8FE;} + .d2-1277959562 .stroke-AA2{stroke:#4A6FF3;} + .d2-1277959562 .stroke-AA4{stroke:#EDF0FD;} + .d2-1277959562 .stroke-AA5{stroke:#F7F8FE;} + .d2-1277959562 .stroke-AB4{stroke:#EDF0FD;} + .d2-1277959562 .stroke-AB5{stroke:#F7F8FE;} + .d2-1277959562 .background-color-N1{background-color:#0A0F25;} + .d2-1277959562 .background-color-N2{background-color:#676C7E;} + .d2-1277959562 .background-color-N3{background-color:#9499AB;} + .d2-1277959562 .background-color-N4{background-color:#CFD2DD;} + .d2-1277959562 .background-color-N5{background-color:#DEE1EB;} + .d2-1277959562 .background-color-N6{background-color:#EEF1F8;} + .d2-1277959562 .background-color-N7{background-color:#FFFFFF;} + .d2-1277959562 .background-color-B1{background-color:#0D32B2;} + .d2-1277959562 .background-color-B2{background-color:#0D32B2;} + .d2-1277959562 .background-color-B3{background-color:#E3E9FD;} + .d2-1277959562 .background-color-B4{background-color:#E3E9FD;} + .d2-1277959562 .background-color-B5{background-color:#EDF0FD;} + .d2-1277959562 .background-color-B6{background-color:#F7F8FE;} + .d2-1277959562 .background-color-AA2{background-color:#4A6FF3;} + .d2-1277959562 .background-color-AA4{background-color:#EDF0FD;} + .d2-1277959562 .background-color-AA5{background-color:#F7F8FE;} + .d2-1277959562 .background-color-AB4{background-color:#EDF0FD;} + .d2-1277959562 .background-color-AB5{background-color:#F7F8FE;} + .d2-1277959562 .color-N1{color:#0A0F25;} + .d2-1277959562 .color-N2{color:#676C7E;} + .d2-1277959562 .color-N3{color:#9499AB;} + .d2-1277959562 .color-N4{color:#CFD2DD;} + .d2-1277959562 .color-N5{color:#DEE1EB;} + .d2-1277959562 .color-N6{color:#EEF1F8;} + .d2-1277959562 .color-N7{color:#FFFFFF;} + .d2-1277959562 .color-B1{color:#0D32B2;} + .d2-1277959562 .color-B2{color:#0D32B2;} + .d2-1277959562 .color-B3{color:#E3E9FD;} + .d2-1277959562 .color-B4{color:#E3E9FD;} + .d2-1277959562 .color-B5{color:#EDF0FD;} + .d2-1277959562 .color-B6{color:#F7F8FE;} + .d2-1277959562 .color-AA2{color:#4A6FF3;} + .d2-1277959562 .color-AA4{color:#EDF0FD;} + .d2-1277959562 .color-AA5{color:#F7F8FE;} + .d2-1277959562 .color-AB4{color:#EDF0FD;} + .d2-1277959562 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + - - + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 7b1a53c12..a8b89a72a 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -1624,7 +1624,7 @@ "route": [ { "x": 235, - "y": 1305 + "y": 1304.666015625 }, { "x": 235, @@ -1662,7 +1662,7 @@ "route": [ { "x": 248.33299255371094, - "y": 1567.666015625 + "y": 1568 }, { "x": 248.33299255371094, @@ -1854,7 +1854,7 @@ "route": [ { "x": 434.1659851074219, - "y": 2227 + "y": 2226.5 }, { "x": 434.1659851074219, @@ -1892,7 +1892,7 @@ "route": [ { "x": 434.1659851074219, - "y": 2591.5 + "y": 2591 }, { "x": 434.1659851074219, @@ -1941,7 +1941,7 @@ "y": 823 }, { - "x": 93.5, + "x": 93.4990005493164, "y": 1239 } ], @@ -2014,7 +2014,7 @@ "route": [ { "x": 221.66600036621094, - "y": 1567.666015625 + "y": 1568 }, { "x": 222, @@ -2102,7 +2102,7 @@ }, { "x": 153, - "y": 2635.3330078125 + "y": 2635 } ], "animated": false, @@ -2136,7 +2136,7 @@ "route": [ { "x": 139.66600036621094, - "y": 2701.3330078125 + "y": 2701 }, { "x": 139.66600036621094, @@ -2220,7 +2220,7 @@ "route": [ { "x": 166.33299255371094, - "y": 2701.3330078125 + "y": 2701 }, { "x": 166.33299255371094, @@ -2269,7 +2269,7 @@ "y": 3143 }, { - "x": 428.8330078125, + "x": 429, "y": 3213 } ], diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index c6cf1b4af..216b4533b 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + .d2-1074953283 .fill-N1{fill:#0A0F25;} + .d2-1074953283 .fill-N2{fill:#676C7E;} + .d2-1074953283 .fill-N3{fill:#9499AB;} + .d2-1074953283 .fill-N4{fill:#CFD2DD;} + .d2-1074953283 .fill-N5{fill:#DEE1EB;} + .d2-1074953283 .fill-N6{fill:#EEF1F8;} + .d2-1074953283 .fill-N7{fill:#FFFFFF;} + .d2-1074953283 .fill-B1{fill:#0D32B2;} + .d2-1074953283 .fill-B2{fill:#0D32B2;} + .d2-1074953283 .fill-B3{fill:#E3E9FD;} + .d2-1074953283 .fill-B4{fill:#E3E9FD;} + .d2-1074953283 .fill-B5{fill:#EDF0FD;} + .d2-1074953283 .fill-B6{fill:#F7F8FE;} + .d2-1074953283 .fill-AA2{fill:#4A6FF3;} + .d2-1074953283 .fill-AA4{fill:#EDF0FD;} + .d2-1074953283 .fill-AA5{fill:#F7F8FE;} + .d2-1074953283 .fill-AB4{fill:#EDF0FD;} + .d2-1074953283 .fill-AB5{fill:#F7F8FE;} + .d2-1074953283 .stroke-N1{stroke:#0A0F25;} + .d2-1074953283 .stroke-N2{stroke:#676C7E;} + .d2-1074953283 .stroke-N3{stroke:#9499AB;} + .d2-1074953283 .stroke-N4{stroke:#CFD2DD;} + .d2-1074953283 .stroke-N5{stroke:#DEE1EB;} + .d2-1074953283 .stroke-N6{stroke:#EEF1F8;} + .d2-1074953283 .stroke-N7{stroke:#FFFFFF;} + .d2-1074953283 .stroke-B1{stroke:#0D32B2;} + .d2-1074953283 .stroke-B2{stroke:#0D32B2;} + .d2-1074953283 .stroke-B3{stroke:#E3E9FD;} + .d2-1074953283 .stroke-B4{stroke:#E3E9FD;} + .d2-1074953283 .stroke-B5{stroke:#EDF0FD;} + .d2-1074953283 .stroke-B6{stroke:#F7F8FE;} + .d2-1074953283 .stroke-AA2{stroke:#4A6FF3;} + .d2-1074953283 .stroke-AA4{stroke:#EDF0FD;} + .d2-1074953283 .stroke-AA5{stroke:#F7F8FE;} + .d2-1074953283 .stroke-AB4{stroke:#EDF0FD;} + .d2-1074953283 .stroke-AB5{stroke:#F7F8FE;} + .d2-1074953283 .background-color-N1{background-color:#0A0F25;} + .d2-1074953283 .background-color-N2{background-color:#676C7E;} + .d2-1074953283 .background-color-N3{background-color:#9499AB;} + .d2-1074953283 .background-color-N4{background-color:#CFD2DD;} + .d2-1074953283 .background-color-N5{background-color:#DEE1EB;} + .d2-1074953283 .background-color-N6{background-color:#EEF1F8;} + .d2-1074953283 .background-color-N7{background-color:#FFFFFF;} + .d2-1074953283 .background-color-B1{background-color:#0D32B2;} + .d2-1074953283 .background-color-B2{background-color:#0D32B2;} + .d2-1074953283 .background-color-B3{background-color:#E3E9FD;} + .d2-1074953283 .background-color-B4{background-color:#E3E9FD;} + .d2-1074953283 .background-color-B5{background-color:#EDF0FD;} + .d2-1074953283 .background-color-B6{background-color:#F7F8FE;} + .d2-1074953283 .background-color-AA2{background-color:#4A6FF3;} + .d2-1074953283 .background-color-AA4{background-color:#EDF0FD;} + .d2-1074953283 .background-color-AA5{background-color:#F7F8FE;} + .d2-1074953283 .background-color-AB4{background-color:#EDF0FD;} + .d2-1074953283 .background-color-AB5{background-color:#F7F8FE;} + .d2-1074953283 .color-N1{color:#0A0F25;} + .d2-1074953283 .color-N2{color:#676C7E;} + .d2-1074953283 .color-N3{color:#9499AB;} + .d2-1074953283 .color-N4{color:#CFD2DD;} + .d2-1074953283 .color-N5{color:#DEE1EB;} + .d2-1074953283 .color-N6{color:#EEF1F8;} + .d2-1074953283 .color-N7{color:#FFFFFF;} + .d2-1074953283 .color-B1{color:#0D32B2;} + .d2-1074953283 .color-B2{color:#0D32B2;} + .d2-1074953283 .color-B3{color:#E3E9FD;} + .d2-1074953283 .color-B4{color:#E3E9FD;} + .d2-1074953283 .color-B5{color:#EDF0FD;} + .d2-1074953283 .color-B6{color:#F7F8FE;} + .d2-1074953283 .color-AA2{color:#4A6FF3;} + .d2-1074953283 .color-AA4{color:#EDF0FD;} + .d2-1074953283 .color-AA5{color:#F7F8FE;} + .d2-1074953283 .color-AB4{color:#EDF0FD;} + .d2-1074953283 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 diff --git a/e2etests/testdata/stable/label_positions/dagre/board.exp.json b/e2etests/testdata/stable/label_positions/dagre/board.exp.json index ddce16a8c..2e5f24e9e 100644 --- a/e2etests/testdata/stable/label_positions/dagre/board.exp.json +++ b/e2etests/testdata/stable/label_positions/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "non container", "type": "rectangle", "pos": { - "x": 460, - "y": 41 + "x": 470, + "y": -5 }, - "width": 5077, - "height": 157, + "width": 6168, + "height": 128, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 500, - "y": 86 + "y": 26 }, "width": 96, "height": 66, @@ -93,7 +93,7 @@ ], "pos": { "x": 656, - "y": 86 + "y": 26 }, "width": 156, "height": 66, @@ -137,7 +137,7 @@ ], "pos": { "x": 872, - "y": 86 + "y": 26 }, "width": 176, "height": 66, @@ -181,7 +181,7 @@ ], "pos": { "x": 1108, - "y": 86 + "y": 26 }, "width": 165, "height": 66, @@ -224,8 +224,8 @@ "OutsideLeftTop" ], "pos": { - "x": 1333, - "y": 86 + "x": 1454, + "y": 26 }, "width": 156, "height": 66, @@ -268,8 +268,8 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1549, - "y": 86 + "x": 1811, + "y": 26 }, "width": 176, "height": 66, @@ -312,8 +312,8 @@ "OutsideLeftBottom" ], "pos": { - "x": 1785, - "y": 86 + "x": 2193, + "y": 26 }, "width": 181, "height": 66, @@ -356,8 +356,8 @@ "OutsideRightTop" ], "pos": { - "x": 2026, - "y": 86 + "x": 2434, + "y": 26 }, "width": 165, "height": 66, @@ -400,8 +400,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 2251, - "y": 86 + "x": 2789, + "y": 26 }, "width": 186, "height": 66, @@ -444,8 +444,8 @@ "OutsideRightBottom" ], "pos": { - "x": 2497, - "y": 86 + "x": 3186, + "y": 26 }, "width": 191, "height": 66, @@ -488,8 +488,8 @@ "OutsideBottomLeft" ], "pos": { - "x": 2748, - "y": 86 + "x": 3593, + "y": 26 }, "width": 182, "height": 66, @@ -532,8 +532,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 2990, - "y": 86 + "x": 3835, + "y": 26 }, "width": 202, "height": 66, @@ -576,8 +576,8 @@ "OutsideBottomRight" ], "pos": { - "x": 3252, - "y": 86 + "x": 4097, + "y": 26 }, "width": 192, "height": 66, @@ -620,8 +620,8 @@ "InsideTopLeft" ], "pos": { - "x": 3504, - "y": 86 + "x": 4349, + "y": 26 }, "width": 142, "height": 66, @@ -664,8 +664,8 @@ "InsideTopCenter" ], "pos": { - "x": 3706, - "y": 86 + "x": 4551, + "y": 26 }, "width": 163, "height": 66, @@ -708,8 +708,8 @@ "InsideTopRight" ], "pos": { - "x": 3929, - "y": 86 + "x": 4774, + "y": 26 }, "width": 152, "height": 66, @@ -752,10 +752,10 @@ "InsideMiddleLeft" ], "pos": { - "x": 4141, - "y": 86 + "x": 4986, + "y": 26 }, - "width": 163, + "width": 291, "height": 66, "opacity": 1, "strokeDash": 0, @@ -796,8 +796,8 @@ "InsideMiddleCenter" ], "pos": { - "x": 4364, - "y": 86 + "x": 5337, + "y": 26 }, "width": 183, "height": 66, @@ -840,10 +840,10 @@ "InsideMiddleRight" ], "pos": { - "x": 4607, - "y": 86 + "x": 5580, + "y": 26 }, - "width": 173, + "width": 311, "height": 66, "opacity": 1, "strokeDash": 0, @@ -884,8 +884,8 @@ "InsideBottomLeft" ], "pos": { - "x": 4840, - "y": 86 + "x": 5951, + "y": 26 }, "width": 169, "height": 66, @@ -928,8 +928,8 @@ "InsideBottomCenter" ], "pos": { - "x": 5069, - "y": 86 + "x": 6180, + "y": 26 }, "width": 189, "height": 66, @@ -972,8 +972,8 @@ "InsideBottomRight" ], "pos": { - "x": 5318, - "y": 86 + "x": 6429, + "y": 26 }, "width": 179, "height": 66, @@ -1014,10 +1014,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 371 + "y": 271 }, - "width": 5967, - "height": 289, + "width": 7497, + "height": 208, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1054,11 +1054,11 @@ "id": "container.Default", "type": "rectangle", "pos": { - "x": 20, - "y": 452 + "x": 30, + "y": 312 }, - "width": 176, - "height": 162, + "width": 156, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1096,7 +1096,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 500 + "y": 342 }, "width": 96, "height": 66, @@ -1139,11 +1139,11 @@ "OutsideTopLeft" ], "pos": { - "x": 216, - "y": 452 + "x": 226, + "y": 312 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1183,11 +1183,11 @@ "OutsideTopCenter" ], "pos": { - "x": 472, - "y": 452 + "x": 482, + "y": 312 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1227,11 +1227,11 @@ "OutsideTopRight" ], "pos": { - "x": 748, - "y": 452 + "x": 758, + "y": 312 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1271,11 +1271,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1013, - "y": 452 + "x": 1188, + "y": 312 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1315,11 +1315,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1269, - "y": 452 + "x": 1638, + "y": 312 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1359,11 +1359,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1545, - "y": 452 + "x": 2116, + "y": 312 }, - "width": 261, - "height": 162, + "width": 241, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1403,11 +1403,11 @@ "OutsideRightTop" ], "pos": { - "x": 1826, - "y": 452 + "x": 2397, + "y": 312 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1447,11 +1447,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2091, - "y": 452 + "x": 2841, + "y": 312 }, - "width": 266, - "height": 162, + "width": 246, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1491,11 +1491,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2377, - "y": 452 + "x": 3335, + "y": 312 }, - "width": 271, - "height": 162, + "width": 251, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1535,11 +1535,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2668, - "y": 452 + "x": 3842, + "y": 312 }, - "width": 262, - "height": 162, + "width": 242, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1579,11 +1579,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2950, - "y": 452 + "x": 4124, + "y": 312 }, - "width": 282, - "height": 162, + "width": 262, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1623,11 +1623,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3262, - "y": 452 + "x": 4436, + "y": 312 }, - "width": 272, - "height": 162, + "width": 252, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1667,11 +1667,11 @@ "InsideTopLeft" ], "pos": { - "x": 3554, - "y": 452 + "x": 4728, + "y": 301 }, - "width": 222, - "height": 162, + "width": 202, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1711,11 +1711,11 @@ "InsideTopCenter" ], "pos": { - "x": 3796, - "y": 452 + "x": 4970, + "y": 301 }, - "width": 243, - "height": 162, + "width": 223, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1755,11 +1755,11 @@ "InsideTopRight" ], "pos": { - "x": 4059, - "y": 452 + "x": 5233, + "y": 301 }, - "width": 232, - "height": 162, + "width": 212, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1799,11 +1799,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4311, - "y": 452 + "x": 5515, + "y": 312 }, - "width": 243, - "height": 162, + "width": 369, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1843,11 +1843,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4574, - "y": 452 + "x": 5924, + "y": 312 }, - "width": 263, - "height": 162, + "width": 243, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1887,11 +1887,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4857, - "y": 452 + "x": 6207, + "y": 312 }, - "width": 253, - "height": 162, + "width": 393, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1931,11 +1931,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5130, - "y": 452 + "x": 6670, + "y": 312 }, - "width": 249, - "height": 162, + "width": 229, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1975,11 +1975,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5399, - "y": 452 + "x": 6939, + "y": 312 }, - "width": 269, - "height": 162, + "width": 249, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2019,11 +2019,11 @@ "InsideBottomRight" ], "pos": { - "x": 5688, - "y": 452 + "x": 7228, + "y": 312 }, - "width": 259, - "height": 162, + "width": 239, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2061,7 +2061,7 @@ "type": "rectangle", "pos": { "x": 256, - "y": 500 + "y": 342 }, "width": 156, "height": 66, @@ -2102,7 +2102,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 500 + "y": 342 }, "width": 176, "height": 66, @@ -2143,7 +2143,7 @@ "type": "rectangle", "pos": { "x": 788, - "y": 500 + "y": 342 }, "width": 165, "height": 66, @@ -2183,8 +2183,8 @@ "id": "container.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1053, - "y": 500 + "x": 1218, + "y": 342 }, "width": 156, "height": 66, @@ -2224,8 +2224,8 @@ "id": "container.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1309, - "y": 500 + "x": 1668, + "y": 342 }, "width": 176, "height": 66, @@ -2265,8 +2265,8 @@ "id": "container.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1585, - "y": 500 + "x": 2146, + "y": 342 }, "width": 181, "height": 66, @@ -2306,8 +2306,8 @@ "id": "container.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 1866, - "y": 500 + "x": 2427, + "y": 342 }, "width": 165, "height": 66, @@ -2347,8 +2347,8 @@ "id": "container.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2131, - "y": 500 + "x": 2871, + "y": 342 }, "width": 186, "height": 66, @@ -2388,8 +2388,8 @@ "id": "container.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2417, - "y": 500 + "x": 3365, + "y": 342 }, "width": 191, "height": 66, @@ -2429,8 +2429,8 @@ "id": "container.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2708, - "y": 500 + "x": 3872, + "y": 342 }, "width": 182, "height": 66, @@ -2470,8 +2470,8 @@ "id": "container.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 2990, - "y": 500 + "x": 4154, + "y": 342 }, "width": 202, "height": 66, @@ -2511,8 +2511,8 @@ "id": "container.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3302, - "y": 500 + "x": 4466, + "y": 342 }, "width": 192, "height": 66, @@ -2552,8 +2552,8 @@ "id": "container.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3594, - "y": 500 + "x": 4758, + "y": 342 }, "width": 142, "height": 66, @@ -2593,8 +2593,8 @@ "id": "container.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 3836, - "y": 500 + "x": 5000, + "y": 342 }, "width": 163, "height": 66, @@ -2634,8 +2634,8 @@ "id": "container.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4099, - "y": 500 + "x": 5263, + "y": 342 }, "width": 152, "height": 66, @@ -2675,8 +2675,8 @@ "id": "container.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4351, - "y": 500 + "x": 5691, + "y": 342 }, "width": 163, "height": 66, @@ -2716,8 +2716,8 @@ "id": "container.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 4614, - "y": 500 + "x": 5954, + "y": 342 }, "width": 183, "height": 66, @@ -2757,8 +2757,8 @@ "id": "container.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 4897, - "y": 500 + "x": 6237, + "y": 342 }, "width": 173, "height": 66, @@ -2798,8 +2798,8 @@ "id": "container.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5170, - "y": 500 + "x": 6700, + "y": 342 }, "width": 169, "height": 66, @@ -2839,8 +2839,8 @@ "id": "container.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5439, - "y": 500 + "x": 6969, + "y": 342 }, "width": 189, "height": 66, @@ -2880,8 +2880,8 @@ "id": "container.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 5728, - "y": 500 + "x": 7258, + "y": 342 }, "width": 179, "height": 66, @@ -2921,11 +2921,11 @@ "id": "with icon", "type": "rectangle", "pos": { - "x": 161, - "y": 833 + "x": 171, + "y": 627 }, - "width": 5649, - "height": 209, + "width": 6740, + "height": 154, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2966,10 +2966,10 @@ ], "pos": { "x": 201, - "y": 878 + "y": 658 }, "width": 122, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3023,10 +3023,10 @@ ], "pos": { "x": 383, - "y": 878 + "y": 658 }, "width": 182, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3080,10 +3080,10 @@ ], "pos": { "x": 625, - "y": 878 + "y": 658 }, "width": 202, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3137,10 +3137,10 @@ ], "pos": { "x": 887, - "y": 878 + "y": 658 }, "width": 191, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3193,11 +3193,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1138, - "y": 878 + "x": 1259, + "y": 658 }, "width": 182, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3250,11 +3250,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1380, - "y": 878 + "x": 1642, + "y": 658 }, "width": 202, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3307,11 +3307,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1642, - "y": 878 + "x": 2050, + "y": 658 }, "width": 207, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3364,11 +3364,11 @@ "OutsideRightTop" ], "pos": { - "x": 1909, - "y": 878 + "x": 2317, + "y": 658 }, "width": 191, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3421,11 +3421,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2160, - "y": 878 + "x": 2698, + "y": 658 }, "width": 212, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3478,11 +3478,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2432, - "y": 878 + "x": 3121, + "y": 658 }, "width": 217, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3535,11 +3535,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2709, - "y": 878 + "x": 3554, + "y": 658 }, "width": 208, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3592,11 +3592,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2977, - "y": 878 + "x": 3822, + "y": 658 }, "width": 228, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3649,11 +3649,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3265, - "y": 878 + "x": 4110, + "y": 658 }, "width": 218, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3706,11 +3706,11 @@ "InsideTopLeft" ], "pos": { - "x": 3543, - "y": 878 + "x": 4388, + "y": 658 }, "width": 168, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3763,11 +3763,11 @@ "InsideTopCenter" ], "pos": { - "x": 3771, - "y": 878 + "x": 4616, + "y": 658 }, "width": 189, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3820,11 +3820,11 @@ "InsideTopRight" ], "pos": { - "x": 4020, - "y": 878 + "x": 4865, + "y": 658 }, "width": 178, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3877,11 +3877,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4258, - "y": 878 + "x": 5103, + "y": 658 }, - "width": 189, - "height": 118, + "width": 317, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3934,11 +3934,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4507, - "y": 878 + "x": 5480, + "y": 658 }, "width": 209, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3991,11 +3991,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4776, - "y": 878 + "x": 5749, + "y": 658 }, - "width": 199, - "height": 118, + "width": 337, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4048,11 +4048,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5035, - "y": 878 + "x": 6146, + "y": 658 }, "width": 195, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4105,11 +4105,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5290, - "y": 878 + "x": 6401, + "y": 658 }, "width": 215, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4162,11 +4162,11 @@ "InsideBottomRight" ], "pos": { - "x": 5565, - "y": 878 + "x": 6676, + "y": 658 }, "width": 205, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4216,10 +4216,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 1215 + "y": 909 }, - "width": 5957, - "height": 289, + "width": 7487, + "height": 252, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4259,11 +4259,11 @@ "icon" ], "pos": { - "x": 20, - "y": 1296 + "x": 30, + "y": 994 }, - "width": 176, - "height": 162, + "width": 156, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4313,7 +4313,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 1344 + "y": 1024 }, "width": 96, "height": 66, @@ -4357,11 +4357,11 @@ "OutsideTopLeft" ], "pos": { - "x": 216, - "y": 1296 + "x": 226, + "y": 994 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4411,7 +4411,7 @@ "type": "rectangle", "pos": { "x": 256, - "y": 1344 + "y": 1024 }, "width": 156, "height": 66, @@ -4455,11 +4455,11 @@ "OutsideTopCenter" ], "pos": { - "x": 472, - "y": 1296 + "x": 482, + "y": 994 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4509,7 +4509,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 1344 + "y": 1024 }, "width": 176, "height": 66, @@ -4553,11 +4553,11 @@ "OutsideTopRight" ], "pos": { - "x": 748, - "y": 1296 + "x": 758, + "y": 994 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4607,7 +4607,7 @@ "type": "rectangle", "pos": { "x": 788, - "y": 1344 + "y": 1024 }, "width": 165, "height": 66, @@ -4651,11 +4651,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1013, - "y": 1296 + "x": 1188, + "y": 994 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4704,8 +4704,8 @@ "id": "container with icon.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1053, - "y": 1344 + "x": 1218, + "y": 1024 }, "width": 156, "height": 66, @@ -4749,11 +4749,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1269, - "y": 1296 + "x": 1638, + "y": 994 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4802,8 +4802,8 @@ "id": "container with icon.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1309, - "y": 1344 + "x": 1668, + "y": 1024 }, "width": 176, "height": 66, @@ -4847,11 +4847,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1545, - "y": 1296 + "x": 2116, + "y": 994 }, - "width": 261, - "height": 162, + "width": 241, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4900,8 +4900,8 @@ "id": "container with icon.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1585, - "y": 1344 + "x": 2146, + "y": 1024 }, "width": 181, "height": 66, @@ -4945,11 +4945,11 @@ "OutsideRightTop" ], "pos": { - "x": 1826, - "y": 1296 + "x": 2397, + "y": 994 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4998,8 +4998,8 @@ "id": "container with icon.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 1866, - "y": 1344 + "x": 2427, + "y": 1024 }, "width": 165, "height": 66, @@ -5043,11 +5043,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2091, - "y": 1296 + "x": 2841, + "y": 994 }, - "width": 266, - "height": 162, + "width": 246, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5096,8 +5096,8 @@ "id": "container with icon.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2131, - "y": 1344 + "x": 2871, + "y": 1024 }, "width": 186, "height": 66, @@ -5141,11 +5141,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2377, - "y": 1296 + "x": 3335, + "y": 994 }, - "width": 271, - "height": 162, + "width": 251, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5194,8 +5194,8 @@ "id": "container with icon.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2417, - "y": 1344 + "x": 3365, + "y": 1024 }, "width": 191, "height": 66, @@ -5239,11 +5239,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2668, - "y": 1296 + "x": 3842, + "y": 994 }, - "width": 262, - "height": 162, + "width": 242, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5292,8 +5292,8 @@ "id": "container with icon.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2708, - "y": 1344 + "x": 3872, + "y": 1024 }, "width": 182, "height": 66, @@ -5337,11 +5337,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2950, - "y": 1296 + "x": 4124, + "y": 994 }, - "width": 282, - "height": 162, + "width": 262, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5390,8 +5390,8 @@ "id": "container with icon.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 2990, - "y": 1344 + "x": 4154, + "y": 1024 }, "width": 202, "height": 66, @@ -5435,11 +5435,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3252, - "y": 1296 + "x": 4426, + "y": 994 }, - "width": 272, - "height": 162, + "width": 252, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5488,8 +5488,8 @@ "id": "container with icon.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3292, - "y": 1344 + "x": 4456, + "y": 1024 }, "width": 192, "height": 66, @@ -5533,11 +5533,11 @@ "InsideTopLeft" ], "pos": { - "x": 3544, - "y": 1296 + "x": 4718, + "y": 983 }, - "width": 222, - "height": 162, + "width": 202, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5586,8 +5586,8 @@ "id": "container with icon.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3584, - "y": 1344 + "x": 4748, + "y": 1024 }, "width": 142, "height": 66, @@ -5631,11 +5631,11 @@ "InsideTopCenter" ], "pos": { - "x": 3786, - "y": 1296 + "x": 4960, + "y": 983 }, - "width": 243, - "height": 162, + "width": 223, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5684,8 +5684,8 @@ "id": "container with icon.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 3826, - "y": 1344 + "x": 4990, + "y": 1024 }, "width": 163, "height": 66, @@ -5729,11 +5729,11 @@ "InsideTopRight" ], "pos": { - "x": 4049, - "y": 1296 + "x": 5223, + "y": 983 }, - "width": 232, - "height": 162, + "width": 212, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5782,8 +5782,8 @@ "id": "container with icon.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4089, - "y": 1344 + "x": 5253, + "y": 1024 }, "width": 152, "height": 66, @@ -5827,11 +5827,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4301, - "y": 1296 + "x": 5505, + "y": 994 }, - "width": 243, - "height": 162, + "width": 369, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5880,8 +5880,8 @@ "id": "container with icon.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4341, - "y": 1344 + "x": 5681, + "y": 1024 }, "width": 163, "height": 66, @@ -5925,11 +5925,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4564, - "y": 1296 + "x": 5914, + "y": 994 }, - "width": 263, - "height": 162, + "width": 243, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5978,8 +5978,8 @@ "id": "container with icon.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 4604, - "y": 1344 + "x": 5944, + "y": 1024 }, "width": 183, "height": 66, @@ -6023,11 +6023,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4847, - "y": 1296 + "x": 6197, + "y": 994 }, - "width": 253, - "height": 162, + "width": 393, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6076,8 +6076,8 @@ "id": "container with icon.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 4887, - "y": 1344 + "x": 6227, + "y": 1024 }, "width": 173, "height": 66, @@ -6121,11 +6121,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5120, - "y": 1296 + "x": 6660, + "y": 994 }, - "width": 249, - "height": 162, + "width": 229, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6174,8 +6174,8 @@ "id": "container with icon.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5160, - "y": 1344 + "x": 6690, + "y": 1024 }, "width": 169, "height": 66, @@ -6219,11 +6219,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5389, - "y": 1296 + "x": 6929, + "y": 994 }, - "width": 269, - "height": 162, + "width": 249, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6272,8 +6272,8 @@ "id": "container with icon.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5429, - "y": 1344 + "x": 6959, + "y": 1024 }, "width": 189, "height": 66, @@ -6317,11 +6317,11 @@ "InsideBottomRight" ], "pos": { - "x": 5678, - "y": 1296 + "x": 7218, + "y": 994 }, - "width": 259, - "height": 162, + "width": 239, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6370,8 +6370,8 @@ "id": "container with icon.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 5718, - "y": 1344 + "x": 7248, + "y": 1024 }, "width": 179, "height": 66, @@ -6435,19 +6435,19 @@ "route": [ { "x": 3091, - "y": 198 + "y": 123 }, { "x": 3091, - "y": 250.8000030517578 + "y": 178.1999969482422 }, { "x": 3091, - "y": 285.3999938964844 + "y": 207.8000030517578 }, { "x": 3091, - "y": 371 + "y": 271 } ], "isCurve": true, @@ -6482,19 +6482,19 @@ "route": [ { "x": 3091, - "y": 660 + "y": 479 }, { "x": 3091, - "y": 712.7999877929688 + "y": 542.2000122070312 }, { "x": 3091, - "y": 747.4000244140625 + "y": 571.7999877929688 }, { "x": 3091, - "y": 833 + "y": 627 } ], "isCurve": true, @@ -6529,19 +6529,19 @@ "route": [ { "x": 3091, - "y": 1042 + "y": 781 }, { "x": 3091, - "y": 1094.800048828125 + "y": 836.2000122070312 }, { "x": 3091, - "y": 1121.199951171875 + "y": 861.7999877929688 }, { "x": 3091, - "y": 1174 + "y": 909 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg index 7de240b2d..691215bfb 100644 --- a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-476545484 .fill-N1{fill:#0A0F25;} + .d2-476545484 .fill-N2{fill:#676C7E;} + .d2-476545484 .fill-N3{fill:#9499AB;} + .d2-476545484 .fill-N4{fill:#CFD2DD;} + .d2-476545484 .fill-N5{fill:#DEE1EB;} + .d2-476545484 .fill-N6{fill:#EEF1F8;} + .d2-476545484 .fill-N7{fill:#FFFFFF;} + .d2-476545484 .fill-B1{fill:#0D32B2;} + .d2-476545484 .fill-B2{fill:#0D32B2;} + .d2-476545484 .fill-B3{fill:#E3E9FD;} + .d2-476545484 .fill-B4{fill:#E3E9FD;} + .d2-476545484 .fill-B5{fill:#EDF0FD;} + .d2-476545484 .fill-B6{fill:#F7F8FE;} + .d2-476545484 .fill-AA2{fill:#4A6FF3;} + .d2-476545484 .fill-AA4{fill:#EDF0FD;} + .d2-476545484 .fill-AA5{fill:#F7F8FE;} + .d2-476545484 .fill-AB4{fill:#EDF0FD;} + .d2-476545484 .fill-AB5{fill:#F7F8FE;} + .d2-476545484 .stroke-N1{stroke:#0A0F25;} + .d2-476545484 .stroke-N2{stroke:#676C7E;} + .d2-476545484 .stroke-N3{stroke:#9499AB;} + .d2-476545484 .stroke-N4{stroke:#CFD2DD;} + .d2-476545484 .stroke-N5{stroke:#DEE1EB;} + .d2-476545484 .stroke-N6{stroke:#EEF1F8;} + .d2-476545484 .stroke-N7{stroke:#FFFFFF;} + .d2-476545484 .stroke-B1{stroke:#0D32B2;} + .d2-476545484 .stroke-B2{stroke:#0D32B2;} + .d2-476545484 .stroke-B3{stroke:#E3E9FD;} + .d2-476545484 .stroke-B4{stroke:#E3E9FD;} + .d2-476545484 .stroke-B5{stroke:#EDF0FD;} + .d2-476545484 .stroke-B6{stroke:#F7F8FE;} + .d2-476545484 .stroke-AA2{stroke:#4A6FF3;} + .d2-476545484 .stroke-AA4{stroke:#EDF0FD;} + .d2-476545484 .stroke-AA5{stroke:#F7F8FE;} + .d2-476545484 .stroke-AB4{stroke:#EDF0FD;} + .d2-476545484 .stroke-AB5{stroke:#F7F8FE;} + .d2-476545484 .background-color-N1{background-color:#0A0F25;} + .d2-476545484 .background-color-N2{background-color:#676C7E;} + .d2-476545484 .background-color-N3{background-color:#9499AB;} + .d2-476545484 .background-color-N4{background-color:#CFD2DD;} + .d2-476545484 .background-color-N5{background-color:#DEE1EB;} + .d2-476545484 .background-color-N6{background-color:#EEF1F8;} + .d2-476545484 .background-color-N7{background-color:#FFFFFF;} + .d2-476545484 .background-color-B1{background-color:#0D32B2;} + .d2-476545484 .background-color-B2{background-color:#0D32B2;} + .d2-476545484 .background-color-B3{background-color:#E3E9FD;} + .d2-476545484 .background-color-B4{background-color:#E3E9FD;} + .d2-476545484 .background-color-B5{background-color:#EDF0FD;} + .d2-476545484 .background-color-B6{background-color:#F7F8FE;} + .d2-476545484 .background-color-AA2{background-color:#4A6FF3;} + .d2-476545484 .background-color-AA4{background-color:#EDF0FD;} + .d2-476545484 .background-color-AA5{background-color:#F7F8FE;} + .d2-476545484 .background-color-AB4{background-color:#EDF0FD;} + .d2-476545484 .background-color-AB5{background-color:#F7F8FE;} + .d2-476545484 .color-N1{color:#0A0F25;} + .d2-476545484 .color-N2{color:#676C7E;} + .d2-476545484 .color-N3{color:#9499AB;} + .d2-476545484 .color-N4{color:#CFD2DD;} + .d2-476545484 .color-N5{color:#DEE1EB;} + .d2-476545484 .color-N6{color:#EEF1F8;} + .d2-476545484 .color-N7{color:#FFFFFF;} + .d2-476545484 .color-B1{color:#0D32B2;} + .d2-476545484 .color-B2{color:#0D32B2;} + .d2-476545484 .color-B3{color:#E3E9FD;} + .d2-476545484 .color-B4{color:#E3E9FD;} + .d2-476545484 .color-B5{color:#EDF0FD;} + .d2-476545484 .color-B6{color:#F7F8FE;} + .d2-476545484 .color-AA2{color:#4A6FF3;} + .d2-476545484 .color-AA4{color:#EDF0FD;} + .d2-476545484 .color-AA5{color:#F7F8FE;} + .d2-476545484 .color-AB4{color:#EDF0FD;} + .d2-476545484 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json index cd06318bf..28358af13 100644 --- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json +++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json @@ -336,10 +336,10 @@ "type": "rectangle", "pos": { "x": 1427, - "y": 407 + "y": 395 }, - "width": 476, - "height": 541, + "width": 466, + "height": 513, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -376,11 +376,11 @@ "id": "i.j", "type": "rectangle", "pos": { - "x": 1449, - "y": 472 + "x": 1459, + "y": 436 }, - "width": 349, - "height": 130, + "width": 329, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 1705, - "y": 504 + "y": 466 }, "width": 53, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 1489, - "y": 504 + "y": 466 }, "width": 49, "height": 66, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 1693, - "y": 802 + "y": 782 }, "width": 57, "height": 66, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": 1810, - "y": 802 + "y": 782 }, "width": 53, "height": 66, @@ -581,11 +581,11 @@ "id": "i.o", "type": "rectangle", "pos": { - "x": 1447, - "y": 788 + "x": 1457, + "y": 752 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 1487, - "y": 820 + "y": 782 }, "width": 53, "height": 66, @@ -704,11 +704,11 @@ "id": "r", "type": "rectangle", "pos": { - "x": 206, - "y": 41 + "x": 216, + "y": 43 }, - "width": 1202, - "height": 591, + "width": 1191, + "height": 549, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -745,11 +745,11 @@ "id": "r.s", "type": "rectangle", "pos": { - "x": 471, - "y": 106 + "x": 502, + "y": 84 }, - "width": 403, - "height": 496, + "width": 367, + "height": 478, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -787,7 +787,7 @@ "type": "rectangle", "pos": { "x": 532, - "y": 504 + "y": 466 }, "width": 51, "height": 66, @@ -827,11 +827,11 @@ "id": "r.s.u", "type": "rectangle", "pos": { - "x": 715, - "y": 169 + "x": 725, + "y": 120 }, - "width": 134, - "height": 135, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 755, - "y": 204 + "y": 150 }, "width": 54, "height": 66, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 643, - "y": 504 + "y": 466 }, "width": 58, "height": 66, @@ -951,7 +951,7 @@ "type": "rectangle", "pos": { "x": 622, - "y": 188 + "y": 150 }, "width": 53, "height": 66, @@ -992,7 +992,7 @@ "type": "rectangle", "pos": { "x": 761, - "y": 504 + "y": 466 }, "width": 54, "height": 66, @@ -1033,7 +1033,7 @@ "type": "rectangle", "pos": { "x": 913, - "y": 486 + "y": 466 }, "width": 52, "height": 66, @@ -1074,7 +1074,7 @@ "type": "rectangle", "pos": { "x": 246, - "y": 170 + "y": 150 }, "width": 62, "height": 66, @@ -1114,11 +1114,11 @@ "id": "r.bb", "type": "rectangle", "pos": { - "x": 1122, - "y": 472 + "x": 1132, + "y": 436 }, - "width": 265, - "height": 130, + "width": 245, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1156,7 +1156,7 @@ "type": "rectangle", "pos": { "x": 1162, - "y": 504 + "y": 466 }, "width": 61, "height": 66, @@ -1197,7 +1197,7 @@ "type": "rectangle", "pos": { "x": 1283, - "y": 504 + "y": 466 }, "width": 64, "height": 66, @@ -1238,7 +1238,7 @@ "type": "rectangle", "pos": { "x": 1023, - "y": 170 + "y": 150 }, "width": 62, "height": 66, @@ -1279,7 +1279,7 @@ "type": "rectangle", "pos": { "x": 1025, - "y": 486 + "y": 466 }, "width": 57, "height": 66, @@ -1320,7 +1320,7 @@ "type": "rectangle", "pos": { "x": 368, - "y": 170 + "y": 150 }, "width": 63, "height": 66, @@ -1384,43 +1384,43 @@ "route": [ { "x": 1731.5, - "y": 570.5 + "y": 532 }, { "x": 1731.5, - "y": 596.0999755859375 + "y": 572 }, { "x": 1731.5, - "y": 612.5 + "y": 592 }, { "x": 1731.5, - "y": 627.5 + "y": 607 }, { "x": 1731.5, - "y": 642.5 + "y": 622 }, { "x": 1731.5, - "y": 662.5 + "y": 642 }, { "x": 1731.5, - "y": 677.5 + "y": 657 }, { "x": 1731.5, - "y": 692.5 + "y": 672 }, { "x": 1730.300048828125, - "y": 762.5 + "y": 742 }, { "x": 1725.5, - "y": 802.5 + "y": 782 } ], "isCurve": true, @@ -1455,43 +1455,43 @@ "route": [ { "x": 1513.75, - "y": 570.5 + "y": 532 }, { "x": 1513.75, - "y": 596.0999755859375 + "y": 572 }, { "x": 1513.75, - "y": 612.5 + "y": 592 }, { "x": 1513.75, - "y": 627.5 + "y": 607 }, { "x": 1513.75, - "y": 642.5 + "y": 622 }, { "x": 1513.75, - "y": 662.5 + "y": 642 }, { "x": 1513.75, - "y": 677.5 + "y": 657 }, { "x": 1513.75, - "y": 692.5 + "y": 672 }, { "x": 1513.75, - "y": 766.0999755859375 + "y": 742 }, { "x": 1513.75, - "y": 820.5 + "y": 782 } ], "isCurve": true, @@ -1525,11 +1525,11 @@ "labelPercentage": 0, "route": [ { - "x": 1813.637939453125, + "x": 1814, "y": 1048 }, { - "x": 1785.927001953125, + "x": 1786, "y": 1008 }, { @@ -1546,11 +1546,11 @@ }, { "x": 1772, - "y": 892.0999755859375 + "y": 888 }, { "x": 1744, - "y": 868.5 + "y": 848 } ], "isCurve": true, @@ -1584,12 +1584,12 @@ "labelPercentage": 0, "route": [ { - "x": 1750, - "y": 851.4559936523438 + "x": 1749.75, + "y": 831 }, { - "x": 1845.800048828125, - "y": 888.6909790039062 + "x": 1845.75, + "y": 884.5999755859375 }, { "x": 1869.75, @@ -1644,11 +1644,11 @@ "route": [ { "x": 1836.5, - "y": 868.5 + "y": 848 }, { "x": 1836.5, - "y": 892.0999755859375 + "y": 888 }, { "x": 1836.5, @@ -1702,12 +1702,12 @@ "labelPercentage": 0, "route": [ { - "x": 1693, - "y": 855.7169799804688 + "x": 1693.5, + "y": 835 }, { - "x": 1622.199951171875, - "y": 889.5430297851562 + "x": 1622.300048828125, + "y": 885.4000244140625 }, { "x": 1604.5, @@ -1761,12 +1761,12 @@ "labelPercentage": 0, "route": [ { - "x": 1693, - "y": 859.885986328125 + "x": 1693.5, + "y": 839 }, { - "x": 1638.199951171875, - "y": 890.3770141601562 + "x": 1638.300048828125, + "y": 886.2000122070312 }, { "x": 1624.5, @@ -1820,12 +1820,12 @@ "labelPercentage": 0, "route": [ { - "x": 1736.4090576171875, - "y": 868.5 + "x": 1736, + "y": 848 }, { - "x": 1754.48095703125, - "y": 892.0999755859375 + "x": 1754.4000244140625, + "y": 888 }, { "x": 1759, @@ -1879,12 +1879,12 @@ "labelPercentage": 0, "route": [ { - "x": 1699.135009765625, - "y": 868.5 + "x": 1699.25, + "y": 848 }, { - "x": 1672.0269775390625, - "y": 892.0999755859375 + "x": 1672.050048828125, + "y": 888 }, { "x": 1665.25, @@ -1985,44 +1985,44 @@ "labelPercentage": 0, "route": [ { - "x": 629.4630126953125, - "y": 254.5 + "x": 629, + "y": 216 }, { - "x": 606.6920166015625, - "y": 294.5 + "x": 606.5999755859375, + "y": 256 }, { "x": 601, - "y": 314.5 + "y": 276 }, { "x": 601, - "y": 329.5 + "y": 291 }, { "x": 601, - "y": 344.5 + "y": 306 }, { "x": 601, - "y": 364.5 + "y": 326 }, { "x": 601, - "y": 379.5 + "y": 341 }, { "x": 601, - "y": 394.5 + "y": 356 }, { "x": 595.5999755859375, - "y": 464.5 + "y": 426 }, { "x": 574, - "y": 504.5 + "y": 466 } ], "isCurve": true, @@ -2056,44 +2056,44 @@ "labelPercentage": 0, "route": [ { - "x": 657.4929809570312, - "y": 254.5 + "x": 657.5, + "y": 216 }, { - "x": 668.697998046875, - "y": 294.5 + "x": 668.7000122070312, + "y": 256 }, { "x": 671.5, - "y": 314.5 + "y": 276 }, { "x": 671.5, - "y": 329.5 + "y": 291 }, { "x": 671.5, - "y": 344.5 + "y": 306 }, { "x": 671.5, - "y": 364.5 + "y": 326 }, { "x": 671.5, - "y": 379.5 + "y": 341 }, { "x": 671.5, - "y": 394.5 + "y": 356 }, { "x": 671.5, - "y": 464.5 + "y": 426 }, { "x": 671.5, - "y": 504.5 + "y": 466 } ], "isCurve": true, @@ -2128,43 +2128,43 @@ "route": [ { "x": 431, - "y": 220.10000610351562 + "y": 200 }, { "x": 531.7999877929688, - "y": 273.2200012207031 + "y": 252.8000030517578 }, { "x": 557, - "y": 296.5 + "y": 276 }, { "x": 557, - "y": 311.5 + "y": 291 }, { "x": 557, - "y": 326.5 + "y": 306 }, { "x": 557, - "y": 346.5 + "y": 326 }, { "x": 557, - "y": 361.5 + "y": 341 }, { "x": 557, - "y": 376.5 + "y": 356 }, { "x": 557, - "y": 450.1000061035156 + "y": 426 }, { "x": 557, - "y": 504.5 + "y": 466 } ], "isCurve": true, @@ -2199,43 +2199,43 @@ "route": [ { "x": 781.75, - "y": 270 + "y": 216 }, { "x": 781.75, - "y": 283.20001220703125 + "y": 256 }, { "x": 781.75, - "y": 296.5 + "y": 276 }, { "x": 781.75, - "y": 311.5 + "y": 291 }, { "x": 781.75, - "y": 326.5 + "y": 306 }, { "x": 781.75, - "y": 346.5 + "y": 326 }, { "x": 781.75, - "y": 361.5 + "y": 341 }, { "x": 781.75, - "y": 376.5 + "y": 356 }, { "x": 807.9500122070312, - "y": 450.29998779296875 + "y": 429.79998779296875 }, { "x": 912.75, - "y": 505.5 + "y": 485 } ], "isCurve": true, @@ -2269,44 +2269,44 @@ "labelPercentage": 0, "route": [ { - "x": 308, - "y": 214.8470001220703 + "x": 307.75, + "y": 194 }, { - "x": 464.6000061035156, - "y": 272.16900634765625 + "x": 464.54998779296875, + "y": 251.60000610351562 }, { "x": 503.75, - "y": 296.5 + "y": 276 }, { "x": 503.75, - "y": 311.5 + "y": 291 }, { "x": 503.75, - "y": 326.5 + "y": 306 }, { "x": 503.75, - "y": 346.5 + "y": 326 }, { "x": 503.75, - "y": 361.5 + "y": 341 }, { "x": 503.75, - "y": 376.5 + "y": 356 }, { "x": 510.1499938964844, - "y": 450.1000061035156 + "y": 426 }, { "x": 535.75, - "y": 504.5 + "y": 466 } ], "isCurve": true, @@ -2341,11 +2341,11 @@ "route": [ { "x": 671.5, - "y": 570.5 + "y": 532 }, { "x": 671.5, - "y": 579.7000122070312 + "y": 572 }, { "x": 671.5, @@ -2373,11 +2373,11 @@ }, { "x": 1638.300048828125, - "y": 747.9000244140625 + "y": 743.7999877929688 }, { "x": 1693.5, - "y": 811.5 + "y": 791 } ], "isCurve": true, @@ -2411,12 +2411,12 @@ "labelPercentage": 0, "route": [ { - "x": 575.7860107421875, - "y": 570.5 + "x": 576.25, + "y": 532 }, { - "x": 598.5570068359375, - "y": 579.7000122070312 + "x": 598.6500244140625, + "y": 572 }, { "x": 604.25, @@ -2530,12 +2530,12 @@ "labelPercentage": 0, "route": [ { - "x": 543.780029296875, - "y": 570.5 + "x": 543.75, + "y": 532 }, { - "x": 527.7559814453125, - "y": 579.7000122070312 + "x": 527.75, + "y": 572 }, { "x": 523.75, @@ -2602,43 +2602,43 @@ "route": [ { "x": 1053.75, - "y": 236.5 + "y": 216 }, { "x": 1053.75, - "y": 276.5 + "y": 256 }, { "x": 1053.75, - "y": 296.5 + "y": 276 }, { "x": 1053.75, - "y": 311.5 + "y": 291 }, { "x": 1053.75, - "y": 326.5 + "y": 306 }, { "x": 1053.75, - "y": 346.5 + "y": 326 }, { "x": 1053.75, - "y": 361.5 + "y": 341 }, { "x": 1053.75, - "y": 376.5 + "y": 356 }, { "x": 1053.75, - "y": 446.5 + "y": 426 }, { "x": 1053.75, - "y": 486.5 + "y": 466 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index e323340fd..3199e1c68 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - + .d2-2093711639 .fill-N1{fill:#0A0F25;} + .d2-2093711639 .fill-N2{fill:#676C7E;} + .d2-2093711639 .fill-N3{fill:#9499AB;} + .d2-2093711639 .fill-N4{fill:#CFD2DD;} + .d2-2093711639 .fill-N5{fill:#DEE1EB;} + .d2-2093711639 .fill-N6{fill:#EEF1F8;} + .d2-2093711639 .fill-N7{fill:#FFFFFF;} + .d2-2093711639 .fill-B1{fill:#0D32B2;} + .d2-2093711639 .fill-B2{fill:#0D32B2;} + .d2-2093711639 .fill-B3{fill:#E3E9FD;} + .d2-2093711639 .fill-B4{fill:#E3E9FD;} + .d2-2093711639 .fill-B5{fill:#EDF0FD;} + .d2-2093711639 .fill-B6{fill:#F7F8FE;} + .d2-2093711639 .fill-AA2{fill:#4A6FF3;} + .d2-2093711639 .fill-AA4{fill:#EDF0FD;} + .d2-2093711639 .fill-AA5{fill:#F7F8FE;} + .d2-2093711639 .fill-AB4{fill:#EDF0FD;} + .d2-2093711639 .fill-AB5{fill:#F7F8FE;} + .d2-2093711639 .stroke-N1{stroke:#0A0F25;} + .d2-2093711639 .stroke-N2{stroke:#676C7E;} + .d2-2093711639 .stroke-N3{stroke:#9499AB;} + .d2-2093711639 .stroke-N4{stroke:#CFD2DD;} + .d2-2093711639 .stroke-N5{stroke:#DEE1EB;} + .d2-2093711639 .stroke-N6{stroke:#EEF1F8;} + .d2-2093711639 .stroke-N7{stroke:#FFFFFF;} + .d2-2093711639 .stroke-B1{stroke:#0D32B2;} + .d2-2093711639 .stroke-B2{stroke:#0D32B2;} + .d2-2093711639 .stroke-B3{stroke:#E3E9FD;} + .d2-2093711639 .stroke-B4{stroke:#E3E9FD;} + .d2-2093711639 .stroke-B5{stroke:#EDF0FD;} + .d2-2093711639 .stroke-B6{stroke:#F7F8FE;} + .d2-2093711639 .stroke-AA2{stroke:#4A6FF3;} + .d2-2093711639 .stroke-AA4{stroke:#EDF0FD;} + .d2-2093711639 .stroke-AA5{stroke:#F7F8FE;} + .d2-2093711639 .stroke-AB4{stroke:#EDF0FD;} + .d2-2093711639 .stroke-AB5{stroke:#F7F8FE;} + .d2-2093711639 .background-color-N1{background-color:#0A0F25;} + .d2-2093711639 .background-color-N2{background-color:#676C7E;} + .d2-2093711639 .background-color-N3{background-color:#9499AB;} + .d2-2093711639 .background-color-N4{background-color:#CFD2DD;} + .d2-2093711639 .background-color-N5{background-color:#DEE1EB;} + .d2-2093711639 .background-color-N6{background-color:#EEF1F8;} + .d2-2093711639 .background-color-N7{background-color:#FFFFFF;} + .d2-2093711639 .background-color-B1{background-color:#0D32B2;} + .d2-2093711639 .background-color-B2{background-color:#0D32B2;} + .d2-2093711639 .background-color-B3{background-color:#E3E9FD;} + .d2-2093711639 .background-color-B4{background-color:#E3E9FD;} + .d2-2093711639 .background-color-B5{background-color:#EDF0FD;} + .d2-2093711639 .background-color-B6{background-color:#F7F8FE;} + .d2-2093711639 .background-color-AA2{background-color:#4A6FF3;} + .d2-2093711639 .background-color-AA4{background-color:#EDF0FD;} + .d2-2093711639 .background-color-AA5{background-color:#F7F8FE;} + .d2-2093711639 .background-color-AB4{background-color:#EDF0FD;} + .d2-2093711639 .background-color-AB5{background-color:#F7F8FE;} + .d2-2093711639 .color-N1{color:#0A0F25;} + .d2-2093711639 .color-N2{color:#676C7E;} + .d2-2093711639 .color-N3{color:#9499AB;} + .d2-2093711639 .color-N4{color:#CFD2DD;} + .d2-2093711639 .color-N5{color:#DEE1EB;} + .d2-2093711639 .color-N6{color:#EEF1F8;} + .d2-2093711639 .color-N7{color:#FFFFFF;} + .d2-2093711639 .color-B1{color:#0D32B2;} + .d2-2093711639 .color-B2{color:#0D32B2;} + .d2-2093711639 .color-B3{color:#E3E9FD;} + .d2-2093711639 .color-B4{color:#E3E9FD;} + .d2-2093711639 .color-B5{color:#EDF0FD;} + .d2-2093711639 .color-B6{color:#F7F8FE;} + .d2-2093711639 .color-AA2{color:#4A6FF3;} + .d2-2093711639 .color-AA4{color:#EDF0FD;} + .d2-2093711639 .color-AA5{color:#F7F8FE;} + .d2-2093711639 .color-AB4{color:#EDF0FD;} + .d2-2093711639 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + @@ -106,29 +106,29 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index 47b3df074..331db4ae7 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -1396,7 +1396,7 @@ }, { "x": 652.75, - "y": 1427.625 + "y": 1428 } ], "animated": false, @@ -1488,7 +1488,7 @@ }, { "x": 602.75, - "y": 1427.625 + "y": 1428 } ], "animated": false, @@ -1522,7 +1522,7 @@ "route": [ { "x": 669.416015625, - "y": 1493.625 + "y": 1494 }, { "x": 669.416015625, @@ -1614,7 +1614,7 @@ "route": [ { "x": 646.166015625, - "y": 1493.625 + "y": 1494 }, { "x": 646.166015625, @@ -1652,7 +1652,7 @@ "route": [ { "x": 602.75, - "y": 1493.625 + "y": 1494 }, { "x": 602.75, @@ -1698,7 +1698,7 @@ "route": [ { "x": 536.0830078125, - "y": 1493.625 + "y": 1494 }, { "x": 536.0830078125, @@ -1744,7 +1744,7 @@ "route": [ { "x": 569.416015625, - "y": 1493.625 + "y": 1494 }, { "x": 569.416015625, @@ -1874,7 +1874,7 @@ "route": [ { "x": 601, - "y": 429 + "y": 428.5 }, { "x": 601, @@ -2034,7 +2034,7 @@ "route": [ { "x": 601, - "y": 627.5 + "y": 627 }, { "x": 601, @@ -2046,7 +2046,7 @@ }, { "x": 552.75, - "y": 1427.625 + "y": 1428 } ], "animated": false, @@ -2083,7 +2083,7 @@ "y": 617 }, { - "x": 270.4989929199219, + "x": 270.5, "y": 1768 } ], diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index 11a3bd0bd..0048bc5e4 100644 --- a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + .d2-3217305317 .fill-N1{fill:#0A0F25;} + .d2-3217305317 .fill-N2{fill:#676C7E;} + .d2-3217305317 .fill-N3{fill:#9499AB;} + .d2-3217305317 .fill-N4{fill:#CFD2DD;} + .d2-3217305317 .fill-N5{fill:#DEE1EB;} + .d2-3217305317 .fill-N6{fill:#EEF1F8;} + .d2-3217305317 .fill-N7{fill:#FFFFFF;} + .d2-3217305317 .fill-B1{fill:#0D32B2;} + .d2-3217305317 .fill-B2{fill:#0D32B2;} + .d2-3217305317 .fill-B3{fill:#E3E9FD;} + .d2-3217305317 .fill-B4{fill:#E3E9FD;} + .d2-3217305317 .fill-B5{fill:#EDF0FD;} + .d2-3217305317 .fill-B6{fill:#F7F8FE;} + .d2-3217305317 .fill-AA2{fill:#4A6FF3;} + .d2-3217305317 .fill-AA4{fill:#EDF0FD;} + .d2-3217305317 .fill-AA5{fill:#F7F8FE;} + .d2-3217305317 .fill-AB4{fill:#EDF0FD;} + .d2-3217305317 .fill-AB5{fill:#F7F8FE;} + .d2-3217305317 .stroke-N1{stroke:#0A0F25;} + .d2-3217305317 .stroke-N2{stroke:#676C7E;} + .d2-3217305317 .stroke-N3{stroke:#9499AB;} + .d2-3217305317 .stroke-N4{stroke:#CFD2DD;} + .d2-3217305317 .stroke-N5{stroke:#DEE1EB;} + .d2-3217305317 .stroke-N6{stroke:#EEF1F8;} + .d2-3217305317 .stroke-N7{stroke:#FFFFFF;} + .d2-3217305317 .stroke-B1{stroke:#0D32B2;} + .d2-3217305317 .stroke-B2{stroke:#0D32B2;} + .d2-3217305317 .stroke-B3{stroke:#E3E9FD;} + .d2-3217305317 .stroke-B4{stroke:#E3E9FD;} + .d2-3217305317 .stroke-B5{stroke:#EDF0FD;} + .d2-3217305317 .stroke-B6{stroke:#F7F8FE;} + .d2-3217305317 .stroke-AA2{stroke:#4A6FF3;} + .d2-3217305317 .stroke-AA4{stroke:#EDF0FD;} + .d2-3217305317 .stroke-AA5{stroke:#F7F8FE;} + .d2-3217305317 .stroke-AB4{stroke:#EDF0FD;} + .d2-3217305317 .stroke-AB5{stroke:#F7F8FE;} + .d2-3217305317 .background-color-N1{background-color:#0A0F25;} + .d2-3217305317 .background-color-N2{background-color:#676C7E;} + .d2-3217305317 .background-color-N3{background-color:#9499AB;} + .d2-3217305317 .background-color-N4{background-color:#CFD2DD;} + .d2-3217305317 .background-color-N5{background-color:#DEE1EB;} + .d2-3217305317 .background-color-N6{background-color:#EEF1F8;} + .d2-3217305317 .background-color-N7{background-color:#FFFFFF;} + .d2-3217305317 .background-color-B1{background-color:#0D32B2;} + .d2-3217305317 .background-color-B2{background-color:#0D32B2;} + .d2-3217305317 .background-color-B3{background-color:#E3E9FD;} + .d2-3217305317 .background-color-B4{background-color:#E3E9FD;} + .d2-3217305317 .background-color-B5{background-color:#EDF0FD;} + .d2-3217305317 .background-color-B6{background-color:#F7F8FE;} + .d2-3217305317 .background-color-AA2{background-color:#4A6FF3;} + .d2-3217305317 .background-color-AA4{background-color:#EDF0FD;} + .d2-3217305317 .background-color-AA5{background-color:#F7F8FE;} + .d2-3217305317 .background-color-AB4{background-color:#EDF0FD;} + .d2-3217305317 .background-color-AB5{background-color:#F7F8FE;} + .d2-3217305317 .color-N1{color:#0A0F25;} + .d2-3217305317 .color-N2{color:#676C7E;} + .d2-3217305317 .color-N3{color:#9499AB;} + .d2-3217305317 .color-N4{color:#CFD2DD;} + .d2-3217305317 .color-N5{color:#DEE1EB;} + .d2-3217305317 .color-N6{color:#EEF1F8;} + .d2-3217305317 .color-N7{color:#FFFFFF;} + .d2-3217305317 .color-B1{color:#0D32B2;} + .d2-3217305317 .color-B2{color:#0D32B2;} + .d2-3217305317 .color-B3{color:#E3E9FD;} + .d2-3217305317 .color-B4{color:#E3E9FD;} + .d2-3217305317 .color-B5{color:#EDF0FD;} + .d2-3217305317 .color-B6{color:#F7F8FE;} + .d2-3217305317 .color-AA2{color:#4A6FF3;} + .d2-3217305317 .color-AA4{color:#EDF0FD;} + .d2-3217305317 .color-AA5{color:#F7F8FE;} + .d2-3217305317 .color-AB4{color:#EDF0FD;} + .d2-3217305317 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json index 5760e319a..457430502 100644 --- a/e2etests/testdata/stable/latex/dagre/board.exp.json +++ b/e2etests/testdata/stable/latex/dagre/board.exp.json @@ -273,11 +273,11 @@ "labelPercentage": 0, "route": [ { - "x": 284.8739929199219, + "x": 285, "y": 51 }, { - "x": 209.7740020751953, + "x": 209.8000030517578, "y": 91 }, { @@ -320,11 +320,11 @@ "labelPercentage": 0, "route": [ { - "x": 380.625, + "x": 380.5, "y": 51 }, { - "x": 455.7250061035156, + "x": 455.70001220703125, "y": 91 }, { @@ -509,11 +509,11 @@ "route": [ { "x": 474.5, - "y": 418 + "y": 417.5 }, { "x": 474.5, - "y": 466.3999938964844 + "y": 466.29998779296875 }, { "x": 474.5, diff --git a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg index 89f411bf3..31ef68f17 100644 --- a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -mixed togethersugarsolution we get +mixed togethersugarsolution we get diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json index ba49c3482..93483c57c 100644 --- a/e2etests/testdata/stable/latex/elk/board.exp.json +++ b/e2etests/testdata/stable/latex/elk/board.exp.json @@ -324,7 +324,7 @@ }, { "x": 446.5, - "y": 184.5 + "y": 185 } ], "animated": false, @@ -404,7 +404,7 @@ "route": [ { "x": 446.5, - "y": 202.5 + "y": 202 }, { "x": 446.5, diff --git a/e2etests/testdata/stable/latex/elk/sketch.exp.svg b/e2etests/testdata/stable/latex/elk/sketch.exp.svg index 780c480c2..3091e7471 100644 --- a/e2etests/testdata/stable/latex/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -mixed togethersugarsolution we get +mixed togethersugarsolution we get diff --git a/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json b/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json index 0b5b99f6f..66f51a747 100644 --- a/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json +++ b/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json @@ -130,11 +130,11 @@ "id": "legend", "type": "rectangle", "pos": { - "x": 87, + "x": 97, "y": 122 }, - "width": 184, - "height": 80, + "width": 164, + "height": 81, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "text", "pos": { "x": 127, - "y": 151 + "y": 152 }, "width": 22, "height": 21, @@ -212,7 +212,7 @@ "type": "text", "pos": { "x": 209, - "y": 151 + "y": 152 }, "width": 22, "height": 21, diff --git a/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg b/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg index 2d89147db..171c287e4 100644 --- a/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzlegendfoobar - +xyzlegendfoobar + - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json index 5096d0de9..93b639665 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json +++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "container", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 292, - "height": 317, + "width": 272, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "text", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 212, "height": 258, @@ -152,11 +152,11 @@ "route": [ { "x": 146, - "y": 358 + "y": 338 }, { "x": 146, - "y": 398 + "y": 394 }, { "x": 146, diff --git a/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg b/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg index 456a9068a..7e9e94124 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -container

they did it in style

-

a header

+container

they did it in style

+

a header

a line of text and an

{
 	indented: "block",
@@ -845,9 +845,9 @@
 }

walk into a bar.

-
 - - +
 + + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json index 3d12b47d6..dd8959eb9 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "markdown", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 539, - "height": 107, + "width": 519, + "height": 108, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "text", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 459, "height": 48, diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg index aedffcf7f..e40b1fcb7 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
- - - +
 + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json index 05dd96fcf..7a28b31e8 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "markdown", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 539, - "height": 107, + "width": 519, + "height": 108, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "text", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 459, "height": 48, diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg index ba9d0deb7..275d48d8d 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
- - - +
 + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-font/dagre/board.exp.json b/e2etests/testdata/stable/mono-font/dagre/board.exp.json index b7ee63c1d..35ed1a099 100644 --- a/e2etests/testdata/stable/mono-font/dagre/board.exp.json +++ b/e2etests/testdata/stable/mono-font/dagre/board.exp.json @@ -7,8 +7,8 @@ "id": "satellites", "type": "stored_data", "pos": { - "x": 22, - "y": 10 + "x": 27, + "y": 0 }, "width": 161, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 32, - "y": 197 + "y": 187 }, "width": 151, "height": 66, @@ -112,20 +112,20 @@ "labelPercentage": 0, "route": [ { - "x": 77, - "y": 76 - }, - { - "x": 38.5989990234375, - "y": 124.4000015258789 + "x": 79, + "y": 66 }, { "x": 39, - "y": 148.6999969482422 + "y": 114.4000015258789 + }, + { + "x": 39, + "y": 138.6999969482422 }, { "x": 79, - "y": 197.5 + "y": 187.5 } ], "isCurve": true, @@ -160,19 +160,19 @@ "route": [ { "x": 107, - "y": 76 + "y": 66 }, { "x": 107, - "y": 124.4000015258789 + "y": 114.4000015258789 }, { "x": 107, - "y": 148.6999969482422 + "y": 138.6999969482422 }, { "x": 107, - "y": 197.5 + "y": 187.5 } ], "isCurve": true, @@ -206,20 +206,20 @@ "labelPercentage": 0, "route": [ { - "x": 137, - "y": 76 - }, - { - "x": 175.39999389648438, - "y": 124.4000015258789 + "x": 135, + "y": 66 }, { "x": 175, - "y": 148.6999969482422 + "y": 114.4000015258789 + }, + { + "x": 175, + "y": 138.6999969482422 }, { "x": 135, - "y": 197.5 + "y": 187.5 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg index 588fe473d..f15f4a05f 100644 --- a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -SATELLITESTRANSMITTER SENDSENDSEND - - - - - - + .d2-1710037582 .fill-N1{fill:#0A0F25;} + .d2-1710037582 .fill-N2{fill:#676C7E;} + .d2-1710037582 .fill-N3{fill:#9499AB;} + .d2-1710037582 .fill-N4{fill:#CFD2DD;} + .d2-1710037582 .fill-N5{fill:#DEE1EB;} + .d2-1710037582 .fill-N6{fill:#EEF1F8;} + .d2-1710037582 .fill-N7{fill:#FFFFFF;} + .d2-1710037582 .fill-B1{fill:#0D32B2;} + .d2-1710037582 .fill-B2{fill:#0D32B2;} + .d2-1710037582 .fill-B3{fill:#E3E9FD;} + .d2-1710037582 .fill-B4{fill:#E3E9FD;} + .d2-1710037582 .fill-B5{fill:#EDF0FD;} + .d2-1710037582 .fill-B6{fill:#F7F8FE;} + .d2-1710037582 .fill-AA2{fill:#4A6FF3;} + .d2-1710037582 .fill-AA4{fill:#EDF0FD;} + .d2-1710037582 .fill-AA5{fill:#F7F8FE;} + .d2-1710037582 .fill-AB4{fill:#EDF0FD;} + .d2-1710037582 .fill-AB5{fill:#F7F8FE;} + .d2-1710037582 .stroke-N1{stroke:#0A0F25;} + .d2-1710037582 .stroke-N2{stroke:#676C7E;} + .d2-1710037582 .stroke-N3{stroke:#9499AB;} + .d2-1710037582 .stroke-N4{stroke:#CFD2DD;} + .d2-1710037582 .stroke-N5{stroke:#DEE1EB;} + .d2-1710037582 .stroke-N6{stroke:#EEF1F8;} + .d2-1710037582 .stroke-N7{stroke:#FFFFFF;} + .d2-1710037582 .stroke-B1{stroke:#0D32B2;} + .d2-1710037582 .stroke-B2{stroke:#0D32B2;} + .d2-1710037582 .stroke-B3{stroke:#E3E9FD;} + .d2-1710037582 .stroke-B4{stroke:#E3E9FD;} + .d2-1710037582 .stroke-B5{stroke:#EDF0FD;} + .d2-1710037582 .stroke-B6{stroke:#F7F8FE;} + .d2-1710037582 .stroke-AA2{stroke:#4A6FF3;} + .d2-1710037582 .stroke-AA4{stroke:#EDF0FD;} + .d2-1710037582 .stroke-AA5{stroke:#F7F8FE;} + .d2-1710037582 .stroke-AB4{stroke:#EDF0FD;} + .d2-1710037582 .stroke-AB5{stroke:#F7F8FE;} + .d2-1710037582 .background-color-N1{background-color:#0A0F25;} + .d2-1710037582 .background-color-N2{background-color:#676C7E;} + .d2-1710037582 .background-color-N3{background-color:#9499AB;} + .d2-1710037582 .background-color-N4{background-color:#CFD2DD;} + .d2-1710037582 .background-color-N5{background-color:#DEE1EB;} + .d2-1710037582 .background-color-N6{background-color:#EEF1F8;} + .d2-1710037582 .background-color-N7{background-color:#FFFFFF;} + .d2-1710037582 .background-color-B1{background-color:#0D32B2;} + .d2-1710037582 .background-color-B2{background-color:#0D32B2;} + .d2-1710037582 .background-color-B3{background-color:#E3E9FD;} + .d2-1710037582 .background-color-B4{background-color:#E3E9FD;} + .d2-1710037582 .background-color-B5{background-color:#EDF0FD;} + .d2-1710037582 .background-color-B6{background-color:#F7F8FE;} + .d2-1710037582 .background-color-AA2{background-color:#4A6FF3;} + .d2-1710037582 .background-color-AA4{background-color:#EDF0FD;} + .d2-1710037582 .background-color-AA5{background-color:#F7F8FE;} + .d2-1710037582 .background-color-AB4{background-color:#EDF0FD;} + .d2-1710037582 .background-color-AB5{background-color:#F7F8FE;} + .d2-1710037582 .color-N1{color:#0A0F25;} + .d2-1710037582 .color-N2{color:#676C7E;} + .d2-1710037582 .color-N3{color:#9499AB;} + .d2-1710037582 .color-N4{color:#CFD2DD;} + .d2-1710037582 .color-N5{color:#DEE1EB;} + .d2-1710037582 .color-N6{color:#EEF1F8;} + .d2-1710037582 .color-N7{color:#FFFFFF;} + .d2-1710037582 .color-B1{color:#0D32B2;} + .d2-1710037582 .color-B2{color:#0D32B2;} + .d2-1710037582 .color-B3{color:#E3E9FD;} + .d2-1710037582 .color-B4{color:#E3E9FD;} + .d2-1710037582 .color-B5{color:#EDF0FD;} + .d2-1710037582 .color-B6{color:#F7F8FE;} + .d2-1710037582 .color-AA2{color:#4A6FF3;} + .d2-1710037582 .color-AA4{color:#EDF0FD;} + .d2-1710037582 .color-AA5{color:#F7F8FE;} + .d2-1710037582 .color-AB4{color:#EDF0FD;} + .d2-1710037582 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-font/elk/board.exp.json b/e2etests/testdata/stable/mono-font/elk/board.exp.json index 80cca418e..9609194e3 100644 --- a/e2etests/testdata/stable/mono-font/elk/board.exp.json +++ b/e2etests/testdata/stable/mono-font/elk/board.exp.json @@ -154,7 +154,7 @@ "y": 88 }, { - "x": 97.5, + "x": 98, "y": 269 } ], diff --git a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg index 6db3a94cd..657a4943d 100644 --- a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -SATELLITESTRANSMITTER SENDSENDSEND + .d2-1743257672 .fill-N1{fill:#0A0F25;} + .d2-1743257672 .fill-N2{fill:#676C7E;} + .d2-1743257672 .fill-N3{fill:#9499AB;} + .d2-1743257672 .fill-N4{fill:#CFD2DD;} + .d2-1743257672 .fill-N5{fill:#DEE1EB;} + .d2-1743257672 .fill-N6{fill:#EEF1F8;} + .d2-1743257672 .fill-N7{fill:#FFFFFF;} + .d2-1743257672 .fill-B1{fill:#0D32B2;} + .d2-1743257672 .fill-B2{fill:#0D32B2;} + .d2-1743257672 .fill-B3{fill:#E3E9FD;} + .d2-1743257672 .fill-B4{fill:#E3E9FD;} + .d2-1743257672 .fill-B5{fill:#EDF0FD;} + .d2-1743257672 .fill-B6{fill:#F7F8FE;} + .d2-1743257672 .fill-AA2{fill:#4A6FF3;} + .d2-1743257672 .fill-AA4{fill:#EDF0FD;} + .d2-1743257672 .fill-AA5{fill:#F7F8FE;} + .d2-1743257672 .fill-AB4{fill:#EDF0FD;} + .d2-1743257672 .fill-AB5{fill:#F7F8FE;} + .d2-1743257672 .stroke-N1{stroke:#0A0F25;} + .d2-1743257672 .stroke-N2{stroke:#676C7E;} + .d2-1743257672 .stroke-N3{stroke:#9499AB;} + .d2-1743257672 .stroke-N4{stroke:#CFD2DD;} + .d2-1743257672 .stroke-N5{stroke:#DEE1EB;} + .d2-1743257672 .stroke-N6{stroke:#EEF1F8;} + .d2-1743257672 .stroke-N7{stroke:#FFFFFF;} + .d2-1743257672 .stroke-B1{stroke:#0D32B2;} + .d2-1743257672 .stroke-B2{stroke:#0D32B2;} + .d2-1743257672 .stroke-B3{stroke:#E3E9FD;} + .d2-1743257672 .stroke-B4{stroke:#E3E9FD;} + .d2-1743257672 .stroke-B5{stroke:#EDF0FD;} + .d2-1743257672 .stroke-B6{stroke:#F7F8FE;} + .d2-1743257672 .stroke-AA2{stroke:#4A6FF3;} + .d2-1743257672 .stroke-AA4{stroke:#EDF0FD;} + .d2-1743257672 .stroke-AA5{stroke:#F7F8FE;} + .d2-1743257672 .stroke-AB4{stroke:#EDF0FD;} + .d2-1743257672 .stroke-AB5{stroke:#F7F8FE;} + .d2-1743257672 .background-color-N1{background-color:#0A0F25;} + .d2-1743257672 .background-color-N2{background-color:#676C7E;} + .d2-1743257672 .background-color-N3{background-color:#9499AB;} + .d2-1743257672 .background-color-N4{background-color:#CFD2DD;} + .d2-1743257672 .background-color-N5{background-color:#DEE1EB;} + .d2-1743257672 .background-color-N6{background-color:#EEF1F8;} + .d2-1743257672 .background-color-N7{background-color:#FFFFFF;} + .d2-1743257672 .background-color-B1{background-color:#0D32B2;} + .d2-1743257672 .background-color-B2{background-color:#0D32B2;} + .d2-1743257672 .background-color-B3{background-color:#E3E9FD;} + .d2-1743257672 .background-color-B4{background-color:#E3E9FD;} + .d2-1743257672 .background-color-B5{background-color:#EDF0FD;} + .d2-1743257672 .background-color-B6{background-color:#F7F8FE;} + .d2-1743257672 .background-color-AA2{background-color:#4A6FF3;} + .d2-1743257672 .background-color-AA4{background-color:#EDF0FD;} + .d2-1743257672 .background-color-AA5{background-color:#F7F8FE;} + .d2-1743257672 .background-color-AB4{background-color:#EDF0FD;} + .d2-1743257672 .background-color-AB5{background-color:#F7F8FE;} + .d2-1743257672 .color-N1{color:#0A0F25;} + .d2-1743257672 .color-N2{color:#676C7E;} + .d2-1743257672 .color-N3{color:#9499AB;} + .d2-1743257672 .color-N4{color:#CFD2DD;} + .d2-1743257672 .color-N5{color:#DEE1EB;} + .d2-1743257672 .color-N6{color:#EEF1F8;} + .d2-1743257672 .color-N7{color:#FFFFFF;} + .d2-1743257672 .color-B1{color:#0D32B2;} + .d2-1743257672 .color-B2{color:#0D32B2;} + .d2-1743257672 .color-B3{color:#E3E9FD;} + .d2-1743257672 .color-B4{color:#E3E9FD;} + .d2-1743257672 .color-B5{color:#EDF0FD;} + .d2-1743257672 .color-B6{color:#F7F8FE;} + .d2-1743257672 .color-AA2{color:#4A6FF3;} + .d2-1743257672 .color-AA4{color:#EDF0FD;} + .d2-1743257672 .color-AA5{color:#F7F8FE;} + .d2-1743257672 .color-AB4{color:#EDF0FD;} + .d2-1743257672 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND - + \ 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 index defb282e2..65b1e9991 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 207 + "y": 179 }, - "width": 268, - "height": 335, + "width": 278, + "height": 293, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 272 + "y": 220 }, - "width": 228, - "height": 240, + "width": 238, + "height": 222, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,11 +89,11 @@ "id": "outer.vg.vd", "type": "rectangle", "pos": { - "x": 40, - "y": 345 + "x": 50, + "y": 276 }, - "width": 188, - "height": 145, + "width": 168, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 80, - "y": 390 + "y": 316 }, "width": 98, "height": 66, @@ -171,7 +171,7 @@ "id": "start", "type": "rectangle", "pos": { - "x": 94, + "x": 89, "y": 0 }, "width": 80, @@ -212,8 +212,8 @@ "id": "end", "type": "rectangle", "pos": { - "x": 98, - "y": 642 + "x": 93, + "y": 632 }, "width": 72, "height": 66, @@ -276,44 +276,44 @@ "labelPercentage": 0, "route": [ { - "x": 134, + "x": 129, "y": 66 }, { - "x": 134, + "x": 129, "y": 106 }, { - "x": 134, + "x": 129, "y": 126 }, { - "x": 134, + "x": 129, "y": 141 }, { - "x": 134, + "x": 129, "y": 156 }, { - "x": 134, + "x": 129, "y": 176 }, { - "x": 134, + "x": 129, "y": 191 }, { - "x": 134, + "x": 129, "y": 206 }, { - "x": 134, - "y": 288.79998779296875 + "x": 129, + "y": 274 }, { - "x": 134, - "y": 380 + "x": 129, + "y": 306 } ], "isCurve": true, @@ -347,32 +347,44 @@ "labelPercentage": 0, "route": [ { - "x": 134, - "y": 456 + "x": 129, + "y": 382 }, { - "x": 134, - "y": 484.79998779296875 + "x": 129, + "y": 422 }, { - "x": 134, - "y": 502 + "x": 129, + "y": 442 }, { - "x": 134, - "y": 517 + "x": 129, + "y": 457 }, { - "x": 134, - "y": 532 + "x": 129, + "y": 472 }, { - "x": 134, - "y": 602 + "x": 129, + "y": 492 }, { - "x": 134, - "y": 642 + "x": 129, + "y": 507 + }, + { + "x": 129, + "y": 522 + }, + { + "x": 129, + "y": 592 + }, + { + "x": 129, + "y": 632 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg index 39caa9bc5..434abd7f7 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -outerstartendvolume groupvolume definitionvolume - - - - - - - + .d2-4203159145 .fill-N1{fill:#0A0F25;} + .d2-4203159145 .fill-N2{fill:#676C7E;} + .d2-4203159145 .fill-N3{fill:#9499AB;} + .d2-4203159145 .fill-N4{fill:#CFD2DD;} + .d2-4203159145 .fill-N5{fill:#DEE1EB;} + .d2-4203159145 .fill-N6{fill:#EEF1F8;} + .d2-4203159145 .fill-N7{fill:#FFFFFF;} + .d2-4203159145 .fill-B1{fill:#0D32B2;} + .d2-4203159145 .fill-B2{fill:#0D32B2;} + .d2-4203159145 .fill-B3{fill:#E3E9FD;} + .d2-4203159145 .fill-B4{fill:#E3E9FD;} + .d2-4203159145 .fill-B5{fill:#EDF0FD;} + .d2-4203159145 .fill-B6{fill:#F7F8FE;} + .d2-4203159145 .fill-AA2{fill:#4A6FF3;} + .d2-4203159145 .fill-AA4{fill:#EDF0FD;} + .d2-4203159145 .fill-AA5{fill:#F7F8FE;} + .d2-4203159145 .fill-AB4{fill:#EDF0FD;} + .d2-4203159145 .fill-AB5{fill:#F7F8FE;} + .d2-4203159145 .stroke-N1{stroke:#0A0F25;} + .d2-4203159145 .stroke-N2{stroke:#676C7E;} + .d2-4203159145 .stroke-N3{stroke:#9499AB;} + .d2-4203159145 .stroke-N4{stroke:#CFD2DD;} + .d2-4203159145 .stroke-N5{stroke:#DEE1EB;} + .d2-4203159145 .stroke-N6{stroke:#EEF1F8;} + .d2-4203159145 .stroke-N7{stroke:#FFFFFF;} + .d2-4203159145 .stroke-B1{stroke:#0D32B2;} + .d2-4203159145 .stroke-B2{stroke:#0D32B2;} + .d2-4203159145 .stroke-B3{stroke:#E3E9FD;} + .d2-4203159145 .stroke-B4{stroke:#E3E9FD;} + .d2-4203159145 .stroke-B5{stroke:#EDF0FD;} + .d2-4203159145 .stroke-B6{stroke:#F7F8FE;} + .d2-4203159145 .stroke-AA2{stroke:#4A6FF3;} + .d2-4203159145 .stroke-AA4{stroke:#EDF0FD;} + .d2-4203159145 .stroke-AA5{stroke:#F7F8FE;} + .d2-4203159145 .stroke-AB4{stroke:#EDF0FD;} + .d2-4203159145 .stroke-AB5{stroke:#F7F8FE;} + .d2-4203159145 .background-color-N1{background-color:#0A0F25;} + .d2-4203159145 .background-color-N2{background-color:#676C7E;} + .d2-4203159145 .background-color-N3{background-color:#9499AB;} + .d2-4203159145 .background-color-N4{background-color:#CFD2DD;} + .d2-4203159145 .background-color-N5{background-color:#DEE1EB;} + .d2-4203159145 .background-color-N6{background-color:#EEF1F8;} + .d2-4203159145 .background-color-N7{background-color:#FFFFFF;} + .d2-4203159145 .background-color-B1{background-color:#0D32B2;} + .d2-4203159145 .background-color-B2{background-color:#0D32B2;} + .d2-4203159145 .background-color-B3{background-color:#E3E9FD;} + .d2-4203159145 .background-color-B4{background-color:#E3E9FD;} + .d2-4203159145 .background-color-B5{background-color:#EDF0FD;} + .d2-4203159145 .background-color-B6{background-color:#F7F8FE;} + .d2-4203159145 .background-color-AA2{background-color:#4A6FF3;} + .d2-4203159145 .background-color-AA4{background-color:#EDF0FD;} + .d2-4203159145 .background-color-AA5{background-color:#F7F8FE;} + .d2-4203159145 .background-color-AB4{background-color:#EDF0FD;} + .d2-4203159145 .background-color-AB5{background-color:#F7F8FE;} + .d2-4203159145 .color-N1{color:#0A0F25;} + .d2-4203159145 .color-N2{color:#676C7E;} + .d2-4203159145 .color-N3{color:#9499AB;} + .d2-4203159145 .color-N4{color:#CFD2DD;} + .d2-4203159145 .color-N5{color:#DEE1EB;} + .d2-4203159145 .color-N6{color:#EEF1F8;} + .d2-4203159145 .color-N7{color:#FFFFFF;} + .d2-4203159145 .color-B1{color:#0D32B2;} + .d2-4203159145 .color-B2{color:#0D32B2;} + .d2-4203159145 .color-B3{color:#E3E9FD;} + .d2-4203159145 .color-B4{color:#E3E9FD;} + .d2-4203159145 .color-B5{color:#EDF0FD;} + .d2-4203159145 .color-B6{color:#F7F8FE;} + .d2-4203159145 .color-AA2{color:#4A6FF3;} + .d2-4203159145 .color-AA4{color:#EDF0FD;} + .d2-4203159145 .color-AA5{color:#F7F8FE;} + .d2-4203159145 .color-AB4{color:#EDF0FD;} + .d2-4203159145 .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}]]>outerstartendvolume groupvolume definitionvolume + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json b/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json index 3af11b9ef..33fe35aad 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "n1", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 143, - "height": 321, + "width": 123, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,8 +48,8 @@ "id": "n1.a", "type": "rectangle", "pos": { - "x": 45, - "y": 78 + "x": 40, + "y": 50 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 264 + "y": 216 }, "width": 53, "height": 66, @@ -130,11 +130,11 @@ "id": "n2", "type": "rectangle", "pos": { - "x": 163, - "y": 41 + "x": 173, + "y": 20 }, - "width": 148, - "height": 321, + "width": 128, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,8 +171,8 @@ "id": "n2.a", "type": "rectangle", "pos": { - "x": 211, - "y": 78 + "x": 203, + "y": 50 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 266 + "y": 216 }, "width": 53, "height": 66, @@ -253,11 +253,11 @@ "id": "n3", "type": "rectangle", "pos": { - "x": 331, - "y": 51 + "x": 341, + "y": 20 }, - "width": 143, - "height": 321, + "width": 123, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "n3.a", "type": "rectangle", "pos": { - "x": 376, - "y": 88 + "x": 371, + "y": 50 }, "width": 53, "height": 66, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 371, - "y": 274 + "y": 216 }, "width": 53, "height": 66, @@ -376,11 +376,11 @@ "id": "n4", "type": "rectangle", "pos": { - "x": 494, - "y": 56 + "x": 514, + "y": 20 }, - "width": 148, - "height": 321, + "width": 128, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,8 +417,8 @@ "id": "n4.a", "type": "rectangle", "pos": { - "x": 542, - "y": 93 + "x": 544, + "y": 50 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "n4.b", "type": "rectangle", "pos": { - "x": 534, - "y": 281 + "x": 544, + "y": 216 }, "width": 53, "height": 66, @@ -499,11 +499,11 @@ "id": "n5", "type": "rectangle", "pos": { - "x": 662, - "y": 51 + "x": 687, + "y": 20 }, - "width": 133, - "height": 321, + "width": 113, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -540,8 +540,8 @@ "id": "n5.a", "type": "rectangle", "pos": { - "x": 702, - "y": 88 + "x": 717, + "y": 50 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "n5.b", "type": "rectangle", "pos": { - "x": 702, - "y": 269 + "x": 717, + "y": 216 }, "width": 53, "height": 66, @@ -622,11 +622,11 @@ "id": "n6", "type": "rectangle", "pos": { - "x": 815, - "y": 56 + "x": 845, + "y": 20 }, - "width": 133, - "height": 321, + "width": 113, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -663,8 +663,8 @@ "id": "n6.a", "type": "rectangle", "pos": { - "x": 855, - "y": 93 + "x": 875, + "y": 50 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "n6.b", "type": "rectangle", "pos": { - "x": 855, - "y": 274 + "x": 875, + "y": 216 }, "width": 53, "height": 66, @@ -745,11 +745,11 @@ "id": "n7", "type": "rectangle", "pos": { - "x": 968, - "y": 51 + "x": 1008, + "y": 10 }, - "width": 143, - "height": 321, + "width": 123, + "height": 302, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,8 +786,8 @@ "id": "n7.a", "type": "rectangle", "pos": { - "x": 1008, - "y": 93 + "x": 1038, + "y": 50 }, "width": 53, "height": 66, @@ -827,8 +827,8 @@ "id": "n7.b", "type": "rectangle", "pos": { - "x": 1013, - "y": 269 + "x": 1038, + "y": 216 }, "width": 53, "height": 66, @@ -868,11 +868,11 @@ "id": "n8", "type": "rectangle", "pos": { - "x": 1131, - "y": 56 + "x": 1171, + "y": 5 }, - "width": 148, - "height": 321, + "width": 128, + "height": 307, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -909,8 +909,8 @@ "id": "n8.a", "type": "rectangle", "pos": { - "x": 1171, - "y": 100 + "x": 1201, + "y": 50 }, "width": 53, "height": 66, @@ -950,8 +950,8 @@ "id": "n8.b", "type": "rectangle", "pos": { - "x": 1179, - "y": 274 + "x": 1201, + "y": 216 }, "width": 53, "height": 66, @@ -991,11 +991,11 @@ "id": "n9", "type": "rectangle", "pos": { - "x": 1299, - "y": 51 + "x": 1354, + "y": 10 }, - "width": 143, - "height": 321, + "width": 123, + "height": 302, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1032,8 +1032,8 @@ "id": "n9.a", "type": "rectangle", "pos": { - "x": 1339, - "y": 93 + "x": 1384, + "y": 50 }, "width": 53, "height": 66, @@ -1073,8 +1073,8 @@ "id": "n9.b", "type": "rectangle", "pos": { - "x": 1339, - "y": 274 + "x": 1384, + "y": 216 }, "width": 53, "height": 66, @@ -1114,11 +1114,11 @@ "id": "n10", "type": "rectangle", "pos": { - "x": 1462, - "y": 56 + "x": 1527, + "y": 5 }, - "width": 148, - "height": 321, + "width": 128, + "height": 307, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1155,8 +1155,8 @@ "id": "n10.a", "type": "rectangle", "pos": { - "x": 1502, - "y": 100 + "x": 1557, + "y": 50 }, "width": 53, "height": 66, @@ -1196,8 +1196,8 @@ "id": "n10.b", "type": "rectangle", "pos": { - "x": 1502, - "y": 281 + "x": 1557, + "y": 216 }, "width": 53, "height": 66, @@ -1260,20 +1260,20 @@ "labelPercentage": 0, "route": [ { - "x": 71.5, - "y": 145 + "x": 66.5, + "y": 116 }, { - "x": 71.5, - "y": 190.1999969482422 + "x": 66.5, + "y": 156 }, { - "x": 71.5, - "y": 212 + "x": 66.5, + "y": 174 }, { - "x": 71.5, - "y": 254 + "x": 66.5, + "y": 206 } ], "isCurve": true, @@ -1307,20 +1307,20 @@ "labelPercentage": 0, "route": [ { - "x": 237, - "y": 145 + "x": 229.5, + "y": 116 }, { - "x": 237, - "y": 190.1999969482422 + "x": 229.5, + "y": 156 }, { - "x": 237, - "y": 211.5 + "x": 229.5, + "y": 173 }, { - "x": 237, - "y": 251.5 + "x": 229.5, + "y": 201 } ], "isCurve": true, @@ -1354,20 +1354,20 @@ "labelPercentage": 0, "route": [ { - "x": 402.5, - "y": 155 + "x": 397.5, + "y": 116 }, { - "x": 402.5, - "y": 200.1999969482422 + "x": 397.5, + "y": 156 }, { - "x": 402.5, - "y": 222 + "x": 397.5, + "y": 174 }, { - "x": 402.5, - "y": 264 + "x": 397.5, + "y": 206 } ], "isCurve": true, @@ -1401,20 +1401,20 @@ "labelPercentage": 0, "route": [ { - "x": 568, - "y": 160 + "x": 570.5, + "y": 116 }, { - "x": 568, - "y": 205.1999969482422 + "x": 570.5, + "y": 156 }, { - "x": 568, - "y": 226.5 + "x": 570.5, + "y": 173 }, { - "x": 568, - "y": 266.5 + "x": 570.5, + "y": 201 } ], "isCurve": true, @@ -1448,20 +1448,20 @@ "labelPercentage": 0, "route": [ { - "x": 728.5, - "y": 155 + "x": 743.5, + "y": 116 }, { - "x": 728.5, - "y": 200.1999969482422 + "x": 743.5, + "y": 156 }, { - "x": 728.5, - "y": 223 + "x": 743.5, + "y": 176 }, { - "x": 728.5, - "y": 269 + "x": 743.5, + "y": 216 } ], "isCurve": true, @@ -1495,20 +1495,20 @@ "labelPercentage": 0, "route": [ { - "x": 881.5, - "y": 160 + "x": 901.5, + "y": 116 }, { - "x": 881.5, - "y": 205.1999969482422 + "x": 901.5, + "y": 156 }, { - "x": 881.5, - "y": 228 + "x": 901.5, + "y": 176 }, { - "x": 881.5, - "y": 274 + "x": 901.5, + "y": 216 } ], "isCurve": true, @@ -1542,20 +1542,20 @@ "labelPercentage": 0, "route": [ { - "x": 1039.5, - "y": 160 + "x": 1064.5, + "y": 116 }, { - "x": 1039.5, - "y": 201.1999969482422 + "x": 1064.5, + "y": 156 }, { - "x": 1039.5, - "y": 223 + "x": 1064.5, + "y": 176 }, { - "x": 1039.5, - "y": 269 + "x": 1064.5, + "y": 216 } ], "isCurve": true, @@ -1589,20 +1589,20 @@ "labelPercentage": 0, "route": [ { - "x": 1205, - "y": 166.5 + "x": 1227.5, + "y": 116 }, { - "x": 1205, - "y": 206.5 + "x": 1227.5, + "y": 156 }, { - "x": 1205, - "y": 228 + "x": 1227.5, + "y": 176 }, { - "x": 1205, - "y": 274 + "x": 1227.5, + "y": 216 } ], "isCurve": true, @@ -1636,20 +1636,20 @@ "labelPercentage": 0, "route": [ { - "x": 1370.5, - "y": 160 + "x": 1410.5, + "y": 116 }, { - "x": 1370.5, - "y": 201.1999969482422 + "x": 1410.5, + "y": 156 }, { - "x": 1370.5, - "y": 222 + "x": 1410.5, + "y": 174 }, { - "x": 1370.5, - "y": 264 + "x": 1410.5, + "y": 206 } ], "isCurve": true, @@ -1683,20 +1683,20 @@ "labelPercentage": 0, "route": [ { - "x": 1536, - "y": 166.5 + "x": 1583.5, + "y": 116 }, { - "x": 1536, - "y": 206.5 + "x": 1583.5, + "y": 156 }, { - "x": 1536, - "y": 226.5 + "x": 1583.5, + "y": 173 }, { - "x": 1536, - "y": 266.5 + "x": 1583.5, + "y": 201 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg index 3eb8f462a..2ba028525 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 - -n4n5 - -n6n7 - -n8n9 - -n10aba - -baba - -bababab - -abab - -a - -b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1828306763 .fill-N1{fill:#0A0F25;} + .d2-1828306763 .fill-N2{fill:#676C7E;} + .d2-1828306763 .fill-N3{fill:#9499AB;} + .d2-1828306763 .fill-N4{fill:#CFD2DD;} + .d2-1828306763 .fill-N5{fill:#DEE1EB;} + .d2-1828306763 .fill-N6{fill:#EEF1F8;} + .d2-1828306763 .fill-N7{fill:#FFFFFF;} + .d2-1828306763 .fill-B1{fill:#0D32B2;} + .d2-1828306763 .fill-B2{fill:#0D32B2;} + .d2-1828306763 .fill-B3{fill:#E3E9FD;} + .d2-1828306763 .fill-B4{fill:#E3E9FD;} + .d2-1828306763 .fill-B5{fill:#EDF0FD;} + .d2-1828306763 .fill-B6{fill:#F7F8FE;} + .d2-1828306763 .fill-AA2{fill:#4A6FF3;} + .d2-1828306763 .fill-AA4{fill:#EDF0FD;} + .d2-1828306763 .fill-AA5{fill:#F7F8FE;} + .d2-1828306763 .fill-AB4{fill:#EDF0FD;} + .d2-1828306763 .fill-AB5{fill:#F7F8FE;} + .d2-1828306763 .stroke-N1{stroke:#0A0F25;} + .d2-1828306763 .stroke-N2{stroke:#676C7E;} + .d2-1828306763 .stroke-N3{stroke:#9499AB;} + .d2-1828306763 .stroke-N4{stroke:#CFD2DD;} + .d2-1828306763 .stroke-N5{stroke:#DEE1EB;} + .d2-1828306763 .stroke-N6{stroke:#EEF1F8;} + .d2-1828306763 .stroke-N7{stroke:#FFFFFF;} + .d2-1828306763 .stroke-B1{stroke:#0D32B2;} + .d2-1828306763 .stroke-B2{stroke:#0D32B2;} + .d2-1828306763 .stroke-B3{stroke:#E3E9FD;} + .d2-1828306763 .stroke-B4{stroke:#E3E9FD;} + .d2-1828306763 .stroke-B5{stroke:#EDF0FD;} + .d2-1828306763 .stroke-B6{stroke:#F7F8FE;} + .d2-1828306763 .stroke-AA2{stroke:#4A6FF3;} + .d2-1828306763 .stroke-AA4{stroke:#EDF0FD;} + .d2-1828306763 .stroke-AA5{stroke:#F7F8FE;} + .d2-1828306763 .stroke-AB4{stroke:#EDF0FD;} + .d2-1828306763 .stroke-AB5{stroke:#F7F8FE;} + .d2-1828306763 .background-color-N1{background-color:#0A0F25;} + .d2-1828306763 .background-color-N2{background-color:#676C7E;} + .d2-1828306763 .background-color-N3{background-color:#9499AB;} + .d2-1828306763 .background-color-N4{background-color:#CFD2DD;} + .d2-1828306763 .background-color-N5{background-color:#DEE1EB;} + .d2-1828306763 .background-color-N6{background-color:#EEF1F8;} + .d2-1828306763 .background-color-N7{background-color:#FFFFFF;} + .d2-1828306763 .background-color-B1{background-color:#0D32B2;} + .d2-1828306763 .background-color-B2{background-color:#0D32B2;} + .d2-1828306763 .background-color-B3{background-color:#E3E9FD;} + .d2-1828306763 .background-color-B4{background-color:#E3E9FD;} + .d2-1828306763 .background-color-B5{background-color:#EDF0FD;} + .d2-1828306763 .background-color-B6{background-color:#F7F8FE;} + .d2-1828306763 .background-color-AA2{background-color:#4A6FF3;} + .d2-1828306763 .background-color-AA4{background-color:#EDF0FD;} + .d2-1828306763 .background-color-AA5{background-color:#F7F8FE;} + .d2-1828306763 .background-color-AB4{background-color:#EDF0FD;} + .d2-1828306763 .background-color-AB5{background-color:#F7F8FE;} + .d2-1828306763 .color-N1{color:#0A0F25;} + .d2-1828306763 .color-N2{color:#676C7E;} + .d2-1828306763 .color-N3{color:#9499AB;} + .d2-1828306763 .color-N4{color:#CFD2DD;} + .d2-1828306763 .color-N5{color:#DEE1EB;} + .d2-1828306763 .color-N6{color:#EEF1F8;} + .d2-1828306763 .color-N7{color:#FFFFFF;} + .d2-1828306763 .color-B1{color:#0D32B2;} + .d2-1828306763 .color-B2{color:#0D32B2;} + .d2-1828306763 .color-B3{color:#E3E9FD;} + .d2-1828306763 .color-B4{color:#E3E9FD;} + .d2-1828306763 .color-B5{color:#EDF0FD;} + .d2-1828306763 .color-B6{color:#F7F8FE;} + .d2-1828306763 .color-AA2{color:#4A6FF3;} + .d2-1828306763 .color-AA4{color:#EDF0FD;} + .d2-1828306763 .color-AA5{color:#F7F8FE;} + .d2-1828306763 .color-AB4{color:#EDF0FD;} + .d2-1828306763 .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}]]>n1n2n3 + +n4n5 + +n6n7 + +n8n9 + +n10aba + +baba + +bababab + +abab + +a + +b + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json b/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json index a0bfacf2b..3d6c59d59 100644 --- a/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "n1", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 20, + "y": 56 }, - "width": 336, - "height": 95, + "width": 266, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,8 +48,8 @@ "id": "n1.a", "type": "rectangle", "pos": { - "x": 226, - "y": 55 + "x": 203, + "y": 96 }, "width": 53, "height": 66, @@ -89,8 +89,8 @@ "id": "n1.b", "type": "rectangle", "pos": { - "x": 53, - "y": 60 + "x": 50, + "y": 96 }, "width": 53, "height": 66, @@ -130,11 +130,11 @@ "id": "n2", "type": "rectangle", "pos": { - "x": 0, - "y": 217 + "x": 20, + "y": 278 }, - "width": 336, - "height": 100, + "width": 266, + "height": 141, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,8 +171,8 @@ "id": "n2.a", "type": "rectangle", "pos": { - "x": 226, - "y": 234 + "x": 203, + "y": 323 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 50, - "y": 241 + "y": 323 }, "width": 53, "height": 66, @@ -253,11 +253,11 @@ "id": "n3", "type": "rectangle", "pos": { - "x": 0, - "y": 408 + "x": 20, + "y": 515 }, - "width": 336, - "height": 95, + "width": 266, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "n3.a", "type": "rectangle", "pos": { - "x": 226, - "y": 422 + "x": 203, + "y": 555 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "n3.b", "type": "rectangle", "pos": { - "x": 53, - "y": 427 + "x": 50, + "y": 555 }, "width": 53, "height": 66, @@ -376,11 +376,11 @@ "id": "n4", "type": "rectangle", "pos": { - "x": 0, - "y": 589 + "x": 20, + "y": 752 }, - "width": 336, - "height": 100, + "width": 266, + "height": 141, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,8 +417,8 @@ "id": "n4.a", "type": "rectangle", "pos": { - "x": 226, - "y": 606 + "x": 203, + "y": 797 }, "width": 53, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 50, - "y": 613 + "y": 797 }, "width": 53, "height": 66, @@ -499,11 +499,11 @@ "id": "n5", "type": "rectangle", "pos": { - "x": 0, - "y": 765 + "x": 20, + "y": 989 }, - "width": 336, - "height": 85, + "width": 266, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -540,8 +540,8 @@ "id": "n5.a", "type": "rectangle", "pos": { - "x": 226, - "y": 774 + "x": 203, + "y": 1019 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "n5.b", "type": "rectangle", "pos": { - "x": 58, - "y": 774 + "x": 50, + "y": 1019 }, "width": 53, "height": 66, @@ -622,11 +622,11 @@ "id": "n6", "type": "rectangle", "pos": { - "x": 0, - "y": 936 + "x": 20, + "y": 1216 }, - "width": 336, - "height": 85, + "width": 266, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -663,8 +663,8 @@ "id": "n6.a", "type": "rectangle", "pos": { - "x": 226, - "y": 945 + "x": 203, + "y": 1246 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "n6.b", "type": "rectangle", "pos": { - "x": 58, - "y": 945 + "x": 50, + "y": 1246 }, "width": 53, "height": 66, @@ -745,11 +745,11 @@ "id": "n7", "type": "rectangle", "pos": { - "x": 0, - "y": 1097 + "x": 20, + "y": 1438 }, - "width": 336, - "height": 95, + "width": 276, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,8 +786,8 @@ "id": "n7.a", "type": "rectangle", "pos": { - "x": 221, - "y": 1116 + "x": 203, + "y": 1478 }, "width": 53, "height": 66, @@ -827,8 +827,8 @@ "id": "n7.b", "type": "rectangle", "pos": { - "x": 58, - "y": 1111 + "x": 50, + "y": 1478 }, "width": 53, "height": 66, @@ -868,11 +868,11 @@ "id": "n8", "type": "rectangle", "pos": { - "x": 0, - "y": 1278 + "x": 20, + "y": 1675 }, - "width": 336, - "height": 100, + "width": 281, + "height": 141, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -909,8 +909,8 @@ "id": "n8.a", "type": "rectangle", "pos": { - "x": 218, - "y": 1302 + "x": 203, + "y": 1720 }, "width": 53, "height": 66, @@ -950,8 +950,8 @@ "id": "n8.b", "type": "rectangle", "pos": { - "x": 58, - "y": 1295 + "x": 50, + "y": 1720 }, "width": 53, "height": 66, @@ -991,11 +991,11 @@ "id": "n9", "type": "rectangle", "pos": { - "x": 0, - "y": 1454 + "x": 20, + "y": 1922 }, - "width": 336, - "height": 95, + "width": 276, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1032,8 +1032,8 @@ "id": "n9.a", "type": "rectangle", "pos": { - "x": 221, - "y": 1473 + "x": 203, + "y": 1962 }, "width": 53, "height": 66, @@ -1073,8 +1073,8 @@ "id": "n9.b", "type": "rectangle", "pos": { - "x": 53, - "y": 1473 + "x": 50, + "y": 1962 }, "width": 53, "height": 66, @@ -1114,11 +1114,11 @@ "id": "n10", "type": "rectangle", "pos": { - "x": 0, - "y": 1635 + "x": 20, + "y": 2174 }, - "width": 336, - "height": 100, + "width": 281, + "height": 141, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1155,8 +1155,8 @@ "id": "n10.a", "type": "rectangle", "pos": { - "x": 218, - "y": 1659 + "x": 203, + "y": 2219 }, "width": 53, "height": 66, @@ -1197,7 +1197,7 @@ "type": "rectangle", "pos": { "x": 50, - "y": 1659 + "y": 2219 }, "width": 53, "height": 66, @@ -1260,20 +1260,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 88.5 + "x": 203, + "y": 129 }, { - "x": 179.5, - "y": 88.5 + "x": 163, + "y": 129 }, { - "x": 157.60000610351562, - "y": 88.5 + "x": 145, + "y": 129 }, { - "x": 116, - "y": 88.5 + "x": 113, + "y": 129 } ], "isCurve": true, @@ -1307,20 +1307,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 267 + "x": 203, + "y": 356 }, { - "x": 179.5, - "y": 267 + "x": 163, + "y": 356 }, { - "x": 158, - "y": 267 + "x": 146, + "y": 356 }, { "x": 118, - "y": 267 + "y": 356 } ], "isCurve": true, @@ -1354,20 +1354,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 455.5 + "x": 203, + "y": 588 }, { - "x": 179.5, - "y": 455.5 + "x": 163, + "y": 588 }, { - "x": 157.60000610351562, - "y": 455.5 + "x": 145, + "y": 588 }, { - "x": 116, - "y": 455.5 + "x": 113, + "y": 588 } ], "isCurve": true, @@ -1401,20 +1401,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 639 + "x": 203, + "y": 830 }, { - "x": 179.5, - "y": 639 + "x": 163, + "y": 830 }, { - "x": 158, - "y": 639 + "x": 146, + "y": 830 }, { "x": 118, - "y": 639 + "y": 830 } ], "isCurve": true, @@ -1448,20 +1448,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 807.5 + "x": 203, + "y": 1052 }, { - "x": 179.5, - "y": 807.5 + "x": 163, + "y": 1052 }, { - "x": 156.60000610351562, - "y": 807.5 + "x": 143, + "y": 1052 }, { - "x": 111, - "y": 807.5 + "x": 103, + "y": 1052 } ], "isCurve": true, @@ -1495,20 +1495,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 978.5 + "x": 203, + "y": 1279 }, { - "x": 179.5, - "y": 978.5 + "x": 163, + "y": 1279 }, { - "x": 156.60000610351562, - "y": 978.5 + "x": 143, + "y": 1279 }, { - "x": 111, - "y": 978.5 + "x": 103, + "y": 1279 } ], "isCurve": true, @@ -1542,20 +1542,20 @@ "labelPercentage": 0, "route": [ { - "x": 220.5, - "y": 1144.5 + "x": 203, + "y": 1511 }, { - "x": 178.5, - "y": 1144.5 + "x": 163, + "y": 1511 }, { - "x": 156.60000610351562, - "y": 1144.5 + "x": 143, + "y": 1511 }, { - "x": 111, - "y": 1144.5 + "x": 103, + "y": 1511 } ], "isCurve": true, @@ -1589,20 +1589,20 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 1328 + "x": 203, + "y": 1753 }, { - "x": 178, - "y": 1328 + "x": 163, + "y": 1753 }, { - "x": 156.60000610351562, - "y": 1328 + "x": 143, + "y": 1753 }, { - "x": 111, - "y": 1328 + "x": 103, + "y": 1753 } ], "isCurve": true, @@ -1636,20 +1636,20 @@ "labelPercentage": 0, "route": [ { - "x": 220.5, - "y": 1501.5 + "x": 203, + "y": 1995 }, { - "x": 178.5, - "y": 1501.5 + "x": 163, + "y": 1995 }, { - "x": 157.60000610351562, - "y": 1501.5 + "x": 145, + "y": 1995 }, { - "x": 116, - "y": 1501.5 + "x": 113, + "y": 1995 } ], "isCurve": true, @@ -1683,20 +1683,20 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 1685 + "x": 203, + "y": 2252 }, { - "x": 178, - "y": 1685 + "x": 163, + "y": 2252 }, { - "x": 158, - "y": 1685 + "x": 146, + "y": 2252 }, { "x": 118, - "y": 1685 + "y": 2252 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg index 2e00fe0c9..997919e0b 100644 --- a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 - -n4n5 - -n6n7 - -n8n9 - -n10aba - -baba - -bababab - -abab - -a - -b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-733541206 .fill-N1{fill:#0A0F25;} + .d2-733541206 .fill-N2{fill:#676C7E;} + .d2-733541206 .fill-N3{fill:#9499AB;} + .d2-733541206 .fill-N4{fill:#CFD2DD;} + .d2-733541206 .fill-N5{fill:#DEE1EB;} + .d2-733541206 .fill-N6{fill:#EEF1F8;} + .d2-733541206 .fill-N7{fill:#FFFFFF;} + .d2-733541206 .fill-B1{fill:#0D32B2;} + .d2-733541206 .fill-B2{fill:#0D32B2;} + .d2-733541206 .fill-B3{fill:#E3E9FD;} + .d2-733541206 .fill-B4{fill:#E3E9FD;} + .d2-733541206 .fill-B5{fill:#EDF0FD;} + .d2-733541206 .fill-B6{fill:#F7F8FE;} + .d2-733541206 .fill-AA2{fill:#4A6FF3;} + .d2-733541206 .fill-AA4{fill:#EDF0FD;} + .d2-733541206 .fill-AA5{fill:#F7F8FE;} + .d2-733541206 .fill-AB4{fill:#EDF0FD;} + .d2-733541206 .fill-AB5{fill:#F7F8FE;} + .d2-733541206 .stroke-N1{stroke:#0A0F25;} + .d2-733541206 .stroke-N2{stroke:#676C7E;} + .d2-733541206 .stroke-N3{stroke:#9499AB;} + .d2-733541206 .stroke-N4{stroke:#CFD2DD;} + .d2-733541206 .stroke-N5{stroke:#DEE1EB;} + .d2-733541206 .stroke-N6{stroke:#EEF1F8;} + .d2-733541206 .stroke-N7{stroke:#FFFFFF;} + .d2-733541206 .stroke-B1{stroke:#0D32B2;} + .d2-733541206 .stroke-B2{stroke:#0D32B2;} + .d2-733541206 .stroke-B3{stroke:#E3E9FD;} + .d2-733541206 .stroke-B4{stroke:#E3E9FD;} + .d2-733541206 .stroke-B5{stroke:#EDF0FD;} + .d2-733541206 .stroke-B6{stroke:#F7F8FE;} + .d2-733541206 .stroke-AA2{stroke:#4A6FF3;} + .d2-733541206 .stroke-AA4{stroke:#EDF0FD;} + .d2-733541206 .stroke-AA5{stroke:#F7F8FE;} + .d2-733541206 .stroke-AB4{stroke:#EDF0FD;} + .d2-733541206 .stroke-AB5{stroke:#F7F8FE;} + .d2-733541206 .background-color-N1{background-color:#0A0F25;} + .d2-733541206 .background-color-N2{background-color:#676C7E;} + .d2-733541206 .background-color-N3{background-color:#9499AB;} + .d2-733541206 .background-color-N4{background-color:#CFD2DD;} + .d2-733541206 .background-color-N5{background-color:#DEE1EB;} + .d2-733541206 .background-color-N6{background-color:#EEF1F8;} + .d2-733541206 .background-color-N7{background-color:#FFFFFF;} + .d2-733541206 .background-color-B1{background-color:#0D32B2;} + .d2-733541206 .background-color-B2{background-color:#0D32B2;} + .d2-733541206 .background-color-B3{background-color:#E3E9FD;} + .d2-733541206 .background-color-B4{background-color:#E3E9FD;} + .d2-733541206 .background-color-B5{background-color:#EDF0FD;} + .d2-733541206 .background-color-B6{background-color:#F7F8FE;} + .d2-733541206 .background-color-AA2{background-color:#4A6FF3;} + .d2-733541206 .background-color-AA4{background-color:#EDF0FD;} + .d2-733541206 .background-color-AA5{background-color:#F7F8FE;} + .d2-733541206 .background-color-AB4{background-color:#EDF0FD;} + .d2-733541206 .background-color-AB5{background-color:#F7F8FE;} + .d2-733541206 .color-N1{color:#0A0F25;} + .d2-733541206 .color-N2{color:#676C7E;} + .d2-733541206 .color-N3{color:#9499AB;} + .d2-733541206 .color-N4{color:#CFD2DD;} + .d2-733541206 .color-N5{color:#DEE1EB;} + .d2-733541206 .color-N6{color:#EEF1F8;} + .d2-733541206 .color-N7{color:#FFFFFF;} + .d2-733541206 .color-B1{color:#0D32B2;} + .d2-733541206 .color-B2{color:#0D32B2;} + .d2-733541206 .color-B3{color:#E3E9FD;} + .d2-733541206 .color-B4{color:#E3E9FD;} + .d2-733541206 .color-B5{color:#EDF0FD;} + .d2-733541206 .color-B6{color:#F7F8FE;} + .d2-733541206 .color-AA2{color:#4A6FF3;} + .d2-733541206 .color-AA4{color:#EDF0FD;} + .d2-733541206 .color-AA5{color:#F7F8FE;} + .d2-733541206 .color-AB4{color:#EDF0FD;} + .d2-733541206 .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}]]>n1n2n3 + +n4n5 + +n6n7 + +n8n9 + +n10aba + +baba + +bababab + +abab + +a + +b + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json b/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json index b56b4750b..35fb68f2f 100644 --- a/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "person", "pos": { "x": 0, - "y": 10 + "y": 0 }, "width": 44, "height": 66, diff --git a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg index 71ff8fe70..de7d00827 100644 --- a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -あ - - + .d2-252721584 .fill-N1{fill:#0A0F25;} + .d2-252721584 .fill-N2{fill:#676C7E;} + .d2-252721584 .fill-N3{fill:#9499AB;} + .d2-252721584 .fill-N4{fill:#CFD2DD;} + .d2-252721584 .fill-N5{fill:#DEE1EB;} + .d2-252721584 .fill-N6{fill:#EEF1F8;} + .d2-252721584 .fill-N7{fill:#FFFFFF;} + .d2-252721584 .fill-B1{fill:#0D32B2;} + .d2-252721584 .fill-B2{fill:#0D32B2;} + .d2-252721584 .fill-B3{fill:#E3E9FD;} + .d2-252721584 .fill-B4{fill:#E3E9FD;} + .d2-252721584 .fill-B5{fill:#EDF0FD;} + .d2-252721584 .fill-B6{fill:#F7F8FE;} + .d2-252721584 .fill-AA2{fill:#4A6FF3;} + .d2-252721584 .fill-AA4{fill:#EDF0FD;} + .d2-252721584 .fill-AA5{fill:#F7F8FE;} + .d2-252721584 .fill-AB4{fill:#EDF0FD;} + .d2-252721584 .fill-AB5{fill:#F7F8FE;} + .d2-252721584 .stroke-N1{stroke:#0A0F25;} + .d2-252721584 .stroke-N2{stroke:#676C7E;} + .d2-252721584 .stroke-N3{stroke:#9499AB;} + .d2-252721584 .stroke-N4{stroke:#CFD2DD;} + .d2-252721584 .stroke-N5{stroke:#DEE1EB;} + .d2-252721584 .stroke-N6{stroke:#EEF1F8;} + .d2-252721584 .stroke-N7{stroke:#FFFFFF;} + .d2-252721584 .stroke-B1{stroke:#0D32B2;} + .d2-252721584 .stroke-B2{stroke:#0D32B2;} + .d2-252721584 .stroke-B3{stroke:#E3E9FD;} + .d2-252721584 .stroke-B4{stroke:#E3E9FD;} + .d2-252721584 .stroke-B5{stroke:#EDF0FD;} + .d2-252721584 .stroke-B6{stroke:#F7F8FE;} + .d2-252721584 .stroke-AA2{stroke:#4A6FF3;} + .d2-252721584 .stroke-AA4{stroke:#EDF0FD;} + .d2-252721584 .stroke-AA5{stroke:#F7F8FE;} + .d2-252721584 .stroke-AB4{stroke:#EDF0FD;} + .d2-252721584 .stroke-AB5{stroke:#F7F8FE;} + .d2-252721584 .background-color-N1{background-color:#0A0F25;} + .d2-252721584 .background-color-N2{background-color:#676C7E;} + .d2-252721584 .background-color-N3{background-color:#9499AB;} + .d2-252721584 .background-color-N4{background-color:#CFD2DD;} + .d2-252721584 .background-color-N5{background-color:#DEE1EB;} + .d2-252721584 .background-color-N6{background-color:#EEF1F8;} + .d2-252721584 .background-color-N7{background-color:#FFFFFF;} + .d2-252721584 .background-color-B1{background-color:#0D32B2;} + .d2-252721584 .background-color-B2{background-color:#0D32B2;} + .d2-252721584 .background-color-B3{background-color:#E3E9FD;} + .d2-252721584 .background-color-B4{background-color:#E3E9FD;} + .d2-252721584 .background-color-B5{background-color:#EDF0FD;} + .d2-252721584 .background-color-B6{background-color:#F7F8FE;} + .d2-252721584 .background-color-AA2{background-color:#4A6FF3;} + .d2-252721584 .background-color-AA4{background-color:#EDF0FD;} + .d2-252721584 .background-color-AA5{background-color:#F7F8FE;} + .d2-252721584 .background-color-AB4{background-color:#EDF0FD;} + .d2-252721584 .background-color-AB5{background-color:#F7F8FE;} + .d2-252721584 .color-N1{color:#0A0F25;} + .d2-252721584 .color-N2{color:#676C7E;} + .d2-252721584 .color-N3{color:#9499AB;} + .d2-252721584 .color-N4{color:#CFD2DD;} + .d2-252721584 .color-N5{color:#DEE1EB;} + .d2-252721584 .color-N6{color:#EEF1F8;} + .d2-252721584 .color-N7{color:#FFFFFF;} + .d2-252721584 .color-B1{color:#0D32B2;} + .d2-252721584 .color-B2{color:#0D32B2;} + .d2-252721584 .color-B3{color:#E3E9FD;} + .d2-252721584 .color-B4{color:#E3E9FD;} + .d2-252721584 .color-B5{color:#EDF0FD;} + .d2-252721584 .color-B6{color:#F7F8FE;} + .d2-252721584 .color-AA2{color:#4A6FF3;} + .d2-252721584 .color-AA4{color:#EDF0FD;} + .d2-252721584 .color-AA5{color:#F7F8FE;} + .d2-252721584 .color-AB4{color:#EDF0FD;} + .d2-252721584 .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}]]>あ + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json index d24969232..2140eaba0 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json @@ -973,12 +973,12 @@ "labelPercentage": 0, "route": [ { - "x": 515, - "y": 369.09698486328125 + "x": 514.75, + "y": 369 }, { - "x": 106.79900360107422, - "y": 432.218994140625 + "x": 106.75, + "y": 432.20001220703125 }, { "x": 14.350000381469727, @@ -1020,12 +1020,12 @@ "labelPercentage": 0, "route": [ { - "x": 515, - "y": 371.4540100097656 + "x": 514.75, + "y": 371 }, { - "x": 263.6000061035156, - "y": 432.69000244140625 + "x": 263.54901123046875, + "y": 432.6000061035156 }, { "x": 200.75, @@ -1067,12 +1067,12 @@ "labelPercentage": 0, "route": [ { - "x": 515, - "y": 384.4639892578125 + "x": 515.5, + "y": 384 }, { - "x": 445.79998779296875, - "y": 435.2919921875 + "x": 445.8999938964844, + "y": 435.20001220703125 }, { "x": 428.5, @@ -1115,11 +1115,11 @@ "route": [ { "x": 568, - "y": 384.37799072265625 + "y": 384 }, { "x": 637.5999755859375, - "y": 435.2749938964844 + "y": 435.20001220703125 }, { "x": 655, @@ -1161,12 +1161,12 @@ "labelPercentage": 0, "route": [ { - "x": 568, - "y": 371.5260009765625 + "x": 567.5, + "y": 372 }, { - "x": 816.4000244140625, - "y": 432.7049865722656 + "x": 816.2999877929688, + "y": 432.79998779296875 }, { "x": 878.5, @@ -1255,20 +1255,20 @@ "labelPercentage": 0, "route": [ { - "x": 568, - "y": 370.4570007324219 + "x": 567.5, + "y": 370 }, { - "x": 869.2000122070312, - "y": 432.4909973144531 + "x": 869.0999755859375, + "y": 432.3999938964844 }, { "x": 954.7000122070312, - "y": 458.79998779296875 + "y": 458.6000061035156 }, { "x": 995.5, - "y": 502 + "y": 501 } ], "isCurve": true, @@ -1302,11 +1302,11 @@ "labelPercentage": 0, "route": [ { - "x": 24.599000930786133, + "x": 24.75, "y": 398 }, { - "x": 24.7189998626709, + "x": 24.75, "y": 438 }, { @@ -1349,11 +1349,11 @@ "labelPercentage": 0, "route": [ { - "x": 134.0989990234375, + "x": 134.25, "y": 398 }, { - "x": 134.218994140625, + "x": 134.25, "y": 438 }, { @@ -1490,11 +1490,11 @@ "labelPercentage": 0, "route": [ { - "x": 177.88800048828125, + "x": 178.25, "y": 564 }, { - "x": 150.177001953125, + "x": 150.25, "y": 604 }, { @@ -1537,11 +1537,11 @@ "labelPercentage": 0, "route": [ { - "x": 223.61099243164062, + "x": 223.25, "y": 564 }, { - "x": 251.32200622558594, + "x": 251.25, "y": 604 }, { @@ -1584,11 +1584,11 @@ "labelPercentage": 0, "route": [ { - "x": 405.9360046386719, + "x": 405.75, "y": 564 }, { - "x": 378.5870056152344, + "x": 378.54998779296875, "y": 604 }, { @@ -1631,11 +1631,11 @@ "labelPercentage": 0, "route": [ { - "x": 451.06298828125, + "x": 451.25, "y": 564 }, { - "x": 478.4119873046875, + "x": 478.45001220703125, "y": 604 }, { @@ -1678,11 +1678,11 @@ "labelPercentage": 0, "route": [ { - "x": 632.635009765625, + "x": 632.75, "y": 564 }, { - "x": 605.5269775390625, + "x": 605.5499877929688, "y": 604 }, { @@ -1725,11 +1725,11 @@ "labelPercentage": 0, "route": [ { - "x": 677.364013671875, + "x": 677.25, "y": 564 }, { - "x": 704.4719848632812, + "x": 704.4500122070312, "y": 604 }, { @@ -1819,11 +1819,11 @@ "labelPercentage": 0, "route": [ { - "x": 856.135009765625, + "x": 856.25, "y": 564 }, { - "x": 829.0269775390625, + "x": 829.0499877929688, "y": 604 }, { @@ -1866,11 +1866,11 @@ "labelPercentage": 0, "route": [ { - "x": 900.864013671875, + "x": 900.75, "y": 564 }, { - "x": 927.9719848632812, + "x": 927.9500122070312, "y": 604 }, { diff --git a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg index ff6f0b82f..45de65439 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstuvw + .d2-3148896759 .fill-N1{fill:#0A0F25;} + .d2-3148896759 .fill-N2{fill:#676C7E;} + .d2-3148896759 .fill-N3{fill:#9499AB;} + .d2-3148896759 .fill-N4{fill:#CFD2DD;} + .d2-3148896759 .fill-N5{fill:#DEE1EB;} + .d2-3148896759 .fill-N6{fill:#EEF1F8;} + .d2-3148896759 .fill-N7{fill:#FFFFFF;} + .d2-3148896759 .fill-B1{fill:#0D32B2;} + .d2-3148896759 .fill-B2{fill:#0D32B2;} + .d2-3148896759 .fill-B3{fill:#E3E9FD;} + .d2-3148896759 .fill-B4{fill:#E3E9FD;} + .d2-3148896759 .fill-B5{fill:#EDF0FD;} + .d2-3148896759 .fill-B6{fill:#F7F8FE;} + .d2-3148896759 .fill-AA2{fill:#4A6FF3;} + .d2-3148896759 .fill-AA4{fill:#EDF0FD;} + .d2-3148896759 .fill-AA5{fill:#F7F8FE;} + .d2-3148896759 .fill-AB4{fill:#EDF0FD;} + .d2-3148896759 .fill-AB5{fill:#F7F8FE;} + .d2-3148896759 .stroke-N1{stroke:#0A0F25;} + .d2-3148896759 .stroke-N2{stroke:#676C7E;} + .d2-3148896759 .stroke-N3{stroke:#9499AB;} + .d2-3148896759 .stroke-N4{stroke:#CFD2DD;} + .d2-3148896759 .stroke-N5{stroke:#DEE1EB;} + .d2-3148896759 .stroke-N6{stroke:#EEF1F8;} + .d2-3148896759 .stroke-N7{stroke:#FFFFFF;} + .d2-3148896759 .stroke-B1{stroke:#0D32B2;} + .d2-3148896759 .stroke-B2{stroke:#0D32B2;} + .d2-3148896759 .stroke-B3{stroke:#E3E9FD;} + .d2-3148896759 .stroke-B4{stroke:#E3E9FD;} + .d2-3148896759 .stroke-B5{stroke:#EDF0FD;} + .d2-3148896759 .stroke-B6{stroke:#F7F8FE;} + .d2-3148896759 .stroke-AA2{stroke:#4A6FF3;} + .d2-3148896759 .stroke-AA4{stroke:#EDF0FD;} + .d2-3148896759 .stroke-AA5{stroke:#F7F8FE;} + .d2-3148896759 .stroke-AB4{stroke:#EDF0FD;} + .d2-3148896759 .stroke-AB5{stroke:#F7F8FE;} + .d2-3148896759 .background-color-N1{background-color:#0A0F25;} + .d2-3148896759 .background-color-N2{background-color:#676C7E;} + .d2-3148896759 .background-color-N3{background-color:#9499AB;} + .d2-3148896759 .background-color-N4{background-color:#CFD2DD;} + .d2-3148896759 .background-color-N5{background-color:#DEE1EB;} + .d2-3148896759 .background-color-N6{background-color:#EEF1F8;} + .d2-3148896759 .background-color-N7{background-color:#FFFFFF;} + .d2-3148896759 .background-color-B1{background-color:#0D32B2;} + .d2-3148896759 .background-color-B2{background-color:#0D32B2;} + .d2-3148896759 .background-color-B3{background-color:#E3E9FD;} + .d2-3148896759 .background-color-B4{background-color:#E3E9FD;} + .d2-3148896759 .background-color-B5{background-color:#EDF0FD;} + .d2-3148896759 .background-color-B6{background-color:#F7F8FE;} + .d2-3148896759 .background-color-AA2{background-color:#4A6FF3;} + .d2-3148896759 .background-color-AA4{background-color:#EDF0FD;} + .d2-3148896759 .background-color-AA5{background-color:#F7F8FE;} + .d2-3148896759 .background-color-AB4{background-color:#EDF0FD;} + .d2-3148896759 .background-color-AB5{background-color:#F7F8FE;} + .d2-3148896759 .color-N1{color:#0A0F25;} + .d2-3148896759 .color-N2{color:#676C7E;} + .d2-3148896759 .color-N3{color:#9499AB;} + .d2-3148896759 .color-N4{color:#CFD2DD;} + .d2-3148896759 .color-N5{color:#DEE1EB;} + .d2-3148896759 .color-N6{color:#EEF1F8;} + .d2-3148896759 .color-N7{color:#FFFFFF;} + .d2-3148896759 .color-B1{color:#0D32B2;} + .d2-3148896759 .color-B2{color:#0D32B2;} + .d2-3148896759 .color-B3{color:#E3E9FD;} + .d2-3148896759 .color-B4{color:#E3E9FD;} + .d2-3148896759 .color-B5{color:#EDF0FD;} + .d2-3148896759 .color-B6{color:#F7F8FE;} + .d2-3148896759 .color-AA2{color:#4A6FF3;} + .d2-3148896759 .color-AA4{color:#EDF0FD;} + .d2-3148896759 .color-AA5{color:#F7F8FE;} + .d2-3148896759 .color-AB4{color:#EDF0FD;} + .d2-3148896759 .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}]]>abcdefghijklmnopqrstuvw diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json index f0d1e96f5..82cc56b50 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json @@ -1163,11 +1163,11 @@ "labelPercentage": 0, "route": [ { - "x": 139.68600463867188, + "x": 139.5, "y": 730 }, { - "x": 112.33699798583984, + "x": 112.30000305175781, "y": 770 }, { @@ -1412,11 +1412,11 @@ "route": [ { "x": 186, - "y": 51.67499923706055 + "y": 52 }, { "x": 260.39898681640625, - "y": 103.13500213623047 + "y": 103.19999694824219 }, { "x": 279, @@ -1470,12 +1470,12 @@ "labelPercentage": 0, "route": [ { - "x": 132, - "y": 53.32600021362305 + "x": 131.75, + "y": 53 }, { - "x": 65.39900207519531, - "y": 103.46499633789062 + "x": 65.3489990234375, + "y": 103.4000015258789 }, { "x": 48.75, @@ -1847,11 +1847,11 @@ "labelPercentage": 0, "route": [ { - "x": 603.5479736328125, + "x": 603.5, "y": 730 }, { - "x": 633.9089965820312, + "x": 633.9000244140625, "y": 770 }, { @@ -1894,11 +1894,11 @@ "labelPercentage": 0, "route": [ { - "x": 590.7249755859375, + "x": 590.25, "y": 730 }, { - "x": 605.5449829101562, + "x": 605.4500122070312, "y": 770 }, { @@ -1941,11 +1941,11 @@ "labelPercentage": 0, "route": [ { - "x": 573.927001953125, + "x": 574, "y": 730 }, { - "x": 568.385009765625, + "x": 568.4000244140625, "y": 770 }, { @@ -2024,11 +2024,11 @@ "labelPercentage": 0, "route": [ { - "x": 556.6320190429688, + "x": 556.5, "y": 730 }, { - "x": 530.1259765625, + "x": 530.0999755859375, "y": 770 }, { @@ -2166,11 +2166,11 @@ "route": [ { "x": 552, - "y": 712.1160278320312 + "y": 712 }, { "x": 456.79998779296875, - "y": 766.4229736328125 + "y": 766.4000244140625 }, { "x": 433, @@ -2224,11 +2224,11 @@ "labelPercentage": 0, "route": [ { - "x": 551.6920166015625, + "x": 551.5, "y": 66 }, { - "x": 573.1380004882812, + "x": 573.0999755859375, "y": 106 }, { @@ -2331,12 +2331,12 @@ "labelPercentage": 0, "route": [ { - "x": 507, - "y": 50.138999938964844 + "x": 507.25, + "y": 50 }, { - "x": 424, - "y": 102.8270034790039 + "x": 424.04998779296875, + "y": 102.80000305175781 }, { "x": 403.25, @@ -2425,11 +2425,11 @@ "labelPercentage": 0, "route": [ { - "x": 424.6199951171875, + "x": 425, "y": 398 }, { - "x": 450.52398681640625, + "x": 450.6000061035156, "y": 438 }, { @@ -2472,11 +2472,11 @@ "labelPercentage": 0, "route": [ { - "x": 380.48699951171875, + "x": 380, "y": 564 }, { - "x": 352.8970031738281, + "x": 352.79998779296875, "y": 604 }, { @@ -2519,12 +2519,12 @@ "labelPercentage": 0, "route": [ { - "x": 373, - "y": 714.1719970703125 + "x": 372.5, + "y": 714 }, { - "x": 455.79998779296875, - "y": 766.833984375 + "x": 455.70001220703125, + "y": 766.7999877929688 }, { "x": 479.29998779296875, @@ -2566,11 +2566,11 @@ "labelPercentage": 0, "route": [ { - "x": 407.1260070800781, + "x": 407, "y": 564 }, { - "x": 411.82501220703125, + "x": 411.79998779296875, "y": 604 }, { @@ -2649,11 +2649,11 @@ "labelPercentage": 0, "route": [ { - "x": 296.2950134277344, + "x": 296.5, "y": 398 }, { - "x": 317.2590026855469, + "x": 317.29998779296875, "y": 438 }, { @@ -2696,12 +2696,12 @@ "labelPercentage": 0, "route": [ { - "x": 377.25, - "y": 378.13800048828125 + "x": 377, + "y": 378 }, { - "x": 266.6499938964844, - "y": 434.0270080566406 + "x": 266.6000061035156, + "y": 434 }, { "x": 239, @@ -2779,12 +2779,12 @@ "labelPercentage": 0, "route": [ { - "x": 319, - "y": 712.9500122070312 + "x": 319.5, + "y": 713 }, { - "x": 228.1999969482422, - "y": 766.5900268554688 + "x": 228.3000030517578, + "y": 766.5999755859375 }, { "x": 211.89999389648438, diff --git a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg index 691347821..7489f1401 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstu + .d2-3313830298 .fill-N1{fill:#0A0F25;} + .d2-3313830298 .fill-N2{fill:#676C7E;} + .d2-3313830298 .fill-N3{fill:#9499AB;} + .d2-3313830298 .fill-N4{fill:#CFD2DD;} + .d2-3313830298 .fill-N5{fill:#DEE1EB;} + .d2-3313830298 .fill-N6{fill:#EEF1F8;} + .d2-3313830298 .fill-N7{fill:#FFFFFF;} + .d2-3313830298 .fill-B1{fill:#0D32B2;} + .d2-3313830298 .fill-B2{fill:#0D32B2;} + .d2-3313830298 .fill-B3{fill:#E3E9FD;} + .d2-3313830298 .fill-B4{fill:#E3E9FD;} + .d2-3313830298 .fill-B5{fill:#EDF0FD;} + .d2-3313830298 .fill-B6{fill:#F7F8FE;} + .d2-3313830298 .fill-AA2{fill:#4A6FF3;} + .d2-3313830298 .fill-AA4{fill:#EDF0FD;} + .d2-3313830298 .fill-AA5{fill:#F7F8FE;} + .d2-3313830298 .fill-AB4{fill:#EDF0FD;} + .d2-3313830298 .fill-AB5{fill:#F7F8FE;} + .d2-3313830298 .stroke-N1{stroke:#0A0F25;} + .d2-3313830298 .stroke-N2{stroke:#676C7E;} + .d2-3313830298 .stroke-N3{stroke:#9499AB;} + .d2-3313830298 .stroke-N4{stroke:#CFD2DD;} + .d2-3313830298 .stroke-N5{stroke:#DEE1EB;} + .d2-3313830298 .stroke-N6{stroke:#EEF1F8;} + .d2-3313830298 .stroke-N7{stroke:#FFFFFF;} + .d2-3313830298 .stroke-B1{stroke:#0D32B2;} + .d2-3313830298 .stroke-B2{stroke:#0D32B2;} + .d2-3313830298 .stroke-B3{stroke:#E3E9FD;} + .d2-3313830298 .stroke-B4{stroke:#E3E9FD;} + .d2-3313830298 .stroke-B5{stroke:#EDF0FD;} + .d2-3313830298 .stroke-B6{stroke:#F7F8FE;} + .d2-3313830298 .stroke-AA2{stroke:#4A6FF3;} + .d2-3313830298 .stroke-AA4{stroke:#EDF0FD;} + .d2-3313830298 .stroke-AA5{stroke:#F7F8FE;} + .d2-3313830298 .stroke-AB4{stroke:#EDF0FD;} + .d2-3313830298 .stroke-AB5{stroke:#F7F8FE;} + .d2-3313830298 .background-color-N1{background-color:#0A0F25;} + .d2-3313830298 .background-color-N2{background-color:#676C7E;} + .d2-3313830298 .background-color-N3{background-color:#9499AB;} + .d2-3313830298 .background-color-N4{background-color:#CFD2DD;} + .d2-3313830298 .background-color-N5{background-color:#DEE1EB;} + .d2-3313830298 .background-color-N6{background-color:#EEF1F8;} + .d2-3313830298 .background-color-N7{background-color:#FFFFFF;} + .d2-3313830298 .background-color-B1{background-color:#0D32B2;} + .d2-3313830298 .background-color-B2{background-color:#0D32B2;} + .d2-3313830298 .background-color-B3{background-color:#E3E9FD;} + .d2-3313830298 .background-color-B4{background-color:#E3E9FD;} + .d2-3313830298 .background-color-B5{background-color:#EDF0FD;} + .d2-3313830298 .background-color-B6{background-color:#F7F8FE;} + .d2-3313830298 .background-color-AA2{background-color:#4A6FF3;} + .d2-3313830298 .background-color-AA4{background-color:#EDF0FD;} + .d2-3313830298 .background-color-AA5{background-color:#F7F8FE;} + .d2-3313830298 .background-color-AB4{background-color:#EDF0FD;} + .d2-3313830298 .background-color-AB5{background-color:#F7F8FE;} + .d2-3313830298 .color-N1{color:#0A0F25;} + .d2-3313830298 .color-N2{color:#676C7E;} + .d2-3313830298 .color-N3{color:#9499AB;} + .d2-3313830298 .color-N4{color:#CFD2DD;} + .d2-3313830298 .color-N5{color:#DEE1EB;} + .d2-3313830298 .color-N6{color:#EEF1F8;} + .d2-3313830298 .color-N7{color:#FFFFFF;} + .d2-3313830298 .color-B1{color:#0D32B2;} + .d2-3313830298 .color-B2{color:#0D32B2;} + .d2-3313830298 .color-B3{color:#E3E9FD;} + .d2-3313830298 .color-B4{color:#E3E9FD;} + .d2-3313830298 .color-B5{color:#EDF0FD;} + .d2-3313830298 .color-B6{color:#F7F8FE;} + .d2-3313830298 .color-AA2{color:#4A6FF3;} + .d2-3313830298 .color-AA4{color:#EDF0FD;} + .d2-3313830298 .color-AA5{color:#F7F8FE;} + .d2-3313830298 .color-AB4{color:#EDF0FD;} + .d2-3313830298 .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}]]>abcdefghijklmnopqrstu diff --git a/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json b/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json index a7f22c5cc..0b3b174cd 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json +++ b/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "z", "type": "rectangle", "pos": { - "x": -123, + "x": -113, "y": 56 }, - "width": 247, - "height": 291, + "width": 227, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": -83, - "y": 85 + "y": 86 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": -83, - "y": 251 + "y": 252 }, "width": 53, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 30, - "y": 85 + "y": 86 }, "width": 53, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 29, - "y": 251 + "y": 252 }, "width": 54, "height": 66, @@ -213,10 +213,10 @@ "type": "rectangle", "pos": { "x": -86, - "y": -245 + "y": -217 }, "width": 173, - "height": 225, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -253,11 +253,11 @@ "id": "a.b", "type": "rectangle", "pos": { - "x": -66, - "y": -179 + "x": -56, + "y": -176 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -147 + "y": -146 }, "width": 53, "height": 66, @@ -335,11 +335,11 @@ "id": "x", "type": "rectangle", "pos": { - "x": -390, - "y": -311 + "x": -360, + "y": -312 }, - "width": 247, - "height": 291, + "width": 227, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -376,8 +376,8 @@ "id": "x.a", "type": "rectangle", "pos": { - "x": -350, - "y": -281 + "x": -330, + "y": -282 }, "width": 53, "height": 66, @@ -417,8 +417,8 @@ "id": "x.b", "type": "rectangle", "pos": { - "x": -350, - "y": -115 + "x": -330, + "y": -116 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "x.c", "type": "rectangle", "pos": { - "x": -236, - "y": -281 + "x": -216, + "y": -282 }, "width": 53, "height": 66, @@ -499,8 +499,8 @@ "id": "x.d", "type": "rectangle", "pos": { - "x": -237, - "y": -115 + "x": -217, + "y": -116 }, "width": 54, "height": 66, @@ -540,11 +540,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 143, - "y": -311 + "x": 133, + "y": -312 }, - "width": 247, - "height": 291, + "width": 227, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -581,8 +581,8 @@ "id": "y.a", "type": "rectangle", "pos": { - "x": 183, - "y": -281 + "x": 163, + "y": -282 }, "width": 53, "height": 66, @@ -622,8 +622,8 @@ "id": "y.b", "type": "rectangle", "pos": { - "x": 183, - "y": -115 + "x": 163, + "y": -116 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "y.c", "type": "rectangle", "pos": { - "x": 297, - "y": -281 + "x": 277, + "y": -282 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "y.d", "type": "rectangle", "pos": { - "x": 296, - "y": -115 + "x": 276, + "y": -116 }, "width": 54, "height": 66, @@ -745,11 +745,11 @@ "id": "b", "type": "rectangle", "pos": { - "x": 143, + "x": 133, "y": 56 }, "width": 214, - "height": 325, + "height": 263, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,11 +786,11 @@ "id": "b.a", "type": "rectangle", "pos": { - "x": 163, - "y": 121 + "x": 153, + "y": 97 }, "width": 174, - "height": 230, + "height": 192, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,10 +828,10 @@ "type": "rectangle", "pos": { "x": 183, - "y": 184 + "y": 133 }, - "width": 134, - "height": 135, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -868,8 +868,8 @@ "id": "b.a.c.d", "type": "rectangle", "pos": { - "x": 223, - "y": 219 + "x": 213, + "y": 163 }, "width": 54, "height": 66, @@ -933,19 +933,19 @@ "route": [ { "x": -57, - "y": 151.5 + "y": 152 }, { "x": -57, - "y": 191.5 + "y": 192 }, { "x": -57, - "y": 211.5 + "y": 212 }, { "x": -57, - "y": 251.5 + "y": 252 } ], "isCurve": true, @@ -980,19 +980,19 @@ "route": [ { "x": 56.5, - "y": 151.5 + "y": 152 }, { "x": 56.5, - "y": 191.5 + "y": 192 }, { "x": 56.5, - "y": 211.5 + "y": 212 }, { "x": 56.5, - "y": 251.5 + "y": 252 } ], "isCurve": true, @@ -1026,20 +1026,20 @@ "labelPercentage": 0, "route": [ { - "x": -324, - "y": -215.5 + "x": -304, + "y": -216 }, { - "x": -324, - "y": -175.5 + "x": -304, + "y": -176 }, { - "x": -324, - "y": -155.5 + "x": -304, + "y": -156 }, { - "x": -324, - "y": -115.5 + "x": -304, + "y": -116 } ], "isCurve": true, @@ -1073,20 +1073,20 @@ "labelPercentage": 0, "route": [ { - "x": -210.5, - "y": -215.5 + "x": -190.5, + "y": -216 }, { - "x": -210.5, - "y": -175.5 + "x": -190.5, + "y": -176 }, { - "x": -210.5, - "y": -155.5 + "x": -190.5, + "y": -156 }, { - "x": -210.5, - "y": -115.5 + "x": -190.5, + "y": -116 } ], "isCurve": true, @@ -1120,20 +1120,20 @@ "labelPercentage": 0, "route": [ { - "x": 210, - "y": -215.5 + "x": 190, + "y": -216 }, { - "x": 210, - "y": -175.5 + "x": 190, + "y": -176 }, { - "x": 210, - "y": -155.5 + "x": 190, + "y": -156 }, { - "x": 210, - "y": -115.5 + "x": 190, + "y": -116 } ], "isCurve": true, @@ -1167,20 +1167,20 @@ "labelPercentage": 0, "route": [ { - "x": 323.5, - "y": -215.5 + "x": 303.5, + "y": -216 }, { - "x": 323.5, - "y": -175.5 + "x": 303.5, + "y": -176 }, { - "x": 323.5, - "y": -155.5 + "x": 303.5, + "y": -156 }, { - "x": 323.5, - "y": -115.5 + "x": 303.5, + "y": -116 } ], "isCurve": true, 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 02835b148..e685aa867 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,16 +1,16 @@ -zaxybabcdbabcdabcdaccd - + .d2-1796086373 .fill-N1{fill:#0A0F25;} + .d2-1796086373 .fill-N2{fill:#676C7E;} + .d2-1796086373 .fill-N3{fill:#9499AB;} + .d2-1796086373 .fill-N4{fill:#CFD2DD;} + .d2-1796086373 .fill-N5{fill:#DEE1EB;} + .d2-1796086373 .fill-N6{fill:#EEF1F8;} + .d2-1796086373 .fill-N7{fill:#FFFFFF;} + .d2-1796086373 .fill-B1{fill:#0D32B2;} + .d2-1796086373 .fill-B2{fill:#0D32B2;} + .d2-1796086373 .fill-B3{fill:#E3E9FD;} + .d2-1796086373 .fill-B4{fill:#E3E9FD;} + .d2-1796086373 .fill-B5{fill:#EDF0FD;} + .d2-1796086373 .fill-B6{fill:#F7F8FE;} + .d2-1796086373 .fill-AA2{fill:#4A6FF3;} + .d2-1796086373 .fill-AA4{fill:#EDF0FD;} + .d2-1796086373 .fill-AA5{fill:#F7F8FE;} + .d2-1796086373 .fill-AB4{fill:#EDF0FD;} + .d2-1796086373 .fill-AB5{fill:#F7F8FE;} + .d2-1796086373 .stroke-N1{stroke:#0A0F25;} + .d2-1796086373 .stroke-N2{stroke:#676C7E;} + .d2-1796086373 .stroke-N3{stroke:#9499AB;} + .d2-1796086373 .stroke-N4{stroke:#CFD2DD;} + .d2-1796086373 .stroke-N5{stroke:#DEE1EB;} + .d2-1796086373 .stroke-N6{stroke:#EEF1F8;} + .d2-1796086373 .stroke-N7{stroke:#FFFFFF;} + .d2-1796086373 .stroke-B1{stroke:#0D32B2;} + .d2-1796086373 .stroke-B2{stroke:#0D32B2;} + .d2-1796086373 .stroke-B3{stroke:#E3E9FD;} + .d2-1796086373 .stroke-B4{stroke:#E3E9FD;} + .d2-1796086373 .stroke-B5{stroke:#EDF0FD;} + .d2-1796086373 .stroke-B6{stroke:#F7F8FE;} + .d2-1796086373 .stroke-AA2{stroke:#4A6FF3;} + .d2-1796086373 .stroke-AA4{stroke:#EDF0FD;} + .d2-1796086373 .stroke-AA5{stroke:#F7F8FE;} + .d2-1796086373 .stroke-AB4{stroke:#EDF0FD;} + .d2-1796086373 .stroke-AB5{stroke:#F7F8FE;} + .d2-1796086373 .background-color-N1{background-color:#0A0F25;} + .d2-1796086373 .background-color-N2{background-color:#676C7E;} + .d2-1796086373 .background-color-N3{background-color:#9499AB;} + .d2-1796086373 .background-color-N4{background-color:#CFD2DD;} + .d2-1796086373 .background-color-N5{background-color:#DEE1EB;} + .d2-1796086373 .background-color-N6{background-color:#EEF1F8;} + .d2-1796086373 .background-color-N7{background-color:#FFFFFF;} + .d2-1796086373 .background-color-B1{background-color:#0D32B2;} + .d2-1796086373 .background-color-B2{background-color:#0D32B2;} + .d2-1796086373 .background-color-B3{background-color:#E3E9FD;} + .d2-1796086373 .background-color-B4{background-color:#E3E9FD;} + .d2-1796086373 .background-color-B5{background-color:#EDF0FD;} + .d2-1796086373 .background-color-B6{background-color:#F7F8FE;} + .d2-1796086373 .background-color-AA2{background-color:#4A6FF3;} + .d2-1796086373 .background-color-AA4{background-color:#EDF0FD;} + .d2-1796086373 .background-color-AA5{background-color:#F7F8FE;} + .d2-1796086373 .background-color-AB4{background-color:#EDF0FD;} + .d2-1796086373 .background-color-AB5{background-color:#F7F8FE;} + .d2-1796086373 .color-N1{color:#0A0F25;} + .d2-1796086373 .color-N2{color:#676C7E;} + .d2-1796086373 .color-N3{color:#9499AB;} + .d2-1796086373 .color-N4{color:#CFD2DD;} + .d2-1796086373 .color-N5{color:#DEE1EB;} + .d2-1796086373 .color-N6{color:#EEF1F8;} + .d2-1796086373 .color-N7{color:#FFFFFF;} + .d2-1796086373 .color-B1{color:#0D32B2;} + .d2-1796086373 .color-B2{color:#0D32B2;} + .d2-1796086373 .color-B3{color:#E3E9FD;} + .d2-1796086373 .color-B4{color:#E3E9FD;} + .d2-1796086373 .color-B5{color:#EDF0FD;} + .d2-1796086373 .color-B6{color:#F7F8FE;} + .d2-1796086373 .color-AA2{color:#4A6FF3;} + .d2-1796086373 .color-AA4{color:#EDF0FD;} + .d2-1796086373 .color-AA5{color:#F7F8FE;} + .d2-1796086373 .color-AB4{color:#EDF0FD;} + .d2-1796086373 .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}]]>zaxybabcdbabcdabcdaccd + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json index e3002fd3e..80fede376 100644 --- a/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "package", "pos": { "x": 0, - "y": 41 + "y": 0 }, "width": 146, - "height": 151, + "height": 192, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "diamond", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 66, "height": 92, @@ -90,10 +90,10 @@ "type": "diamond", "pos": { "x": 166, - "y": 41 + "y": 0 }, "width": 156, - "height": 151, + "height": 192, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "oval", "pos": { "x": 206, - "y": 78 + "y": 58 }, "width": 76, "height": 76, diff --git a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg index 22ec7c748..7cc71e3c1 100644 --- a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aaccbbdd - - - - - + .d2-989314006 .fill-N1{fill:#0A0F25;} + .d2-989314006 .fill-N2{fill:#676C7E;} + .d2-989314006 .fill-N3{fill:#9499AB;} + .d2-989314006 .fill-N4{fill:#CFD2DD;} + .d2-989314006 .fill-N5{fill:#DEE1EB;} + .d2-989314006 .fill-N6{fill:#EEF1F8;} + .d2-989314006 .fill-N7{fill:#FFFFFF;} + .d2-989314006 .fill-B1{fill:#0D32B2;} + .d2-989314006 .fill-B2{fill:#0D32B2;} + .d2-989314006 .fill-B3{fill:#E3E9FD;} + .d2-989314006 .fill-B4{fill:#E3E9FD;} + .d2-989314006 .fill-B5{fill:#EDF0FD;} + .d2-989314006 .fill-B6{fill:#F7F8FE;} + .d2-989314006 .fill-AA2{fill:#4A6FF3;} + .d2-989314006 .fill-AA4{fill:#EDF0FD;} + .d2-989314006 .fill-AA5{fill:#F7F8FE;} + .d2-989314006 .fill-AB4{fill:#EDF0FD;} + .d2-989314006 .fill-AB5{fill:#F7F8FE;} + .d2-989314006 .stroke-N1{stroke:#0A0F25;} + .d2-989314006 .stroke-N2{stroke:#676C7E;} + .d2-989314006 .stroke-N3{stroke:#9499AB;} + .d2-989314006 .stroke-N4{stroke:#CFD2DD;} + .d2-989314006 .stroke-N5{stroke:#DEE1EB;} + .d2-989314006 .stroke-N6{stroke:#EEF1F8;} + .d2-989314006 .stroke-N7{stroke:#FFFFFF;} + .d2-989314006 .stroke-B1{stroke:#0D32B2;} + .d2-989314006 .stroke-B2{stroke:#0D32B2;} + .d2-989314006 .stroke-B3{stroke:#E3E9FD;} + .d2-989314006 .stroke-B4{stroke:#E3E9FD;} + .d2-989314006 .stroke-B5{stroke:#EDF0FD;} + .d2-989314006 .stroke-B6{stroke:#F7F8FE;} + .d2-989314006 .stroke-AA2{stroke:#4A6FF3;} + .d2-989314006 .stroke-AA4{stroke:#EDF0FD;} + .d2-989314006 .stroke-AA5{stroke:#F7F8FE;} + .d2-989314006 .stroke-AB4{stroke:#EDF0FD;} + .d2-989314006 .stroke-AB5{stroke:#F7F8FE;} + .d2-989314006 .background-color-N1{background-color:#0A0F25;} + .d2-989314006 .background-color-N2{background-color:#676C7E;} + .d2-989314006 .background-color-N3{background-color:#9499AB;} + .d2-989314006 .background-color-N4{background-color:#CFD2DD;} + .d2-989314006 .background-color-N5{background-color:#DEE1EB;} + .d2-989314006 .background-color-N6{background-color:#EEF1F8;} + .d2-989314006 .background-color-N7{background-color:#FFFFFF;} + .d2-989314006 .background-color-B1{background-color:#0D32B2;} + .d2-989314006 .background-color-B2{background-color:#0D32B2;} + .d2-989314006 .background-color-B3{background-color:#E3E9FD;} + .d2-989314006 .background-color-B4{background-color:#E3E9FD;} + .d2-989314006 .background-color-B5{background-color:#EDF0FD;} + .d2-989314006 .background-color-B6{background-color:#F7F8FE;} + .d2-989314006 .background-color-AA2{background-color:#4A6FF3;} + .d2-989314006 .background-color-AA4{background-color:#EDF0FD;} + .d2-989314006 .background-color-AA5{background-color:#F7F8FE;} + .d2-989314006 .background-color-AB4{background-color:#EDF0FD;} + .d2-989314006 .background-color-AB5{background-color:#F7F8FE;} + .d2-989314006 .color-N1{color:#0A0F25;} + .d2-989314006 .color-N2{color:#676C7E;} + .d2-989314006 .color-N3{color:#9499AB;} + .d2-989314006 .color-N4{color:#CFD2DD;} + .d2-989314006 .color-N5{color:#DEE1EB;} + .d2-989314006 .color-N6{color:#EEF1F8;} + .d2-989314006 .color-N7{color:#FFFFFF;} + .d2-989314006 .color-B1{color:#0D32B2;} + .d2-989314006 .color-B2{color:#0D32B2;} + .d2-989314006 .color-B3{color:#E3E9FD;} + .d2-989314006 .color-B4{color:#E3E9FD;} + .d2-989314006 .color-B5{color:#EDF0FD;} + .d2-989314006 .color-B6{color:#F7F8FE;} + .d2-989314006 .color-AA2{color:#4A6FF3;} + .d2-989314006 .color-AA4{color:#EDF0FD;} + .d2-989314006 .color-AA5{color:#F7F8FE;} + .d2-989314006 .color-AB4{color:#EDF0FD;} + .d2-989314006 .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}]]>aaccbbdd + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json index 1984f19b4..dbf5c7046 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 314, - "height": 125, + "width": 260, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 187, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -359,11 +359,11 @@ "route": [ { "x": 66.5, - "y": 136.5 + "y": 116 }, { "x": 66.5, - "y": 160.10000610351562 + "y": 156 }, { "x": 66.5, @@ -619,11 +619,11 @@ "route": [ { "x": 270, - "y": 166 + "y": 146 }, { "x": 270, - "y": 206 + "y": 202 }, { "x": 270, @@ -748,12 +748,12 @@ "labelPercentage": 0, "route": [ { - "x": 190.68600463867188, - "y": 136.5 + "x": 190.5, + "y": 116 }, { - "x": 163.33700561523438, - "y": 160.10000610351562 + "x": 163.3000030517578, + "y": 156 }, { "x": 156.5, 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 67750d9d0..4e044b490 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh - - + .d2-2332751097 .fill-N1{fill:#0A0F25;} + .d2-2332751097 .fill-N2{fill:#676C7E;} + .d2-2332751097 .fill-N3{fill:#9499AB;} + .d2-2332751097 .fill-N4{fill:#CFD2DD;} + .d2-2332751097 .fill-N5{fill:#DEE1EB;} + .d2-2332751097 .fill-N6{fill:#EEF1F8;} + .d2-2332751097 .fill-N7{fill:#FFFFFF;} + .d2-2332751097 .fill-B1{fill:#0D32B2;} + .d2-2332751097 .fill-B2{fill:#0D32B2;} + .d2-2332751097 .fill-B3{fill:#E3E9FD;} + .d2-2332751097 .fill-B4{fill:#E3E9FD;} + .d2-2332751097 .fill-B5{fill:#EDF0FD;} + .d2-2332751097 .fill-B6{fill:#F7F8FE;} + .d2-2332751097 .fill-AA2{fill:#4A6FF3;} + .d2-2332751097 .fill-AA4{fill:#EDF0FD;} + .d2-2332751097 .fill-AA5{fill:#F7F8FE;} + .d2-2332751097 .fill-AB4{fill:#EDF0FD;} + .d2-2332751097 .fill-AB5{fill:#F7F8FE;} + .d2-2332751097 .stroke-N1{stroke:#0A0F25;} + .d2-2332751097 .stroke-N2{stroke:#676C7E;} + .d2-2332751097 .stroke-N3{stroke:#9499AB;} + .d2-2332751097 .stroke-N4{stroke:#CFD2DD;} + .d2-2332751097 .stroke-N5{stroke:#DEE1EB;} + .d2-2332751097 .stroke-N6{stroke:#EEF1F8;} + .d2-2332751097 .stroke-N7{stroke:#FFFFFF;} + .d2-2332751097 .stroke-B1{stroke:#0D32B2;} + .d2-2332751097 .stroke-B2{stroke:#0D32B2;} + .d2-2332751097 .stroke-B3{stroke:#E3E9FD;} + .d2-2332751097 .stroke-B4{stroke:#E3E9FD;} + .d2-2332751097 .stroke-B5{stroke:#EDF0FD;} + .d2-2332751097 .stroke-B6{stroke:#F7F8FE;} + .d2-2332751097 .stroke-AA2{stroke:#4A6FF3;} + .d2-2332751097 .stroke-AA4{stroke:#EDF0FD;} + .d2-2332751097 .stroke-AA5{stroke:#F7F8FE;} + .d2-2332751097 .stroke-AB4{stroke:#EDF0FD;} + .d2-2332751097 .stroke-AB5{stroke:#F7F8FE;} + .d2-2332751097 .background-color-N1{background-color:#0A0F25;} + .d2-2332751097 .background-color-N2{background-color:#676C7E;} + .d2-2332751097 .background-color-N3{background-color:#9499AB;} + .d2-2332751097 .background-color-N4{background-color:#CFD2DD;} + .d2-2332751097 .background-color-N5{background-color:#DEE1EB;} + .d2-2332751097 .background-color-N6{background-color:#EEF1F8;} + .d2-2332751097 .background-color-N7{background-color:#FFFFFF;} + .d2-2332751097 .background-color-B1{background-color:#0D32B2;} + .d2-2332751097 .background-color-B2{background-color:#0D32B2;} + .d2-2332751097 .background-color-B3{background-color:#E3E9FD;} + .d2-2332751097 .background-color-B4{background-color:#E3E9FD;} + .d2-2332751097 .background-color-B5{background-color:#EDF0FD;} + .d2-2332751097 .background-color-B6{background-color:#F7F8FE;} + .d2-2332751097 .background-color-AA2{background-color:#4A6FF3;} + .d2-2332751097 .background-color-AA4{background-color:#EDF0FD;} + .d2-2332751097 .background-color-AA5{background-color:#F7F8FE;} + .d2-2332751097 .background-color-AB4{background-color:#EDF0FD;} + .d2-2332751097 .background-color-AB5{background-color:#F7F8FE;} + .d2-2332751097 .color-N1{color:#0A0F25;} + .d2-2332751097 .color-N2{color:#676C7E;} + .d2-2332751097 .color-N3{color:#9499AB;} + .d2-2332751097 .color-N4{color:#CFD2DD;} + .d2-2332751097 .color-N5{color:#DEE1EB;} + .d2-2332751097 .color-N6{color:#EEF1F8;} + .d2-2332751097 .color-N7{color:#FFFFFF;} + .d2-2332751097 .color-B1{color:#0D32B2;} + .d2-2332751097 .color-B2{color:#0D32B2;} + .d2-2332751097 .color-B3{color:#E3E9FD;} + .d2-2332751097 .color-B4{color:#E3E9FD;} + .d2-2332751097 .color-B5{color:#EDF0FD;} + .d2-2332751097 .color-B6{color:#F7F8FE;} + .d2-2332751097 .color-AA2{color:#4A6FF3;} + .d2-2332751097 .color-AA4{color:#EDF0FD;} + .d2-2332751097 .color-AA5{color:#F7F8FE;} + .d2-2332751097 .color-AB4{color:#EDF0FD;} + .d2-2332751097 .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}]]>acdefgbh + + - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json index 643fd62b5..a853f9265 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "top2", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 93, + "y": 20 }, - "width": 326, - "height": 125, + "width": 140, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 123, - "y": 70 + "y": 50 }, "width": 80, "height": 66, @@ -212,11 +212,11 @@ "id": "bottom", "type": "rectangle", "pos": { - "x": 0, - "y": 473 + "x": 107, + "y": 452 }, - "width": 324, - "height": 125, + "width": 132, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 137, - "y": 502 + "y": 482 }, "width": 72, "height": 66, @@ -318,11 +318,11 @@ "route": [ { "x": 123, - "y": 135.11900329589844 + "y": 115 }, { "x": 71, - "y": 159.822998046875 + "y": 155.8000030517578 }, { "x": 58, @@ -364,12 +364,12 @@ "labelPercentage": 0, "route": [ { - "x": 166.17999267578125, - "y": 136.5 + "x": 166, + "y": 116 }, { - "x": 170.03599548339844, - "y": 160.10000610351562 + "x": 170, + "y": 156 }, { "x": 171, @@ -412,11 +412,11 @@ "route": [ { "x": 203, - "y": 130.93800354003906 + "y": 110 }, { "x": 267.79998779296875, - "y": 158.98699951171875 + "y": 154.8000030517578 }, { "x": 284, @@ -467,11 +467,11 @@ }, { "x": 73.80000305175781, - "y": 447.5 + "y": 443.3999938964844 }, { "x": 137, - "y": 509.5 + "y": 489 } ], "isCurve": true, @@ -514,11 +514,11 @@ }, { "x": 171.1999969482422, - "y": 446.1000061035156 + "y": 442 }, { "x": 172, - "y": 502.5 + "y": 482 } ], "isCurve": true, @@ -561,11 +561,11 @@ }, { "x": 269, - "y": 447.29998779296875 + "y": 443.20001220703125 }, { "x": 209, - "y": 508.5 + "y": 488 } ], "isCurve": true, 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 b8f3dd184..ea8bc4ca6 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,16 +1,16 @@ -top2abcbottomstartend - - + .d2-1100252641 .fill-N1{fill:#0A0F25;} + .d2-1100252641 .fill-N2{fill:#676C7E;} + .d2-1100252641 .fill-N3{fill:#9499AB;} + .d2-1100252641 .fill-N4{fill:#CFD2DD;} + .d2-1100252641 .fill-N5{fill:#DEE1EB;} + .d2-1100252641 .fill-N6{fill:#EEF1F8;} + .d2-1100252641 .fill-N7{fill:#FFFFFF;} + .d2-1100252641 .fill-B1{fill:#0D32B2;} + .d2-1100252641 .fill-B2{fill:#0D32B2;} + .d2-1100252641 .fill-B3{fill:#E3E9FD;} + .d2-1100252641 .fill-B4{fill:#E3E9FD;} + .d2-1100252641 .fill-B5{fill:#EDF0FD;} + .d2-1100252641 .fill-B6{fill:#F7F8FE;} + .d2-1100252641 .fill-AA2{fill:#4A6FF3;} + .d2-1100252641 .fill-AA4{fill:#EDF0FD;} + .d2-1100252641 .fill-AA5{fill:#F7F8FE;} + .d2-1100252641 .fill-AB4{fill:#EDF0FD;} + .d2-1100252641 .fill-AB5{fill:#F7F8FE;} + .d2-1100252641 .stroke-N1{stroke:#0A0F25;} + .d2-1100252641 .stroke-N2{stroke:#676C7E;} + .d2-1100252641 .stroke-N3{stroke:#9499AB;} + .d2-1100252641 .stroke-N4{stroke:#CFD2DD;} + .d2-1100252641 .stroke-N5{stroke:#DEE1EB;} + .d2-1100252641 .stroke-N6{stroke:#EEF1F8;} + .d2-1100252641 .stroke-N7{stroke:#FFFFFF;} + .d2-1100252641 .stroke-B1{stroke:#0D32B2;} + .d2-1100252641 .stroke-B2{stroke:#0D32B2;} + .d2-1100252641 .stroke-B3{stroke:#E3E9FD;} + .d2-1100252641 .stroke-B4{stroke:#E3E9FD;} + .d2-1100252641 .stroke-B5{stroke:#EDF0FD;} + .d2-1100252641 .stroke-B6{stroke:#F7F8FE;} + .d2-1100252641 .stroke-AA2{stroke:#4A6FF3;} + .d2-1100252641 .stroke-AA4{stroke:#EDF0FD;} + .d2-1100252641 .stroke-AA5{stroke:#F7F8FE;} + .d2-1100252641 .stroke-AB4{stroke:#EDF0FD;} + .d2-1100252641 .stroke-AB5{stroke:#F7F8FE;} + .d2-1100252641 .background-color-N1{background-color:#0A0F25;} + .d2-1100252641 .background-color-N2{background-color:#676C7E;} + .d2-1100252641 .background-color-N3{background-color:#9499AB;} + .d2-1100252641 .background-color-N4{background-color:#CFD2DD;} + .d2-1100252641 .background-color-N5{background-color:#DEE1EB;} + .d2-1100252641 .background-color-N6{background-color:#EEF1F8;} + .d2-1100252641 .background-color-N7{background-color:#FFFFFF;} + .d2-1100252641 .background-color-B1{background-color:#0D32B2;} + .d2-1100252641 .background-color-B2{background-color:#0D32B2;} + .d2-1100252641 .background-color-B3{background-color:#E3E9FD;} + .d2-1100252641 .background-color-B4{background-color:#E3E9FD;} + .d2-1100252641 .background-color-B5{background-color:#EDF0FD;} + .d2-1100252641 .background-color-B6{background-color:#F7F8FE;} + .d2-1100252641 .background-color-AA2{background-color:#4A6FF3;} + .d2-1100252641 .background-color-AA4{background-color:#EDF0FD;} + .d2-1100252641 .background-color-AA5{background-color:#F7F8FE;} + .d2-1100252641 .background-color-AB4{background-color:#EDF0FD;} + .d2-1100252641 .background-color-AB5{background-color:#F7F8FE;} + .d2-1100252641 .color-N1{color:#0A0F25;} + .d2-1100252641 .color-N2{color:#676C7E;} + .d2-1100252641 .color-N3{color:#9499AB;} + .d2-1100252641 .color-N4{color:#CFD2DD;} + .d2-1100252641 .color-N5{color:#DEE1EB;} + .d2-1100252641 .color-N6{color:#EEF1F8;} + .d2-1100252641 .color-N7{color:#FFFFFF;} + .d2-1100252641 .color-B1{color:#0D32B2;} + .d2-1100252641 .color-B2{color:#0D32B2;} + .d2-1100252641 .color-B3{color:#E3E9FD;} + .d2-1100252641 .color-B4{color:#E3E9FD;} + .d2-1100252641 .color-B5{color:#EDF0FD;} + .d2-1100252641 .color-B6{color:#F7F8FE;} + .d2-1100252641 .color-AA2{color:#4A6FF3;} + .d2-1100252641 .color-AA4{color:#EDF0FD;} + .d2-1100252641 .color-AA5{color:#F7F8FE;} + .d2-1100252641 .color-AB4{color:#EDF0FD;} + .d2-1100252641 .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}]]>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 index 0b07ba894..f424c7cf9 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json @@ -49,7 +49,7 @@ "type": "person", "pos": { "x": 9, - "y": 447 + "y": 395 }, "width": 157, "height": 105, @@ -90,7 +90,7 @@ "type": "person", "pos": { "x": 28, - "y": 242 + "y": 216 }, "width": 118, "height": 79, @@ -153,20 +153,20 @@ "labelPercentage": 0, "route": [ { - "x": 75, + "x": 71, "y": 142 }, { - "x": 68.5999984741211, - "y": 182 + "x": 67.80000305175781, + "y": 161.1999969482422 }, { - "x": 69, - "y": 202.1999969482422 + "x": 69.19999694824219, + "y": 176.1999969482422 }, { - "x": 77, - "y": 243 + "x": 78, + "y": 217 } ], "isCurve": true, @@ -201,19 +201,19 @@ "route": [ { "x": 87, - "y": 447 + "y": 395 }, { "x": 87, - "y": 407 + "y": 355 }, { "x": 87, - "y": 387 + "y": 340.20001220703125 }, { "x": 87, - "y": 347 + "y": 321 } ], "isCurve": true, @@ -252,15 +252,15 @@ }, { "x": 87, - "y": 182 + "y": 161.1999969482422 }, { "x": 87, - "y": 202 + "y": 176 }, { "x": 87, - "y": 242 + "y": 216 } ], "isCurve": true, @@ -294,20 +294,20 @@ "labelPercentage": 0, "route": [ { - "x": 98, - "y": 448 - }, - { - "x": 105.19999694824219, - "y": 407.20001220703125 + "x": 97, + "y": 395 }, { "x": 105, - "y": 387 + "y": 355 }, { - "x": 97, - "y": 347 + "x": 106, + "y": 340.20001220703125 + }, + { + "x": 102, + "y": 321 } ], "isCurve": true, @@ -341,20 +341,20 @@ "labelPercentage": 0, "route": [ { - "x": 77, - "y": 347 + "x": 72, + "y": 321 + }, + { + "x": 68, + "y": 340.20001220703125 }, { "x": 69, - "y": 387 + "y": 355 }, { - "x": 68.80000305175781, - "y": 407.20001220703125 - }, - { - "x": 76, - "y": 448 + "x": 77, + "y": 395 } ], "isCurve": true, @@ -388,19 +388,19 @@ "labelPercentage": 0, "route": [ { - "x": 97, - "y": 243 + "x": 96, + "y": 217 }, { - "x": 105, - "y": 202.1999969482422 + "x": 104.80000305175781, + "y": 176.1999969482422 }, { - "x": 105.4000015258789, - "y": 182 + "x": 106.19999694824219, + "y": 161.1999969482422 }, { - "x": 99, + "x": 103, "y": 142 } ], diff --git a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg index bf848899a..99939528b 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle - + .d2-3305683316 .fill-N1{fill:#0A0F25;} + .d2-3305683316 .fill-N2{fill:#676C7E;} + .d2-3305683316 .fill-N3{fill:#9499AB;} + .d2-3305683316 .fill-N4{fill:#CFD2DD;} + .d2-3305683316 .fill-N5{fill:#DEE1EB;} + .d2-3305683316 .fill-N6{fill:#EEF1F8;} + .d2-3305683316 .fill-N7{fill:#FFFFFF;} + .d2-3305683316 .fill-B1{fill:#0D32B2;} + .d2-3305683316 .fill-B2{fill:#0D32B2;} + .d2-3305683316 .fill-B3{fill:#E3E9FD;} + .d2-3305683316 .fill-B4{fill:#E3E9FD;} + .d2-3305683316 .fill-B5{fill:#EDF0FD;} + .d2-3305683316 .fill-B6{fill:#F7F8FE;} + .d2-3305683316 .fill-AA2{fill:#4A6FF3;} + .d2-3305683316 .fill-AA4{fill:#EDF0FD;} + .d2-3305683316 .fill-AA5{fill:#F7F8FE;} + .d2-3305683316 .fill-AB4{fill:#EDF0FD;} + .d2-3305683316 .fill-AB5{fill:#F7F8FE;} + .d2-3305683316 .stroke-N1{stroke:#0A0F25;} + .d2-3305683316 .stroke-N2{stroke:#676C7E;} + .d2-3305683316 .stroke-N3{stroke:#9499AB;} + .d2-3305683316 .stroke-N4{stroke:#CFD2DD;} + .d2-3305683316 .stroke-N5{stroke:#DEE1EB;} + .d2-3305683316 .stroke-N6{stroke:#EEF1F8;} + .d2-3305683316 .stroke-N7{stroke:#FFFFFF;} + .d2-3305683316 .stroke-B1{stroke:#0D32B2;} + .d2-3305683316 .stroke-B2{stroke:#0D32B2;} + .d2-3305683316 .stroke-B3{stroke:#E3E9FD;} + .d2-3305683316 .stroke-B4{stroke:#E3E9FD;} + .d2-3305683316 .stroke-B5{stroke:#EDF0FD;} + .d2-3305683316 .stroke-B6{stroke:#F7F8FE;} + .d2-3305683316 .stroke-AA2{stroke:#4A6FF3;} + .d2-3305683316 .stroke-AA4{stroke:#EDF0FD;} + .d2-3305683316 .stroke-AA5{stroke:#F7F8FE;} + .d2-3305683316 .stroke-AB4{stroke:#EDF0FD;} + .d2-3305683316 .stroke-AB5{stroke:#F7F8FE;} + .d2-3305683316 .background-color-N1{background-color:#0A0F25;} + .d2-3305683316 .background-color-N2{background-color:#676C7E;} + .d2-3305683316 .background-color-N3{background-color:#9499AB;} + .d2-3305683316 .background-color-N4{background-color:#CFD2DD;} + .d2-3305683316 .background-color-N5{background-color:#DEE1EB;} + .d2-3305683316 .background-color-N6{background-color:#EEF1F8;} + .d2-3305683316 .background-color-N7{background-color:#FFFFFF;} + .d2-3305683316 .background-color-B1{background-color:#0D32B2;} + .d2-3305683316 .background-color-B2{background-color:#0D32B2;} + .d2-3305683316 .background-color-B3{background-color:#E3E9FD;} + .d2-3305683316 .background-color-B4{background-color:#E3E9FD;} + .d2-3305683316 .background-color-B5{background-color:#EDF0FD;} + .d2-3305683316 .background-color-B6{background-color:#F7F8FE;} + .d2-3305683316 .background-color-AA2{background-color:#4A6FF3;} + .d2-3305683316 .background-color-AA4{background-color:#EDF0FD;} + .d2-3305683316 .background-color-AA5{background-color:#F7F8FE;} + .d2-3305683316 .background-color-AB4{background-color:#EDF0FD;} + .d2-3305683316 .background-color-AB5{background-color:#F7F8FE;} + .d2-3305683316 .color-N1{color:#0A0F25;} + .d2-3305683316 .color-N2{color:#676C7E;} + .d2-3305683316 .color-N3{color:#9499AB;} + .d2-3305683316 .color-N4{color:#CFD2DD;} + .d2-3305683316 .color-N5{color:#DEE1EB;} + .d2-3305683316 .color-N6{color:#EEF1F8;} + .d2-3305683316 .color-N7{color:#FFFFFF;} + .d2-3305683316 .color-B1{color:#0D32B2;} + .d2-3305683316 .color-B2{color:#0D32B2;} + .d2-3305683316 .color-B3{color:#E3E9FD;} + .d2-3305683316 .color-B4{color:#E3E9FD;} + .d2-3305683316 .color-B5{color:#EDF0FD;} + .d2-3305683316 .color-B6{color:#F7F8FE;} + .d2-3305683316 .color-AA2{color:#4A6FF3;} + .d2-3305683316 .color-AA4{color:#EDF0FD;} + .d2-3305683316 .color-AA5{color:#F7F8FE;} + .d2-3305683316 .color-AB4{color:#EDF0FD;} + .d2-3305683316 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle + - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json index 7f980921e..8241c4499 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json @@ -61,10 +61,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 295 + "y": 248 }, "width": 932, - "height": 963, + "height": 847, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -102,7 +102,7 @@ "type": "image", "pos": { "x": 402, - "y": 324 + "y": 278 }, "width": 128, "height": 128, @@ -155,10 +155,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 635 + "y": 547 }, "width": 436, - "height": 593, + "height": 518, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -196,7 +196,7 @@ "type": "image", "pos": { "x": 174, - "y": 667 + "y": 577 }, "width": 128, "height": 128, @@ -248,11 +248,11 @@ "id": "container.left2.inner", "type": "rectangle", "pos": { - "x": 40, - "y": 973 + "x": 50, + "y": 846 }, - "width": 396, - "height": 223, + "width": 376, + "height": 189, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -290,7 +290,7 @@ "type": "image", "pos": { "x": 80, - "y": 1008 + "y": 876 }, "width": 128, "height": 128, @@ -343,7 +343,7 @@ "type": "image", "pos": { "x": 268, - "y": 1008 + "y": 876 }, "width": 128, "height": 128, @@ -396,10 +396,10 @@ "type": "rectangle", "pos": { "x": 476, - "y": 635 + "y": 547 }, "width": 436, - "height": 593, + "height": 518, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -437,7 +437,7 @@ "type": "image", "pos": { "x": 630, - "y": 667 + "y": 577 }, "width": 128, "height": 128, @@ -489,11 +489,11 @@ "id": "container.right.inner", "type": "rectangle", "pos": { - "x": 496, - "y": 973 + "x": 506, + "y": 846 }, - "width": 396, - "height": 223, + "width": 376, + "height": 189, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +531,7 @@ "type": "image", "pos": { "x": 536, - "y": 1008 + "y": 876 }, "width": 128, "height": 128, @@ -584,7 +584,7 @@ "type": "image", "pos": { "x": 724, - "y": 1008 + "y": 876 }, "width": 128, "height": 128, @@ -664,15 +664,15 @@ }, { "x": 466, - "y": 194 + "y": 173.1999969482422 }, { "x": 466, - "y": 268.1000061035156 + "y": 238 }, { "x": 466, - "y": 324.5 + "y": 278 } ], "isCurve": true, @@ -706,20 +706,20 @@ "labelPercentage": 0, "route": [ { - "x": 185.36000061035156, - "y": 821.5 + "x": 190, + "y": 704.5 }, { - "x": 152.27200317382812, - "y": 869.9000244140625 + "x": 153.1999969482422, + "y": 753.2999877929688 }, { "x": 144, - "y": 955.5999755859375 + "y": 836 }, { "x": 144, - "y": 1008 + "y": 876 } ], "isCurve": true, @@ -753,20 +753,20 @@ "labelPercentage": 0, "route": [ { - "x": 290.6400146484375, - "y": 821.5 + "x": 286, + "y": 704.5 }, { - "x": 323.7279968261719, - "y": 869.9000244140625 + "x": 322.79998779296875, + "y": 753.2999877929688 }, { "x": 332, - "y": 955.5999755859375 + "y": 836 }, { "x": 332, - "y": 1008 + "y": 876 } ], "isCurve": true, @@ -800,20 +800,20 @@ "labelPercentage": 0, "route": [ { - "x": 641.3599853515625, - "y": 821.5 + "x": 646, + "y": 704.5 }, { - "x": 608.27197265625, - "y": 869.9000244140625 + "x": 609.2000122070312, + "y": 753.2999877929688 }, { "x": 600, - "y": 955.5999755859375 + "y": 836 }, { "x": 600, - "y": 1008 + "y": 876 } ], "isCurve": true, @@ -847,20 +847,20 @@ "labelPercentage": 0, "route": [ { - "x": 746.6400146484375, - "y": 821.5 + "x": 742, + "y": 704.5 }, { - "x": 779.72802734375, - "y": 869.9000244140625 + "x": 778.7999877929688, + "y": 753.2999877929688 }, { "x": 788, - "y": 955.5999755859375 + "y": 836 }, { "x": 788, - "y": 1008 + "y": 876 } ], "isCurve": true, @@ -895,19 +895,19 @@ "route": [ { "x": 402, - "y": 440.09600830078125 + "y": 376.5 }, { "x": 270.79901123046875, - "y": 519.218994140625 + "y": 448.5 }, { "x": 238, - "y": 613.0999755859375 + "y": 537 }, { "x": 238, - "y": 667.5 + "y": 577 } ], "isCurve": true, @@ -942,19 +942,19 @@ "route": [ { "x": 530, - "y": 440.09600830078125 + "y": 376.5 }, { "x": 661.2000122070312, - "y": 519.218994140625 + "y": 448.5 }, { "x": 694, - "y": 613.0999755859375 + "y": 537 }, { "x": 694, - "y": 667.5 + "y": 577 } ], "isCurve": true, 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 3bf1bc2fc..2a99b35e3 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,23 +1,23 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root - + .d2-2980654810 .fill-N1{fill:#0A0F25;} + .d2-2980654810 .fill-N2{fill:#676C7E;} + .d2-2980654810 .fill-N3{fill:#9499AB;} + .d2-2980654810 .fill-N4{fill:#CFD2DD;} + .d2-2980654810 .fill-N5{fill:#DEE1EB;} + .d2-2980654810 .fill-N6{fill:#EEF1F8;} + .d2-2980654810 .fill-N7{fill:#FFFFFF;} + .d2-2980654810 .fill-B1{fill:#0D32B2;} + .d2-2980654810 .fill-B2{fill:#0D32B2;} + .d2-2980654810 .fill-B3{fill:#E3E9FD;} + .d2-2980654810 .fill-B4{fill:#E3E9FD;} + .d2-2980654810 .fill-B5{fill:#EDF0FD;} + .d2-2980654810 .fill-B6{fill:#F7F8FE;} + .d2-2980654810 .fill-AA2{fill:#4A6FF3;} + .d2-2980654810 .fill-AA4{fill:#EDF0FD;} + .d2-2980654810 .fill-AA5{fill:#F7F8FE;} + .d2-2980654810 .fill-AB4{fill:#EDF0FD;} + .d2-2980654810 .fill-AB5{fill:#F7F8FE;} + .d2-2980654810 .stroke-N1{stroke:#0A0F25;} + .d2-2980654810 .stroke-N2{stroke:#676C7E;} + .d2-2980654810 .stroke-N3{stroke:#9499AB;} + .d2-2980654810 .stroke-N4{stroke:#CFD2DD;} + .d2-2980654810 .stroke-N5{stroke:#DEE1EB;} + .d2-2980654810 .stroke-N6{stroke:#EEF1F8;} + .d2-2980654810 .stroke-N7{stroke:#FFFFFF;} + .d2-2980654810 .stroke-B1{stroke:#0D32B2;} + .d2-2980654810 .stroke-B2{stroke:#0D32B2;} + .d2-2980654810 .stroke-B3{stroke:#E3E9FD;} + .d2-2980654810 .stroke-B4{stroke:#E3E9FD;} + .d2-2980654810 .stroke-B5{stroke:#EDF0FD;} + .d2-2980654810 .stroke-B6{stroke:#F7F8FE;} + .d2-2980654810 .stroke-AA2{stroke:#4A6FF3;} + .d2-2980654810 .stroke-AA4{stroke:#EDF0FD;} + .d2-2980654810 .stroke-AA5{stroke:#F7F8FE;} + .d2-2980654810 .stroke-AB4{stroke:#EDF0FD;} + .d2-2980654810 .stroke-AB5{stroke:#F7F8FE;} + .d2-2980654810 .background-color-N1{background-color:#0A0F25;} + .d2-2980654810 .background-color-N2{background-color:#676C7E;} + .d2-2980654810 .background-color-N3{background-color:#9499AB;} + .d2-2980654810 .background-color-N4{background-color:#CFD2DD;} + .d2-2980654810 .background-color-N5{background-color:#DEE1EB;} + .d2-2980654810 .background-color-N6{background-color:#EEF1F8;} + .d2-2980654810 .background-color-N7{background-color:#FFFFFF;} + .d2-2980654810 .background-color-B1{background-color:#0D32B2;} + .d2-2980654810 .background-color-B2{background-color:#0D32B2;} + .d2-2980654810 .background-color-B3{background-color:#E3E9FD;} + .d2-2980654810 .background-color-B4{background-color:#E3E9FD;} + .d2-2980654810 .background-color-B5{background-color:#EDF0FD;} + .d2-2980654810 .background-color-B6{background-color:#F7F8FE;} + .d2-2980654810 .background-color-AA2{background-color:#4A6FF3;} + .d2-2980654810 .background-color-AA4{background-color:#EDF0FD;} + .d2-2980654810 .background-color-AA5{background-color:#F7F8FE;} + .d2-2980654810 .background-color-AB4{background-color:#EDF0FD;} + .d2-2980654810 .background-color-AB5{background-color:#F7F8FE;} + .d2-2980654810 .color-N1{color:#0A0F25;} + .d2-2980654810 .color-N2{color:#676C7E;} + .d2-2980654810 .color-N3{color:#9499AB;} + .d2-2980654810 .color-N4{color:#CFD2DD;} + .d2-2980654810 .color-N5{color:#DEE1EB;} + .d2-2980654810 .color-N6{color:#EEF1F8;} + .d2-2980654810 .color-N7{color:#FFFFFF;} + .d2-2980654810 .color-B1{color:#0D32B2;} + .d2-2980654810 .color-B2{color:#0D32B2;} + .d2-2980654810 .color-B3{color:#E3E9FD;} + .d2-2980654810 .color-B4{color:#E3E9FD;} + .d2-2980654810 .color-B5{color:#EDF0FD;} + .d2-2980654810 .color-B6{color:#F7F8FE;} + .d2-2980654810 .color-AA2{color:#4A6FF3;} + .d2-2980654810 .color-AA4{color:#EDF0FD;} + .d2-2980654810 .color-AA5{color:#F7F8FE;} + .d2-2980654810 .color-AB4{color:#EDF0FD;} + .d2-2980654810 .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}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json index b6cff33a9..504fa726a 100644 --- a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json +++ b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json @@ -153,12 +153,12 @@ "labelPercentage": 0, "route": [ { - "x": 53, - "y": 18.384000778198242 + "x": 53.33300018310547, + "y": 18 }, { - "x": 79.66600036621094, - "y": 3.6760001182556152 + "x": 79.73300170898438, + "y": 3.5989999771118164 }, { "x": 88, @@ -197,12 +197,12 @@ "y": 59.400001525878906 }, { - "x": 79.66600036621094, - "y": 62.323001861572266 + "x": 79.73300170898438, + "y": 62.400001525878906 }, { - "x": 53, - "y": 47.6150016784668 + "x": 53.33300018310547, + "y": 48 } ], "isCurve": true, @@ -237,11 +237,11 @@ "route": [ { "x": 53, - "y": 22.889999389648438 + "y": 23 }, { "x": 101, - "y": 4.578000068664551 + "y": 4.598999977111816 }, { "x": 116, @@ -281,11 +281,11 @@ }, { "x": 101, - "y": 61.42100143432617 + "y": 61.400001525878906 }, { "x": 53, - "y": 43.10900115966797 + "y": 43 } ], "isCurve": true, @@ -413,12 +413,12 @@ "labelPercentage": 0, "route": [ { - "x": 245, - "y": 19.523000717163086 + "x": 244.66600036621094, + "y": 20 }, { - "x": 275.13299560546875, - "y": 3.9040000438690186 + "x": 275.0660095214844, + "y": 4 }, { "x": 284.54998779296875, @@ -457,12 +457,12 @@ "y": 59.400001525878906 }, { - "x": 275.13299560546875, - "y": 62.095001220703125 + "x": 275.0660095214844, + "y": 62 }, { - "x": 245, - "y": 46.47600173950195 + "x": 244.66600036621094, + "y": 46 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg index b2cb11f9b..9d8e8a8f5 100644 --- a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz hello + .d2-741425355 .fill-N1{fill:#0A0F25;} + .d2-741425355 .fill-N2{fill:#676C7E;} + .d2-741425355 .fill-N3{fill:#9499AB;} + .d2-741425355 .fill-N4{fill:#CFD2DD;} + .d2-741425355 .fill-N5{fill:#DEE1EB;} + .d2-741425355 .fill-N6{fill:#EEF1F8;} + .d2-741425355 .fill-N7{fill:#FFFFFF;} + .d2-741425355 .fill-B1{fill:#0D32B2;} + .d2-741425355 .fill-B2{fill:#0D32B2;} + .d2-741425355 .fill-B3{fill:#E3E9FD;} + .d2-741425355 .fill-B4{fill:#E3E9FD;} + .d2-741425355 .fill-B5{fill:#EDF0FD;} + .d2-741425355 .fill-B6{fill:#F7F8FE;} + .d2-741425355 .fill-AA2{fill:#4A6FF3;} + .d2-741425355 .fill-AA4{fill:#EDF0FD;} + .d2-741425355 .fill-AA5{fill:#F7F8FE;} + .d2-741425355 .fill-AB4{fill:#EDF0FD;} + .d2-741425355 .fill-AB5{fill:#F7F8FE;} + .d2-741425355 .stroke-N1{stroke:#0A0F25;} + .d2-741425355 .stroke-N2{stroke:#676C7E;} + .d2-741425355 .stroke-N3{stroke:#9499AB;} + .d2-741425355 .stroke-N4{stroke:#CFD2DD;} + .d2-741425355 .stroke-N5{stroke:#DEE1EB;} + .d2-741425355 .stroke-N6{stroke:#EEF1F8;} + .d2-741425355 .stroke-N7{stroke:#FFFFFF;} + .d2-741425355 .stroke-B1{stroke:#0D32B2;} + .d2-741425355 .stroke-B2{stroke:#0D32B2;} + .d2-741425355 .stroke-B3{stroke:#E3E9FD;} + .d2-741425355 .stroke-B4{stroke:#E3E9FD;} + .d2-741425355 .stroke-B5{stroke:#EDF0FD;} + .d2-741425355 .stroke-B6{stroke:#F7F8FE;} + .d2-741425355 .stroke-AA2{stroke:#4A6FF3;} + .d2-741425355 .stroke-AA4{stroke:#EDF0FD;} + .d2-741425355 .stroke-AA5{stroke:#F7F8FE;} + .d2-741425355 .stroke-AB4{stroke:#EDF0FD;} + .d2-741425355 .stroke-AB5{stroke:#F7F8FE;} + .d2-741425355 .background-color-N1{background-color:#0A0F25;} + .d2-741425355 .background-color-N2{background-color:#676C7E;} + .d2-741425355 .background-color-N3{background-color:#9499AB;} + .d2-741425355 .background-color-N4{background-color:#CFD2DD;} + .d2-741425355 .background-color-N5{background-color:#DEE1EB;} + .d2-741425355 .background-color-N6{background-color:#EEF1F8;} + .d2-741425355 .background-color-N7{background-color:#FFFFFF;} + .d2-741425355 .background-color-B1{background-color:#0D32B2;} + .d2-741425355 .background-color-B2{background-color:#0D32B2;} + .d2-741425355 .background-color-B3{background-color:#E3E9FD;} + .d2-741425355 .background-color-B4{background-color:#E3E9FD;} + .d2-741425355 .background-color-B5{background-color:#EDF0FD;} + .d2-741425355 .background-color-B6{background-color:#F7F8FE;} + .d2-741425355 .background-color-AA2{background-color:#4A6FF3;} + .d2-741425355 .background-color-AA4{background-color:#EDF0FD;} + .d2-741425355 .background-color-AA5{background-color:#F7F8FE;} + .d2-741425355 .background-color-AB4{background-color:#EDF0FD;} + .d2-741425355 .background-color-AB5{background-color:#F7F8FE;} + .d2-741425355 .color-N1{color:#0A0F25;} + .d2-741425355 .color-N2{color:#676C7E;} + .d2-741425355 .color-N3{color:#9499AB;} + .d2-741425355 .color-N4{color:#CFD2DD;} + .d2-741425355 .color-N5{color:#DEE1EB;} + .d2-741425355 .color-N6{color:#EEF1F8;} + .d2-741425355 .color-N7{color:#FFFFFF;} + .d2-741425355 .color-B1{color:#0D32B2;} + .d2-741425355 .color-B2{color:#0D32B2;} + .d2-741425355 .color-B3{color:#E3E9FD;} + .d2-741425355 .color-B4{color:#E3E9FD;} + .d2-741425355 .color-B5{color:#EDF0FD;} + .d2-741425355 .color-B6{color:#F7F8FE;} + .d2-741425355 .color-AA2{color:#4A6FF3;} + .d2-741425355 .color-AA4{color:#EDF0FD;} + .d2-741425355 .color-AA5{color:#F7F8FE;} + .d2-741425355 .color-AB4{color:#EDF0FD;} + .d2-741425355 .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}]]>xyz hello diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json index 4cf556290..baa755aa5 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json @@ -775,11 +775,11 @@ "id": "another", "type": "rectangle", "pos": { - "x": 994, - "y": 249 + "x": 1004, + "y": 231 }, - "width": 1034, - "height": 1205, + "width": 1014, + "height": 1201, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -817,7 +817,7 @@ "type": "sequence_diagram", "pos": { "x": 1034, - "y": 281 + "y": 261 }, "width": 954, "height": 1141, @@ -858,7 +858,7 @@ "type": "rectangle", "pos": { "x": 1046, - "y": 364 + "y": 344 }, "width": 100, "height": 66, @@ -899,7 +899,7 @@ "type": "rectangle", "pos": { "x": 1090, - "y": 490 + "y": 470 }, "width": 12, "height": 860, @@ -939,7 +939,7 @@ "type": "rectangle", "pos": { "x": 1186, - "y": 364 + "y": 344 }, "width": 140, "height": 66, @@ -980,7 +980,7 @@ "type": "rectangle", "pos": { "x": 1250, - "y": 490 + "y": 470 }, "width": 12, "height": 90, @@ -1020,7 +1020,7 @@ "type": "rectangle", "pos": { "x": 1356, - "y": 364 + "y": 344 }, "width": 100, "height": 66, @@ -1061,7 +1061,7 @@ "type": "rectangle", "pos": { "x": 1400, - "y": 630 + "y": 610 }, "width": 12, "height": 90, @@ -1101,7 +1101,7 @@ "type": "rectangle", "pos": { "x": 1496, - "y": 364 + "y": 344 }, "width": 126, "height": 66, @@ -1142,7 +1142,7 @@ "type": "rectangle", "pos": { "x": 1553, - "y": 770 + "y": 750 }, "width": 12, "height": 230, @@ -1182,7 +1182,7 @@ "type": "rectangle", "pos": { "x": 1549, - "y": 840 + "y": 820 }, "width": 20, "height": 90, @@ -1222,7 +1222,7 @@ "type": "rectangle", "pos": { "x": 1699, - "y": 364 + "y": 344 }, "width": 100, "height": 66, @@ -1263,7 +1263,7 @@ "type": "rectangle", "pos": { "x": 1743, - "y": 910 + "y": 890 }, "width": 12, "height": 30, @@ -1303,7 +1303,7 @@ "type": "rectangle", "pos": { "x": 1839, - "y": 364 + "y": 344 }, "width": 137, "height": 66, @@ -1344,7 +1344,7 @@ "type": "rectangle", "pos": { "x": 1901, - "y": 1050 + "y": 1030 }, "width": 12, "height": 30, @@ -1384,7 +1384,7 @@ "type": "rectangle", "pos": { "x": 1400, - "y": 1120 + "y": 1100 }, "width": 12, "height": 30, @@ -1424,7 +1424,7 @@ "type": "rectangle", "pos": { "x": 1400, - "y": 1190 + "y": 1170 }, "width": 12, "height": 30, @@ -1464,7 +1464,7 @@ "type": "rectangle", "pos": { "x": 1901, - "y": 1260 + "y": 1240 }, "width": 12, "height": 30, @@ -1504,7 +1504,7 @@ "type": "rectangle", "pos": { "x": 1901, - "y": 1330 + "y": 1310 }, "width": 12, "height": 30, @@ -1585,10 +1585,10 @@ "type": "queue", "pos": { "x": 1238, - "y": 1595 + "y": 1554 }, "width": 1074, - "height": 850, + "height": 891, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1626,7 +1626,7 @@ "type": "sequence_diagram", "pos": { "x": 1313, - "y": 1624 + "y": 1604 }, "width": 934, "height": 791, @@ -1667,7 +1667,7 @@ "type": "rectangle", "pos": { "x": 1325, - "y": 1707 + "y": 1687 }, "width": 100, "height": 66, @@ -1708,7 +1708,7 @@ "type": "rectangle", "pos": { "x": 1475, - "y": 1707 + "y": 1687 }, "width": 100, "height": 66, @@ -1749,7 +1749,7 @@ "type": "rectangle", "pos": { "x": 1615, - "y": 1707 + "y": 1687 }, "width": 126, "height": 66, @@ -1790,7 +1790,7 @@ "type": "rectangle", "pos": { "x": 1778, - "y": 1707 + "y": 1687 }, "width": 100, "height": 66, @@ -1831,7 +1831,7 @@ "type": "rectangle", "pos": { "x": 1918, - "y": 1707 + "y": 1687 }, "width": 137, "height": 66, @@ -1872,7 +1872,7 @@ "type": "rectangle", "pos": { "x": 2095, - "y": 1707 + "y": 1687 }, "width": 140, "height": 66, @@ -1913,7 +1913,7 @@ "type": "rectangle", "pos": { "x": 2159, - "y": 1833 + "y": 1813 }, "width": 12, "height": 30, @@ -1953,7 +1953,7 @@ "type": "rectangle", "pos": { "x": 1822, - "y": 1823 + "y": 1803 }, "width": 12, "height": 380, @@ -1993,7 +1993,7 @@ "type": "rectangle", "pos": { "x": 1818, - "y": 1833 + "y": 1813 }, "width": 20, "height": 90, @@ -2033,7 +2033,7 @@ "type": "rectangle", "pos": { "x": 1672, - "y": 1883 + "y": 1863 }, "width": 12, "height": 190, @@ -2073,7 +2073,7 @@ "type": "rectangle", "pos": { "x": 1668, - "y": 1893 + "y": 1873 }, "width": 20, "height": 170, @@ -2113,7 +2113,7 @@ "type": "rectangle", "pos": { "x": 1664, - "y": 1903 + "y": 1883 }, "width": 28, "height": 90, @@ -2153,7 +2153,7 @@ "type": "rectangle", "pos": { "x": 1519, - "y": 1943 + "y": 1923 }, "width": 12, "height": 220, @@ -2193,7 +2193,7 @@ "type": "rectangle", "pos": { "x": 1515, - "y": 1953 + "y": 1933 }, "width": 20, "height": 200, @@ -2233,7 +2233,7 @@ "type": "rectangle", "pos": { "x": 1511, - "y": 1963 + "y": 1943 }, "width": 28, "height": 180, @@ -2273,7 +2273,7 @@ "type": "rectangle", "pos": { "x": 1507, - "y": 1973 + "y": 1953 }, "width": 36, "height": 160, @@ -2313,7 +2313,7 @@ "type": "rectangle", "pos": { "x": 1980, - "y": 2073 + "y": 2053 }, "width": 12, "height": 240, @@ -2353,7 +2353,7 @@ "type": "rectangle", "pos": { "x": 1976, - "y": 2083 + "y": 2063 }, "width": 20, "height": 220, @@ -2393,7 +2393,7 @@ "type": "rectangle", "pos": { "x": 1972, - "y": 2093 + "y": 2073 }, "width": 28, "height": 200, @@ -2433,7 +2433,7 @@ "type": "rectangle", "pos": { "x": 1968, - "y": 2103 + "y": 2083 }, "width": 36, "height": 180, @@ -2473,7 +2473,7 @@ "type": "rectangle", "pos": { "x": 1964, - "y": 2113 + "y": 2093 }, "width": 44, "height": 160, @@ -2513,7 +2513,7 @@ "type": "rectangle", "pos": { "x": 1369, - "y": 2183 + "y": 2163 }, "width": 12, "height": 30, @@ -2553,7 +2553,7 @@ "type": "rectangle", "pos": { "x": 2159, - "y": 2323 + "y": 2303 }, "width": 12, "height": 30, @@ -3110,11 +3110,11 @@ "route": [ { "x": 1102, - "y": 500.5 + "y": 480 }, { "x": 1250, - "y": 500.5 + "y": 480 } ], "animated": false, @@ -3148,11 +3148,11 @@ "route": [ { "x": 1102, - "y": 570.5 + "y": 550 }, { "x": 1250, - "y": 570.5 + "y": 550 } ], "animated": false, @@ -3186,11 +3186,11 @@ "route": [ { "x": 1102, - "y": 640.5 + "y": 620 }, { "x": 1400, - "y": 640.5 + "y": 620 } ], "animated": false, @@ -3224,11 +3224,11 @@ "route": [ { "x": 1102, - "y": 710.5 + "y": 690 }, { "x": 1400, - "y": 710.5 + "y": 690 } ], "animated": false, @@ -3262,11 +3262,11 @@ "route": [ { "x": 1102, - "y": 780.5 + "y": 760 }, { "x": 1553, - "y": 780.5 + "y": 760 } ], "animated": false, @@ -3300,11 +3300,11 @@ "route": [ { "x": 1256, - "y": 850.5 + "y": 830 }, { "x": 1549, - "y": 850.5 + "y": 830 } ], "animated": false, @@ -3338,11 +3338,11 @@ "route": [ { "x": 1569, - "y": 920.5 + "y": 900 }, { "x": 1743, - "y": 920.5 + "y": 900 } ], "animated": false, @@ -3376,11 +3376,11 @@ "route": [ { "x": 1096, - "y": 990.5 + "y": 970 }, { "x": 1553, - "y": 990.5 + "y": 970 } ], "animated": false, @@ -3414,11 +3414,11 @@ "route": [ { "x": 1102, - "y": 1060.5 + "y": 1040 }, { "x": 1901.5, - "y": 1060.5 + "y": 1040 } ], "animated": false, @@ -3452,11 +3452,11 @@ "route": [ { "x": 1102, - "y": 1130.5 + "y": 1110 }, { "x": 1400, - "y": 1130.5 + "y": 1110 } ], "animated": false, @@ -3490,11 +3490,11 @@ "route": [ { "x": 1102, - "y": 1200.5 + "y": 1180 }, { "x": 1400, - "y": 1200.5 + "y": 1180 } ], "animated": false, @@ -3528,11 +3528,11 @@ "route": [ { "x": 1102, - "y": 1270.5 + "y": 1250 }, { "x": 1901.5, - "y": 1270.5 + "y": 1250 } ], "animated": false, @@ -3566,11 +3566,11 @@ "route": [ { "x": 1102, - "y": 1340.5 + "y": 1320 }, { "x": 1901.5, - "y": 1340.5 + "y": 1320 } ], "animated": false, @@ -3659,11 +3659,11 @@ }, { "x": 1511, - "y": 222.60000610351562 + "y": 218.5 }, { "x": 1511, - "y": 281 + "y": 260.5 } ], "isCurve": true, @@ -3757,11 +3757,11 @@ "route": [ { "x": 1511, - "y": 1423 + "y": 1402.5 }, { "x": 1511, - "y": 1447.800048828125 + "y": 1443.699951171875 }, { "x": 1511, @@ -3777,11 +3777,11 @@ }, { "x": 1517, - "y": 1568.0999755859375 + "y": 1564 }, { "x": 1541, - "y": 1624.5 + "y": 1604 } ], "isCurve": true, @@ -3860,11 +3860,11 @@ }, { "x": 2048, - "y": 1522.199951171875 + "y": 1514 }, { "x": 2048, - "y": 1595 + "y": 1554 } ], "isCurve": true, @@ -3899,11 +3899,11 @@ "route": [ { "x": 2159, - "y": 1843.5 + "y": 1823 }, { "x": 1838, - "y": 1843.5 + "y": 1823 } ], "animated": false, @@ -3937,11 +3937,11 @@ "route": [ { "x": 1818, - "y": 1913.5 + "y": 1893 }, { "x": 1692, - "y": 1913.5 + "y": 1893 } ], "animated": false, @@ -3975,11 +3975,11 @@ "route": [ { "x": 1664, - "y": 1983.5 + "y": 1963 }, { "x": 1543, - "y": 1983.5 + "y": 1963 } ], "animated": false, @@ -4013,11 +4013,11 @@ "route": [ { "x": 1822, - "y": 2053.5 + "y": 2033 }, { "x": 1688, - "y": 2053.5 + "y": 2033 } ], "animated": false, @@ -4051,11 +4051,11 @@ "route": [ { "x": 1543, - "y": 2123.5 + "y": 2103 }, { "x": 1964.5, - "y": 2123.5 + "y": 2103 } ], "animated": false, @@ -4089,11 +4089,11 @@ "route": [ { "x": 1381, - "y": 2193.5 + "y": 2173 }, { "x": 1822, - "y": 2193.5 + "y": 2173 } ], "animated": false, @@ -4127,11 +4127,11 @@ "route": [ { "x": 1964.5, - "y": 2263.5 + "y": 2243 }, { "x": 1375, - "y": 2263.5 + "y": 2243 } ], "animated": false, @@ -4165,11 +4165,11 @@ "route": [ { "x": 1375, - "y": 2333.5 + "y": 2313 }, { "x": 2159, - "y": 2333.5 + "y": 2313 } ], "animated": false, @@ -4431,11 +4431,11 @@ "route": [ { "x": 1096, - "y": 430.5 + "y": 410 }, { "x": 1096, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4469,11 +4469,11 @@ "route": [ { "x": 1256, - "y": 430.5 + "y": 410 }, { "x": 1256, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4507,11 +4507,11 @@ "route": [ { "x": 1406, - "y": 430.5 + "y": 410 }, { "x": 1406, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4545,11 +4545,11 @@ "route": [ { "x": 1559, - "y": 430.5 + "y": 410 }, { "x": 1559, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4583,11 +4583,11 @@ "route": [ { "x": 1749, - "y": 430.5 + "y": 410 }, { "x": 1749, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4621,11 +4621,11 @@ "route": [ { "x": 1907.5, - "y": 430.5 + "y": 410 }, { "x": 1907.5, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4659,11 +4659,11 @@ "route": [ { "x": 1375, - "y": 1773.5 + "y": 1753 }, { "x": 1375, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4697,11 +4697,11 @@ "route": [ { "x": 1525, - "y": 1773.5 + "y": 1753 }, { "x": 1525, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4735,11 +4735,11 @@ "route": [ { "x": 1678, - "y": 1773.5 + "y": 1753 }, { "x": 1678, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4773,11 +4773,11 @@ "route": [ { "x": 1828, - "y": 1773.5 + "y": 1753 }, { "x": 1828, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4811,11 +4811,11 @@ "route": [ { "x": 1986.5, - "y": 1773.5 + "y": 1753 }, { "x": 1986.5, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4849,11 +4849,11 @@ "route": [ { "x": 2165, - "y": 1773.5 + "y": 1753 }, { "x": 2165, - "y": 2403.5 + "y": 2383 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index d079a9325..87c97ade9 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -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) + .d2-255106218 .fill-N1{fill:#0A0F25;} + .d2-255106218 .fill-N2{fill:#676C7E;} + .d2-255106218 .fill-N3{fill:#9499AB;} + .d2-255106218 .fill-N4{fill:#CFD2DD;} + .d2-255106218 .fill-N5{fill:#DEE1EB;} + .d2-255106218 .fill-N6{fill:#EEF1F8;} + .d2-255106218 .fill-N7{fill:#FFFFFF;} + .d2-255106218 .fill-B1{fill:#0D32B2;} + .d2-255106218 .fill-B2{fill:#0D32B2;} + .d2-255106218 .fill-B3{fill:#E3E9FD;} + .d2-255106218 .fill-B4{fill:#E3E9FD;} + .d2-255106218 .fill-B5{fill:#EDF0FD;} + .d2-255106218 .fill-B6{fill:#F7F8FE;} + .d2-255106218 .fill-AA2{fill:#4A6FF3;} + .d2-255106218 .fill-AA4{fill:#EDF0FD;} + .d2-255106218 .fill-AA5{fill:#F7F8FE;} + .d2-255106218 .fill-AB4{fill:#EDF0FD;} + .d2-255106218 .fill-AB5{fill:#F7F8FE;} + .d2-255106218 .stroke-N1{stroke:#0A0F25;} + .d2-255106218 .stroke-N2{stroke:#676C7E;} + .d2-255106218 .stroke-N3{stroke:#9499AB;} + .d2-255106218 .stroke-N4{stroke:#CFD2DD;} + .d2-255106218 .stroke-N5{stroke:#DEE1EB;} + .d2-255106218 .stroke-N6{stroke:#EEF1F8;} + .d2-255106218 .stroke-N7{stroke:#FFFFFF;} + .d2-255106218 .stroke-B1{stroke:#0D32B2;} + .d2-255106218 .stroke-B2{stroke:#0D32B2;} + .d2-255106218 .stroke-B3{stroke:#E3E9FD;} + .d2-255106218 .stroke-B4{stroke:#E3E9FD;} + .d2-255106218 .stroke-B5{stroke:#EDF0FD;} + .d2-255106218 .stroke-B6{stroke:#F7F8FE;} + .d2-255106218 .stroke-AA2{stroke:#4A6FF3;} + .d2-255106218 .stroke-AA4{stroke:#EDF0FD;} + .d2-255106218 .stroke-AA5{stroke:#F7F8FE;} + .d2-255106218 .stroke-AB4{stroke:#EDF0FD;} + .d2-255106218 .stroke-AB5{stroke:#F7F8FE;} + .d2-255106218 .background-color-N1{background-color:#0A0F25;} + .d2-255106218 .background-color-N2{background-color:#676C7E;} + .d2-255106218 .background-color-N3{background-color:#9499AB;} + .d2-255106218 .background-color-N4{background-color:#CFD2DD;} + .d2-255106218 .background-color-N5{background-color:#DEE1EB;} + .d2-255106218 .background-color-N6{background-color:#EEF1F8;} + .d2-255106218 .background-color-N7{background-color:#FFFFFF;} + .d2-255106218 .background-color-B1{background-color:#0D32B2;} + .d2-255106218 .background-color-B2{background-color:#0D32B2;} + .d2-255106218 .background-color-B3{background-color:#E3E9FD;} + .d2-255106218 .background-color-B4{background-color:#E3E9FD;} + .d2-255106218 .background-color-B5{background-color:#EDF0FD;} + .d2-255106218 .background-color-B6{background-color:#F7F8FE;} + .d2-255106218 .background-color-AA2{background-color:#4A6FF3;} + .d2-255106218 .background-color-AA4{background-color:#EDF0FD;} + .d2-255106218 .background-color-AA5{background-color:#F7F8FE;} + .d2-255106218 .background-color-AB4{background-color:#EDF0FD;} + .d2-255106218 .background-color-AB5{background-color:#F7F8FE;} + .d2-255106218 .color-N1{color:#0A0F25;} + .d2-255106218 .color-N2{color:#676C7E;} + .d2-255106218 .color-N3{color:#9499AB;} + .d2-255106218 .color-N4{color:#CFD2DD;} + .d2-255106218 .color-N5{color:#DEE1EB;} + .d2-255106218 .color-N6{color:#EEF1F8;} + .d2-255106218 .color-N7{color:#FFFFFF;} + .d2-255106218 .color-B1{color:#0D32B2;} + .d2-255106218 .color-B2{color:#0D32B2;} + .d2-255106218 .color-B3{color:#E3E9FD;} + .d2-255106218 .color-B4{color:#E3E9FD;} + .d2-255106218 .color-B5{color:#EDF0FD;} + .d2-255106218 .color-B6{color:#F7F8FE;} + .d2-255106218 .color-AA2{color:#4A6FF3;} + .d2-255106218 .color-AA4{color:#EDF0FD;} + .d2-255106218 .color-AA5{color:#F7F8FE;} + .d2-255106218 .color-AB4{color:#EDF0FD;} + .d2-255106218 .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_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) - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -142,16 +142,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index 12b8ca096..f9b1fbdbc 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -3616,7 +3616,7 @@ }, { "x": 489, - "y": 252.5 + "y": 253 } ], "animated": false, @@ -3688,7 +3688,7 @@ "route": [ { "x": 489, - "y": 1398.5 + "y": 1398 }, { "x": 489, diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index 62057a24d..47693e83e 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -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) + .d2-2497879949 .fill-N1{fill:#0A0F25;} + .d2-2497879949 .fill-N2{fill:#676C7E;} + .d2-2497879949 .fill-N3{fill:#9499AB;} + .d2-2497879949 .fill-N4{fill:#CFD2DD;} + .d2-2497879949 .fill-N5{fill:#DEE1EB;} + .d2-2497879949 .fill-N6{fill:#EEF1F8;} + .d2-2497879949 .fill-N7{fill:#FFFFFF;} + .d2-2497879949 .fill-B1{fill:#0D32B2;} + .d2-2497879949 .fill-B2{fill:#0D32B2;} + .d2-2497879949 .fill-B3{fill:#E3E9FD;} + .d2-2497879949 .fill-B4{fill:#E3E9FD;} + .d2-2497879949 .fill-B5{fill:#EDF0FD;} + .d2-2497879949 .fill-B6{fill:#F7F8FE;} + .d2-2497879949 .fill-AA2{fill:#4A6FF3;} + .d2-2497879949 .fill-AA4{fill:#EDF0FD;} + .d2-2497879949 .fill-AA5{fill:#F7F8FE;} + .d2-2497879949 .fill-AB4{fill:#EDF0FD;} + .d2-2497879949 .fill-AB5{fill:#F7F8FE;} + .d2-2497879949 .stroke-N1{stroke:#0A0F25;} + .d2-2497879949 .stroke-N2{stroke:#676C7E;} + .d2-2497879949 .stroke-N3{stroke:#9499AB;} + .d2-2497879949 .stroke-N4{stroke:#CFD2DD;} + .d2-2497879949 .stroke-N5{stroke:#DEE1EB;} + .d2-2497879949 .stroke-N6{stroke:#EEF1F8;} + .d2-2497879949 .stroke-N7{stroke:#FFFFFF;} + .d2-2497879949 .stroke-B1{stroke:#0D32B2;} + .d2-2497879949 .stroke-B2{stroke:#0D32B2;} + .d2-2497879949 .stroke-B3{stroke:#E3E9FD;} + .d2-2497879949 .stroke-B4{stroke:#E3E9FD;} + .d2-2497879949 .stroke-B5{stroke:#EDF0FD;} + .d2-2497879949 .stroke-B6{stroke:#F7F8FE;} + .d2-2497879949 .stroke-AA2{stroke:#4A6FF3;} + .d2-2497879949 .stroke-AA4{stroke:#EDF0FD;} + .d2-2497879949 .stroke-AA5{stroke:#F7F8FE;} + .d2-2497879949 .stroke-AB4{stroke:#EDF0FD;} + .d2-2497879949 .stroke-AB5{stroke:#F7F8FE;} + .d2-2497879949 .background-color-N1{background-color:#0A0F25;} + .d2-2497879949 .background-color-N2{background-color:#676C7E;} + .d2-2497879949 .background-color-N3{background-color:#9499AB;} + .d2-2497879949 .background-color-N4{background-color:#CFD2DD;} + .d2-2497879949 .background-color-N5{background-color:#DEE1EB;} + .d2-2497879949 .background-color-N6{background-color:#EEF1F8;} + .d2-2497879949 .background-color-N7{background-color:#FFFFFF;} + .d2-2497879949 .background-color-B1{background-color:#0D32B2;} + .d2-2497879949 .background-color-B2{background-color:#0D32B2;} + .d2-2497879949 .background-color-B3{background-color:#E3E9FD;} + .d2-2497879949 .background-color-B4{background-color:#E3E9FD;} + .d2-2497879949 .background-color-B5{background-color:#EDF0FD;} + .d2-2497879949 .background-color-B6{background-color:#F7F8FE;} + .d2-2497879949 .background-color-AA2{background-color:#4A6FF3;} + .d2-2497879949 .background-color-AA4{background-color:#EDF0FD;} + .d2-2497879949 .background-color-AA5{background-color:#F7F8FE;} + .d2-2497879949 .background-color-AB4{background-color:#EDF0FD;} + .d2-2497879949 .background-color-AB5{background-color:#F7F8FE;} + .d2-2497879949 .color-N1{color:#0A0F25;} + .d2-2497879949 .color-N2{color:#676C7E;} + .d2-2497879949 .color-N3{color:#9499AB;} + .d2-2497879949 .color-N4{color:#CFD2DD;} + .d2-2497879949 .color-N5{color:#DEE1EB;} + .d2-2497879949 .color-N6{color:#EEF1F8;} + .d2-2497879949 .color-N7{color:#FFFFFF;} + .d2-2497879949 .color-B1{color:#0D32B2;} + .d2-2497879949 .color-B2{color:#0D32B2;} + .d2-2497879949 .color-B3{color:#E3E9FD;} + .d2-2497879949 .color-B4{color:#E3E9FD;} + .d2-2497879949 .color-B5{color:#EDF0FD;} + .d2-2497879949 .color-B6{color:#F7F8FE;} + .d2-2497879949 .color-AA2{color:#4A6FF3;} + .d2-2497879949 .color-AA4{color:#EDF0FD;} + .d2-2497879949 .color-AA5{color:#F7F8FE;} + .d2-2497879949 .color-AB4{color:#EDF0FD;} + .d2-2497879949 .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_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/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json index 97b6ad726..d5c0c9def 100644 --- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 15 + "y": 0 }, "width": 111, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 9, - "y": 196 + "y": 166 }, "width": 94, "height": 94, @@ -112,20 +112,20 @@ "labelPercentage": 0, "route": [ { - "x": 63, - "y": 81 + "x": 55.5, + "y": 66 }, { - "x": 63, - "y": 121 + "x": 55.5, + "y": 106 }, { - "x": 63, - "y": 141 + "x": 55.5, + "y": 123 }, { - "x": 63, - "y": 181 + "x": 55.5, + "y": 151 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index 2a6778bd9..58f8bc375 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - - -rectangle - -square - - - + .d2-3271298053 .fill-N1{fill:#0A0F25;} + .d2-3271298053 .fill-N2{fill:#676C7E;} + .d2-3271298053 .fill-N3{fill:#9499AB;} + .d2-3271298053 .fill-N4{fill:#CFD2DD;} + .d2-3271298053 .fill-N5{fill:#DEE1EB;} + .d2-3271298053 .fill-N6{fill:#EEF1F8;} + .d2-3271298053 .fill-N7{fill:#FFFFFF;} + .d2-3271298053 .fill-B1{fill:#0D32B2;} + .d2-3271298053 .fill-B2{fill:#0D32B2;} + .d2-3271298053 .fill-B3{fill:#E3E9FD;} + .d2-3271298053 .fill-B4{fill:#E3E9FD;} + .d2-3271298053 .fill-B5{fill:#EDF0FD;} + .d2-3271298053 .fill-B6{fill:#F7F8FE;} + .d2-3271298053 .fill-AA2{fill:#4A6FF3;} + .d2-3271298053 .fill-AA4{fill:#EDF0FD;} + .d2-3271298053 .fill-AA5{fill:#F7F8FE;} + .d2-3271298053 .fill-AB4{fill:#EDF0FD;} + .d2-3271298053 .fill-AB5{fill:#F7F8FE;} + .d2-3271298053 .stroke-N1{stroke:#0A0F25;} + .d2-3271298053 .stroke-N2{stroke:#676C7E;} + .d2-3271298053 .stroke-N3{stroke:#9499AB;} + .d2-3271298053 .stroke-N4{stroke:#CFD2DD;} + .d2-3271298053 .stroke-N5{stroke:#DEE1EB;} + .d2-3271298053 .stroke-N6{stroke:#EEF1F8;} + .d2-3271298053 .stroke-N7{stroke:#FFFFFF;} + .d2-3271298053 .stroke-B1{stroke:#0D32B2;} + .d2-3271298053 .stroke-B2{stroke:#0D32B2;} + .d2-3271298053 .stroke-B3{stroke:#E3E9FD;} + .d2-3271298053 .stroke-B4{stroke:#E3E9FD;} + .d2-3271298053 .stroke-B5{stroke:#EDF0FD;} + .d2-3271298053 .stroke-B6{stroke:#F7F8FE;} + .d2-3271298053 .stroke-AA2{stroke:#4A6FF3;} + .d2-3271298053 .stroke-AA4{stroke:#EDF0FD;} + .d2-3271298053 .stroke-AA5{stroke:#F7F8FE;} + .d2-3271298053 .stroke-AB4{stroke:#EDF0FD;} + .d2-3271298053 .stroke-AB5{stroke:#F7F8FE;} + .d2-3271298053 .background-color-N1{background-color:#0A0F25;} + .d2-3271298053 .background-color-N2{background-color:#676C7E;} + .d2-3271298053 .background-color-N3{background-color:#9499AB;} + .d2-3271298053 .background-color-N4{background-color:#CFD2DD;} + .d2-3271298053 .background-color-N5{background-color:#DEE1EB;} + .d2-3271298053 .background-color-N6{background-color:#EEF1F8;} + .d2-3271298053 .background-color-N7{background-color:#FFFFFF;} + .d2-3271298053 .background-color-B1{background-color:#0D32B2;} + .d2-3271298053 .background-color-B2{background-color:#0D32B2;} + .d2-3271298053 .background-color-B3{background-color:#E3E9FD;} + .d2-3271298053 .background-color-B4{background-color:#E3E9FD;} + .d2-3271298053 .background-color-B5{background-color:#EDF0FD;} + .d2-3271298053 .background-color-B6{background-color:#F7F8FE;} + .d2-3271298053 .background-color-AA2{background-color:#4A6FF3;} + .d2-3271298053 .background-color-AA4{background-color:#EDF0FD;} + .d2-3271298053 .background-color-AA5{background-color:#F7F8FE;} + .d2-3271298053 .background-color-AB4{background-color:#EDF0FD;} + .d2-3271298053 .background-color-AB5{background-color:#F7F8FE;} + .d2-3271298053 .color-N1{color:#0A0F25;} + .d2-3271298053 .color-N2{color:#676C7E;} + .d2-3271298053 .color-N3{color:#9499AB;} + .d2-3271298053 .color-N4{color:#CFD2DD;} + .d2-3271298053 .color-N5{color:#DEE1EB;} + .d2-3271298053 .color-N6{color:#EEF1F8;} + .d2-3271298053 .color-N7{color:#FFFFFF;} + .d2-3271298053 .color-B1{color:#0D32B2;} + .d2-3271298053 .color-B2{color:#0D32B2;} + .d2-3271298053 .color-B3{color:#E3E9FD;} + .d2-3271298053 .color-B4{color:#E3E9FD;} + .d2-3271298053 .color-B5{color:#EDF0FD;} + .d2-3271298053 .color-B6{color:#F7F8FE;} + .d2-3271298053 .color-AA2{color:#4A6FF3;} + .d2-3271298053 .color-AA4{color:#EDF0FD;} + .d2-3271298053 .color-AA5{color:#F7F8FE;} + .d2-3271298053 .color-AB4{color:#EDF0FD;} + .d2-3271298053 .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}]]> + +rectangle + +square + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json index 69a24f07e..2589ae801 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json @@ -130,11 +130,11 @@ "id": "l1", "type": "rectangle", "pos": { - "x": 20, - "y": 207 + "x": 30, + "y": 186 }, - "width": 439, - "height": 125, + "width": 419, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -294,11 +294,11 @@ "id": "l2c1", "type": "rectangle", "pos": { - "x": 20, - "y": 473 + "x": 30, + "y": 452 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 502 + "y": 482 }, "width": 53, "height": 66, @@ -376,11 +376,11 @@ "id": "l2c3", "type": "rectangle", "pos": { - "x": 326, - "y": 473 + "x": 336, + "y": 452 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 502 + "y": 482 }, "width": 53, "height": 66, @@ -458,11 +458,11 @@ "id": "l2c2", "type": "rectangle", "pos": { - "x": 173, - "y": 473 + "x": 183, + "y": 452 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 502 + "y": 482 }, "width": 53, "height": 66, @@ -540,11 +540,11 @@ "id": "l3c1", "type": "rectangle", "pos": { - "x": 20, - "y": 739 + "x": 30, + "y": 718 }, - "width": 286, - "height": 125, + "width": 266, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 768 + "y": 748 }, "width": 53, "height": 66, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 768 + "y": 748 }, "width": 53, "height": 66, @@ -663,11 +663,11 @@ "id": "l3c2", "type": "rectangle", "pos": { - "x": 326, - "y": 739 + "x": 336, + "y": 718 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 768 + "y": 748 }, "width": 53, "height": 66, @@ -746,10 +746,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 1005 + "y": 993 }, "width": 479, - "height": 225, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,11 +786,11 @@ "id": "l4.c1", "type": "rectangle", "pos": { - "x": 20, - "y": 1070 + "x": 30, + "y": 1034 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 1102 + "y": 1064 }, "width": 53, "height": 66, @@ -868,11 +868,11 @@ "id": "l4.c2", "type": "rectangle", "pos": { - "x": 173, - "y": 1070 + "x": 183, + "y": 1034 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 1102 + "y": 1064 }, "width": 53, "height": 66, @@ -950,11 +950,11 @@ "id": "l4.c3", "type": "rectangle", "pos": { - "x": 326, - "y": 1070 + "x": 336, + "y": 1034 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -992,7 +992,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 1102 + "y": 1064 }, "width": 53, "height": 66, @@ -1064,11 +1064,11 @@ }, { "x": 239.5, - "y": 180.10000610351562 + "y": 176 }, { "x": 239.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -1111,11 +1111,11 @@ }, { "x": 86.5, - "y": 180.10000610351562 + "y": 176 }, { "x": 86.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -1158,11 +1158,11 @@ }, { "x": 392.5, - "y": 180.10000610351562 + "y": 176 }, { "x": 392.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -1197,11 +1197,11 @@ "route": [ { "x": 86.5, - "y": 302.5 + "y": 282 }, { "x": 86.5, - "y": 326.1000061035156 + "y": 322 }, { "x": 86.5, @@ -1217,11 +1217,11 @@ }, { "x": 86.5, - "y": 446.1000061035156 + "y": 442 }, { "x": 86.5, - "y": 502.5 + "y": 482 } ], "isCurve": true, @@ -1256,11 +1256,11 @@ "route": [ { "x": 392.5, - "y": 302.5 + "y": 282 }, { "x": 392.5, - "y": 326.1000061035156 + "y": 322 }, { "x": 392.5, @@ -1276,11 +1276,11 @@ }, { "x": 392.5, - "y": 446.1000061035156 + "y": 442 }, { "x": 392.5, - "y": 502.5 + "y": 482 } ], "isCurve": true, @@ -1315,11 +1315,11 @@ "route": [ { "x": 239.5, - "y": 302.5 + "y": 282 }, { "x": 239.5, - "y": 326.1000061035156 + "y": 322 }, { "x": 239.5, @@ -1335,11 +1335,11 @@ }, { "x": 239.5, - "y": 446.1000061035156 + "y": 442 }, { "x": 239.5, - "y": 502.5 + "y": 482 } ], "isCurve": true, @@ -1374,11 +1374,11 @@ "route": [ { "x": 86.5, - "y": 568.5 + "y": 548 }, { "x": 86.5, - "y": 592.0999755859375 + "y": 588 }, { "x": 86.5, @@ -1394,11 +1394,11 @@ }, { "x": 86.5, - "y": 712.0999755859375 + "y": 708 }, { "x": 86.5, - "y": 768.5 + "y": 748 } ], "isCurve": true, @@ -1433,11 +1433,11 @@ "route": [ { "x": 239.5, - "y": 568.5 + "y": 548 }, { "x": 239.5, - "y": 592.0999755859375 + "y": 588 }, { "x": 239.5, @@ -1453,11 +1453,11 @@ }, { "x": 239.5, - "y": 712.0999755859375 + "y": 708 }, { "x": 239.5, - "y": 768.5 + "y": 748 } ], "isCurve": true, @@ -1492,11 +1492,11 @@ "route": [ { "x": 392.5, - "y": 568.5 + "y": 548 }, { "x": 392.5, - "y": 592.0999755859375 + "y": 588 }, { "x": 392.5, @@ -1512,11 +1512,11 @@ }, { "x": 392.5, - "y": 712.0999755859375 + "y": 708 }, { "x": 392.5, - "y": 768.5 + "y": 748 } ], "isCurve": true, @@ -1551,11 +1551,11 @@ "route": [ { "x": 86.5, - "y": 834.5 + "y": 814 }, { "x": 86.5, - "y": 858.0999755859375 + "y": 854 }, { "x": 86.5, @@ -1583,11 +1583,11 @@ }, { "x": 86.5, - "y": 1031.699951171875 + "y": 1024 }, { "x": 86.5, - "y": 1102.5 + "y": 1064 } ], "isCurve": true, @@ -1622,11 +1622,11 @@ "route": [ { "x": 239.5, - "y": 834.5 + "y": 814 }, { "x": 239.5, - "y": 858.0999755859375 + "y": 854 }, { "x": 239.5, @@ -1654,11 +1654,11 @@ }, { "x": 239.5, - "y": 1031.699951171875 + "y": 1024 }, { "x": 239.5, - "y": 1102.5 + "y": 1064 } ], "isCurve": true, @@ -1693,11 +1693,11 @@ "route": [ { "x": 392.5, - "y": 834.5 + "y": 814 }, { "x": 392.5, - "y": 858.0999755859375 + "y": 854 }, { "x": 392.5, @@ -1725,11 +1725,11 @@ }, { "x": 392.5, - "y": 1031.699951171875 + "y": 1024 }, { "x": 392.5, - "y": 1102.5 + "y": 1064 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg index f8688891d..8e7abee2c 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - + .d2-3275392116 .fill-N1{fill:#0A0F25;} + .d2-3275392116 .fill-N2{fill:#676C7E;} + .d2-3275392116 .fill-N3{fill:#9499AB;} + .d2-3275392116 .fill-N4{fill:#CFD2DD;} + .d2-3275392116 .fill-N5{fill:#DEE1EB;} + .d2-3275392116 .fill-N6{fill:#EEF1F8;} + .d2-3275392116 .fill-N7{fill:#FFFFFF;} + .d2-3275392116 .fill-B1{fill:#0D32B2;} + .d2-3275392116 .fill-B2{fill:#0D32B2;} + .d2-3275392116 .fill-B3{fill:#E3E9FD;} + .d2-3275392116 .fill-B4{fill:#E3E9FD;} + .d2-3275392116 .fill-B5{fill:#EDF0FD;} + .d2-3275392116 .fill-B6{fill:#F7F8FE;} + .d2-3275392116 .fill-AA2{fill:#4A6FF3;} + .d2-3275392116 .fill-AA4{fill:#EDF0FD;} + .d2-3275392116 .fill-AA5{fill:#F7F8FE;} + .d2-3275392116 .fill-AB4{fill:#EDF0FD;} + .d2-3275392116 .fill-AB5{fill:#F7F8FE;} + .d2-3275392116 .stroke-N1{stroke:#0A0F25;} + .d2-3275392116 .stroke-N2{stroke:#676C7E;} + .d2-3275392116 .stroke-N3{stroke:#9499AB;} + .d2-3275392116 .stroke-N4{stroke:#CFD2DD;} + .d2-3275392116 .stroke-N5{stroke:#DEE1EB;} + .d2-3275392116 .stroke-N6{stroke:#EEF1F8;} + .d2-3275392116 .stroke-N7{stroke:#FFFFFF;} + .d2-3275392116 .stroke-B1{stroke:#0D32B2;} + .d2-3275392116 .stroke-B2{stroke:#0D32B2;} + .d2-3275392116 .stroke-B3{stroke:#E3E9FD;} + .d2-3275392116 .stroke-B4{stroke:#E3E9FD;} + .d2-3275392116 .stroke-B5{stroke:#EDF0FD;} + .d2-3275392116 .stroke-B6{stroke:#F7F8FE;} + .d2-3275392116 .stroke-AA2{stroke:#4A6FF3;} + .d2-3275392116 .stroke-AA4{stroke:#EDF0FD;} + .d2-3275392116 .stroke-AA5{stroke:#F7F8FE;} + .d2-3275392116 .stroke-AB4{stroke:#EDF0FD;} + .d2-3275392116 .stroke-AB5{stroke:#F7F8FE;} + .d2-3275392116 .background-color-N1{background-color:#0A0F25;} + .d2-3275392116 .background-color-N2{background-color:#676C7E;} + .d2-3275392116 .background-color-N3{background-color:#9499AB;} + .d2-3275392116 .background-color-N4{background-color:#CFD2DD;} + .d2-3275392116 .background-color-N5{background-color:#DEE1EB;} + .d2-3275392116 .background-color-N6{background-color:#EEF1F8;} + .d2-3275392116 .background-color-N7{background-color:#FFFFFF;} + .d2-3275392116 .background-color-B1{background-color:#0D32B2;} + .d2-3275392116 .background-color-B2{background-color:#0D32B2;} + .d2-3275392116 .background-color-B3{background-color:#E3E9FD;} + .d2-3275392116 .background-color-B4{background-color:#E3E9FD;} + .d2-3275392116 .background-color-B5{background-color:#EDF0FD;} + .d2-3275392116 .background-color-B6{background-color:#F7F8FE;} + .d2-3275392116 .background-color-AA2{background-color:#4A6FF3;} + .d2-3275392116 .background-color-AA4{background-color:#EDF0FD;} + .d2-3275392116 .background-color-AA5{background-color:#F7F8FE;} + .d2-3275392116 .background-color-AB4{background-color:#EDF0FD;} + .d2-3275392116 .background-color-AB5{background-color:#F7F8FE;} + .d2-3275392116 .color-N1{color:#0A0F25;} + .d2-3275392116 .color-N2{color:#676C7E;} + .d2-3275392116 .color-N3{color:#9499AB;} + .d2-3275392116 .color-N4{color:#CFD2DD;} + .d2-3275392116 .color-N5{color:#DEE1EB;} + .d2-3275392116 .color-N6{color:#EEF1F8;} + .d2-3275392116 .color-N7{color:#FFFFFF;} + .d2-3275392116 .color-B1{color:#0D32B2;} + .d2-3275392116 .color-B2{color:#0D32B2;} + .d2-3275392116 .color-B3{color:#E3E9FD;} + .d2-3275392116 .color-B4{color:#E3E9FD;} + .d2-3275392116 .color-B5{color:#EDF0FD;} + .d2-3275392116 .color-B6{color:#F7F8FE;} + .d2-3275392116 .color-AA2{color:#4A6FF3;} + .d2-3275392116 .color-AA4{color:#EDF0FD;} + .d2-3275392116 .color-AA5{color:#F7F8FE;} + .d2-3275392116 .color-AB4{color:#EDF0FD;} + .d2-3275392116 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json index c0df7856c..49405db61 100644 --- a/e2etests/testdata/stable/stylish/dagre/board.exp.json +++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json @@ -7,7 +7,7 @@ "id": "x", "type": "rectangle", "pos": { - "x": 8, + "x": 1, "y": 0 }, "width": 53, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 202 + "y": 187 }, "width": 54, "height": 66, @@ -113,20 +113,20 @@ "labelPercentage": 0, "route": [ { - "x": 34.5, - "y": 66 + "x": 27, + "y": 65.5 }, { - "x": 34.5, - "y": 114.4000015258789 + "x": 27, + "y": 114.30000305175781 }, { - "x": 34.5, - "y": 138.6999969482422 + "x": 27, + "y": 135.6999969482422 }, { - "x": 34.5, - "y": 187.5 + "x": 27, + "y": 172.5 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg index 1d06a16d9..6280886e4 100644 --- a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-663732822 .fill-N1{fill:#0A0F25;} + .d2-663732822 .fill-N2{fill:#676C7E;} + .d2-663732822 .fill-N3{fill:#9499AB;} + .d2-663732822 .fill-N4{fill:#CFD2DD;} + .d2-663732822 .fill-N5{fill:#DEE1EB;} + .d2-663732822 .fill-N6{fill:#EEF1F8;} + .d2-663732822 .fill-N7{fill:#FFFFFF;} + .d2-663732822 .fill-B1{fill:#0D32B2;} + .d2-663732822 .fill-B2{fill:#0D32B2;} + .d2-663732822 .fill-B3{fill:#E3E9FD;} + .d2-663732822 .fill-B4{fill:#E3E9FD;} + .d2-663732822 .fill-B5{fill:#EDF0FD;} + .d2-663732822 .fill-B6{fill:#F7F8FE;} + .d2-663732822 .fill-AA2{fill:#4A6FF3;} + .d2-663732822 .fill-AA4{fill:#EDF0FD;} + .d2-663732822 .fill-AA5{fill:#F7F8FE;} + .d2-663732822 .fill-AB4{fill:#EDF0FD;} + .d2-663732822 .fill-AB5{fill:#F7F8FE;} + .d2-663732822 .stroke-N1{stroke:#0A0F25;} + .d2-663732822 .stroke-N2{stroke:#676C7E;} + .d2-663732822 .stroke-N3{stroke:#9499AB;} + .d2-663732822 .stroke-N4{stroke:#CFD2DD;} + .d2-663732822 .stroke-N5{stroke:#DEE1EB;} + .d2-663732822 .stroke-N6{stroke:#EEF1F8;} + .d2-663732822 .stroke-N7{stroke:#FFFFFF;} + .d2-663732822 .stroke-B1{stroke:#0D32B2;} + .d2-663732822 .stroke-B2{stroke:#0D32B2;} + .d2-663732822 .stroke-B3{stroke:#E3E9FD;} + .d2-663732822 .stroke-B4{stroke:#E3E9FD;} + .d2-663732822 .stroke-B5{stroke:#EDF0FD;} + .d2-663732822 .stroke-B6{stroke:#F7F8FE;} + .d2-663732822 .stroke-AA2{stroke:#4A6FF3;} + .d2-663732822 .stroke-AA4{stroke:#EDF0FD;} + .d2-663732822 .stroke-AA5{stroke:#F7F8FE;} + .d2-663732822 .stroke-AB4{stroke:#EDF0FD;} + .d2-663732822 .stroke-AB5{stroke:#F7F8FE;} + .d2-663732822 .background-color-N1{background-color:#0A0F25;} + .d2-663732822 .background-color-N2{background-color:#676C7E;} + .d2-663732822 .background-color-N3{background-color:#9499AB;} + .d2-663732822 .background-color-N4{background-color:#CFD2DD;} + .d2-663732822 .background-color-N5{background-color:#DEE1EB;} + .d2-663732822 .background-color-N6{background-color:#EEF1F8;} + .d2-663732822 .background-color-N7{background-color:#FFFFFF;} + .d2-663732822 .background-color-B1{background-color:#0D32B2;} + .d2-663732822 .background-color-B2{background-color:#0D32B2;} + .d2-663732822 .background-color-B3{background-color:#E3E9FD;} + .d2-663732822 .background-color-B4{background-color:#E3E9FD;} + .d2-663732822 .background-color-B5{background-color:#EDF0FD;} + .d2-663732822 .background-color-B6{background-color:#F7F8FE;} + .d2-663732822 .background-color-AA2{background-color:#4A6FF3;} + .d2-663732822 .background-color-AA4{background-color:#EDF0FD;} + .d2-663732822 .background-color-AA5{background-color:#F7F8FE;} + .d2-663732822 .background-color-AB4{background-color:#EDF0FD;} + .d2-663732822 .background-color-AB5{background-color:#F7F8FE;} + .d2-663732822 .color-N1{color:#0A0F25;} + .d2-663732822 .color-N2{color:#676C7E;} + .d2-663732822 .color-N3{color:#9499AB;} + .d2-663732822 .color-N4{color:#CFD2DD;} + .d2-663732822 .color-N5{color:#DEE1EB;} + .d2-663732822 .color-N6{color:#EEF1F8;} + .d2-663732822 .color-N7{color:#FFFFFF;} + .d2-663732822 .color-B1{color:#0D32B2;} + .d2-663732822 .color-B2{color:#0D32B2;} + .d2-663732822 .color-B3{color:#E3E9FD;} + .d2-663732822 .color-B4{color:#E3E9FD;} + .d2-663732822 .color-B5{color:#EDF0FD;} + .d2-663732822 .color-B6{color:#F7F8FE;} + .d2-663732822 .color-AA2{color:#4A6FF3;} + .d2-663732822 .color-AA4{color:#EDF0FD;} + .d2-663732822 .color-AA5{color:#F7F8FE;} + .d2-663732822 .color-AB4{color:#EDF0FD;} + .d2-663732822 .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}]]> @@ -104,11 +104,11 @@ -x - -y in style - - - - +x + +y in style + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json index aef37e591..49dd731ac 100644 --- a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json +++ b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 204 + "y": 224 }, "width": 272, "height": 461, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 543, - "y": 130 + "y": 149 }, "width": 236, "height": 610, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 1050, - "y": 283 + "y": 303 }, "width": 473, "height": 303, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 2144, - "y": 232 + "y": 272 }, "width": 582, "height": 344, @@ -213,10 +213,10 @@ "type": "rectangle", "pos": { "x": 2335, - "y": 596 + "y": 676 }, "width": 201, - "height": 118, + "height": 123, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -266,7 +266,7 @@ "type": "oval", "pos": { "x": 60, - "y": 264 + "y": 284 }, "width": 152, "height": 152, @@ -319,7 +319,7 @@ "type": "oval", "pos": { "x": 60, - "y": 456 + "y": 476 }, "width": 152, "height": 149, @@ -372,7 +372,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 190 + "y": 209 }, "width": 116, "height": 66, @@ -413,7 +413,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 296 + "y": 315 }, "width": 116, "height": 66, @@ -454,7 +454,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 402 + "y": 421 }, "width": 116, "height": 66, @@ -495,7 +495,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 508 + "y": 527 }, "width": 116, "height": 66, @@ -536,7 +536,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 614 + "y": 633 }, "width": 116, "height": 66, @@ -577,7 +577,7 @@ "type": "text", "pos": { "x": 1110, - "y": 343 + "y": 363 }, "width": 353, "height": 51, @@ -618,7 +618,7 @@ "type": "rectangle", "pos": { "x": 1110, - "y": 434 + "y": 454 }, "width": 140, "height": 92, @@ -671,7 +671,7 @@ "type": "rectangle", "pos": { "x": 1290, - "y": 434 + "y": 454 }, "width": 173, "height": 92, @@ -953,7 +953,7 @@ "type": "rectangle", "pos": { "x": 2204, - "y": 292 + "y": 332 }, "width": 103, "height": 92, @@ -1006,7 +1006,7 @@ "type": "rectangle", "pos": { "x": 2347, - "y": 292 + "y": 332 }, "width": 152, "height": 92, @@ -1059,7 +1059,7 @@ "type": "rectangle", "pos": { "x": 2539, - "y": 292 + "y": 332 }, "width": 126, "height": 92, @@ -1112,7 +1112,7 @@ "type": "rectangle", "pos": { "x": 2204, - "y": 424 + "y": 464 }, "width": 138, "height": 92, @@ -1165,7 +1165,7 @@ "type": "rectangle", "pos": { "x": 2382, - "y": 424 + "y": 464 }, "width": 108, "height": 92, @@ -1218,7 +1218,7 @@ "type": "rectangle", "pos": { "x": 2530, - "y": 424 + "y": 464 }, "width": 136, "height": 92, @@ -1293,20 +1293,20 @@ "labelPercentage": 0, "route": [ { - "x": 272, - "y": 434.5 + "x": 271.5, + "y": 454 }, { - "x": 380.3999938964844, - "y": 434.5 + "x": 380.29998779296875, + "y": 454 }, { "x": 434.70001220703125, - "y": 434.5 + "y": 454 }, { "x": 543.5, - "y": 434.5 + "y": 454 } ], "isCurve": true, @@ -1340,20 +1340,20 @@ "labelPercentage": 0, "route": [ { - "x": 779, - "y": 434.5 + "x": 778.5, + "y": 454 }, { - "x": 887.4000244140625, - "y": 434.5 + "x": 887.2999877929688, + "y": 454 }, { "x": 941.7000122070312, - "y": 434.5 + "y": 454 }, { "x": 1050.5, - "y": 434.5 + "y": 454 } ], "isCurve": true, @@ -1387,12 +1387,12 @@ "labelPercentage": 0, "route": [ { - "x": 1511.3280029296875, - "y": 283 + "x": 1498.72998046875, + "y": 302.5 }, { - "x": 1721.4649658203125, - "y": 141.39999389648438 + "x": 1718.946044921875, + "y": 145.2989959716797 }, { "x": 1824.199951171875, @@ -1435,19 +1435,19 @@ "route": [ { "x": 1523, - "y": 419.7030029296875 + "y": 449 }, { "x": 1723.800048828125, - "y": 407.1400146484375 + "y": 445 }, { "x": 1848, - "y": 404 + "y": 444 }, { "x": 2144, - "y": 404 + "y": 444 } ], "isCurve": true, @@ -1482,19 +1482,19 @@ "route": [ { "x": 1523, - "y": 495.38299560546875 + "y": 521 }, { "x": 1723.800048828125, - "y": 547.0759887695312 + "y": 578.5999755859375 }, { "x": 1886.0999755859375, - "y": 576.1110229492188 + "y": 621.0770263671875 }, { "x": 2334.5, - "y": 640.5549926757812 + "y": 733.385986328125 } ], "isCurve": true, @@ -1529,19 +1529,19 @@ "route": [ { "x": 1523, - "y": 556.2670288085938 + "y": 589 }, { "x": 1723.800048828125, - "y": 659.6530151367188 + "y": 728.2000122070312 }, { "x": 1886.0999755859375, - "y": 680.3270263671875 + "y": 761.3040161132812 }, { "x": 2334.5, - "y": 659.6370239257812 + "y": 754.52001953125 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg index 722085853..67eb38f57 100644 --- a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

Identity Native Proxy

-
Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged - - +TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

Identity Native Proxy

+
Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json index efb10bc96..9610888ec 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 15 + "y": 0 }, "width": 79, "height": 66, diff --git a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg index 2052701bc..fe1b1537d 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - - -cube - - + .d2-285423310 .fill-N1{fill:#0A0F25;} + .d2-285423310 .fill-N2{fill:#676C7E;} + .d2-285423310 .fill-N3{fill:#9499AB;} + .d2-285423310 .fill-N4{fill:#CFD2DD;} + .d2-285423310 .fill-N5{fill:#DEE1EB;} + .d2-285423310 .fill-N6{fill:#EEF1F8;} + .d2-285423310 .fill-N7{fill:#FFFFFF;} + .d2-285423310 .fill-B1{fill:#0D32B2;} + .d2-285423310 .fill-B2{fill:#0D32B2;} + .d2-285423310 .fill-B3{fill:#E3E9FD;} + .d2-285423310 .fill-B4{fill:#E3E9FD;} + .d2-285423310 .fill-B5{fill:#EDF0FD;} + .d2-285423310 .fill-B6{fill:#F7F8FE;} + .d2-285423310 .fill-AA2{fill:#4A6FF3;} + .d2-285423310 .fill-AA4{fill:#EDF0FD;} + .d2-285423310 .fill-AA5{fill:#F7F8FE;} + .d2-285423310 .fill-AB4{fill:#EDF0FD;} + .d2-285423310 .fill-AB5{fill:#F7F8FE;} + .d2-285423310 .stroke-N1{stroke:#0A0F25;} + .d2-285423310 .stroke-N2{stroke:#676C7E;} + .d2-285423310 .stroke-N3{stroke:#9499AB;} + .d2-285423310 .stroke-N4{stroke:#CFD2DD;} + .d2-285423310 .stroke-N5{stroke:#DEE1EB;} + .d2-285423310 .stroke-N6{stroke:#EEF1F8;} + .d2-285423310 .stroke-N7{stroke:#FFFFFF;} + .d2-285423310 .stroke-B1{stroke:#0D32B2;} + .d2-285423310 .stroke-B2{stroke:#0D32B2;} + .d2-285423310 .stroke-B3{stroke:#E3E9FD;} + .d2-285423310 .stroke-B4{stroke:#E3E9FD;} + .d2-285423310 .stroke-B5{stroke:#EDF0FD;} + .d2-285423310 .stroke-B6{stroke:#F7F8FE;} + .d2-285423310 .stroke-AA2{stroke:#4A6FF3;} + .d2-285423310 .stroke-AA4{stroke:#EDF0FD;} + .d2-285423310 .stroke-AA5{stroke:#F7F8FE;} + .d2-285423310 .stroke-AB4{stroke:#EDF0FD;} + .d2-285423310 .stroke-AB5{stroke:#F7F8FE;} + .d2-285423310 .background-color-N1{background-color:#0A0F25;} + .d2-285423310 .background-color-N2{background-color:#676C7E;} + .d2-285423310 .background-color-N3{background-color:#9499AB;} + .d2-285423310 .background-color-N4{background-color:#CFD2DD;} + .d2-285423310 .background-color-N5{background-color:#DEE1EB;} + .d2-285423310 .background-color-N6{background-color:#EEF1F8;} + .d2-285423310 .background-color-N7{background-color:#FFFFFF;} + .d2-285423310 .background-color-B1{background-color:#0D32B2;} + .d2-285423310 .background-color-B2{background-color:#0D32B2;} + .d2-285423310 .background-color-B3{background-color:#E3E9FD;} + .d2-285423310 .background-color-B4{background-color:#E3E9FD;} + .d2-285423310 .background-color-B5{background-color:#EDF0FD;} + .d2-285423310 .background-color-B6{background-color:#F7F8FE;} + .d2-285423310 .background-color-AA2{background-color:#4A6FF3;} + .d2-285423310 .background-color-AA4{background-color:#EDF0FD;} + .d2-285423310 .background-color-AA5{background-color:#F7F8FE;} + .d2-285423310 .background-color-AB4{background-color:#EDF0FD;} + .d2-285423310 .background-color-AB5{background-color:#F7F8FE;} + .d2-285423310 .color-N1{color:#0A0F25;} + .d2-285423310 .color-N2{color:#676C7E;} + .d2-285423310 .color-N3{color:#9499AB;} + .d2-285423310 .color-N4{color:#CFD2DD;} + .d2-285423310 .color-N5{color:#DEE1EB;} + .d2-285423310 .color-N6{color:#EEF1F8;} + .d2-285423310 .color-N7{color:#FFFFFF;} + .d2-285423310 .color-B1{color:#0D32B2;} + .d2-285423310 .color-B2{color:#0D32B2;} + .d2-285423310 .color-B3{color:#E3E9FD;} + .d2-285423310 .color-B4{color:#E3E9FD;} + .d2-285423310 .color-B5{color:#EDF0FD;} + .d2-285423310 .color-B6{color:#F7F8FE;} + .d2-285423310 .color-AA2{color:#4A6FF3;} + .d2-285423310 .color-AA4{color:#EDF0FD;} + .d2-285423310 .color-AA5{color:#F7F8FE;} + .d2-285423310 .color-AB4{color:#EDF0FD;} + .d2-285423310 .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}]]> + +cube + + \ No newline at end of file diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json index 0be51c4cc..3526ab0f8 100644 --- a/e2etests/testdata/stable/us_map/dagre/board.exp.json +++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json @@ -2127,11 +2127,11 @@ "labelPercentage": 0, "route": [ { - "x": 29.02400016784668, + "x": 29, "y": 398 }, { - "x": 24.20400047302246, + "x": 24.200000762939453, "y": 438 }, { @@ -2174,11 +2174,11 @@ "labelPercentage": 0, "route": [ { - "x": 29.02400016784668, + "x": 29, "y": 564 }, { - "x": 24.20400047302246, + "x": 24.200000762939453, "y": 604 }, { @@ -2221,11 +2221,11 @@ "labelPercentage": 0, "route": [ { - "x": 1025.009033203125, + "x": 1025.25, "y": 730 }, { - "x": 993.2009887695312, + "x": 993.25, "y": 770 }, { @@ -2399,12 +2399,12 @@ "labelPercentage": 0, "route": [ { - "x": 261, - "y": 876.2059936523438 + "x": 261.25, + "y": 876 }, { - "x": 123.5999984741211, - "y": 932.041015625 + "x": 123.6500015258789, + "y": 932 }, { "x": 148.64999389648438, @@ -2446,12 +2446,12 @@ "labelPercentage": 0, "route": [ { - "x": 386.25, - "y": 1054.508056640625 + "x": 386, + "y": 1055 }, { - "x": 327.6499938964844, - "y": 1100.5009765625 + "x": 327.6000061035156, + "y": 1100.5999755859375 }, { "x": 419.3999938964844, @@ -2493,11 +2493,11 @@ "labelPercentage": 0, "route": [ { - "x": 863.4869995117188, + "x": 863.5, "y": 1228 }, { - "x": 845.89697265625, + "x": 845.9000244140625, "y": 1268 }, { @@ -2599,11 +2599,11 @@ "labelPercentage": 0, "route": [ { - "x": 1040.3759765625, + "x": 1040.75, "y": 564 }, { - "x": 1015.0750122070312, + "x": 1015.1500244140625, "y": 604 }, { @@ -2646,11 +2646,11 @@ "labelPercentage": 0, "route": [ { - "x": 1034.2530517578125, + "x": 1034.5, "y": 730 }, { - "x": 1013.6500244140625, + "x": 1013.7000122070312, "y": 770 }, { @@ -2823,12 +2823,12 @@ "labelPercentage": 0, "route": [ { - "x": 945.25, - "y": 1556.759033203125 + "x": 945, + "y": 1557 }, { - "x": 899.4500122070312, - "y": 1599.3509521484375 + "x": 899.4000244140625, + "y": 1599.4000244140625 }, { "x": 939, @@ -2870,12 +2870,12 @@ "labelPercentage": 0, "route": [ { - "x": 326, - "y": 893.2239990234375 + "x": 325.75, + "y": 893 }, { - "x": 371.3999938964844, - "y": 935.4439697265625 + "x": 371.3500061035156, + "y": 935.4000244140625 }, { "x": 387.1499938964844, @@ -2917,12 +2917,12 @@ "labelPercentage": 0, "route": [ { - "x": 386.25, - "y": 1060.45703125 + "x": 386, + "y": 1061 }, { - "x": 343.6499938964844, - "y": 1101.6910400390625 + "x": 343.6000061035156, + "y": 1101.800048828125 }, { "x": 333, @@ -3023,11 +3023,11 @@ "labelPercentage": 0, "route": [ { - "x": 1297.6739501953125, + "x": 1298, "y": 730 }, { - "x": 1262.7340087890625, + "x": 1262.800048828125, "y": 770 }, { @@ -3082,11 +3082,11 @@ "labelPercentage": 0, "route": [ { - "x": 1399.56005859375, + "x": 1400, "y": 1062 }, { - "x": 1377.511962890625, + "x": 1377.5999755859375, "y": 1102 }, { @@ -3223,11 +3223,11 @@ "labelPercentage": 0, "route": [ { - "x": 476.197998046875, + "x": 476, "y": 1560 }, { - "x": 446.4389953613281, + "x": 446.3999938964844, "y": 1600 }, { @@ -3329,11 +3329,11 @@ "labelPercentage": 0, "route": [ { - "x": 215.14999389648438, + "x": 215.5, "y": 1062 }, { - "x": 185.02999877929688, + "x": 185.10000610351562, "y": 1102 }, { @@ -3388,11 +3388,11 @@ "labelPercentage": 0, "route": [ { - "x": 370.8760070800781, + "x": 371.25, "y": 1394 }, { - "x": 345.57501220703125, + "x": 345.6499938964844, "y": 1434 }, { @@ -3494,11 +3494,11 @@ "labelPercentage": 0, "route": [ { - "x": 757.9240112304688, + "x": 758.25, "y": 1062 }, { - "x": 722.9840087890625, + "x": 723.0499877929688, "y": 1102 }, { @@ -3541,11 +3541,11 @@ "labelPercentage": 0, "route": [ { - "x": 704.1110229492188, + "x": 703.75, "y": 1228 }, { - "x": 691.822021484375, + "x": 691.75, "y": 1268 }, { @@ -3647,11 +3647,11 @@ "labelPercentage": 0, "route": [ { - "x": 36.974998474121094, + "x": 37, "y": 564 }, { - "x": 41.79499816894531, + "x": 41.79999923706055, "y": 604 }, { @@ -3754,11 +3754,11 @@ "labelPercentage": 0, "route": [ { - "x": 39.02399826049805, + "x": 39, "y": 1228 }, { - "x": 34.20399856567383, + "x": 34.20000076293945, "y": 1268 }, { @@ -3801,11 +3801,11 @@ "labelPercentage": 0, "route": [ { - "x": 39.02399826049805, + "x": 39, "y": 1394 }, { - "x": 34.20399856567383, + "x": 34.20000076293945, "y": 1434 }, { @@ -3895,11 +3895,11 @@ "labelPercentage": 0, "route": [ { - "x": 1150.68896484375, + "x": 1150.75, "y": 896 }, { - "x": 1122.737060546875, + "x": 1122.75, "y": 936 }, { @@ -3942,11 +3942,11 @@ "labelPercentage": 0, "route": [ { - "x": 405.7279968261719, + "x": 406, "y": 1062 }, { - "x": 389.94500732421875, + "x": 390, "y": 1102 }, { @@ -4189,11 +4189,11 @@ "labelPercentage": 0, "route": [ { - "x": 1829.4329833984375, + "x": 1829.5, "y": 232 }, { - "x": 1812.68603515625, + "x": 1812.699951171875, "y": 272 }, { @@ -4236,11 +4236,11 @@ "labelPercentage": 0, "route": [ { - "x": 1781.0660400390625, + "x": 1781.5, "y": 398 }, { - "x": 1747.81298828125, + "x": 1747.9000244140625, "y": 438 }, { @@ -4283,12 +4283,12 @@ "labelPercentage": 0, "route": [ { - "x": 1709, - "y": 544.0989990234375 + "x": 1709.25, + "y": 544 }, { - "x": 1578.800048828125, - "y": 600.0189819335938 + "x": 1578.8499755859375, + "y": 600 }, { "x": 1590.699951171875, @@ -4330,11 +4330,11 @@ "labelPercentage": 0, "route": [ { - "x": 1779.9210205078125, + "x": 1779.5, "y": 730 }, { - "x": 1755.583984375, + "x": 1755.5, "y": 770 }, { @@ -4460,12 +4460,12 @@ "labelPercentage": 0, "route": [ { - "x": 1872.75, - "y": 219.11000061035156 + "x": 1873, + "y": 219 }, { - "x": 1946.550048828125, - "y": 269.4219970703125 + "x": 1946.5999755859375, + "y": 269.3999938964844 }, { "x": 1965, @@ -4543,11 +4543,11 @@ "labelPercentage": 0, "route": [ { - "x": 1818.9840087890625, + "x": 1818.75, "y": 664 }, { - "x": 1841.9959716796875, + "x": 1841.949951171875, "y": 624 }, { @@ -4590,11 +4590,11 @@ "labelPercentage": 0, "route": [ { - "x": 1725.2860107421875, + "x": 1725.75, "y": 564 }, { - "x": 1708.0570068359375, + "x": 1708.1500244140625, "y": 604 }, { @@ -4697,12 +4697,12 @@ "labelPercentage": 0, "route": [ { - "x": 1838, - "y": 386.9100036621094 + "x": 1838.25, + "y": 387 }, { - "x": 1903.800048828125, - "y": 435.7820129394531 + "x": 1903.8499755859375, + "y": 435.79998779296875 }, { "x": 1920.25, @@ -4756,11 +4756,11 @@ "labelPercentage": 0, "route": [ { - "x": 1900.1500244140625, + "x": 1900.5, "y": 730 }, { - "x": 1870.030029296875, + "x": 1870.0999755859375, "y": 770 }, { @@ -4850,11 +4850,11 @@ "labelPercentage": 0, "route": [ { - "x": 1407.511962890625, + "x": 1408, "y": 1062 }, { - "x": 1395.10205078125, + "x": 1395.199951171875, "y": 1102 }, { @@ -4944,12 +4944,12 @@ "labelPercentage": 0, "route": [ { - "x": 1358, - "y": 725.6519775390625 + "x": 1357.75, + "y": 726 }, { - "x": 1405.800048828125, - "y": 769.1300048828125 + "x": 1405.75, + "y": 769.2000122070312 }, { "x": 1426.550048828125, @@ -4991,11 +4991,11 @@ "labelPercentage": 0, "route": [ { - "x": 1501.3399658203125, + "x": 1501.25, "y": 896 }, { - "x": 1513.2679443359375, + "x": 1513.25, "y": 936 }, { @@ -5097,11 +5097,11 @@ "labelPercentage": 0, "route": [ { - "x": 1816.89697265625, + "x": 1816.5, "y": 730 }, { - "x": 1837.3790283203125, + "x": 1837.300048828125, "y": 770 }, { @@ -5262,11 +5262,11 @@ "labelPercentage": 0, "route": [ { - "x": 949.7160034179688, + "x": 950, "y": 1560 }, { - "x": 916.343017578125, + "x": 916.4000244140625, "y": 1600 }, { @@ -5356,12 +5356,12 @@ "labelPercentage": 0, "route": [ { - "x": 1092.75, - "y": 561.7579956054688 + "x": 1093.25, + "y": 562 }, { - "x": 1135.550048828125, - "y": 603.551025390625 + "x": 1135.6500244140625, + "y": 603.5999755859375 }, { "x": 1133.8499755859375, @@ -5403,11 +5403,11 @@ "labelPercentage": 0, "route": [ { - "x": 1050.4539794921875, + "x": 1050.25, "y": 730 }, { - "x": 1049.489990234375, + "x": 1049.449951171875, "y": 770 }, { @@ -5605,11 +5605,11 @@ "labelPercentage": 0, "route": [ { - "x": 794.0059814453125, + "x": 794, "y": 1062 }, { - "x": 802.801025390625, + "x": 802.7999877929688, "y": 1102 }, { @@ -5782,11 +5782,11 @@ "labelPercentage": 0, "route": [ { - "x": 261.0719909667969, + "x": 261, "y": 1062 }, { - "x": 286.614013671875, + "x": 286.6000061035156, "y": 1102 }, { @@ -5829,11 +5829,11 @@ "labelPercentage": 0, "route": [ { - "x": 535.0120239257812, + "x": 535, "y": 1228 }, { - "x": 512.6019897460938, + "x": 512.5999755859375, "y": 1268 }, { @@ -5876,11 +5876,11 @@ "labelPercentage": 0, "route": [ { - "x": 378.8280029296875, + "x": 379.25, "y": 1394 }, { - "x": 363.1650085449219, + "x": 363.25, "y": 1434 }, { @@ -5935,11 +5935,11 @@ "labelPercentage": 0, "route": [ { - "x": 498.2590026855469, + "x": 498.5, "y": 1726 }, { - "x": 486.45098876953125, + "x": 486.5, "y": 1766 }, { @@ -5982,11 +5982,11 @@ "labelPercentage": 0, "route": [ { - "x": 1768.324951171875, + "x": 1768, "y": 564 }, { - "x": 1803.2650146484375, + "x": 1803.199951171875, "y": 604 }, { @@ -6112,11 +6112,11 @@ "labelPercentage": 0, "route": [ { - "x": 1790.6619873046875, + "x": 1790.5, "y": 1228 }, { - "x": 1788.1319580078125, + "x": 1788.0999755859375, "y": 1268 }, { @@ -6159,11 +6159,11 @@ "labelPercentage": 0, "route": [ { - "x": 1932.9510498046875, + "x": 1933, "y": 730 }, { - "x": 1942.5899658203125, + "x": 1942.5999755859375, "y": 770 }, { @@ -6218,11 +6218,11 @@ "labelPercentage": 0, "route": [ { - "x": 1552.322021484375, + "x": 1552.25, "y": 1062 }, { - "x": 1537.864013671875, + "x": 1537.8499755859375, "y": 1102 }, { @@ -6265,11 +6265,11 @@ "labelPercentage": 0, "route": [ { - "x": 1553.56005859375, + "x": 1554, "y": 1228 }, { - "x": 1531.511962890625, + "x": 1531.5999755859375, "y": 1268 }, { @@ -6312,11 +6312,11 @@ "labelPercentage": 0, "route": [ { - "x": 1058.406005859375, + "x": 1058.25, "y": 730 }, { - "x": 1067.0810546875, + "x": 1067.050048828125, "y": 770 }, { @@ -6490,11 +6490,11 @@ "labelPercentage": 0, "route": [ { - "x": 1425.7010498046875, + "x": 1425.75, "y": 1062 }, { - "x": 1435.3399658203125, + "x": 1435.3499755859375, "y": 1102 }, { @@ -6596,11 +6596,11 @@ "labelPercentage": 0, "route": [ { - "x": 1187.16796875, + "x": 1187.5, "y": 896 }, { - "x": 1203.4329833984375, + "x": 1203.5, "y": 936 }, { @@ -6643,11 +6643,11 @@ "labelPercentage": 0, "route": [ { - "x": 1560.2740478515625, + "x": 1560.25, "y": 1062 }, { - "x": 1555.4539794921875, + "x": 1555.449951171875, "y": 1102 }, { @@ -6797,11 +6797,11 @@ "labelPercentage": 0, "route": [ { - "x": 1443.989990234375, + "x": 1443.75, "y": 1062 }, { - "x": 1475.7979736328125, + "x": 1475.75, "y": 1102 }, { @@ -6844,11 +6844,11 @@ "labelPercentage": 0, "route": [ { - "x": 1588.64697265625, + "x": 1588.25, "y": 1228 }, { - "x": 1609.1290283203125, + "x": 1609.050048828125, "y": 1268 }, { @@ -7057,11 +7057,11 @@ "labelPercentage": 0, "route": [ { - "x": 570.7949829101562, + "x": 571, "y": 1228 }, { - "x": 591.7589721679688, + "x": 591.7999877929688, "y": 1268 }, { @@ -7164,11 +7164,11 @@ "labelPercentage": 0, "route": [ { - "x": 732.239990234375, + "x": 732.5, "y": 1228 }, { - "x": 754.0479736328125, + "x": 754.0999755859375, "y": 1268 }, { @@ -7211,12 +7211,12 @@ "labelPercentage": 0, "route": [ { - "x": 423.75, - "y": 1382.8599853515625 + "x": 424.25, + "y": 1383 }, { - "x": 495.3500061035156, - "y": 1431.77197265625 + "x": 495.45001220703125, + "y": 1431.800048828125 }, { "x": 554.1500244140625, @@ -7258,11 +7258,11 @@ "labelPercentage": 0, "route": [ { - "x": 892.5120239257812, + "x": 892.5, "y": 1228 }, { - "x": 910.1019897460938, + "x": 910.0999755859375, "y": 1268 }, { @@ -7306,11 +7306,11 @@ "route": [ { "x": 1362.75, - "y": 1381.43994140625 + "y": 1382 }, { "x": 1443.550048828125, - "y": 1431.488037109375 + "y": 1431.5999755859375 }, { "x": 1463.75, @@ -7364,12 +7364,12 @@ "labelPercentage": 0, "route": [ { - "x": 423.75, - "y": 1379.77001953125 + "x": 424.25, + "y": 1380 }, { - "x": 511.3500061035156, - "y": 1431.154052734375 + "x": 511.45001220703125, + "y": 1431.199951171875 }, { "x": 570.1500244140625, @@ -7458,11 +7458,11 @@ "labelPercentage": 0, "route": [ { - "x": 517.739990234375, + "x": 517.5, "y": 1726 }, { - "x": 529.5479736328125, + "x": 529.5, "y": 1766 }, { @@ -7505,12 +7505,12 @@ "labelPercentage": 0, "route": [ { - "x": 75, - "y": 1225.010986328125 + "x": 74.5, + "y": 1225 }, { - "x": 120.19999694824219, - "y": 1267.4019775390625 + "x": 120.0999984741211, + "y": 1267.4000244140625 }, { "x": 120.0999984741211, @@ -7552,11 +7552,11 @@ "labelPercentage": 0, "route": [ { - "x": 59.79800033569336, + "x": 60.25, "y": 1394 }, { - "x": 80.15899658203125, + "x": 80.25, "y": 1434 }, { @@ -7599,11 +7599,11 @@ "labelPercentage": 0, "route": [ { - "x": 983.6110229492188, + "x": 983.25, "y": 1560 }, { - "x": 991.322021484375, + "x": 991.25, "y": 1600 }, { @@ -7646,11 +7646,11 @@ "labelPercentage": 0, "route": [ { - "x": 1588.10498046875, + "x": 1588.25, "y": 1062 }, { - "x": 1617.02099609375, + "x": 1617.050048828125, "y": 1102 }, { @@ -7693,11 +7693,11 @@ "labelPercentage": 0, "route": [ { - "x": 1800.7010498046875, + "x": 1800.75, "y": 1228 }, { - "x": 1810.3399658203125, + "x": 1810.3499755859375, "y": 1268 }, { @@ -7752,11 +7752,11 @@ "labelPercentage": 0, "route": [ { - "x": 753.7249755859375, + "x": 753.75, "y": 1560 }, { - "x": 758.5449829101562, + "x": 758.5499877929688, "y": 1600 }, { @@ -7812,11 +7812,11 @@ "route": [ { "x": 1362.75, - "y": 1378.7850341796875 + "y": 1379 }, { "x": 1459.550048828125, - "y": 1430.95703125 + "y": 1431 }, { "x": 1483.75, @@ -7870,11 +7870,11 @@ "labelPercentage": 0, "route": [ { - "x": 287.62298583984375, + "x": 287.25, "y": 1394 }, { - "x": 312.92401123046875, + "x": 312.8500061035156, "y": 1434 }, { @@ -7929,11 +7929,11 @@ "labelPercentage": 0, "route": [ { - "x": 761.677001953125, + "x": 761.75, "y": 1560 }, { - "x": 776.135009765625, + "x": 776.1500244140625, "y": 1600 }, { @@ -7988,11 +7988,11 @@ "labelPercentage": 0, "route": [ { - "x": 1596.5989990234375, + "x": 1596.25, "y": 1228 }, { - "x": 1626.718994140625, + "x": 1626.6500244140625, "y": 1268 }, { @@ -8095,11 +8095,11 @@ "labelPercentage": 0, "route": [ { - "x": 991.56298828125, + "x": 991.25, "y": 1560 }, { - "x": 1008.9119873046875, + "x": 1008.8499755859375, "y": 1600 }, { @@ -8142,11 +8142,11 @@ "labelPercentage": 0, "route": [ { - "x": 531.0659790039062, + "x": 531, "y": 1560 }, { - "x": 567.81298828125, + "x": 567.7999877929688, "y": 1600 }, { @@ -8201,12 +8201,12 @@ "labelPercentage": 0, "route": [ { - "x": 947.75, - "y": 1700.31005859375 + "x": 948.25, + "y": 1700 }, { - "x": 1216.949951171875, - "y": 1760.862060546875 + "x": 1217.050048828125, + "y": 1760.800048828125 }, { "x": 1217.6500244140625, diff --git a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg index 84f55ae99..932580745 100644 --- a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + .d2-2937976607 .fill-N1{fill:#0A0F25;} + .d2-2937976607 .fill-N2{fill:#676C7E;} + .d2-2937976607 .fill-N3{fill:#9499AB;} + .d2-2937976607 .fill-N4{fill:#CFD2DD;} + .d2-2937976607 .fill-N5{fill:#DEE1EB;} + .d2-2937976607 .fill-N6{fill:#EEF1F8;} + .d2-2937976607 .fill-N7{fill:#FFFFFF;} + .d2-2937976607 .fill-B1{fill:#0D32B2;} + .d2-2937976607 .fill-B2{fill:#0D32B2;} + .d2-2937976607 .fill-B3{fill:#E3E9FD;} + .d2-2937976607 .fill-B4{fill:#E3E9FD;} + .d2-2937976607 .fill-B5{fill:#EDF0FD;} + .d2-2937976607 .fill-B6{fill:#F7F8FE;} + .d2-2937976607 .fill-AA2{fill:#4A6FF3;} + .d2-2937976607 .fill-AA4{fill:#EDF0FD;} + .d2-2937976607 .fill-AA5{fill:#F7F8FE;} + .d2-2937976607 .fill-AB4{fill:#EDF0FD;} + .d2-2937976607 .fill-AB5{fill:#F7F8FE;} + .d2-2937976607 .stroke-N1{stroke:#0A0F25;} + .d2-2937976607 .stroke-N2{stroke:#676C7E;} + .d2-2937976607 .stroke-N3{stroke:#9499AB;} + .d2-2937976607 .stroke-N4{stroke:#CFD2DD;} + .d2-2937976607 .stroke-N5{stroke:#DEE1EB;} + .d2-2937976607 .stroke-N6{stroke:#EEF1F8;} + .d2-2937976607 .stroke-N7{stroke:#FFFFFF;} + .d2-2937976607 .stroke-B1{stroke:#0D32B2;} + .d2-2937976607 .stroke-B2{stroke:#0D32B2;} + .d2-2937976607 .stroke-B3{stroke:#E3E9FD;} + .d2-2937976607 .stroke-B4{stroke:#E3E9FD;} + .d2-2937976607 .stroke-B5{stroke:#EDF0FD;} + .d2-2937976607 .stroke-B6{stroke:#F7F8FE;} + .d2-2937976607 .stroke-AA2{stroke:#4A6FF3;} + .d2-2937976607 .stroke-AA4{stroke:#EDF0FD;} + .d2-2937976607 .stroke-AA5{stroke:#F7F8FE;} + .d2-2937976607 .stroke-AB4{stroke:#EDF0FD;} + .d2-2937976607 .stroke-AB5{stroke:#F7F8FE;} + .d2-2937976607 .background-color-N1{background-color:#0A0F25;} + .d2-2937976607 .background-color-N2{background-color:#676C7E;} + .d2-2937976607 .background-color-N3{background-color:#9499AB;} + .d2-2937976607 .background-color-N4{background-color:#CFD2DD;} + .d2-2937976607 .background-color-N5{background-color:#DEE1EB;} + .d2-2937976607 .background-color-N6{background-color:#EEF1F8;} + .d2-2937976607 .background-color-N7{background-color:#FFFFFF;} + .d2-2937976607 .background-color-B1{background-color:#0D32B2;} + .d2-2937976607 .background-color-B2{background-color:#0D32B2;} + .d2-2937976607 .background-color-B3{background-color:#E3E9FD;} + .d2-2937976607 .background-color-B4{background-color:#E3E9FD;} + .d2-2937976607 .background-color-B5{background-color:#EDF0FD;} + .d2-2937976607 .background-color-B6{background-color:#F7F8FE;} + .d2-2937976607 .background-color-AA2{background-color:#4A6FF3;} + .d2-2937976607 .background-color-AA4{background-color:#EDF0FD;} + .d2-2937976607 .background-color-AA5{background-color:#F7F8FE;} + .d2-2937976607 .background-color-AB4{background-color:#EDF0FD;} + .d2-2937976607 .background-color-AB5{background-color:#F7F8FE;} + .d2-2937976607 .color-N1{color:#0A0F25;} + .d2-2937976607 .color-N2{color:#676C7E;} + .d2-2937976607 .color-N3{color:#9499AB;} + .d2-2937976607 .color-N4{color:#CFD2DD;} + .d2-2937976607 .color-N5{color:#DEE1EB;} + .d2-2937976607 .color-N6{color:#EEF1F8;} + .d2-2937976607 .color-N7{color:#FFFFFF;} + .d2-2937976607 .color-B1{color:#0D32B2;} + .d2-2937976607 .color-B2{color:#0D32B2;} + .d2-2937976607 .color-B3{color:#E3E9FD;} + .d2-2937976607 .color-B4{color:#E3E9FD;} + .d2-2937976607 .color-B5{color:#EDF0FD;} + .d2-2937976607 .color-B6{color:#F7F8FE;} + .d2-2937976607 .color-AA2{color:#4A6FF3;} + .d2-2937976607 .color-AA4{color:#EDF0FD;} + .d2-2937976607 .color-AA5{color:#F7F8FE;} + .d2-2937976607 .color-AB4{color:#EDF0FD;} + .d2-2937976607 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND 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 5c8ddbdef..9516c93f5 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "network", "type": "rectangle", "pos": { - "x": 0, - "y": 438 + "x": 7, + "y": 641 }, - "width": 450, - "height": 1694, + "width": 402, + "height": 1422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 95, - "y": 503 + "x": 112, + "y": 682 }, - "width": 336, - "height": 766, + "width": 267, + "height": 547, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,8 +89,8 @@ "id": "network.cell tower.satellites", "type": "stored_data", "pos": { - "x": 140, - "y": 765 + "x": 142, + "y": 722 }, "width": 130, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 1171 + "y": 1133 }, "width": 146, "height": 66, @@ -171,11 +171,11 @@ "id": "network.online portal", "type": "rectangle", "pos": { - "x": 20, - "y": 1941 + "x": 37, + "y": 1904 }, - "width": 147, - "height": 161, + "width": 119, + "height": 129, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "hexagon", "pos": { "x": 67, - "y": 1987 + "y": 1934 }, "width": 59, "height": 69, @@ -253,11 +253,11 @@ "id": "network.data processor", "type": "rectangle", "pos": { - "x": 181, - "y": 1426 + "x": 196, + "y": 1380 }, - "width": 189, - "height": 192, + "width": 169, + "height": 188, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "network.data processor.storage", "type": "cylinder", "pos": { - "x": 221, - "y": 1468 + "x": 226, + "y": 1420 }, "width": 99, "height": 118, @@ -336,7 +336,7 @@ "type": "person", "pos": { "x": 80, - "y": 82 + "y": 95 }, "width": 130, "height": 87, @@ -376,8 +376,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 490, - "y": 1698 + "x": 508, + "y": 1688 }, "width": 116, "height": 66, @@ -417,8 +417,8 @@ "id": "logs", "type": "page", "pos": { - "x": 507, - "y": 1945 + "x": 529, + "y": 1925 }, "width": 73, "height": 87, @@ -458,7 +458,7 @@ "id": "users", "type": "sql_table", "pos": { - "x": 307, + "x": 304, "y": 30 }, "width": 208, @@ -642,7 +642,7 @@ "id": "products", "type": "class", "pos": { - "x": 575, + "x": 572, "y": 0 }, "width": 242, @@ -706,7 +706,7 @@ "id": "markdown", "type": "text", "pos": { - "x": 877, + "x": 894, "y": 79 }, "width": 97, @@ -746,7 +746,7 @@ "id": "code", "type": "code", "pos": { - "x": 490, + "x": 508, "y": 497 }, "width": 870, @@ -786,7 +786,7 @@ "id": "ex", "type": "text", "pos": { - "x": 723, + "x": 741, "y": 1140 }, "width": 404, @@ -849,20 +849,20 @@ "labelPercentage": 0, "route": [ { - "x": 205, - "y": 832 + "x": 203, + "y": 788 }, { - "x": 179.39999389648438, - "y": 1055.199951171875 + "x": 177, + "y": 1015.5999755859375 }, { - "x": 186.1999969482422, - "y": 1123.199951171875 + "x": 183.89999389648438, + "y": 1084.699951171875 }, { - "x": 239, - "y": 1172 + "x": 237.5, + "y": 1133.5 } ], "isCurve": true, @@ -896,20 +896,20 @@ "labelPercentage": 0, "route": [ { - "x": 214, - "y": 832 + "x": 211, + "y": 788 }, { - "x": 239.60000610351562, - "y": 1055.199951171875 + "x": 237, + "y": 1015.5999755859375 }, { - "x": 249.8000030517578, - "y": 1123.199951171875 + "x": 247.6999969482422, + "y": 1084.699951171875 }, { - "x": 265, - "y": 1172 + "x": 264.5, + "y": 1133.5 } ], "isCurve": true, @@ -943,20 +943,20 @@ "labelPercentage": 0, "route": [ { - "x": 226, - "y": 832 + "x": 221, + "y": 788 }, { - "x": 325.3999938964844, - "y": 1055.199951171875 + "x": 330.3999938964844, + "y": 1015.5999755859375 }, { - "x": 340.6499938964844, - "y": 1123.199951171875 + "x": 348.3500061035156, + "y": 1084.699951171875 }, { - "x": 302.25, - "y": 1172 + "x": 310.75, + "y": 1133.5 } ], "isCurve": true, @@ -991,31 +991,31 @@ "route": [ { "x": 275.5, - "y": 1237.5 + "y": 1199 }, { "x": 275.5, - "y": 1263.0999755859375 + "y": 1239 }, { "x": 275.5, - "y": 1281.5999755859375 + "y": 1261.0999755859375 }, { "x": 275.5, - "y": 1299.75 + "y": 1279.25 }, { "x": 275.5, - "y": 1317.9000244140625 + "y": 1297.4000244140625 }, { "x": 275.6000061035156, - "y": 1404.199951171875 + "y": 1378 }, { "x": 276, - "y": 1459 + "y": 1410 } ], "isCurve": true, @@ -1049,20 +1049,20 @@ "labelPercentage": 0, "route": [ { - "x": 163.5, - "y": 194.5 + "x": 166, + "y": 207.5 }, { - "x": 200.3000030517578, - "y": 308.1000061035156 + "x": 198.8000030517578, + "y": 310.70001220703125 }, { - "x": 209.5, - "y": 411.20001220703125 + "x": 207, + "y": 446.79998779296875 }, { - "x": 209.5, - "y": 468 + "x": 207, + "y": 646 } ], "isCurve": true, @@ -1096,12 +1096,12 @@ "labelPercentage": 0, "route": [ { - "x": 124.75, - "y": 194.5 + "x": 123.75, + "y": 197.5 }, { - "x": 84.75, - "y": 308.1000061035156 + "x": 84.55000305175781, + "y": 308.70001220703125 }, { "x": 74.75, @@ -1201,71 +1201,71 @@ }, { "x": 74.75, - "y": 1392.800048828125 + "y": 1391.800048828125 }, { "x": 74.75, - "y": 1427 + "y": 1424.5 }, { "x": 74.75, - "y": 1461.199951171875 + "y": 1457.199951171875 }, { "x": 74.75, - "y": 1506.800048828125 + "y": 1500.800048828125 }, { "x": 74.75, - "y": 1541 + "y": 1533.5 }, { "x": 74.75, - "y": 1575.199951171875 + "y": 1566.199951171875 }, { "x": 74.75, - "y": 1608 + "y": 1598 }, { "x": 74.75, - "y": 1623 + "y": 1613 }, { "x": 74.75, - "y": 1638 + "y": 1628 }, { "x": 74.75, - "y": 1664.5999755859375 + "y": 1654.5999755859375 }, { "x": 74.75, - "y": 1689.5 + "y": 1679.5 }, { "x": 74.75, - "y": 1714.4000244140625 + "y": 1704.4000244140625 }, { "x": 74.75, - "y": 1749.699951171875 + "y": 1739.699951171875 }, { "x": 74.75, - "y": 1777.75 + "y": 1767.75 }, { "x": 74.75, - "y": 1805.800048828125 + "y": 1795.800048828125 }, { "x": 77.5999984741211, - "y": 1905.5999755859375 + "y": 1886.800048828125 }, { "x": 89, - "y": 1988 + "y": 1934 } ], "isCurve": true, @@ -1299,20 +1299,20 @@ "labelPercentage": 0, "route": [ { - "x": 490, - "y": 1743.7149658203125 + "x": 507.5, + "y": 1733.7900390625 }, { - "x": 195.1999969482422, - "y": 1808.343017578125 + "x": 198.6999969482422, + "y": 1798.3580322265625 }, { - "x": 118.19999694824219, - "y": 1905.5999755859375 + "x": 118.4000015258789, + "y": 1886.800048828125 }, { - "x": 105, - "y": 1988 + "x": 106, + "y": 1934 } ], "isCurve": true, @@ -1346,20 +1346,20 @@ "labelPercentage": 0, "route": [ { - "x": 548, - "y": 1764 + "x": 565.5, + "y": 1753.5 }, { - "x": 548, - "y": 1812.4000244140625 + "x": 565.5, + "y": 1802.300048828125 }, { - "x": 548, - "y": 1895 + "x": 565.5999755859375, + "y": 1883 }, { - "x": 548, - "y": 1935 + "x": 566, + "y": 1915 } ], "isCurve": true, @@ -1393,20 +1393,20 @@ "labelPercentage": 0, "route": [ { - "x": 275.5, - "y": 1618.5 + "x": 285.5, + "y": 1568 }, { - "x": 275.5, - "y": 1642.0999755859375 + "x": 285.5, + "y": 1624 }, { - "x": 318.5, - "y": 1661 + "x": 329.8999938964844, + "y": 1651.0340576171875 }, { - "x": 490.5, - "y": 1713 + "x": 507.5, + "y": 1703.1700439453125 } ], "isCurve": true, @@ -1440,31 +1440,31 @@ "labelPercentage": 0, "route": [ { - "x": 925, + "x": 942.5, "y": 198.5 }, { - "x": 925, + "x": 942.5, "y": 308.8999938964844 }, { - "x": 925, + "x": 942.5, "y": 348.6000061035156 }, { - "x": 925, + "x": 942.5, "y": 366.75 }, { - "x": 925, + "x": 942.5, "y": 384.8999938964844 }, { - "x": 925, + "x": 942.5, "y": 457 }, { - "x": 925, + "x": 942.5, "y": 497 } ], @@ -1499,19 +1499,19 @@ "labelPercentage": 0, "route": [ { - "x": 925, - "y": 1012 + "x": 942.5, + "y": 1011.5 }, { - "x": 925, - "y": 1060.4000244140625 + "x": 942.5, + "y": 1060.300048828125 }, { - "x": 925, + "x": 942.5, "y": 1086.0999755859375 }, { - "x": 925, + "x": 942.5, "y": 1140.5 } ], 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 debe001a7..2ef133183 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
-
package main +
package main import (     "fmt" @@ -885,7 +885,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}package main +}package main import (     "fmt" @@ -908,28 +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/origami/dagre/board.exp.json b/e2etests/testdata/themes/origami/dagre/board.exp.json index 00460a587..6bc8d05cb 100644 --- a/e2etests/testdata/themes/origami/dagre/board.exp.json +++ b/e2etests/testdata/themes/origami/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "network", "type": "rectangle", "pos": { - "x": 0, - "y": 275 + "x": 5, + "y": 227 }, - "width": 409, - "height": 1255, + "width": 356, + "height": 1198, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,11 +49,11 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 95, - "y": 340 + "x": 157, + "y": 268 }, - "width": 294, - "height": 327, + "width": 174, + "height": 323, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -91,8 +91,8 @@ "id": "network.cell tower.satellites", "type": "stored_data", "pos": { - "x": 185, - "y": 382 + "x": 187, + "y": 308 }, "width": 104, "height": 66, @@ -133,8 +133,8 @@ "id": "network.cell tower.transmitter", "type": "rectangle", "pos": { - "x": 190, - "y": 569 + "x": 187, + "y": 495 }, "width": 104, "height": 66, @@ -175,11 +175,11 @@ "id": "network.online portal", "type": "rectangle", "pos": { - "x": 20, - "y": 1339 + "x": 35, + "y": 1266 }, - "width": 144, - "height": 161, + "width": 119, + "height": 129, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -218,7 +218,7 @@ "type": "hexagon", "pos": { "x": 65, - "y": 1385 + "y": 1296 }, "width": 59, "height": 69, @@ -259,11 +259,11 @@ "id": "network.data processor", "type": "rectangle", "pos": { - "x": 145, - "y": 824 + "x": 157, + "y": 742 }, - "width": 194, - "height": 192, + "width": 174, + "height": 188, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -301,8 +301,8 @@ "id": "network.data processor.storage", "type": "cylinder", "pos": { - "x": 185, - "y": 866 + "x": 187, + "y": 782 }, "width": 104, "height": 118, @@ -427,8 +427,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 448, - "y": 1096 + "x": 463, + "y": 1050 }, "width": 151, "height": 66, @@ -469,8 +469,8 @@ "id": "logs", "type": "page", "pos": { - "x": 477, - "y": 1343 + "x": 497, + "y": 1287 }, "width": 84, "height": 87, @@ -533,20 +533,20 @@ "labelPercentage": 0, "route": [ { - "x": 212, - "y": 449 + "x": 213, + "y": 374 }, { - "x": 175.60000610351562, - "y": 497 + "x": 173.8000030517578, + "y": 422.3999938964844 }, { - "x": 176.3000030517578, - "y": 521.2000122070312 + "x": 173.8000030517578, + "y": 446.70001220703125 }, { - "x": 215.5, - "y": 570 + "x": 213, + "y": 495.5 } ], "isCurve": true, @@ -579,20 +579,20 @@ "labelPercentage": 0, "route": [ { - "x": 241, - "y": 449 + "x": 239, + "y": 374 }, { - "x": 241.39999389648438, - "y": 497 + "x": 239, + "y": 422.3999938964844 }, { - "x": 241.5, - "y": 521.2000122070312 + "x": 239, + "y": 446.70001220703125 }, { - "x": 241.5, - "y": 570 + "x": 239, + "y": 495.5 } ], "isCurve": true, @@ -625,20 +625,20 @@ "labelPercentage": 0, "route": [ { - "x": 271, - "y": 449 + "x": 265, + "y": 374 }, { - "x": 307.3999938964844, - "y": 497 + "x": 312.20001220703125, + "y": 422.3999938964844 }, { - "x": 306.70001220703125, - "y": 521.2000122070312 + "x": 312.20001220703125, + "y": 446.70001220703125 }, { - "x": 267.5, - "y": 570 + "x": 265, + "y": 495.5 } ], "isCurve": true, @@ -671,32 +671,32 @@ "labelPercentage": 0, "route": [ { - "x": 241.5, - "y": 635.5 + "x": 239, + "y": 561 }, { - "x": 241.5, - "y": 661.0999755859375 + "x": 239, + "y": 601 }, { - "x": 241.5, - "y": 679.5999755859375 + "x": 239, + "y": 623.0999755859375 }, { - "x": 241.5, - "y": 697.75 + "x": 239, + "y": 641.25 }, { - "x": 241.5, - "y": 715.9000244140625 + "x": 239, + "y": 659.4000244140625 }, { - "x": 241.60000610351562, - "y": 802.2000122070312 + "x": 239, + "y": 740 }, { - "x": 242, - "y": 857 + "x": 239, + "y": 772 } ], "isCurve": true, @@ -729,20 +729,20 @@ "labelPercentage": 0, "route": [ { - "x": 171, - "y": 87 + "x": 190, + "y": 93.5 }, { - "x": 227.39999389648438, - "y": 156.1999969482422 + "x": 229.1999969482422, + "y": 136.6999969482422 }, { - "x": 241.5, - "y": 248.1999969482422 + "x": 239, + "y": 212.8000030517578 }, { - "x": 241.5, - "y": 305 + "x": 239, + "y": 232 } ], "isCurve": true, @@ -775,176 +775,176 @@ "labelPercentage": 0, "route": [ { - "x": 111.75, - "y": 112.5 + "x": 101.75, + "y": 108.5 }, { - "x": 82.1500015258789, - "y": 161.3000030517578 + "x": 80.1500015258789, + "y": 139.6999969482422 }, { "x": 74.75, - "y": 185.60000610351562 + "y": 159.60000610351562 }, { "x": 74.75, - "y": 203.75 + "y": 177.75 }, { "x": 74.75, - "y": 221.89999389648438 + "y": 195.89999389648438 }, { "x": 74.75, - "y": 244 + "y": 218 }, { "x": 74.75, - "y": 259 + "y": 233 }, { "x": 74.75, - "y": 274 + "y": 248 }, { "x": 74.75, - "y": 301.6000061035156 + "y": 274.6000061035156 }, { "x": 74.75, - "y": 328 + "y": 299.5 }, { "x": 74.75, - "y": 354.3999938964844 + "y": 324.3999938964844 }, { "x": 74.75, - "y": 391.70001220703125 + "y": 359.70001220703125 }, { "x": 74.75, - "y": 421.25 + "y": 387.75 }, { "x": 74.75, - "y": 450.79998779296875 + "y": 415.79998779296875 }, { "x": 74.75, - "y": 489.20001220703125 + "y": 453.20001220703125 }, { "x": 74.75, - "y": 517.25 + "y": 481.25 }, { "x": 74.75, - "y": 545.2999877929688 + "y": 509.29998779296875 }, { "x": 74.75, - "y": 580.5999755859375 + "y": 544.5999755859375 }, { "x": 74.75, - "y": 605.5 + "y": 569.5 }, { "x": 74.75, - "y": 630.4000244140625 + "y": 594.4000244140625 }, { "x": 74.75, - "y": 659.0999755859375 + "y": 623.0999755859375 }, { "x": 74.75, - "y": 677.25 + "y": 641.25 }, { "x": 74.75, - "y": 695.4000244140625 + "y": 659.4000244140625 }, { "x": 74.75, - "y": 719.5999755859375 + "y": 683.5999755859375 }, { "x": 74.75, - "y": 737.75 + "y": 701.75 }, { "x": 74.75, - "y": 755.9000244140625 + "y": 719.9000244140625 }, { "x": 74.75, - "y": 790.7999877929688 + "y": 753.7999877929688 }, { "x": 74.75, - "y": 825 + "y": 786.5 }, { "x": 74.75, - "y": 859.2000122070312 + "y": 819.2000122070312 }, { "x": 74.75, - "y": 904.7999877929688 + "y": 862.7999877929688 }, { "x": 74.75, - "y": 939 + "y": 895.5 }, { "x": 74.75, - "y": 973.2000122070312 + "y": 928.2000122070312 }, { "x": 74.75, - "y": 1006 + "y": 960 }, { "x": 74.75, - "y": 1021 + "y": 975 }, { "x": 74.75, - "y": 1036 + "y": 990 }, { "x": 74.75, - "y": 1062.5999755859375 + "y": 1016.5999755859375 }, { "x": 74.75, - "y": 1087.5 + "y": 1041.5 }, { "x": 74.75, - "y": 1112.4000244140625 + "y": 1066.4000244140625 }, { "x": 74.75, - "y": 1147.699951171875 + "y": 1101.699951171875 }, { "x": 74.75, - "y": 1175.75 + "y": 1129.75 }, { "x": 74.75, - "y": 1203.800048828125 + "y": 1157.800048828125 }, { - "x": 77.4000015258789, - "y": 1303.5999755859375 + "x": 77.19999694824219, + "y": 1248.800048828125 }, { - "x": 88, - "y": 1386 + "x": 87, + "y": 1296 } ], "isCurve": true, @@ -977,20 +977,20 @@ "labelPercentage": 0, "route": [ { - "x": 448.25, - "y": 1146.4510498046875 + "x": 463.25, + "y": 1100.5 }, { - "x": 185.0500030517578, - "y": 1207.2900390625 + "x": 188.0500030517578, + "y": 1161.300048828125 }, { "x": 116, - "y": 1303.5999755859375 + "y": 1248.800048828125 }, { "x": 103, - "y": 1386 + "y": 1296 } ], "isCurve": true, @@ -1023,20 +1023,20 @@ "labelPercentage": 0, "route": [ { - "x": 523.75, - "y": 1162 + "x": 538.75, + "y": 1115.5 }, { - "x": 523.75, - "y": 1210.4000244140625 + "x": 538.75, + "y": 1164.300048828125 }, { - "x": 523.7990112304688, - "y": 1293 + "x": 538.7999877929688, + "y": 1245 }, { - "x": 524, - "y": 1333 + "x": 539, + "y": 1277 } ], "isCurve": true, @@ -1069,20 +1069,20 @@ "labelPercentage": 0, "route": [ { - "x": 241.5, - "y": 1016.5 + "x": 239, + "y": 930 }, { - "x": 241.5, - "y": 1040.0989990234375 + "x": 239, + "y": 986 }, { - "x": 282.8999938964844, - "y": 1058.199951171875 + "x": 283.79998779296875, + "y": 1012.2000122070312 }, { - "x": 448.5, - "y": 1107 + "x": 463, + "y": 1061 } ], "isCurve": true, diff --git a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg index 95b6a1f75..de7c68203 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 - - - - - - + .d2-1307947579 .fill-N1{fill:#0A0F25;} + .d2-1307947579 .fill-N2{fill:#676C7E;} + .d2-1307947579 .fill-N3{fill:#9499AB;} + .d2-1307947579 .fill-N4{fill:#CFD2DD;} + .d2-1307947579 .fill-N5{fill:#DEE1EB;} + .d2-1307947579 .fill-N6{fill:#EEF1F8;} + .d2-1307947579 .fill-N7{fill:#FFFFFF;} + .d2-1307947579 .fill-B1{fill:#0D32B2;} + .d2-1307947579 .fill-B2{fill:#0D32B2;} + .d2-1307947579 .fill-B3{fill:#E3E9FD;} + .d2-1307947579 .fill-B4{fill:#E3E9FD;} + .d2-1307947579 .fill-B5{fill:#EDF0FD;} + .d2-1307947579 .fill-B6{fill:#F7F8FE;} + .d2-1307947579 .fill-AA2{fill:#4A6FF3;} + .d2-1307947579 .fill-AA4{fill:#EDF0FD;} + .d2-1307947579 .fill-AA5{fill:#F7F8FE;} + .d2-1307947579 .fill-AB4{fill:#EDF0FD;} + .d2-1307947579 .fill-AB5{fill:#F7F8FE;} + .d2-1307947579 .stroke-N1{stroke:#0A0F25;} + .d2-1307947579 .stroke-N2{stroke:#676C7E;} + .d2-1307947579 .stroke-N3{stroke:#9499AB;} + .d2-1307947579 .stroke-N4{stroke:#CFD2DD;} + .d2-1307947579 .stroke-N5{stroke:#DEE1EB;} + .d2-1307947579 .stroke-N6{stroke:#EEF1F8;} + .d2-1307947579 .stroke-N7{stroke:#FFFFFF;} + .d2-1307947579 .stroke-B1{stroke:#0D32B2;} + .d2-1307947579 .stroke-B2{stroke:#0D32B2;} + .d2-1307947579 .stroke-B3{stroke:#E3E9FD;} + .d2-1307947579 .stroke-B4{stroke:#E3E9FD;} + .d2-1307947579 .stroke-B5{stroke:#EDF0FD;} + .d2-1307947579 .stroke-B6{stroke:#F7F8FE;} + .d2-1307947579 .stroke-AA2{stroke:#4A6FF3;} + .d2-1307947579 .stroke-AA4{stroke:#EDF0FD;} + .d2-1307947579 .stroke-AA5{stroke:#F7F8FE;} + .d2-1307947579 .stroke-AB4{stroke:#EDF0FD;} + .d2-1307947579 .stroke-AB5{stroke:#F7F8FE;} + .d2-1307947579 .background-color-N1{background-color:#0A0F25;} + .d2-1307947579 .background-color-N2{background-color:#676C7E;} + .d2-1307947579 .background-color-N3{background-color:#9499AB;} + .d2-1307947579 .background-color-N4{background-color:#CFD2DD;} + .d2-1307947579 .background-color-N5{background-color:#DEE1EB;} + .d2-1307947579 .background-color-N6{background-color:#EEF1F8;} + .d2-1307947579 .background-color-N7{background-color:#FFFFFF;} + .d2-1307947579 .background-color-B1{background-color:#0D32B2;} + .d2-1307947579 .background-color-B2{background-color:#0D32B2;} + .d2-1307947579 .background-color-B3{background-color:#E3E9FD;} + .d2-1307947579 .background-color-B4{background-color:#E3E9FD;} + .d2-1307947579 .background-color-B5{background-color:#EDF0FD;} + .d2-1307947579 .background-color-B6{background-color:#F7F8FE;} + .d2-1307947579 .background-color-AA2{background-color:#4A6FF3;} + .d2-1307947579 .background-color-AA4{background-color:#EDF0FD;} + .d2-1307947579 .background-color-AA5{background-color:#F7F8FE;} + .d2-1307947579 .background-color-AB4{background-color:#EDF0FD;} + .d2-1307947579 .background-color-AB5{background-color:#F7F8FE;} + .d2-1307947579 .color-N1{color:#0A0F25;} + .d2-1307947579 .color-N2{color:#676C7E;} + .d2-1307947579 .color-N3{color:#9499AB;} + .d2-1307947579 .color-N4{color:#CFD2DD;} + .d2-1307947579 .color-N5{color:#DEE1EB;} + .d2-1307947579 .color-N6{color:#EEF1F8;} + .d2-1307947579 .color-N7{color:#FFFFFF;} + .d2-1307947579 .color-B1{color:#0D32B2;} + .d2-1307947579 .color-B2{color:#0D32B2;} + .d2-1307947579 .color-B3{color:#E3E9FD;} + .d2-1307947579 .color-B4{color:#E3E9FD;} + .d2-1307947579 .color-B5{color:#EDF0FD;} + .d2-1307947579 .color-B6{color:#F7F8FE;} + .d2-1307947579 .color-AA2{color:#4A6FF3;} + .d2-1307947579 .color-AA4{color:#EDF0FD;} + .d2-1307947579 .color-AA5{color:#F7F8FE;} + .d2-1307947579 .color-AB4{color:#EDF0FD;} + .d2-1307947579 .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}]]>Big fontabca + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json index 5ba9d5b05..94c8bbff0 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json @@ -49,10 +49,10 @@ "type": "cloud", "pos": { "x": 0, - "y": 207 + "y": 166 }, "width": 398, - "height": 125, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 183, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -326,11 +326,11 @@ }, { "x": 68.5, - "y": 184.0970001220703 + "y": 179.9969940185547 }, { "x": 182.5, - "y": 256.4849853515625 + "y": 235.98500061035156 } ], "isCurve": true, @@ -365,11 +365,11 @@ "route": [ { "x": 209, - "y": 302.5 + "y": 282 }, { "x": 209, - "y": 326.1000061035156 + "y": 322 }, { "x": 209, @@ -420,11 +420,11 @@ }, { "x": 159.8000030517578, - "y": 180.10000610351562 + "y": 176 }, { "x": 187, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -463,18 +463,9 @@ }, { "x": 265, - "y": 106 - }, - { - "x": 265, - "y": 126 - }, - { - "x": 265, - "y": 166 + "y": 125 } ], - "isCurve": true, "animated": false, "tooltip": "", "icon": null, @@ -514,11 +505,11 @@ }, { "x": 377.6000061035156, - "y": 145 + "y": 140 }, { "x": 378, - "y": 261 + "y": 236 } ], "isCurve": true, 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 d4ee0b98c..03d379a64 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,16 +1,16 @@ -aa container labeldefgc + .d2-1836296818 .fill-N1{fill:#0A0F25;} + .d2-1836296818 .fill-N2{fill:#676C7E;} + .d2-1836296818 .fill-N3{fill:#9499AB;} + .d2-1836296818 .fill-N4{fill:#CFD2DD;} + .d2-1836296818 .fill-N5{fill:#DEE1EB;} + .d2-1836296818 .fill-N6{fill:#EEF1F8;} + .d2-1836296818 .fill-N7{fill:#FFFFFF;} + .d2-1836296818 .fill-B1{fill:#0D32B2;} + .d2-1836296818 .fill-B2{fill:#0D32B2;} + .d2-1836296818 .fill-B3{fill:#E3E9FD;} + .d2-1836296818 .fill-B4{fill:#E3E9FD;} + .d2-1836296818 .fill-B5{fill:#EDF0FD;} + .d2-1836296818 .fill-B6{fill:#F7F8FE;} + .d2-1836296818 .fill-AA2{fill:#4A6FF3;} + .d2-1836296818 .fill-AA4{fill:#EDF0FD;} + .d2-1836296818 .fill-AA5{fill:#F7F8FE;} + .d2-1836296818 .fill-AB4{fill:#EDF0FD;} + .d2-1836296818 .fill-AB5{fill:#F7F8FE;} + .d2-1836296818 .stroke-N1{stroke:#0A0F25;} + .d2-1836296818 .stroke-N2{stroke:#676C7E;} + .d2-1836296818 .stroke-N3{stroke:#9499AB;} + .d2-1836296818 .stroke-N4{stroke:#CFD2DD;} + .d2-1836296818 .stroke-N5{stroke:#DEE1EB;} + .d2-1836296818 .stroke-N6{stroke:#EEF1F8;} + .d2-1836296818 .stroke-N7{stroke:#FFFFFF;} + .d2-1836296818 .stroke-B1{stroke:#0D32B2;} + .d2-1836296818 .stroke-B2{stroke:#0D32B2;} + .d2-1836296818 .stroke-B3{stroke:#E3E9FD;} + .d2-1836296818 .stroke-B4{stroke:#E3E9FD;} + .d2-1836296818 .stroke-B5{stroke:#EDF0FD;} + .d2-1836296818 .stroke-B6{stroke:#F7F8FE;} + .d2-1836296818 .stroke-AA2{stroke:#4A6FF3;} + .d2-1836296818 .stroke-AA4{stroke:#EDF0FD;} + .d2-1836296818 .stroke-AA5{stroke:#F7F8FE;} + .d2-1836296818 .stroke-AB4{stroke:#EDF0FD;} + .d2-1836296818 .stroke-AB5{stroke:#F7F8FE;} + .d2-1836296818 .background-color-N1{background-color:#0A0F25;} + .d2-1836296818 .background-color-N2{background-color:#676C7E;} + .d2-1836296818 .background-color-N3{background-color:#9499AB;} + .d2-1836296818 .background-color-N4{background-color:#CFD2DD;} + .d2-1836296818 .background-color-N5{background-color:#DEE1EB;} + .d2-1836296818 .background-color-N6{background-color:#EEF1F8;} + .d2-1836296818 .background-color-N7{background-color:#FFFFFF;} + .d2-1836296818 .background-color-B1{background-color:#0D32B2;} + .d2-1836296818 .background-color-B2{background-color:#0D32B2;} + .d2-1836296818 .background-color-B3{background-color:#E3E9FD;} + .d2-1836296818 .background-color-B4{background-color:#E3E9FD;} + .d2-1836296818 .background-color-B5{background-color:#EDF0FD;} + .d2-1836296818 .background-color-B6{background-color:#F7F8FE;} + .d2-1836296818 .background-color-AA2{background-color:#4A6FF3;} + .d2-1836296818 .background-color-AA4{background-color:#EDF0FD;} + .d2-1836296818 .background-color-AA5{background-color:#F7F8FE;} + .d2-1836296818 .background-color-AB4{background-color:#EDF0FD;} + .d2-1836296818 .background-color-AB5{background-color:#F7F8FE;} + .d2-1836296818 .color-N1{color:#0A0F25;} + .d2-1836296818 .color-N2{color:#676C7E;} + .d2-1836296818 .color-N3{color:#9499AB;} + .d2-1836296818 .color-N4{color:#CFD2DD;} + .d2-1836296818 .color-N5{color:#DEE1EB;} + .d2-1836296818 .color-N6{color:#EEF1F8;} + .d2-1836296818 .color-N7{color:#FFFFFF;} + .d2-1836296818 .color-B1{color:#0D32B2;} + .d2-1836296818 .color-B2{color:#0D32B2;} + .d2-1836296818 .color-B3{color:#E3E9FD;} + .d2-1836296818 .color-B4{color:#E3E9FD;} + .d2-1836296818 .color-B5{color:#EDF0FD;} + .d2-1836296818 .color-B6{color:#F7F8FE;} + .d2-1836296818 .color-AA2{color:#4A6FF3;} + .d2-1836296818 .color-AA4{color:#EDF0FD;} + .d2-1836296818 .color-AA5{color:#F7F8FE;} + .d2-1836296818 .color-AB4{color:#EDF0FD;} + .d2-1836296818 .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}]]>aa container labeldefgc - + - + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json index 3dc98d2b0..d503bd825 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json @@ -48,11 +48,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 0, - "y": 207 + "x": 10, + "y": 186 }, - "width": 132, - "height": 125, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 236 + "y": 216 }, "width": 52, "height": 66, @@ -174,11 +174,11 @@ }, { "x": 66, - "y": 126 + "y": 121.80000305175781 }, { "x": 66, - "y": 166 + "y": 145 } ], "isCurve": true, 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 688f602e3..ea705106c 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,23 +1,23 @@ -xbarz foo - + .d2-2250240028 .fill-N1{fill:#0A0F25;} + .d2-2250240028 .fill-N2{fill:#676C7E;} + .d2-2250240028 .fill-N3{fill:#9499AB;} + .d2-2250240028 .fill-N4{fill:#CFD2DD;} + .d2-2250240028 .fill-N5{fill:#DEE1EB;} + .d2-2250240028 .fill-N6{fill:#EEF1F8;} + .d2-2250240028 .fill-N7{fill:#FFFFFF;} + .d2-2250240028 .fill-B1{fill:#0D32B2;} + .d2-2250240028 .fill-B2{fill:#0D32B2;} + .d2-2250240028 .fill-B3{fill:#E3E9FD;} + .d2-2250240028 .fill-B4{fill:#E3E9FD;} + .d2-2250240028 .fill-B5{fill:#EDF0FD;} + .d2-2250240028 .fill-B6{fill:#F7F8FE;} + .d2-2250240028 .fill-AA2{fill:#4A6FF3;} + .d2-2250240028 .fill-AA4{fill:#EDF0FD;} + .d2-2250240028 .fill-AA5{fill:#F7F8FE;} + .d2-2250240028 .fill-AB4{fill:#EDF0FD;} + .d2-2250240028 .fill-AB5{fill:#F7F8FE;} + .d2-2250240028 .stroke-N1{stroke:#0A0F25;} + .d2-2250240028 .stroke-N2{stroke:#676C7E;} + .d2-2250240028 .stroke-N3{stroke:#9499AB;} + .d2-2250240028 .stroke-N4{stroke:#CFD2DD;} + .d2-2250240028 .stroke-N5{stroke:#DEE1EB;} + .d2-2250240028 .stroke-N6{stroke:#EEF1F8;} + .d2-2250240028 .stroke-N7{stroke:#FFFFFF;} + .d2-2250240028 .stroke-B1{stroke:#0D32B2;} + .d2-2250240028 .stroke-B2{stroke:#0D32B2;} + .d2-2250240028 .stroke-B3{stroke:#E3E9FD;} + .d2-2250240028 .stroke-B4{stroke:#E3E9FD;} + .d2-2250240028 .stroke-B5{stroke:#EDF0FD;} + .d2-2250240028 .stroke-B6{stroke:#F7F8FE;} + .d2-2250240028 .stroke-AA2{stroke:#4A6FF3;} + .d2-2250240028 .stroke-AA4{stroke:#EDF0FD;} + .d2-2250240028 .stroke-AA5{stroke:#F7F8FE;} + .d2-2250240028 .stroke-AB4{stroke:#EDF0FD;} + .d2-2250240028 .stroke-AB5{stroke:#F7F8FE;} + .d2-2250240028 .background-color-N1{background-color:#0A0F25;} + .d2-2250240028 .background-color-N2{background-color:#676C7E;} + .d2-2250240028 .background-color-N3{background-color:#9499AB;} + .d2-2250240028 .background-color-N4{background-color:#CFD2DD;} + .d2-2250240028 .background-color-N5{background-color:#DEE1EB;} + .d2-2250240028 .background-color-N6{background-color:#EEF1F8;} + .d2-2250240028 .background-color-N7{background-color:#FFFFFF;} + .d2-2250240028 .background-color-B1{background-color:#0D32B2;} + .d2-2250240028 .background-color-B2{background-color:#0D32B2;} + .d2-2250240028 .background-color-B3{background-color:#E3E9FD;} + .d2-2250240028 .background-color-B4{background-color:#E3E9FD;} + .d2-2250240028 .background-color-B5{background-color:#EDF0FD;} + .d2-2250240028 .background-color-B6{background-color:#F7F8FE;} + .d2-2250240028 .background-color-AA2{background-color:#4A6FF3;} + .d2-2250240028 .background-color-AA4{background-color:#EDF0FD;} + .d2-2250240028 .background-color-AA5{background-color:#F7F8FE;} + .d2-2250240028 .background-color-AB4{background-color:#EDF0FD;} + .d2-2250240028 .background-color-AB5{background-color:#F7F8FE;} + .d2-2250240028 .color-N1{color:#0A0F25;} + .d2-2250240028 .color-N2{color:#676C7E;} + .d2-2250240028 .color-N3{color:#9499AB;} + .d2-2250240028 .color-N4{color:#CFD2DD;} + .d2-2250240028 .color-N5{color:#DEE1EB;} + .d2-2250240028 .color-N6{color:#EEF1F8;} + .d2-2250240028 .color-N7{color:#FFFFFF;} + .d2-2250240028 .color-B1{color:#0D32B2;} + .d2-2250240028 .color-B2{color:#0D32B2;} + .d2-2250240028 .color-B3{color:#E3E9FD;} + .d2-2250240028 .color-B4{color:#E3E9FD;} + .d2-2250240028 .color-B5{color:#EDF0FD;} + .d2-2250240028 .color-B6{color:#F7F8FE;} + .d2-2250240028 .color-AA2{color:#4A6FF3;} + .d2-2250240028 .color-AA4{color:#EDF0FD;} + .d2-2250240028 .color-AA5{color:#F7F8FE;} + .d2-2250240028 .color-AB4{color:#EDF0FD;} + .d2-2250240028 .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}]]>xbarz foo + - - + + \ No newline at end of file diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json index 35dde90d3..c2a5b5cf4 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json @@ -322,11 +322,11 @@ "labelPercentage": 0, "route": [ { - "x": 187.53599548339844, + "x": 187.5, "y": 282 }, { - "x": 240.3070068359375, + "x": 240.3000030517578, "y": 322 }, { @@ -369,11 +369,11 @@ "labelPercentage": 0, "route": [ { - "x": 141.01800537109375, + "x": 141.5, "y": 282 }, { - "x": 137.4029998779297, + "x": 137.5, "y": 322 }, { @@ -428,11 +428,11 @@ "labelPercentage": 0, "route": [ { - "x": 108.01799774169922, + "x": 108.5, "y": 282 }, { - "x": 64.40299987792969, + "x": 64.5, "y": 322 }, { @@ -511,11 +511,11 @@ "labelPercentage": 0, "route": [ { - "x": 233.6199951171875, + "x": 233.5, "y": 448 }, { - "x": 209.5240020751953, + "x": 209.5, "y": 488 }, { @@ -605,11 +605,11 @@ "labelPercentage": 0, "route": [ { - "x": 209.16200256347656, + "x": 209.5, "y": 714 }, { - "x": 276.6319885253906, + "x": 276.70001220703125, "y": 674 }, { 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 478eba267..1515ae07e 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,20 +1,20 @@ -OEM Factory

company Warehouse

@@ -843,7 +843,7 @@
  • Staging
  • Dispatch to Site
    • -
    MasterRegional-1Regional-2Regional-N +MasterRegional-1Regional-2Regional-N 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 54dd7728f..8b613b932 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 @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 9 }, "width": 932, - "height": 415, + "height": 427, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "oval", "pos": { "x": 20, - "y": 106 + "y": 50 }, "width": 208, - "height": 320, + "height": 356, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "diamond", "pos": { "x": 60, - "y": 234 + "y": 196 }, "width": 128, "height": 64, @@ -131,10 +131,10 @@ "type": "diamond", "pos": { "x": 248, - "y": 106 + "y": 50 }, "width": 208, - "height": 320, + "height": 356, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "oval", "pos": { "x": 288, - "y": 202 + "y": 164 }, "width": 128, "height": 128, @@ -213,10 +213,10 @@ "type": "oval", "pos": { "x": 476, - "y": 106 + "y": 50 }, "width": 208, - "height": 320, + "height": 356, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -254,7 +254,7 @@ "type": "hexagon", "pos": { "x": 516, - "y": 234 + "y": 196 }, "width": 128, "height": 64, @@ -295,10 +295,10 @@ "type": "hexagon", "pos": { "x": 704, - "y": 106 + "y": 50 }, "width": 208, - "height": 320, + "height": 356, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,7 +336,7 @@ "type": "oval", "pos": { "x": 744, - "y": 234 + "y": 196 }, "width": 128, "height": 64, 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 252b9a04b..ef900bd7c 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,21 +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/japanese-full/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json index dae5f577e..e7ba2a978 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json +++ b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json @@ -113,11 +113,11 @@ "route": [ { "x": 691, - "y": 98 + "y": 97.5 }, { "x": 691, - "y": 146.39999389648438 + "y": 146.3000030517578 }, { "x": 691, diff --git a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg index d508b9dcc..c4dd9af2e 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 + .d2-1036466245 .fill-N1{fill:#0A0F25;} + .d2-1036466245 .fill-N2{fill:#676C7E;} + .d2-1036466245 .fill-N3{fill:#9499AB;} + .d2-1036466245 .fill-N4{fill:#CFD2DD;} + .d2-1036466245 .fill-N5{fill:#DEE1EB;} + .d2-1036466245 .fill-N6{fill:#EEF1F8;} + .d2-1036466245 .fill-N7{fill:#FFFFFF;} + .d2-1036466245 .fill-B1{fill:#0D32B2;} + .d2-1036466245 .fill-B2{fill:#0D32B2;} + .d2-1036466245 .fill-B3{fill:#E3E9FD;} + .d2-1036466245 .fill-B4{fill:#E3E9FD;} + .d2-1036466245 .fill-B5{fill:#EDF0FD;} + .d2-1036466245 .fill-B6{fill:#F7F8FE;} + .d2-1036466245 .fill-AA2{fill:#4A6FF3;} + .d2-1036466245 .fill-AA4{fill:#EDF0FD;} + .d2-1036466245 .fill-AA5{fill:#F7F8FE;} + .d2-1036466245 .fill-AB4{fill:#EDF0FD;} + .d2-1036466245 .fill-AB5{fill:#F7F8FE;} + .d2-1036466245 .stroke-N1{stroke:#0A0F25;} + .d2-1036466245 .stroke-N2{stroke:#676C7E;} + .d2-1036466245 .stroke-N3{stroke:#9499AB;} + .d2-1036466245 .stroke-N4{stroke:#CFD2DD;} + .d2-1036466245 .stroke-N5{stroke:#DEE1EB;} + .d2-1036466245 .stroke-N6{stroke:#EEF1F8;} + .d2-1036466245 .stroke-N7{stroke:#FFFFFF;} + .d2-1036466245 .stroke-B1{stroke:#0D32B2;} + .d2-1036466245 .stroke-B2{stroke:#0D32B2;} + .d2-1036466245 .stroke-B3{stroke:#E3E9FD;} + .d2-1036466245 .stroke-B4{stroke:#E3E9FD;} + .d2-1036466245 .stroke-B5{stroke:#EDF0FD;} + .d2-1036466245 .stroke-B6{stroke:#F7F8FE;} + .d2-1036466245 .stroke-AA2{stroke:#4A6FF3;} + .d2-1036466245 .stroke-AA4{stroke:#EDF0FD;} + .d2-1036466245 .stroke-AA5{stroke:#F7F8FE;} + .d2-1036466245 .stroke-AB4{stroke:#EDF0FD;} + .d2-1036466245 .stroke-AB5{stroke:#F7F8FE;} + .d2-1036466245 .background-color-N1{background-color:#0A0F25;} + .d2-1036466245 .background-color-N2{background-color:#676C7E;} + .d2-1036466245 .background-color-N3{background-color:#9499AB;} + .d2-1036466245 .background-color-N4{background-color:#CFD2DD;} + .d2-1036466245 .background-color-N5{background-color:#DEE1EB;} + .d2-1036466245 .background-color-N6{background-color:#EEF1F8;} + .d2-1036466245 .background-color-N7{background-color:#FFFFFF;} + .d2-1036466245 .background-color-B1{background-color:#0D32B2;} + .d2-1036466245 .background-color-B2{background-color:#0D32B2;} + .d2-1036466245 .background-color-B3{background-color:#E3E9FD;} + .d2-1036466245 .background-color-B4{background-color:#E3E9FD;} + .d2-1036466245 .background-color-B5{background-color:#EDF0FD;} + .d2-1036466245 .background-color-B6{background-color:#F7F8FE;} + .d2-1036466245 .background-color-AA2{background-color:#4A6FF3;} + .d2-1036466245 .background-color-AA4{background-color:#EDF0FD;} + .d2-1036466245 .background-color-AA5{background-color:#F7F8FE;} + .d2-1036466245 .background-color-AB4{background-color:#EDF0FD;} + .d2-1036466245 .background-color-AB5{background-color:#F7F8FE;} + .d2-1036466245 .color-N1{color:#0A0F25;} + .d2-1036466245 .color-N2{color:#676C7E;} + .d2-1036466245 .color-N3{color:#9499AB;} + .d2-1036466245 .color-N4{color:#CFD2DD;} + .d2-1036466245 .color-N5{color:#DEE1EB;} + .d2-1036466245 .color-N6{color:#EEF1F8;} + .d2-1036466245 .color-N7{color:#FFFFFF;} + .d2-1036466245 .color-B1{color:#0D32B2;} + .d2-1036466245 .color-B2{color:#0D32B2;} + .d2-1036466245 .color-B3{color:#E3E9FD;} + .d2-1036466245 .color-B4{color:#E3E9FD;} + .d2-1036466245 .color-B5{color:#EDF0FD;} + .d2-1036466245 .color-B6{color:#F7F8FE;} + .d2-1036466245 .color-AA2{color:#4A6FF3;} + .d2-1036466245 .color-AA4{color:#EDF0FD;} + .d2-1036466245 .color-AA5{color:#F7F8FE;} + .d2-1036466245 .color-AB4{color:#EDF0FD;} + .d2-1036466245 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 diff --git a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json index 1fa81de41..421ffcdfe 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json +++ b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json @@ -152,11 +152,11 @@ "labelPercentage": 0, "route": [ { - "x": 357.8380126953125, + "x": 358, "y": 98 }, { - "x": 250.76699829101562, + "x": 250.8000030517578, "y": 138 }, { @@ -199,11 +199,11 @@ "labelPercentage": 0, "route": [ { - "x": 620.1610107421875, + "x": 620, "y": 98 }, { - "x": 727.2319946289062, + "x": 727.2000122070312, "y": 138 }, { diff --git a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg index f8b63e9f9..93f07a86c 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

    夏になると、とても暑くて、人々は汗を流しています。

    여름에는 매우 더워서 사람들은 땀을 흘립니다.

    -
     +
     From 92b8c2c877ba11bfb85bcc687e0a50ea6309aac0 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 17 Jul 2023 15:11:38 -0700 Subject: [PATCH 080/138] check for internal edges and their labels --- d2layouts/d2dagrelayout/layout.go | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 5a2ff9145..62efe1a53 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1403,6 +1403,32 @@ func fitPadding(obj *d2graph.Object) { innerLeft = math.Min(innerLeft, child.TopLeft.X-math.Max(margin.left, padding.left)) innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+dx+math.Max(margin.right, padding.right)) } + for _, edge := range obj.Graph.Edges { + if !edge.Src.IsDescendantOf(obj) || !edge.Dst.IsDescendantOf(obj) { + continue + } + // check internal edge + their labels + if edge.Label.Value != "" { + labelPosition := label.InsideMiddleCenter + if edge.LabelPosition != nil { + labelPosition = label.Position(*edge.LabelPosition) + } + labelWidth := float64(edge.LabelDimensions.Width) + labelHeight := float64(edge.LabelDimensions.Height) + point, _ := labelPosition.GetPointOnRoute(edge.Route, 2, 0, labelWidth, labelHeight) + + innerTop = math.Min(innerTop, point.Y-padding.top) + innerBottom = math.Max(innerBottom, point.Y+labelHeight+padding.bottom) + innerLeft = math.Min(innerLeft, point.X-padding.left) + innerRight = math.Max(innerRight, point.X+labelWidth+padding.right) + } + for _, point := range edge.Route { + innerTop = math.Min(innerTop, point.Y-padding.top) + innerBottom = math.Max(innerBottom, point.Y+padding.bottom) + innerLeft = math.Min(innerLeft, point.X-padding.left) + innerRight = math.Max(innerRight, point.X+padding.right) + } + } currentTop := obj.TopLeft.Y currentBottom := obj.TopLeft.Y + obj.Height From 2d518a6cfd42a2c12ab99711a26c867313fbc623 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 17 Jul 2023 15:17:00 -0700 Subject: [PATCH 081/138] update tests --- .../testdata/paper-real/sketch.exp.svg | 166 ++--- .../d2sketch/testdata/terminal/sketch.exp.svg | 164 ++--- .../patterns/real-lines/dagre/board.exp.json | 8 +- .../patterns/real-lines/dagre/sketch.exp.svg | 172 +++--- .../patterns/real/dagre/board.exp.json | 8 +- .../patterns/real/dagre/sketch.exp.svg | 166 ++--- .../elk_alignment/dagre/board.exp.json | 4 +- .../elk_alignment/dagre/sketch.exp.svg | 166 ++--- .../unconnected/dagre/board.exp.json | 4 +- .../unconnected/dagre/sketch.exp.svg | 558 ++++++++--------- .../stable/elk_shim/dagre/board.exp.json | 6 +- .../stable/elk_shim/dagre/sketch.exp.svg | 166 ++--- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 578 +++++++++--------- .../themes/origami/dagre/board.exp.json | 6 +- .../themes/origami/dagre/sketch.exp.svg | 168 ++--- .../themes/terminal/dagre/board.exp.json | 4 +- .../themes/terminal/dagre/sketch.exp.svg | 572 ++++++++--------- .../terminal_grayscale/dagre/board.exp.json | 6 +- .../terminal_grayscale/dagre/sketch.exp.svg | 164 ++--- 20 files changed, 1545 insertions(+), 1545 deletions(-) diff --git a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg index 575f38b74..cef9800de 100644 --- a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1635834384 .fill-N1{fill:#0A0F25;} + .d2-1635834384 .fill-N2{fill:#676C7E;} + .d2-1635834384 .fill-N3{fill:#9499AB;} + .d2-1635834384 .fill-N4{fill:#CFD2DD;} + .d2-1635834384 .fill-N5{fill:#DEE1EB;} + .d2-1635834384 .fill-N6{fill:#EEF1F8;} + .d2-1635834384 .fill-N7{fill:#FFFFFF;} + .d2-1635834384 .fill-B1{fill:#0D32B2;} + .d2-1635834384 .fill-B2{fill:#0D32B2;} + .d2-1635834384 .fill-B3{fill:#E3E9FD;} + .d2-1635834384 .fill-B4{fill:#E3E9FD;} + .d2-1635834384 .fill-B5{fill:#EDF0FD;} + .d2-1635834384 .fill-B6{fill:#F7F8FE;} + .d2-1635834384 .fill-AA2{fill:#4A6FF3;} + .d2-1635834384 .fill-AA4{fill:#EDF0FD;} + .d2-1635834384 .fill-AA5{fill:#F7F8FE;} + .d2-1635834384 .fill-AB4{fill:#EDF0FD;} + .d2-1635834384 .fill-AB5{fill:#F7F8FE;} + .d2-1635834384 .stroke-N1{stroke:#0A0F25;} + .d2-1635834384 .stroke-N2{stroke:#676C7E;} + .d2-1635834384 .stroke-N3{stroke:#9499AB;} + .d2-1635834384 .stroke-N4{stroke:#CFD2DD;} + .d2-1635834384 .stroke-N5{stroke:#DEE1EB;} + .d2-1635834384 .stroke-N6{stroke:#EEF1F8;} + .d2-1635834384 .stroke-N7{stroke:#FFFFFF;} + .d2-1635834384 .stroke-B1{stroke:#0D32B2;} + .d2-1635834384 .stroke-B2{stroke:#0D32B2;} + .d2-1635834384 .stroke-B3{stroke:#E3E9FD;} + .d2-1635834384 .stroke-B4{stroke:#E3E9FD;} + .d2-1635834384 .stroke-B5{stroke:#EDF0FD;} + .d2-1635834384 .stroke-B6{stroke:#F7F8FE;} + .d2-1635834384 .stroke-AA2{stroke:#4A6FF3;} + .d2-1635834384 .stroke-AA4{stroke:#EDF0FD;} + .d2-1635834384 .stroke-AA5{stroke:#F7F8FE;} + .d2-1635834384 .stroke-AB4{stroke:#EDF0FD;} + .d2-1635834384 .stroke-AB5{stroke:#F7F8FE;} + .d2-1635834384 .background-color-N1{background-color:#0A0F25;} + .d2-1635834384 .background-color-N2{background-color:#676C7E;} + .d2-1635834384 .background-color-N3{background-color:#9499AB;} + .d2-1635834384 .background-color-N4{background-color:#CFD2DD;} + .d2-1635834384 .background-color-N5{background-color:#DEE1EB;} + .d2-1635834384 .background-color-N6{background-color:#EEF1F8;} + .d2-1635834384 .background-color-N7{background-color:#FFFFFF;} + .d2-1635834384 .background-color-B1{background-color:#0D32B2;} + .d2-1635834384 .background-color-B2{background-color:#0D32B2;} + .d2-1635834384 .background-color-B3{background-color:#E3E9FD;} + .d2-1635834384 .background-color-B4{background-color:#E3E9FD;} + .d2-1635834384 .background-color-B5{background-color:#EDF0FD;} + .d2-1635834384 .background-color-B6{background-color:#F7F8FE;} + .d2-1635834384 .background-color-AA2{background-color:#4A6FF3;} + .d2-1635834384 .background-color-AA4{background-color:#EDF0FD;} + .d2-1635834384 .background-color-AA5{background-color:#F7F8FE;} + .d2-1635834384 .background-color-AB4{background-color:#EDF0FD;} + .d2-1635834384 .background-color-AB5{background-color:#F7F8FE;} + .d2-1635834384 .color-N1{color:#0A0F25;} + .d2-1635834384 .color-N2{color:#676C7E;} + .d2-1635834384 .color-N3{color:#9499AB;} + .d2-1635834384 .color-N4{color:#CFD2DD;} + .d2-1635834384 .color-N5{color:#DEE1EB;} + .d2-1635834384 .color-N6{color:#EEF1F8;} + .d2-1635834384 .color-N7{color:#FFFFFF;} + .d2-1635834384 .color-B1{color:#0D32B2;} + .d2-1635834384 .color-B2{color:#0D32B2;} + .d2-1635834384 .color-B3{color:#E3E9FD;} + .d2-1635834384 .color-B4{color:#E3E9FD;} + .d2-1635834384 .color-B5{color:#EDF0FD;} + .d2-1635834384 .color-B6{color:#F7F8FE;} + .d2-1635834384 .color-AA2{color:#4A6FF3;} + .d2-1635834384 .color-AA4{color:#EDF0FD;} + .d2-1635834384 .color-AA5{color:#F7F8FE;} + .d2-1635834384 .color-AB4{color:#EDF0FD;} + .d2-1635834384 .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}]]> @@ -1205,10 +1205,10 @@ -NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND - - - +NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND + + + diff --git a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg index 7f5ade5d5..2a6fd361f 100644 --- a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-4175782703 .fill-N1{fill:#000410;} + .d2-4175782703 .fill-N2{fill:#0000B8;} + .d2-4175782703 .fill-N3{fill:#9499AB;} + .d2-4175782703 .fill-N4{fill:#CFD2DD;} + .d2-4175782703 .fill-N5{fill:#C3DEF3;} + .d2-4175782703 .fill-N6{fill:#EEF1F8;} + .d2-4175782703 .fill-N7{fill:#FFFFFF;} + .d2-4175782703 .fill-B1{fill:#000410;} + .d2-4175782703 .fill-B2{fill:#0000E4;} + .d2-4175782703 .fill-B3{fill:#5AA4DC;} + .d2-4175782703 .fill-B4{fill:#E7E9EE;} + .d2-4175782703 .fill-B5{fill:#F5F6F9;} + .d2-4175782703 .fill-B6{fill:#FFFFFF;} + .d2-4175782703 .fill-AA2{fill:#008566;} + .d2-4175782703 .fill-AA4{fill:#45BBA5;} + .d2-4175782703 .fill-AA5{fill:#7ACCBD;} + .d2-4175782703 .fill-AB4{fill:#F1C759;} + .d2-4175782703 .fill-AB5{fill:#F9E088;} + .d2-4175782703 .stroke-N1{stroke:#000410;} + .d2-4175782703 .stroke-N2{stroke:#0000B8;} + .d2-4175782703 .stroke-N3{stroke:#9499AB;} + .d2-4175782703 .stroke-N4{stroke:#CFD2DD;} + .d2-4175782703 .stroke-N5{stroke:#C3DEF3;} + .d2-4175782703 .stroke-N6{stroke:#EEF1F8;} + .d2-4175782703 .stroke-N7{stroke:#FFFFFF;} + .d2-4175782703 .stroke-B1{stroke:#000410;} + .d2-4175782703 .stroke-B2{stroke:#0000E4;} + .d2-4175782703 .stroke-B3{stroke:#5AA4DC;} + .d2-4175782703 .stroke-B4{stroke:#E7E9EE;} + .d2-4175782703 .stroke-B5{stroke:#F5F6F9;} + .d2-4175782703 .stroke-B6{stroke:#FFFFFF;} + .d2-4175782703 .stroke-AA2{stroke:#008566;} + .d2-4175782703 .stroke-AA4{stroke:#45BBA5;} + .d2-4175782703 .stroke-AA5{stroke:#7ACCBD;} + .d2-4175782703 .stroke-AB4{stroke:#F1C759;} + .d2-4175782703 .stroke-AB5{stroke:#F9E088;} + .d2-4175782703 .background-color-N1{background-color:#000410;} + .d2-4175782703 .background-color-N2{background-color:#0000B8;} + .d2-4175782703 .background-color-N3{background-color:#9499AB;} + .d2-4175782703 .background-color-N4{background-color:#CFD2DD;} + .d2-4175782703 .background-color-N5{background-color:#C3DEF3;} + .d2-4175782703 .background-color-N6{background-color:#EEF1F8;} + .d2-4175782703 .background-color-N7{background-color:#FFFFFF;} + .d2-4175782703 .background-color-B1{background-color:#000410;} + .d2-4175782703 .background-color-B2{background-color:#0000E4;} + .d2-4175782703 .background-color-B3{background-color:#5AA4DC;} + .d2-4175782703 .background-color-B4{background-color:#E7E9EE;} + .d2-4175782703 .background-color-B5{background-color:#F5F6F9;} + .d2-4175782703 .background-color-B6{background-color:#FFFFFF;} + .d2-4175782703 .background-color-AA2{background-color:#008566;} + .d2-4175782703 .background-color-AA4{background-color:#45BBA5;} + .d2-4175782703 .background-color-AA5{background-color:#7ACCBD;} + .d2-4175782703 .background-color-AB4{background-color:#F1C759;} + .d2-4175782703 .background-color-AB5{background-color:#F9E088;} + .d2-4175782703 .color-N1{color:#000410;} + .d2-4175782703 .color-N2{color:#0000B8;} + .d2-4175782703 .color-N3{color:#9499AB;} + .d2-4175782703 .color-N4{color:#CFD2DD;} + .d2-4175782703 .color-N5{color:#C3DEF3;} + .d2-4175782703 .color-N6{color:#EEF1F8;} + .d2-4175782703 .color-N7{color:#FFFFFF;} + .d2-4175782703 .color-B1{color:#000410;} + .d2-4175782703 .color-B2{color:#0000E4;} + .d2-4175782703 .color-B3{color:#5AA4DC;} + .d2-4175782703 .color-B4{color:#E7E9EE;} + .d2-4175782703 .color-B5{color:#F5F6F9;} + .d2-4175782703 .color-B6{color:#FFFFFF;} + .d2-4175782703 .color-AA2{color:#008566;} + .d2-4175782703 .color-AA4{color:#45BBA5;} + .d2-4175782703 .color-AA5{color:#7ACCBD;} + .d2-4175782703 .color-AB4{color:#F1C759;} + .d2-4175782703 .color-AB5{color:#F9E088;}.appendix text.text{fill:#000410}.md{--color-fg-default:#000410;--color-fg-muted:#0000B8;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#000410;--color-border-muted:#0000E4;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0000E4;--color-accent-emphasis:#0000E4;--color-attention-subtle:#0000B8;--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-normal);mix-blend-mode:color-burn}.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-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.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-normal);mix-blend-mode:color-burn}.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}]]> @@ -137,13 +137,13 @@ -NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST +NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST - + - + diff --git a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json index 673bbd71d..2adadd4fd 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json +++ b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json @@ -7,10 +7,10 @@ "id": "NETWORK", "type": "rectangle", "pos": { - "x": 40, + "x": 23, "y": 76 }, - "width": 291, + "width": 314, "height": 508, "opacity": 1, "strokeDash": 0, @@ -49,10 +49,10 @@ "id": "NETWORK.CELL TOWER", "type": "rectangle", "pos": { - "x": 70, + "x": 53, "y": 117 }, - "width": 231, + "width": 254, "height": 437, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg index 4ac5aadef..a6e6641a8 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -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 - + .d2-1793236246 .fill-N1{fill:#0A0F25;} + .d2-1793236246 .fill-N2{fill:#676C7E;} + .d2-1793236246 .fill-N3{fill:#9499AB;} + .d2-1793236246 .fill-N4{fill:#CFD2DD;} + .d2-1793236246 .fill-N5{fill:#DEE1EB;} + .d2-1793236246 .fill-N6{fill:#EEF1F8;} + .d2-1793236246 .fill-N7{fill:#FFFFFF;} + .d2-1793236246 .fill-B1{fill:#0D32B2;} + .d2-1793236246 .fill-B2{fill:#0D32B2;} + .d2-1793236246 .fill-B3{fill:#E3E9FD;} + .d2-1793236246 .fill-B4{fill:#E3E9FD;} + .d2-1793236246 .fill-B5{fill:#EDF0FD;} + .d2-1793236246 .fill-B6{fill:#F7F8FE;} + .d2-1793236246 .fill-AA2{fill:#4A6FF3;} + .d2-1793236246 .fill-AA4{fill:#EDF0FD;} + .d2-1793236246 .fill-AA5{fill:#F7F8FE;} + .d2-1793236246 .fill-AB4{fill:#EDF0FD;} + .d2-1793236246 .fill-AB5{fill:#F7F8FE;} + .d2-1793236246 .stroke-N1{stroke:#0A0F25;} + .d2-1793236246 .stroke-N2{stroke:#676C7E;} + .d2-1793236246 .stroke-N3{stroke:#9499AB;} + .d2-1793236246 .stroke-N4{stroke:#CFD2DD;} + .d2-1793236246 .stroke-N5{stroke:#DEE1EB;} + .d2-1793236246 .stroke-N6{stroke:#EEF1F8;} + .d2-1793236246 .stroke-N7{stroke:#FFFFFF;} + .d2-1793236246 .stroke-B1{stroke:#0D32B2;} + .d2-1793236246 .stroke-B2{stroke:#0D32B2;} + .d2-1793236246 .stroke-B3{stroke:#E3E9FD;} + .d2-1793236246 .stroke-B4{stroke:#E3E9FD;} + .d2-1793236246 .stroke-B5{stroke:#EDF0FD;} + .d2-1793236246 .stroke-B6{stroke:#F7F8FE;} + .d2-1793236246 .stroke-AA2{stroke:#4A6FF3;} + .d2-1793236246 .stroke-AA4{stroke:#EDF0FD;} + .d2-1793236246 .stroke-AA5{stroke:#F7F8FE;} + .d2-1793236246 .stroke-AB4{stroke:#EDF0FD;} + .d2-1793236246 .stroke-AB5{stroke:#F7F8FE;} + .d2-1793236246 .background-color-N1{background-color:#0A0F25;} + .d2-1793236246 .background-color-N2{background-color:#676C7E;} + .d2-1793236246 .background-color-N3{background-color:#9499AB;} + .d2-1793236246 .background-color-N4{background-color:#CFD2DD;} + .d2-1793236246 .background-color-N5{background-color:#DEE1EB;} + .d2-1793236246 .background-color-N6{background-color:#EEF1F8;} + .d2-1793236246 .background-color-N7{background-color:#FFFFFF;} + .d2-1793236246 .background-color-B1{background-color:#0D32B2;} + .d2-1793236246 .background-color-B2{background-color:#0D32B2;} + .d2-1793236246 .background-color-B3{background-color:#E3E9FD;} + .d2-1793236246 .background-color-B4{background-color:#E3E9FD;} + .d2-1793236246 .background-color-B5{background-color:#EDF0FD;} + .d2-1793236246 .background-color-B6{background-color:#F7F8FE;} + .d2-1793236246 .background-color-AA2{background-color:#4A6FF3;} + .d2-1793236246 .background-color-AA4{background-color:#EDF0FD;} + .d2-1793236246 .background-color-AA5{background-color:#F7F8FE;} + .d2-1793236246 .background-color-AB4{background-color:#EDF0FD;} + .d2-1793236246 .background-color-AB5{background-color:#F7F8FE;} + .d2-1793236246 .color-N1{color:#0A0F25;} + .d2-1793236246 .color-N2{color:#676C7E;} + .d2-1793236246 .color-N3{color:#9499AB;} + .d2-1793236246 .color-N4{color:#CFD2DD;} + .d2-1793236246 .color-N5{color:#DEE1EB;} + .d2-1793236246 .color-N6{color:#EEF1F8;} + .d2-1793236246 .color-N7{color:#FFFFFF;} + .d2-1793236246 .color-B1{color:#0D32B2;} + .d2-1793236246 .color-B2{color:#0D32B2;} + .d2-1793236246 .color-B3{color:#E3E9FD;} + .d2-1793236246 .color-B4{color:#E3E9FD;} + .d2-1793236246 .color-B5{color:#EDF0FD;} + .d2-1793236246 .color-B6{color:#F7F8FE;} + .d2-1793236246 .color-AA2{color:#4A6FF3;} + .d2-1793236246 .color-AA4{color:#EDF0FD;} + .d2-1793236246 .color-AA5{color:#F7F8FE;} + .d2-1793236246 .color-AB4{color:#EDF0FD;} + .d2-1793236246 .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}]]>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/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json index eef3f08fe..1b1935538 100644 --- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json +++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json @@ -131,10 +131,10 @@ "type": "rectangle", "pos": { "x": 659, - "y": 299 + "y": 270 }, "width": 832, - "height": 294, + "height": 323, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index a27d41448..44f9695e1 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
      +OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
      • Asset Tagging
      • Inventory
      • Staging
      • Dispatch to Site
      -
      InstallationSupport +
    InstallationSupport - + diff --git a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json index cd266dc7a..cbad13b6e 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 7, "y": 227 }, - "width": 379, + "width": 398, "height": 1188, "opacity": 1, "strokeDash": 0, @@ -48,10 +48,10 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 146, + "x": 127, "y": 268 }, - "width": 210, + "width": 248, "height": 313, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg index a8a3410c3..debe7ea82 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + .d2-2944963252 .fill-N1{fill:#0A0F25;} + .d2-2944963252 .fill-N2{fill:#676C7E;} + .d2-2944963252 .fill-N3{fill:#9499AB;} + .d2-2944963252 .fill-N4{fill:#CFD2DD;} + .d2-2944963252 .fill-N5{fill:#DEE1EB;} + .d2-2944963252 .fill-N6{fill:#EEF1F8;} + .d2-2944963252 .fill-N7{fill:#FFFFFF;} + .d2-2944963252 .fill-B1{fill:#0D32B2;} + .d2-2944963252 .fill-B2{fill:#0D32B2;} + .d2-2944963252 .fill-B3{fill:#E3E9FD;} + .d2-2944963252 .fill-B4{fill:#E3E9FD;} + .d2-2944963252 .fill-B5{fill:#EDF0FD;} + .d2-2944963252 .fill-B6{fill:#F7F8FE;} + .d2-2944963252 .fill-AA2{fill:#4A6FF3;} + .d2-2944963252 .fill-AA4{fill:#EDF0FD;} + .d2-2944963252 .fill-AA5{fill:#F7F8FE;} + .d2-2944963252 .fill-AB4{fill:#EDF0FD;} + .d2-2944963252 .fill-AB5{fill:#F7F8FE;} + .d2-2944963252 .stroke-N1{stroke:#0A0F25;} + .d2-2944963252 .stroke-N2{stroke:#676C7E;} + .d2-2944963252 .stroke-N3{stroke:#9499AB;} + .d2-2944963252 .stroke-N4{stroke:#CFD2DD;} + .d2-2944963252 .stroke-N5{stroke:#DEE1EB;} + .d2-2944963252 .stroke-N6{stroke:#EEF1F8;} + .d2-2944963252 .stroke-N7{stroke:#FFFFFF;} + .d2-2944963252 .stroke-B1{stroke:#0D32B2;} + .d2-2944963252 .stroke-B2{stroke:#0D32B2;} + .d2-2944963252 .stroke-B3{stroke:#E3E9FD;} + .d2-2944963252 .stroke-B4{stroke:#E3E9FD;} + .d2-2944963252 .stroke-B5{stroke:#EDF0FD;} + .d2-2944963252 .stroke-B6{stroke:#F7F8FE;} + .d2-2944963252 .stroke-AA2{stroke:#4A6FF3;} + .d2-2944963252 .stroke-AA4{stroke:#EDF0FD;} + .d2-2944963252 .stroke-AA5{stroke:#F7F8FE;} + .d2-2944963252 .stroke-AB4{stroke:#EDF0FD;} + .d2-2944963252 .stroke-AB5{stroke:#F7F8FE;} + .d2-2944963252 .background-color-N1{background-color:#0A0F25;} + .d2-2944963252 .background-color-N2{background-color:#676C7E;} + .d2-2944963252 .background-color-N3{background-color:#9499AB;} + .d2-2944963252 .background-color-N4{background-color:#CFD2DD;} + .d2-2944963252 .background-color-N5{background-color:#DEE1EB;} + .d2-2944963252 .background-color-N6{background-color:#EEF1F8;} + .d2-2944963252 .background-color-N7{background-color:#FFFFFF;} + .d2-2944963252 .background-color-B1{background-color:#0D32B2;} + .d2-2944963252 .background-color-B2{background-color:#0D32B2;} + .d2-2944963252 .background-color-B3{background-color:#E3E9FD;} + .d2-2944963252 .background-color-B4{background-color:#E3E9FD;} + .d2-2944963252 .background-color-B5{background-color:#EDF0FD;} + .d2-2944963252 .background-color-B6{background-color:#F7F8FE;} + .d2-2944963252 .background-color-AA2{background-color:#4A6FF3;} + .d2-2944963252 .background-color-AA4{background-color:#EDF0FD;} + .d2-2944963252 .background-color-AA5{background-color:#F7F8FE;} + .d2-2944963252 .background-color-AB4{background-color:#EDF0FD;} + .d2-2944963252 .background-color-AB5{background-color:#F7F8FE;} + .d2-2944963252 .color-N1{color:#0A0F25;} + .d2-2944963252 .color-N2{color:#676C7E;} + .d2-2944963252 .color-N3{color:#9499AB;} + .d2-2944963252 .color-N4{color:#CFD2DD;} + .d2-2944963252 .color-N5{color:#DEE1EB;} + .d2-2944963252 .color-N6{color:#EEF1F8;} + .d2-2944963252 .color-N7{color:#FFFFFF;} + .d2-2944963252 .color-B1{color:#0D32B2;} + .d2-2944963252 .color-B2{color:#0D32B2;} + .d2-2944963252 .color-B3{color:#E3E9FD;} + .d2-2944963252 .color-B4{color:#E3E9FD;} + .d2-2944963252 .color-B5{color:#EDF0FD;} + .d2-2944963252 .color-B6{color:#F7F8FE;} + .d2-2944963252 .color-AA2{color:#4A6FF3;} + .d2-2944963252 .color-AA4{color:#EDF0FD;} + .d2-2944963252 .color-AA5{color:#F7F8FE;} + .d2-2944963252 .color-AB4{color:#EDF0FD;} + .d2-2944963252 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - + 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 9516c93f5..4945204b4 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 7, "y": 641 }, - "width": 402, + "width": 410, "height": 1422, "opacity": 1, "strokeDash": 0, @@ -51,7 +51,7 @@ "x": 112, "y": 682 }, - "width": 267, + "width": 275, "height": 547, "opacity": 1, "strokeDash": 0, 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 2ef133183..fa4fa320d 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,16 +908,16 @@     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 6bc8d05cb..0112af344 100644 --- a/e2etests/testdata/themes/origami/dagre/board.exp.json +++ b/e2etests/testdata/themes/origami/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 5, "y": 227 }, - "width": 356, + "width": 395, "height": 1198, "opacity": 1, "strokeDash": 0, @@ -49,10 +49,10 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 157, + "x": 118, "y": 268 }, - "width": 174, + "width": 252, "height": 323, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg index de7c68203..38c59ed49 100644 --- a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -heyyayyyceeeyoheybeeedeee + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json new file mode 100644 index 000000000..9b2579ba4 --- /dev/null +++ b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json @@ -0,0 +1,434 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "heyy", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 171, + "height": 302, + "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": "heyy", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 54, + "labelHeight": 36, + "labelPosition": "INSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "heyy.yo", + "type": "rectangle", + "pos": { + "x": 66, + "y": 62 + }, + "width": 63, + "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": "yo", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 18, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "heyy.hey", + "type": "rectangle", + "pos": { + "x": 62, + "y": 198 + }, + "width": 71, + "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": "hey", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 26, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "ayyy", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 203, + "y": 42 + }, + "width": 204, + "height": 242, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ayyy", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 53, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "ayyy.beee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 253, + "y": 116 + }, + "width": 104, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_RIGHT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "beee", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 33, + "labelHeight": 21, + "labelPosition": "OUTSIDE_TOP_LEFT", + "zIndex": 0, + "level": 2 + }, + { + "id": "ceee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 427, + "y": 42 + }, + "width": 205, + "height": 242, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_BOTTOM_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ceee", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 53, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "ceee.deee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 477, + "y": 92 + }, + "width": 105, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_BOTTOM_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "deee", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 34, + "labelHeight": 21, + "labelPosition": "OUTSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "heyy.(yo -> hey)[0]", + "src": "heyy.yo", + "srcArrow": "none", + "dst": "heyy.hey", + "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.5, + "y": 128 + }, + { + "x": 97.5, + "y": 198 + } + ], + "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/overlapping_child_label/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg new file mode 100644 index 000000000..a96791eb4 --- /dev/null +++ b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg @@ -0,0 +1,108 @@ +heyyayyyceeeyoheybeeedeee + + + + + + + + + \ No newline at end of file From a8cc241c2219109a04a1ff9170ba63e5724a6498 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 18 Jul 2023 19:24:32 -0700 Subject: [PATCH 084/138] move overlaps func to d2 --- lib/geo/box.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/geo/box.go b/lib/geo/box.go index de9b36cff..de9f3af0a 100644 --- a/lib/geo/box.go +++ b/lib/geo/box.go @@ -83,3 +83,9 @@ func (b *Box) Contains(p *Point) bool { return !(p.X < b.TopLeft.X || b.TopLeft.X+b.Width < p.X || p.Y < b.TopLeft.Y || b.TopLeft.Y+b.Height < p.Y) } + +func (b1 Box) Overlaps(b2 Box) bool { + // https://silentmatt.com/rectangle-intersection/ + return (b1.TopLeft.X < (b2.TopLeft.X + b2.Width)) && ((b1.TopLeft.X + b1.Width) > b2.TopLeft.X) && + (b1.TopLeft.Y < (b2.TopLeft.Y + b2.Height)) && ((b1.TopLeft.Y + b1.Height) > b2.TopLeft.Y) +} From 09174c17b81b8149663ab0dee6b472f4904a1afa Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 19 Jul 2023 17:31:52 -0700 Subject: [PATCH 085/138] check for overlaps with children --- d2graph/layout.go | 18 +++ d2layouts/d2dagrelayout/layout.go | 254 ++++++++++++++++++++++++++++-- 2 files changed, 257 insertions(+), 15 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index 358a95934..4d50efc1d 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -317,6 +317,24 @@ func (obj *Object) GetLabelTopLeft() *geo.Point { return labelTL } +func (obj *Object) GetIconTopLeft() *geo.Point { + if obj.IconPosition == nil { + return nil + } + + s := obj.ToShape() + iconPosition := label.Position(*obj.IconPosition) + + var box *geo.Box + if iconPosition.IsOutside() { + box = s.GetBox() + } else { + box = s.GetInnerBox() + } + + return iconPosition.GetPointOnBox(box, label.PADDING, d2target.MAX_ICON_SIZE, d2target.MAX_ICON_SIZE) +} + func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (newStart, newEnd int) { srcShape := edge.Src.ToShape() dstShape := edge.Dst.ToShape() diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 62efe1a53..e3ded9ec0 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1150,17 +1150,15 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { continue } } else { - startingRank := startingParentRanks[child] - endingRank := endingParentRanks[child] - if startingRank != rank && endingRank != rank { + if startingParentRanks[child] != rank { continue } } margin, _ := getSpacing(child) if isHorizontal { - startPosition = child.TopLeft.X - margin.left + startPosition = child.TopLeft.X - margin.left - padding.left } else { - startPosition = child.TopLeft.Y - margin.top + startPosition = child.TopLeft.Y - margin.top - padding.top } startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], startPosition) } @@ -1185,6 +1183,7 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } else { endPosition = parent.TopLeft.Y + parent.Height + padding.bottom - rankSep/2. } + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], endPosition) for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { @@ -1192,18 +1191,16 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { continue } } else { - startingRank := startingParentRanks[child] - endingRank := endingParentRanks[child] - if startingRank != rank && endingRank != rank { + if endingParentRanks[child] != rank { continue } } margin, _ := getSpacing(child) if isHorizontal { - endPosition = child.TopLeft.X + child.Width + margin.right + endPosition = child.TopLeft.X + child.Width + margin.right + padding.right } else { - endPosition = child.TopLeft.Y + child.Height + margin.bottom + endPosition = child.TopLeft.Y + child.Height + margin.bottom + padding.bottom } endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], endPosition) } @@ -1383,26 +1380,93 @@ func fitPadding(obj *d2graph.Object) { fitPadding(child) } + // we will compute a perfectly fit innerBox merging our padding with children's margin, + // but we need to add padding and margin together if an outside child label will overlap with our inside label _, padding := getSpacing(obj) padding.top = math.Max(padding.top, DEFAULT_PADDING) padding.bottom = math.Max(padding.bottom, DEFAULT_PADDING) padding.left = math.Max(padding.left, DEFAULT_PADDING) padding.right = math.Max(padding.right, DEFAULT_PADDING) + // where we are (current*) vs where we want to fit each side to (inner*) + currentTop := obj.TopLeft.Y + currentBottom := obj.TopLeft.Y + obj.Height + currentLeft := obj.TopLeft.X + currentRight := obj.TopLeft.X + obj.Width + innerTop := math.Inf(1) innerBottom := math.Inf(-1) innerLeft := math.Inf(1) innerRight := math.Inf(-1) + // we create boxes for our inside label and icon, and will check against overlaps with any internal boxes + var labelPosition, iconPosition label.Position + var labelBox, iconBox *geo.Box + if obj.HasLabel() && obj.LabelPosition != nil { + labelPosition = label.Position(*obj.LabelPosition) + switch labelPosition { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight, + label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight, + label.InsideMiddleLeft, label.InsideMiddleRight: + labelTL := obj.GetLabelTopLeft() + if labelTL != nil { + labelBox = geo.NewBox(labelTL, float64(obj.LabelDimensions.Width)+2*label.PADDING, float64(obj.LabelDimensions.Height)) + } + } + } + if obj.Icon != nil && shapeType != shape.IMAGE_TYPE && obj.IconPosition != nil { + iconPosition = label.Position(*obj.IconPosition) + switch iconPosition { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight, + label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight, + label.InsideMiddleLeft, label.InsideMiddleRight: + iconTL := obj.GetIconTopLeft() + if iconTL != nil { + iconBox = geo.NewBox(iconTL, d2target.MAX_ICON_SIZE, d2target.MAX_ICON_SIZE) + } + } + } + + // update the inner positions for children's margin and collect the outside boxes that we cannot overlap with + var innerBoxes []geo.Box for _, child := range obj.ChildrenArray { margin, _ := getSpacing(child) dx, dy := child.GetModifierElementAdjustments() + if labelBox != nil || iconBox != nil { + var childLabelBox *geo.Box + var childLabelPosition, childIconPosition label.Position + if child.HasLabel() && child.LabelPosition != nil { + childLabelPosition = label.Position(*child.LabelPosition) + if childLabelPosition.IsOutside() { + childLabelTL := child.GetLabelTopLeft() + + childLabelBox = geo.NewBox( + childLabelTL, + float64(child.LabelDimensions.Width), + float64(child.LabelDimensions.Height), + ) + innerBoxes = append(innerBoxes, *childLabelBox) + } + } + if child.Icon != nil && child.Shape.Value != d2target.ShapeImage && child.IconPosition != nil { + childIconPosition = label.Position(*child.IconPosition) + if childIconPosition.IsOutside() { + childIconTL := child.GetIconTopLeft() + + childIconBox := geo.NewBox(childIconTL, d2target.MAX_ICON_SIZE, d2target.MAX_ICON_SIZE) + innerBoxes = append(innerBoxes, *childIconBox) + } + } + } + innerTop = math.Min(innerTop, child.TopLeft.Y-dy-math.Max(margin.top, padding.top)) innerBottom = math.Max(innerBottom, child.TopLeft.Y+child.Height+math.Max(margin.bottom, padding.bottom)) innerLeft = math.Min(innerLeft, child.TopLeft.X-math.Max(margin.left, padding.left)) innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+dx+math.Max(margin.right, padding.right)) } + + // collect edge label boxes and update inner box for internal edges for _, edge := range obj.Graph.Edges { if !edge.Src.IsDescendantOf(obj) || !edge.Dst.IsDescendantOf(obj) { continue @@ -1417,6 +1481,10 @@ func fitPadding(obj *d2graph.Object) { labelHeight := float64(edge.LabelDimensions.Height) point, _ := labelPosition.GetPointOnRoute(edge.Route, 2, 0, labelWidth, labelHeight) + if labelBox != nil || iconBox != nil { + innerBoxes = append(innerBoxes, geo.Box{TopLeft: point, Width: labelWidth, Height: labelHeight}) + } + innerTop = math.Min(innerTop, point.Y-padding.top) innerBottom = math.Max(innerBottom, point.Y+labelHeight+padding.bottom) innerLeft = math.Min(innerLeft, point.X-padding.left) @@ -1430,16 +1498,172 @@ func fitPadding(obj *d2graph.Object) { } } - currentTop := obj.TopLeft.Y - currentBottom := obj.TopLeft.Y + obj.Height - currentLeft := obj.TopLeft.X - currentRight := obj.TopLeft.X + obj.Width - + // how much do we need to shrink each side topDelta := innerTop - currentTop bottomDelta := currentBottom - innerBottom leftDelta := innerLeft - currentLeft rightDelta := currentRight - innerRight + if topDelta > 0 || bottomDelta > 0 || leftDelta > 0 || rightDelta > 0 { + var leftOverlap, rightOverlap, topOverlap, bottomOverlap float64 + var labelSide, iconSide geo.Orientation + if labelBox != nil { + switch labelPosition { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + labelSide = geo.Top + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + labelSide = geo.Bottom + case label.InsideMiddleLeft: + labelSide = geo.Left + case label.InsideMiddleRight: + labelSide = geo.Right + default: + labelSide = geo.NONE + } + // move labelBox to its position with the merged delta and check for overlaps + switch labelSide { + case geo.Top: + if topDelta > 0 { + labelBox.TopLeft.Y += topDelta + } + case geo.Bottom: + if bottomDelta > 0 { + labelBox.TopLeft.Y -= bottomDelta + } + case geo.Left: + if leftDelta > 0 { + labelBox.TopLeft.X += leftDelta + } + case geo.Right: + if rightDelta > 0 { + labelBox.TopLeft.X -= rightDelta + } + } + switch labelSide { + case geo.Top: + if topDelta > 0 { + for _, box := range innerBoxes { + if labelBox.Overlaps(box) { + dy := labelBox.TopLeft.Y + labelBox.Height - box.TopLeft.Y + topOverlap = go2.Max(topOverlap, dy) + } + } + } + case geo.Bottom: + if bottomDelta > 0 { + for _, box := range innerBoxes { + if labelBox.Overlaps(box) { + dy := box.TopLeft.Y + box.Height - labelBox.TopLeft.Y + bottomOverlap = go2.Max(bottomOverlap, dy) + } + } + } + case geo.Left: + if leftDelta > 0 { + for _, box := range innerBoxes { + if labelBox.Overlaps(box) { + dx := labelBox.TopLeft.X + labelBox.Width - box.TopLeft.X + leftOverlap = go2.Max(leftOverlap, dx) + } + } + } + case geo.Right: + if rightDelta > 0 { + for _, box := range innerBoxes { + if labelBox.Overlaps(box) { + dx := box.TopLeft.X + box.Width - labelBox.TopLeft.X + rightOverlap = go2.Max(rightOverlap, dx) + } + } + } + } + } + if iconBox != nil { + switch iconPosition { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + iconSide = geo.Top + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + iconSide = geo.Bottom + case label.InsideMiddleLeft: + iconSide = geo.Left + case label.InsideMiddleRight: + iconSide = geo.Right + default: + iconSide = geo.NONE + } + // move iconBox to its position with the merged delta and check for overlaps + switch iconSide { + case geo.Top: + if topDelta > 0 { + iconBox.TopLeft.Y += topDelta + } + case geo.Bottom: + if bottomDelta > 0 { + iconBox.TopLeft.Y -= bottomDelta + } + case geo.Left: + if leftDelta > 0 { + iconBox.TopLeft.X += leftDelta + } + case geo.Right: + if rightDelta > 0 { + iconBox.TopLeft.X -= rightDelta + } + } + switch iconSide { + case geo.Top: + if topDelta > 0 { + for _, box := range innerBoxes { + if iconBox.Overlaps(box) { + dy := iconBox.TopLeft.Y + iconBox.Height - box.TopLeft.Y + topOverlap = go2.Max(topOverlap, dy) + } + } + } + case geo.Bottom: + if bottomDelta > 0 { + for _, box := range innerBoxes { + if iconBox.Overlaps(box) { + dy := box.TopLeft.Y + box.Height - iconBox.TopLeft.Y + bottomOverlap = go2.Max(bottomOverlap, dy) + } + } + } + case geo.Left: + if leftDelta > 0 { + for _, box := range innerBoxes { + if iconBox.Overlaps(box) { + dx := iconBox.TopLeft.X + iconBox.Width - box.TopLeft.X + leftOverlap = go2.Max(leftOverlap, dx) + } + } + } + case geo.Right: + if rightDelta > 0 { + for _, box := range innerBoxes { + if iconBox.Overlaps(box) { + dx := box.TopLeft.X + box.Width - iconBox.TopLeft.X + rightOverlap = go2.Max(rightOverlap, dx) + } + } + } + } + } + + if leftOverlap > 0 { + leftDelta -= leftOverlap + } + if rightOverlap > 0 { + rightDelta -= rightOverlap + } + if topOverlap > 0 { + topDelta -= topOverlap + } + if bottomOverlap > 0 { + bottomDelta -= bottomOverlap + } + } + if 0 < topDelta { topDelta = adjustDeltaForEdges(obj, currentTop, topDelta, false) if 0 < topDelta { From 1eb3999c9994dae5327dd5bbf23661cf69fd2748 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 19 Jul 2023 17:32:59 -0700 Subject: [PATCH 086/138] update test --- .../dagre/board.exp.json | 18 +- .../dagre/sketch.exp.svg | 168 +++++++++--------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json index 533dfa432..d4b5af472 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 33 }, "width": 131, - "height": 395, + "height": 490, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 316 + "y": 390 }, "width": 71, "height": 66, @@ -134,10 +134,10 @@ ], "pos": { "x": 181, - "y": -24 + "y": -60 }, "width": 164, - "height": 196, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -246,10 +246,10 @@ ], "pos": { "x": 385, - "y": 4 + "y": -17 }, "width": 165, - "height": 212, + "height": 297, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -382,15 +382,15 @@ }, { "x": 75.5, - "y": 198.60000610351562 + "y": 257.79998779296875 }, { "x": 75.5, - "y": 276 + "y": 350 }, { "x": 75.5, - "y": 316 + "y": 390 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg index 466525352..1d315a75d 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -heyyayyyceeeyoheybeeedeee - - - - + .d2-1499565599 .fill-N1{fill:#0A0F25;} + .d2-1499565599 .fill-N2{fill:#676C7E;} + .d2-1499565599 .fill-N3{fill:#9499AB;} + .d2-1499565599 .fill-N4{fill:#CFD2DD;} + .d2-1499565599 .fill-N5{fill:#DEE1EB;} + .d2-1499565599 .fill-N6{fill:#EEF1F8;} + .d2-1499565599 .fill-N7{fill:#FFFFFF;} + .d2-1499565599 .fill-B1{fill:#0D32B2;} + .d2-1499565599 .fill-B2{fill:#0D32B2;} + .d2-1499565599 .fill-B3{fill:#E3E9FD;} + .d2-1499565599 .fill-B4{fill:#E3E9FD;} + .d2-1499565599 .fill-B5{fill:#EDF0FD;} + .d2-1499565599 .fill-B6{fill:#F7F8FE;} + .d2-1499565599 .fill-AA2{fill:#4A6FF3;} + .d2-1499565599 .fill-AA4{fill:#EDF0FD;} + .d2-1499565599 .fill-AA5{fill:#F7F8FE;} + .d2-1499565599 .fill-AB4{fill:#EDF0FD;} + .d2-1499565599 .fill-AB5{fill:#F7F8FE;} + .d2-1499565599 .stroke-N1{stroke:#0A0F25;} + .d2-1499565599 .stroke-N2{stroke:#676C7E;} + .d2-1499565599 .stroke-N3{stroke:#9499AB;} + .d2-1499565599 .stroke-N4{stroke:#CFD2DD;} + .d2-1499565599 .stroke-N5{stroke:#DEE1EB;} + .d2-1499565599 .stroke-N6{stroke:#EEF1F8;} + .d2-1499565599 .stroke-N7{stroke:#FFFFFF;} + .d2-1499565599 .stroke-B1{stroke:#0D32B2;} + .d2-1499565599 .stroke-B2{stroke:#0D32B2;} + .d2-1499565599 .stroke-B3{stroke:#E3E9FD;} + .d2-1499565599 .stroke-B4{stroke:#E3E9FD;} + .d2-1499565599 .stroke-B5{stroke:#EDF0FD;} + .d2-1499565599 .stroke-B6{stroke:#F7F8FE;} + .d2-1499565599 .stroke-AA2{stroke:#4A6FF3;} + .d2-1499565599 .stroke-AA4{stroke:#EDF0FD;} + .d2-1499565599 .stroke-AA5{stroke:#F7F8FE;} + .d2-1499565599 .stroke-AB4{stroke:#EDF0FD;} + .d2-1499565599 .stroke-AB5{stroke:#F7F8FE;} + .d2-1499565599 .background-color-N1{background-color:#0A0F25;} + .d2-1499565599 .background-color-N2{background-color:#676C7E;} + .d2-1499565599 .background-color-N3{background-color:#9499AB;} + .d2-1499565599 .background-color-N4{background-color:#CFD2DD;} + .d2-1499565599 .background-color-N5{background-color:#DEE1EB;} + .d2-1499565599 .background-color-N6{background-color:#EEF1F8;} + .d2-1499565599 .background-color-N7{background-color:#FFFFFF;} + .d2-1499565599 .background-color-B1{background-color:#0D32B2;} + .d2-1499565599 .background-color-B2{background-color:#0D32B2;} + .d2-1499565599 .background-color-B3{background-color:#E3E9FD;} + .d2-1499565599 .background-color-B4{background-color:#E3E9FD;} + .d2-1499565599 .background-color-B5{background-color:#EDF0FD;} + .d2-1499565599 .background-color-B6{background-color:#F7F8FE;} + .d2-1499565599 .background-color-AA2{background-color:#4A6FF3;} + .d2-1499565599 .background-color-AA4{background-color:#EDF0FD;} + .d2-1499565599 .background-color-AA5{background-color:#F7F8FE;} + .d2-1499565599 .background-color-AB4{background-color:#EDF0FD;} + .d2-1499565599 .background-color-AB5{background-color:#F7F8FE;} + .d2-1499565599 .color-N1{color:#0A0F25;} + .d2-1499565599 .color-N2{color:#676C7E;} + .d2-1499565599 .color-N3{color:#9499AB;} + .d2-1499565599 .color-N4{color:#CFD2DD;} + .d2-1499565599 .color-N5{color:#DEE1EB;} + .d2-1499565599 .color-N6{color:#EEF1F8;} + .d2-1499565599 .color-N7{color:#FFFFFF;} + .d2-1499565599 .color-B1{color:#0D32B2;} + .d2-1499565599 .color-B2{color:#0D32B2;} + .d2-1499565599 .color-B3{color:#E3E9FD;} + .d2-1499565599 .color-B4{color:#E3E9FD;} + .d2-1499565599 .color-B5{color:#EDF0FD;} + .d2-1499565599 .color-B6{color:#F7F8FE;} + .d2-1499565599 .color-AA2{color:#4A6FF3;} + .d2-1499565599 .color-AA4{color:#EDF0FD;} + .d2-1499565599 .color-AA5{color:#F7F8FE;} + .d2-1499565599 .color-AB4{color:#EDF0FD;} + .d2-1499565599 .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}]]>heyyayyyceeeyoheybeeedeee + + + + - + \ No newline at end of file From a18eae7158aa3fbd4765538d49c146344a94dc13 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 19 Jul 2023 19:22:37 -0700 Subject: [PATCH 087/138] consider edges close to collapsing edge as being on it --- d2layouts/d2dagrelayout/layout.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index e3ded9ec0..b6019da36 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1723,30 +1723,26 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori if !isOnSide { return false } + buffer := 10. var isInRange bool if delta > 0 { - if objPosition < position && position < objPosition+delta { + if objPosition <= position && position <= objPosition+delta+buffer { isInRange = true } } else { - if objPosition+delta < position && position < objPosition { + if objPosition+delta-buffer <= position && position <= objPosition { isInRange = true } } - if !isInRange { - if isHorizontal { - return false - } else { - return false - } - } - return true + return isInRange } + hasEdgeOnCollapsingSide := false outermost := objPosition + delta for _, edge := range obj.Graph.Edges { if edge.Src == obj { p := edge.Route[0] if isOnCollapsingSide(p) { + hasEdgeOnCollapsingSide = true var position float64 if isHorizontal { position = p.X @@ -1763,6 +1759,7 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori if edge.Dst == obj { p := edge.Route[len(edge.Route)-1] if isOnCollapsingSide(p) { + hasEdgeOnCollapsingSide = true var position float64 if isHorizontal { position = p.X @@ -1778,7 +1775,7 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori } } newMagnitude = math.Abs(delta) - if outermost != objPosition+delta { + if hasEdgeOnCollapsingSide { // only reduce to outermost + DEFAULT_PADDING if delta < 0 { newMagnitude = math.Max(0, objPosition-(outermost+DEFAULT_PADDING)) From 77acbdcfa1b8bf1354b059b325cc75b6ad9828cb Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 19 Jul 2023 19:22:51 -0700 Subject: [PATCH 088/138] update tests --- .../unconnected/dagre/board.exp.json | 2 +- .../unconnected/dagre/sketch.exp.svg | 556 +++++++++--------- .../one_container_loop/dagre/board.exp.json | 2 +- .../one_container_loop/dagre/sketch.exp.svg | 162 ++--- 4 files changed, 361 insertions(+), 361 deletions(-) diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json index 1b1935538..c247f0d23 100644 --- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json +++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json @@ -134,7 +134,7 @@ "y": 270 }, "width": 832, - "height": 323, + "height": 334, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index 44f9695e1..cf7896a76 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
        +OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
        • Asset Tagging
        • Inventory
        • Staging
        • Dispatch to Site
        -
        InstallationSupport +
      InstallationSupport diff --git a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json index dbf5c7046..16ddc4df3 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 10, "y": 20 }, - "width": 260, + "width": 290, "height": 126, "opacity": 1, "strokeDash": 0, 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 4e044b490..01a0c4752 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh - - + .d2-3661473330 .fill-N1{fill:#0A0F25;} + .d2-3661473330 .fill-N2{fill:#676C7E;} + .d2-3661473330 .fill-N3{fill:#9499AB;} + .d2-3661473330 .fill-N4{fill:#CFD2DD;} + .d2-3661473330 .fill-N5{fill:#DEE1EB;} + .d2-3661473330 .fill-N6{fill:#EEF1F8;} + .d2-3661473330 .fill-N7{fill:#FFFFFF;} + .d2-3661473330 .fill-B1{fill:#0D32B2;} + .d2-3661473330 .fill-B2{fill:#0D32B2;} + .d2-3661473330 .fill-B3{fill:#E3E9FD;} + .d2-3661473330 .fill-B4{fill:#E3E9FD;} + .d2-3661473330 .fill-B5{fill:#EDF0FD;} + .d2-3661473330 .fill-B6{fill:#F7F8FE;} + .d2-3661473330 .fill-AA2{fill:#4A6FF3;} + .d2-3661473330 .fill-AA4{fill:#EDF0FD;} + .d2-3661473330 .fill-AA5{fill:#F7F8FE;} + .d2-3661473330 .fill-AB4{fill:#EDF0FD;} + .d2-3661473330 .fill-AB5{fill:#F7F8FE;} + .d2-3661473330 .stroke-N1{stroke:#0A0F25;} + .d2-3661473330 .stroke-N2{stroke:#676C7E;} + .d2-3661473330 .stroke-N3{stroke:#9499AB;} + .d2-3661473330 .stroke-N4{stroke:#CFD2DD;} + .d2-3661473330 .stroke-N5{stroke:#DEE1EB;} + .d2-3661473330 .stroke-N6{stroke:#EEF1F8;} + .d2-3661473330 .stroke-N7{stroke:#FFFFFF;} + .d2-3661473330 .stroke-B1{stroke:#0D32B2;} + .d2-3661473330 .stroke-B2{stroke:#0D32B2;} + .d2-3661473330 .stroke-B3{stroke:#E3E9FD;} + .d2-3661473330 .stroke-B4{stroke:#E3E9FD;} + .d2-3661473330 .stroke-B5{stroke:#EDF0FD;} + .d2-3661473330 .stroke-B6{stroke:#F7F8FE;} + .d2-3661473330 .stroke-AA2{stroke:#4A6FF3;} + .d2-3661473330 .stroke-AA4{stroke:#EDF0FD;} + .d2-3661473330 .stroke-AA5{stroke:#F7F8FE;} + .d2-3661473330 .stroke-AB4{stroke:#EDF0FD;} + .d2-3661473330 .stroke-AB5{stroke:#F7F8FE;} + .d2-3661473330 .background-color-N1{background-color:#0A0F25;} + .d2-3661473330 .background-color-N2{background-color:#676C7E;} + .d2-3661473330 .background-color-N3{background-color:#9499AB;} + .d2-3661473330 .background-color-N4{background-color:#CFD2DD;} + .d2-3661473330 .background-color-N5{background-color:#DEE1EB;} + .d2-3661473330 .background-color-N6{background-color:#EEF1F8;} + .d2-3661473330 .background-color-N7{background-color:#FFFFFF;} + .d2-3661473330 .background-color-B1{background-color:#0D32B2;} + .d2-3661473330 .background-color-B2{background-color:#0D32B2;} + .d2-3661473330 .background-color-B3{background-color:#E3E9FD;} + .d2-3661473330 .background-color-B4{background-color:#E3E9FD;} + .d2-3661473330 .background-color-B5{background-color:#EDF0FD;} + .d2-3661473330 .background-color-B6{background-color:#F7F8FE;} + .d2-3661473330 .background-color-AA2{background-color:#4A6FF3;} + .d2-3661473330 .background-color-AA4{background-color:#EDF0FD;} + .d2-3661473330 .background-color-AA5{background-color:#F7F8FE;} + .d2-3661473330 .background-color-AB4{background-color:#EDF0FD;} + .d2-3661473330 .background-color-AB5{background-color:#F7F8FE;} + .d2-3661473330 .color-N1{color:#0A0F25;} + .d2-3661473330 .color-N2{color:#676C7E;} + .d2-3661473330 .color-N3{color:#9499AB;} + .d2-3661473330 .color-N4{color:#CFD2DD;} + .d2-3661473330 .color-N5{color:#DEE1EB;} + .d2-3661473330 .color-N6{color:#EEF1F8;} + .d2-3661473330 .color-N7{color:#FFFFFF;} + .d2-3661473330 .color-B1{color:#0D32B2;} + .d2-3661473330 .color-B2{color:#0D32B2;} + .d2-3661473330 .color-B3{color:#E3E9FD;} + .d2-3661473330 .color-B4{color:#E3E9FD;} + .d2-3661473330 .color-B5{color:#EDF0FD;} + .d2-3661473330 .color-B6{color:#F7F8FE;} + .d2-3661473330 .color-AA2{color:#4A6FF3;} + .d2-3661473330 .color-AA4{color:#EDF0FD;} + .d2-3661473330 .color-AA5{color:#F7F8FE;} + .d2-3661473330 .color-AB4{color:#EDF0FD;} + .d2-3661473330 .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}]]>acdefgbh + + From fbda3e88739a8d048601ff27054dc015369babfe Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 20 Jul 2023 11:31:40 -0700 Subject: [PATCH 089/138] add some extra space between overlapping --- d2layouts/d2dagrelayout/layout.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index b6019da36..ebab1e73e 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -35,6 +35,7 @@ const ( MIN_RANK_SEP = 60 EDGE_LABEL_GAP = 20 DEFAULT_PADDING = 30. + MIN_SPACING = 10. ) type ConfigurableOpts struct { @@ -1651,16 +1652,16 @@ func fitPadding(obj *d2graph.Object) { } if leftOverlap > 0 { - leftDelta -= leftOverlap + leftDelta -= leftOverlap + MIN_SPACING } if rightOverlap > 0 { - rightDelta -= rightOverlap + rightDelta -= rightOverlap + MIN_SPACING } if topOverlap > 0 { - topDelta -= topOverlap + topDelta -= topOverlap + MIN_SPACING } if bottomOverlap > 0 { - bottomDelta -= bottomOverlap + bottomDelta -= bottomOverlap + MIN_SPACING } } @@ -1723,7 +1724,7 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori if !isOnSide { return false } - buffer := 10. + buffer := MIN_SPACING var isInRange bool if delta > 0 { if objPosition <= position && position <= objPosition+delta+buffer { From 10c94c08cd26ff82243fcc600bb19a11eb8eddb9 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 20 Jul 2023 11:31:59 -0700 Subject: [PATCH 090/138] update test --- .../testdata/files/overlapping_child_label.d2 | 20 +- .../dagre/board.exp.json | 158 +++++++++++++--- .../dagre/sketch.exp.svg | 176 +++++++++--------- .../elk/board.exp.json | 148 +++++++++++++-- .../elk/sketch.exp.svg | 174 ++++++++--------- 5 files changed, 458 insertions(+), 218 deletions(-) diff --git a/e2etests/testdata/files/overlapping_child_label.d2 b/e2etests/testdata/files/overlapping_child_label.d2 index 8af560505..c8e945e91 100644 --- a/e2etests/testdata/files/overlapping_child_label.d2 +++ b/e2etests/testdata/files/overlapping_child_label.d2 @@ -4,30 +4,42 @@ heyy: { hey.label.near: outside-bottom-right } -ayyy: { +aaaa: { label.near: top-right icon.near: top-left class: icon - beee: { + bbbb: { label.near: outside-top-left icon.near: outside-top-right class: icon } } -ceee: { +cccc: { label.near: top-right icon.near: bottom-left class: icon - deee: { + dddd: { label.near: outside-top-right icon.near: outside-bottom-left class: icon } } +eeeeeeeeeeeeeeeeeee: { + label.near: center-right + icon.near: center-left + class: icon + + fffffffffff: { + label.near: outside-right-center + icon.near: outside-left-center + class: icon + } +} + classes: { icon.icon: https://icons.terrastruct.com/essentials/time.svg } diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json index d4b5af472..68e4a89c8 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 33 }, "width": 131, - "height": 490, + "height": 500, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -127,17 +127,17 @@ "level": 2 }, { - "id": "ayyy", + "id": "aaaa", "type": "rectangle", "classes": [ "icon" ], "pos": { "x": 181, - "y": -60 + "y": -70 }, - "width": 164, - "height": 232, + "width": 167, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -168,7 +168,7 @@ "fields": null, "methods": null, "columns": null, - "label": "ayyy", + "label": "aaaa", "fontSize": 28, "fontFamily": "DEFAULT", "language": "", @@ -176,14 +176,14 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 53, + "labelWidth": 55, "labelHeight": 36, "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 1 }, { - "id": "ayyy.beee", + "id": "aaaa.bbbb", "type": "rectangle", "classes": [ "icon" @@ -192,7 +192,7 @@ "x": 211, "y": 50 }, - "width": 104, + "width": 107, "height": 92, "opacity": 1, "strokeDash": 0, @@ -224,7 +224,7 @@ "fields": null, "methods": null, "columns": null, - "label": "beee", + "label": "bbbb", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -232,24 +232,24 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 33, + "labelWidth": 36, "labelHeight": 21, "labelPosition": "OUTSIDE_TOP_LEFT", "zIndex": 0, "level": 2 }, { - "id": "ceee", + "id": "cccc", "type": "rectangle", "classes": [ "icon" ], "pos": { - "x": 385, - "y": -17 + "x": 388, + "y": -27 }, - "width": 165, - "height": 297, + "width": 168, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -280,7 +280,7 @@ "fields": null, "methods": null, "columns": null, - "label": "ceee", + "label": "cccc", "fontSize": 28, "fontFamily": "DEFAULT", "language": "", @@ -288,23 +288,23 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 53, + "labelWidth": 51, "labelHeight": 36, "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 1 }, { - "id": "ceee.deee", + "id": "cccc.dddd", "type": "rectangle", "classes": [ "icon" ], "pos": { - "x": 415, + "x": 418, "y": 50 }, - "width": 105, + "width": 108, "height": 92, "opacity": 1, "strokeDash": 0, @@ -336,7 +336,7 @@ "fields": null, "methods": null, "columns": null, - "label": "deee", + "label": "dddd", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -344,11 +344,123 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 34, + "labelWidth": 37, "labelHeight": 21, "labelPosition": "OUTSIDE_TOP_RIGHT", "zIndex": 0, "level": 2 + }, + { + "id": "eeeeeeeeeeeeeeeeeee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 626, + "y": 20 + }, + "width": 624, + "height": 152, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "eeeeeeeeeeeeeeeeeee", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 263, + "labelHeight": 36, + "labelPosition": "INSIDE_MIDDLE_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "eeeeeeeeeeeeeeeeeee.fffffffffff", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 774, + "y": 50 + }, + "width": 132, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_MIDDLE", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "fffffffffff", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 } ], "connections": [ diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg index 1d315a75d..a18fd9f65 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg @@ -1,17 +1,17 @@ -heyyayyyceeeyoheybeeedeee - - - - + .d2-2221498878 .fill-N1{fill:#0A0F25;} + .d2-2221498878 .fill-N2{fill:#676C7E;} + .d2-2221498878 .fill-N3{fill:#9499AB;} + .d2-2221498878 .fill-N4{fill:#CFD2DD;} + .d2-2221498878 .fill-N5{fill:#DEE1EB;} + .d2-2221498878 .fill-N6{fill:#EEF1F8;} + .d2-2221498878 .fill-N7{fill:#FFFFFF;} + .d2-2221498878 .fill-B1{fill:#0D32B2;} + .d2-2221498878 .fill-B2{fill:#0D32B2;} + .d2-2221498878 .fill-B3{fill:#E3E9FD;} + .d2-2221498878 .fill-B4{fill:#E3E9FD;} + .d2-2221498878 .fill-B5{fill:#EDF0FD;} + .d2-2221498878 .fill-B6{fill:#F7F8FE;} + .d2-2221498878 .fill-AA2{fill:#4A6FF3;} + .d2-2221498878 .fill-AA4{fill:#EDF0FD;} + .d2-2221498878 .fill-AA5{fill:#F7F8FE;} + .d2-2221498878 .fill-AB4{fill:#EDF0FD;} + .d2-2221498878 .fill-AB5{fill:#F7F8FE;} + .d2-2221498878 .stroke-N1{stroke:#0A0F25;} + .d2-2221498878 .stroke-N2{stroke:#676C7E;} + .d2-2221498878 .stroke-N3{stroke:#9499AB;} + .d2-2221498878 .stroke-N4{stroke:#CFD2DD;} + .d2-2221498878 .stroke-N5{stroke:#DEE1EB;} + .d2-2221498878 .stroke-N6{stroke:#EEF1F8;} + .d2-2221498878 .stroke-N7{stroke:#FFFFFF;} + .d2-2221498878 .stroke-B1{stroke:#0D32B2;} + .d2-2221498878 .stroke-B2{stroke:#0D32B2;} + .d2-2221498878 .stroke-B3{stroke:#E3E9FD;} + .d2-2221498878 .stroke-B4{stroke:#E3E9FD;} + .d2-2221498878 .stroke-B5{stroke:#EDF0FD;} + .d2-2221498878 .stroke-B6{stroke:#F7F8FE;} + .d2-2221498878 .stroke-AA2{stroke:#4A6FF3;} + .d2-2221498878 .stroke-AA4{stroke:#EDF0FD;} + .d2-2221498878 .stroke-AA5{stroke:#F7F8FE;} + .d2-2221498878 .stroke-AB4{stroke:#EDF0FD;} + .d2-2221498878 .stroke-AB5{stroke:#F7F8FE;} + .d2-2221498878 .background-color-N1{background-color:#0A0F25;} + .d2-2221498878 .background-color-N2{background-color:#676C7E;} + .d2-2221498878 .background-color-N3{background-color:#9499AB;} + .d2-2221498878 .background-color-N4{background-color:#CFD2DD;} + .d2-2221498878 .background-color-N5{background-color:#DEE1EB;} + .d2-2221498878 .background-color-N6{background-color:#EEF1F8;} + .d2-2221498878 .background-color-N7{background-color:#FFFFFF;} + .d2-2221498878 .background-color-B1{background-color:#0D32B2;} + .d2-2221498878 .background-color-B2{background-color:#0D32B2;} + .d2-2221498878 .background-color-B3{background-color:#E3E9FD;} + .d2-2221498878 .background-color-B4{background-color:#E3E9FD;} + .d2-2221498878 .background-color-B5{background-color:#EDF0FD;} + .d2-2221498878 .background-color-B6{background-color:#F7F8FE;} + .d2-2221498878 .background-color-AA2{background-color:#4A6FF3;} + .d2-2221498878 .background-color-AA4{background-color:#EDF0FD;} + .d2-2221498878 .background-color-AA5{background-color:#F7F8FE;} + .d2-2221498878 .background-color-AB4{background-color:#EDF0FD;} + .d2-2221498878 .background-color-AB5{background-color:#F7F8FE;} + .d2-2221498878 .color-N1{color:#0A0F25;} + .d2-2221498878 .color-N2{color:#676C7E;} + .d2-2221498878 .color-N3{color:#9499AB;} + .d2-2221498878 .color-N4{color:#CFD2DD;} + .d2-2221498878 .color-N5{color:#DEE1EB;} + .d2-2221498878 .color-N6{color:#EEF1F8;} + .d2-2221498878 .color-N7{color:#FFFFFF;} + .d2-2221498878 .color-B1{color:#0D32B2;} + .d2-2221498878 .color-B2{color:#0D32B2;} + .d2-2221498878 .color-B3{color:#E3E9FD;} + .d2-2221498878 .color-B4{color:#E3E9FD;} + .d2-2221498878 .color-B5{color:#EDF0FD;} + .d2-2221498878 .color-B6{color:#F7F8FE;} + .d2-2221498878 .color-AA2{color:#4A6FF3;} + .d2-2221498878 .color-AA4{color:#EDF0FD;} + .d2-2221498878 .color-AA5{color:#F7F8FE;} + .d2-2221498878 .color-AB4{color:#EDF0FD;} + .d2-2221498878 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff + + + + + - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json index 9b2579ba4..f7d744bab 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json +++ b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json @@ -127,7 +127,7 @@ "level": 2 }, { - "id": "ayyy", + "id": "aaaa", "type": "rectangle", "classes": [ "icon" @@ -136,7 +136,7 @@ "x": 203, "y": 42 }, - "width": 204, + "width": 207, "height": 242, "opacity": 1, "strokeDash": 0, @@ -168,7 +168,7 @@ "fields": null, "methods": null, "columns": null, - "label": "ayyy", + "label": "aaaa", "fontSize": 28, "fontFamily": "DEFAULT", "language": "", @@ -176,14 +176,14 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 53, + "labelWidth": 55, "labelHeight": 36, "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 1 }, { - "id": "ayyy.beee", + "id": "aaaa.bbbb", "type": "rectangle", "classes": [ "icon" @@ -192,7 +192,7 @@ "x": 253, "y": 116 }, - "width": 104, + "width": 107, "height": 118, "opacity": 1, "strokeDash": 0, @@ -224,7 +224,7 @@ "fields": null, "methods": null, "columns": null, - "label": "beee", + "label": "bbbb", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -232,23 +232,23 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 33, + "labelWidth": 36, "labelHeight": 21, "labelPosition": "OUTSIDE_TOP_LEFT", "zIndex": 0, "level": 2 }, { - "id": "ceee", + "id": "cccc", "type": "rectangle", "classes": [ "icon" ], "pos": { - "x": 427, + "x": 430, "y": 42 }, - "width": 205, + "width": 208, "height": 242, "opacity": 1, "strokeDash": 0, @@ -280,7 +280,7 @@ "fields": null, "methods": null, "columns": null, - "label": "ceee", + "label": "cccc", "fontSize": 28, "fontFamily": "DEFAULT", "language": "", @@ -288,23 +288,23 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 53, + "labelWidth": 51, "labelHeight": 36, "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 1 }, { - "id": "ceee.deee", + "id": "cccc.dddd", "type": "rectangle", "classes": [ "icon" ], "pos": { - "x": 477, + "x": 480, "y": 92 }, - "width": 105, + "width": 108, "height": 118, "opacity": 1, "strokeDash": 0, @@ -336,7 +336,7 @@ "fields": null, "methods": null, "columns": null, - "label": "deee", + "label": "dddd", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -344,11 +344,123 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 34, + "labelWidth": 37, "labelHeight": 21, "labelPosition": "OUTSIDE_TOP_RIGHT", "zIndex": 0, "level": 2 + }, + { + "id": "eeeeeeeeeeeeeeeeeee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 658, + "y": 54 + }, + "width": 614, + "height": 218, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "eeeeeeeeeeeeeeeeeee", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 263, + "labelHeight": 36, + "labelPosition": "INSIDE_MIDDLE_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "eeeeeeeeeeeeeeeeeee.fffffffffff", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 801, + "y": 104 + }, + "width": 132, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_MIDDLE", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "fffffffffff", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 } ], "connections": [ diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg index a96791eb4..701afc1a0 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg @@ -1,17 +1,17 @@ -heyyayyyceeeyoheybeeedeee - + .d2-1602067992 .fill-N1{fill:#0A0F25;} + .d2-1602067992 .fill-N2{fill:#676C7E;} + .d2-1602067992 .fill-N3{fill:#9499AB;} + .d2-1602067992 .fill-N4{fill:#CFD2DD;} + .d2-1602067992 .fill-N5{fill:#DEE1EB;} + .d2-1602067992 .fill-N6{fill:#EEF1F8;} + .d2-1602067992 .fill-N7{fill:#FFFFFF;} + .d2-1602067992 .fill-B1{fill:#0D32B2;} + .d2-1602067992 .fill-B2{fill:#0D32B2;} + .d2-1602067992 .fill-B3{fill:#E3E9FD;} + .d2-1602067992 .fill-B4{fill:#E3E9FD;} + .d2-1602067992 .fill-B5{fill:#EDF0FD;} + .d2-1602067992 .fill-B6{fill:#F7F8FE;} + .d2-1602067992 .fill-AA2{fill:#4A6FF3;} + .d2-1602067992 .fill-AA4{fill:#EDF0FD;} + .d2-1602067992 .fill-AA5{fill:#F7F8FE;} + .d2-1602067992 .fill-AB4{fill:#EDF0FD;} + .d2-1602067992 .fill-AB5{fill:#F7F8FE;} + .d2-1602067992 .stroke-N1{stroke:#0A0F25;} + .d2-1602067992 .stroke-N2{stroke:#676C7E;} + .d2-1602067992 .stroke-N3{stroke:#9499AB;} + .d2-1602067992 .stroke-N4{stroke:#CFD2DD;} + .d2-1602067992 .stroke-N5{stroke:#DEE1EB;} + .d2-1602067992 .stroke-N6{stroke:#EEF1F8;} + .d2-1602067992 .stroke-N7{stroke:#FFFFFF;} + .d2-1602067992 .stroke-B1{stroke:#0D32B2;} + .d2-1602067992 .stroke-B2{stroke:#0D32B2;} + .d2-1602067992 .stroke-B3{stroke:#E3E9FD;} + .d2-1602067992 .stroke-B4{stroke:#E3E9FD;} + .d2-1602067992 .stroke-B5{stroke:#EDF0FD;} + .d2-1602067992 .stroke-B6{stroke:#F7F8FE;} + .d2-1602067992 .stroke-AA2{stroke:#4A6FF3;} + .d2-1602067992 .stroke-AA4{stroke:#EDF0FD;} + .d2-1602067992 .stroke-AA5{stroke:#F7F8FE;} + .d2-1602067992 .stroke-AB4{stroke:#EDF0FD;} + .d2-1602067992 .stroke-AB5{stroke:#F7F8FE;} + .d2-1602067992 .background-color-N1{background-color:#0A0F25;} + .d2-1602067992 .background-color-N2{background-color:#676C7E;} + .d2-1602067992 .background-color-N3{background-color:#9499AB;} + .d2-1602067992 .background-color-N4{background-color:#CFD2DD;} + .d2-1602067992 .background-color-N5{background-color:#DEE1EB;} + .d2-1602067992 .background-color-N6{background-color:#EEF1F8;} + .d2-1602067992 .background-color-N7{background-color:#FFFFFF;} + .d2-1602067992 .background-color-B1{background-color:#0D32B2;} + .d2-1602067992 .background-color-B2{background-color:#0D32B2;} + .d2-1602067992 .background-color-B3{background-color:#E3E9FD;} + .d2-1602067992 .background-color-B4{background-color:#E3E9FD;} + .d2-1602067992 .background-color-B5{background-color:#EDF0FD;} + .d2-1602067992 .background-color-B6{background-color:#F7F8FE;} + .d2-1602067992 .background-color-AA2{background-color:#4A6FF3;} + .d2-1602067992 .background-color-AA4{background-color:#EDF0FD;} + .d2-1602067992 .background-color-AA5{background-color:#F7F8FE;} + .d2-1602067992 .background-color-AB4{background-color:#EDF0FD;} + .d2-1602067992 .background-color-AB5{background-color:#F7F8FE;} + .d2-1602067992 .color-N1{color:#0A0F25;} + .d2-1602067992 .color-N2{color:#676C7E;} + .d2-1602067992 .color-N3{color:#9499AB;} + .d2-1602067992 .color-N4{color:#CFD2DD;} + .d2-1602067992 .color-N5{color:#DEE1EB;} + .d2-1602067992 .color-N6{color:#EEF1F8;} + .d2-1602067992 .color-N7{color:#FFFFFF;} + .d2-1602067992 .color-B1{color:#0D32B2;} + .d2-1602067992 .color-B2{color:#0D32B2;} + .d2-1602067992 .color-B3{color:#E3E9FD;} + .d2-1602067992 .color-B4{color:#E3E9FD;} + .d2-1602067992 .color-B5{color:#EDF0FD;} + .d2-1602067992 .color-B6{color:#F7F8FE;} + .d2-1602067992 .color-AA2{color:#4A6FF3;} + .d2-1602067992 .color-AA4{color:#EDF0FD;} + .d2-1602067992 .color-AA5{color:#F7F8FE;} + .d2-1602067992 .color-AB4{color:#EDF0FD;} + .d2-1602067992 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff + - - + + + - - + + + \ No newline at end of file From 45b396c894be46ac45eb85b08745b5959f00f34e Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 14 Jul 2023 13:08:26 -0700 Subject: [PATCH 091/138] config vars --- d2chaos/d2chaos_test.go | 2 +- d2cli/main.go | 132 ++- d2cli/watch.go | 5 +- d2compiler/compile.go | 52 +- d2compiler/compile_test.go | 167 +++- d2exporter/export_test.go | 2 +- d2graph/serde_test.go | 4 +- d2ir/compile.go | 60 ++ d2layouts/d2sequence/layout_test.go | 6 +- d2lib/d2.go | 109 ++- d2oracle/edit.go | 2 +- d2oracle/edit_test.go | 10 +- d2renderers/d2animate/d2animate.go | 10 +- d2renderers/d2sketch/sketch_test.go | 29 +- d2renderers/d2svg/appendix/appendix_test.go | 20 +- d2renderers/d2svg/d2svg.go | 33 +- .../d2svg/dark_theme/dark_theme_test.go | 22 +- d2target/d2target.go | 18 +- docs/examples/lib/1-d2lib/d2lib.go | 23 +- docs/examples/lib/2-d2oracle/d2oracle.go | 13 +- docs/examples/lib/3-lowlevel/lowlevel.go | 5 +- e2etests-cli/main_test.go | 63 ++ .../testdata/TestCLI_E2E/import_vars.exp.svg | 96 ++ .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 80096 -> 80081 bytes .../TestCLI_E2E/vars-animation.exp.svg | 883 ++++++++++++++++++ .../testdata/TestCLI_E2E/vars-config.exp.svg | 117 +++ e2etests/e2e_test.go | 40 +- e2etests/themes_test.go | 8 +- .../TestCompile2/vars/config/basic.exp.json | 291 ++++++ .../TestCompile2/vars/config/invalid.exp.json | 11 + .../vars/config/not-root.exp.json | 11 + 31 files changed, 2015 insertions(+), 229 deletions(-) create mode 100644 e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg create mode 100644 e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg create mode 100644 e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg create mode 100644 testdata/d2compiler/TestCompile2/vars/config/basic.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/config/invalid.exp.json create mode 100644 testdata/d2compiler/TestCompile2/vars/config/not-root.exp.json diff --git a/d2chaos/d2chaos_test.go b/d2chaos/d2chaos_test.go index 0033cec90..e101d434d 100644 --- a/d2chaos/d2chaos_test.go +++ b/d2chaos/d2chaos_test.go @@ -102,7 +102,7 @@ func test(t *testing.T, textPath, text string) { t.Fatal(err) } - g, err := d2compiler.Compile("", strings.NewReader(text), nil) + g, _, err := d2compiler.Compile("", strings.NewReader(text), nil) if err != nil { t.Fatal(err) } diff --git a/d2cli/main.go b/d2cli/main.go index 3d4fa6054..0f0e8167b 100644 --- a/d2cli/main.go +++ b/d2cli/main.go @@ -20,6 +20,7 @@ import ( "oss.terrastruct.com/util-go/go2" "oss.terrastruct.com/util-go/xmain" + "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2lib" "oss.terrastruct.com/d2/d2parser" "oss.terrastruct.com/d2/d2plugin" @@ -117,11 +118,11 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { fontBoldFlag := ms.Opts.String("D2_FONT_BOLD", "font-bold", "", "", "path to .ttf file to use for the bold font. If none provided, Source Sans Pro Bold is used.") fontSemiboldFlag := ms.Opts.String("D2_FONT_SEMIBOLD", "font-semibold", "", "", "path to .ttf file to use for the semibold font. If none provided, Source Sans Pro Semibold is used.") - ps, err := d2plugin.ListPlugins(ctx) + plugins, err := d2plugin.ListPlugins(ctx) if err != nil { return err } - err = populateLayoutOpts(ctx, ms, ps) + err = populateLayoutOpts(ctx, ms, plugins) if err != nil { return err } @@ -146,7 +147,7 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { case "init-playwright": return initPlaywright() case "layout": - return layoutCmd(ctx, ms, ps) + return layoutCmd(ctx, ms, plugins) case "themes": themesCmd(ctx, ms) return nil @@ -226,6 +227,38 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { } ms.Log.Debug.Printf("using theme %s (ID: %d)", match.Name, *themeFlag) + // If flag is not explicitly set by user, set to nil. + // Later, configs from D2 code will only overwrite if they weren't explicitly set by user + flagSet := make(map[string]struct{}) + ms.Opts.Flags.Visit(func(f *pflag.Flag) { + flagSet[f.Name] = struct{}{} + }) + if ms.Env.Getenv("D2_LAYOUT") == "" { + if _, ok := flagSet["layout"]; !ok { + layoutFlag = nil + } + } + if ms.Env.Getenv("D2_THEME") == "" { + if _, ok := flagSet["theme"]; !ok { + themeFlag = nil + } + } + if ms.Env.Getenv("D2_SKETCH") == "" { + if _, ok := flagSet["sketch"]; !ok { + sketchFlag = nil + } + } + if ms.Env.Getenv("D2_PAD") == "" { + if _, ok := flagSet["pad"]; !ok { + padFlag = nil + } + } + if ms.Env.Getenv("D2_CENTER") == "" { + if _, ok := flagSet["center"]; !ok { + centerFlag = nil + } + } + if *darkThemeFlag == -1 { darkThemeFlag = nil // TODO this is a temporary solution: https://github.com/terrastruct/util-go/issues/7 } @@ -241,29 +274,6 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { scale = scaleFlag } - plugin, err := d2plugin.FindPlugin(ctx, ps, *layoutFlag) - if err != nil { - if errors.Is(err, exec.ErrNotFound) { - return layoutNotFound(ctx, ps, *layoutFlag) - } - return err - } - - err = d2plugin.HydratePluginOpts(ctx, ms, plugin) - if err != nil { - return err - } - - pinfo, err := plugin.Info(ctx) - if err != nil { - return err - } - plocation := pinfo.Type - if pinfo.Type == "binary" { - plocation = fmt.Sprintf("executable plugin at %s", humanPath(pinfo.Path)) - } - ms.Log.Debug.Printf("using layout plugin %s (%s)", *layoutFlag, plocation) - if !outputFormat.supportsDarkTheme() { if darkThemeFlag != nil { ms.Log.Warn.Printf("--dark-theme cannot be used while exporting to another format other than .svg") @@ -285,10 +295,10 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { } renderOpts := d2svg.RenderOpts{ - Pad: int(*padFlag), - Sketch: *sketchFlag, - Center: *centerFlag, - ThemeID: *themeFlag, + Pad: padFlag, + Sketch: sketchFlag, + Center: centerFlag, + ThemeID: themeFlag, DarkThemeID: darkThemeFlag, Scale: scale, } @@ -298,7 +308,8 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { return xmain.UsageErrorf("-w[atch] cannot be combined with reading input from stdin") } w, err := newWatcher(ctx, ms, watcherOpts{ - layoutPlugin: plugin, + plugins: plugins, + layout: layoutFlag, renderOpts: renderOpts, animateInterval: *animateIntervalFlag, host: *hostFlag, @@ -319,7 +330,7 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { 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) + _, written, err := compile(ctx, ms, plugins, layoutFlag, renderOpts, fontFamily, *animateIntervalFlag, inputPath, outputPath, *bundleFlag, *forceAppendixFlag, pw.Page) if err != nil { if written { return fmt.Errorf("failed to fully compile (partial render written): %w", err) @@ -329,7 +340,32 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { return nil } -func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, renderOpts d2svg.RenderOpts, fontFamily *d2fonts.FontFamily, animateInterval int64, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page) (_ []byte, written bool, _ error) { +func LayoutResolver(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin) func(engine string) (d2graph.LayoutGraph, error) { + cached := make(map[string]d2graph.LayoutGraph) + return func(engine string) (d2graph.LayoutGraph, error) { + if c, ok := cached[engine]; ok { + return c, nil + } + + plugin, err := d2plugin.FindPlugin(ctx, plugins, engine) + if err != nil { + if errors.Is(err, exec.ErrNotFound) { + return nil, layoutNotFound(ctx, plugins, engine) + } + return nil, err + } + + err = d2plugin.HydratePluginOpts(ctx, ms, plugin) + if err != nil { + return nil, err + } + + cached[engine] = plugin.Layout + return plugin.Layout, nil + } +} + +func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, layout *string, renderOpts d2svg.RenderOpts, fontFamily *d2fonts.FontFamily, animateInterval int64, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page) (_ []byte, written bool, _ error) { start := time.Now() input, err := ms.ReadPath(inputPath) if err != nil { @@ -341,16 +377,12 @@ func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, rende return nil, false, err } - layout := plugin.Layout opts := &d2lib.CompileOptions{ - Layout: layout, - Ruler: ruler, - ThemeID: renderOpts.ThemeID, - FontFamily: fontFamily, - InputPath: inputPath, - } - if renderOpts.Sketch { - opts.FontFamily = go2.Pointer(d2fonts.HandDrawn) + Ruler: ruler, + FontFamily: fontFamily, + InputPath: inputPath, + LayoutResolver: LayoutResolver(ctx, ms, plugins), + Layout: layout, } cancel := background.Repeat(func() { @@ -358,12 +390,14 @@ func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, rende }, time.Second*5) defer cancel() - diagram, g, err := d2lib.Compile(ctx, string(input), opts) + diagram, g, err := d2lib.Compile(ctx, string(input), opts, &renderOpts) if err != nil { return nil, false, err } cancel() + plugin, _ := d2plugin.FindPlugin(ctx, plugins, *opts.Layout) + if animateInterval > 0 { masterID, err := diagram.HashID() if err != nil { @@ -372,6 +406,16 @@ func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, rende renderOpts.MasterID = masterID } + pinfo, err := plugin.Info(ctx) + if err != nil { + return nil, false, err + } + plocation := pinfo.Type + if pinfo.Type == "binary" { + plocation = fmt.Sprintf("executable plugin at %s", humanPath(pinfo.Path)) + } + ms.Log.Debug.Printf("using layout plugin %s (%s)", *opts.Layout, plocation) + pluginInfo, err := plugin.Info(ctx) if err != nil { return nil, false, err @@ -805,7 +849,7 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opt if err != nil { return svg, err } - err = doc.AddPDFPage(pngImg, boardPath, opts.ThemeID, rootFill, diagram.Shapes, int64(opts.Pad), viewboxX, viewboxY, pageMap) + err = doc.AddPDFPage(pngImg, boardPath, *opts.ThemeID, rootFill, diagram.Shapes, *opts.Pad, viewboxX, viewboxY, pageMap) if err != nil { return svg, err } diff --git a/d2cli/watch.go b/d2cli/watch.go index bb006eb17..0fefabd61 100644 --- a/d2cli/watch.go +++ b/d2cli/watch.go @@ -41,7 +41,8 @@ var devMode = false var staticFS embed.FS type watcherOpts struct { - layoutPlugin d2plugin.Plugin + layout *string + plugins []d2plugin.Plugin renderOpts d2svg.RenderOpts animateInterval int64 host string @@ -361,7 +362,7 @@ func (w *watcher) compileLoop(ctx context.Context) error { w.pw = newPW } - svg, _, err := compile(ctx, w.ms, w.layoutPlugin, w.renderOpts, w.fontFamily, w.animateInterval, w.inputPath, w.outputPath, w.bundle, w.forceAppendix, w.pw.Page) + svg, _, err := compile(ctx, w.ms, w.plugins, w.layout, w.renderOpts, w.fontFamily, w.animateInterval, w.inputPath, w.outputPath, w.bundle, w.forceAppendix, w.pw.Page) errs := "" if err != nil { if len(svg) > 0 { diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 600179d40..486e886b1 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -27,7 +27,7 @@ type CompileOptions struct { FS fs.FS } -func Compile(p string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph, error) { +func Compile(p string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph, *d2target.Config, error) { if opts == nil { opts = &CompileOptions{} } @@ -36,7 +36,7 @@ func Compile(p string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph, e UTF16: opts.UTF16, }) if err != nil { - return nil, err + return nil, nil, err } ir, err := d2ir.Compile(ast, &d2ir.CompileOptions{ @@ -44,16 +44,16 @@ func Compile(p string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph, e FS: opts.FS, }) if err != nil { - return nil, err + return nil, nil, err } g, err := compileIR(ast, ir) if err != nil { - return nil, err + return nil, nil, err } g.SortObjectsByAST() g.SortEdgesByAST() - return g, nil + return g, compileConfig(ir), nil } func compileIR(ast *d2ast.Map, m *d2ir.Map) (*d2graph.Graph, error) { @@ -1285,3 +1285,45 @@ func parentSeqDiagram(n d2ir.Node) *d2ir.Map { n = m } } + +func compileConfig(ir *d2ir.Map) *d2target.Config { + f := ir.GetField("vars", "d2-config") + if f == nil || f.Map() == nil { + return nil + } + + configMap := f.Map() + + config := &d2target.Config{} + + f = configMap.GetField("sketch") + if f != nil { + val, _ := strconv.ParseBool(f.Primary().Value.ScalarString()) + config.Sketch = &val + } + + f = configMap.GetField("theme-id") + if f != nil { + val, _ := strconv.Atoi(f.Primary().Value.ScalarString()) + config.ThemeID = go2.Pointer(int64(val)) + } + + f = configMap.GetField("dark-theme-id") + if f != nil { + val, _ := strconv.Atoi(f.Primary().Value.ScalarString()) + config.DarkThemeID = go2.Pointer(int64(val)) + } + + f = configMap.GetField("pad") + if f != nil { + val, _ := strconv.Atoi(f.Primary().Value.ScalarString()) + config.Pad = go2.Pointer(int64(val)) + } + + f = configMap.GetField("layout-engine") + if f != nil { + config.LayoutEngine = go2.Pointer(f.Primary().Value.ScalarString()) + } + + return config +} diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index aee82e145..959defbf2 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2702,7 +2702,7 @@ object: { t.Parallel() d2Path := fmt.Sprintf("d2/testdata/d2compiler/%v.d2", t.Name()) - g, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) + g, _, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) if tc.expErr != "" { if err == nil { t.Fatalf("expected error with: %q", tc.expErr) @@ -2757,7 +2757,7 @@ func testBoards(t *testing.T) { { name: "root", run: func(t *testing.T) { - g := assertCompile(t, `base + g, _ := assertCompile(t, `base layers: { one: { @@ -2776,7 +2776,7 @@ layers: { { name: "recursive", run: func(t *testing.T) { - g := assertCompile(t, `base + g, _ := assertCompile(t, `base layers: { one: { @@ -2804,7 +2804,7 @@ layers: { { name: "isFolderOnly", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` layers: { one: { santa @@ -2939,7 +2939,7 @@ func testNulls(t *testing.T) { { name: "shape", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` a a: null `, "") @@ -2949,7 +2949,7 @@ a: null { name: "edge", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` a -> b (a -> b)[0]: null `, "") @@ -2960,7 +2960,7 @@ a -> b { name: "attribute", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` a.style.opacity: 0.2 a.style.opacity: null `, "") @@ -2992,7 +2992,7 @@ a.style.opacity: null { name: "shape", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` a a: null a @@ -3003,7 +3003,7 @@ a { name: "edge", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` a -> b (a -> b)[0]: null a -> b @@ -3015,7 +3015,7 @@ a -> b { name: "attribute-reset", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` a.style.opacity: 0.2 a: null a @@ -3027,7 +3027,7 @@ a { name: "edge-reset", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` a -> b a: null a @@ -3039,7 +3039,7 @@ a { name: "children-reset", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` a.b.c a.b: null a.b @@ -3072,7 +3072,7 @@ a.b { name: "delete-connection", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` x -> y y: null `, "") @@ -3083,7 +3083,7 @@ y: null { name: "delete-multiple-connections", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` x -> y z -> y y -> a @@ -3096,7 +3096,7 @@ y: null { name: "no-delete-connection", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` y: null x -> y `, "") @@ -3107,7 +3107,7 @@ x -> y { name: "delete-children", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` x.y.z a.b.c @@ -3142,7 +3142,7 @@ a.b: null { name: "scenario", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` x scenarios: { @@ -3183,7 +3183,7 @@ func testVars(t *testing.T) { { name: "shape-label", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im a var } @@ -3196,7 +3196,7 @@ hi: ${x} { name: "style", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { primary-color: red } @@ -3211,7 +3211,7 @@ hi: { { name: "number", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { columns: 2 } @@ -3226,7 +3226,7 @@ hi: { { name: "nested", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { colors: { primary: { @@ -3244,7 +3244,7 @@ hi: { { name: "combined", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im a var } @@ -3256,7 +3256,7 @@ hi: 1 ${x} 2 { name: "double-quoted", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im a var } @@ -3268,7 +3268,7 @@ hi: "1 ${x} 2" { name: "single-quoted", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im a var } @@ -3280,7 +3280,7 @@ hi: '1 ${x} 2' { name: "edge-label", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im a var } @@ -3293,7 +3293,7 @@ a -> b: ${x} { name: "edge-map", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im a var } @@ -3308,7 +3308,7 @@ a -> b: { { name: "quoted-var", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { primaryColors: { button: { @@ -3330,7 +3330,7 @@ button: { { name: "quoted-var-quoted-sub", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: "hi" } @@ -3343,7 +3343,7 @@ y: "hey ${x}" { name: "parent-scope", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im root var } @@ -3360,7 +3360,7 @@ a: { { name: "map", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { cool-style: { fill: red @@ -3379,7 +3379,7 @@ a -> b: ${arrows} { name: "primary-and-composite", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: all { a: b @@ -3395,7 +3395,7 @@ z: ${x} { name: "spread", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: all { a: b @@ -3415,7 +3415,7 @@ z: { { name: "array", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { base-constraints: [UNQ; NOT NULL] } @@ -3431,7 +3431,7 @@ a: { { name: "spread-array", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { base-constraints: [UNQ; NOT NULL] } @@ -3447,7 +3447,7 @@ a: { { name: "sub-array", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: all } @@ -3460,7 +3460,7 @@ z.class: [a; ${x}] { name: "multi-part-array", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: all } @@ -3473,7 +3473,7 @@ z.class: [a; ${x}together] { name: "double-quote-primary", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: always { a: b @@ -3488,7 +3488,7 @@ z: "${x} be my maybe" { name: "spread-nested", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { disclaimer: { I am not a lawyer @@ -3504,7 +3504,7 @@ custom-disclaimer: DRAFT DISCLAIMER { { name: "spread-edge", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { connections: { x -> a @@ -3543,7 +3543,7 @@ hi: { { name: "label", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im a var } @@ -3557,7 +3557,7 @@ hi: not a var { name: "map", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im root var } @@ -3574,7 +3574,7 @@ a: { { name: "var-in-var", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { surname: Smith } @@ -3592,7 +3592,7 @@ a: { { name: "recursive-var", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: a } @@ -3667,7 +3667,7 @@ a: { { name: "layer", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im a var } @@ -3685,7 +3685,7 @@ layers: { { name: "layer-2", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: root var x y: root var y @@ -3710,7 +3710,7 @@ layers: { { name: "scenario", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im a var } @@ -3728,7 +3728,7 @@ scenarios: { { name: "overlay", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im x var } @@ -3763,7 +3763,7 @@ layers: { { name: "replace", run: func(t *testing.T) { - g := assertCompile(t, ` + g, _ := assertCompile(t, ` vars: { x: im x var } @@ -3795,6 +3795,71 @@ scenarios: { } }) + t.Run("config", func(t *testing.T) { + t.Parallel() + + tca := []struct { + name string + skip bool + run func(t *testing.T) + }{ + { + name: "basic", + run: func(t *testing.T) { + _, config := assertCompile(t, ` +vars: { + d2-config: { + sketch: true + } +} + +x -> y +`, "") + assert.Equal(t, true, *config.Sketch) + }, + }, + { + name: "invalid", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + d2-config: { + sketch: lol + } +} + +x -> y +`, `d2/testdata/d2compiler/TestCompile2/vars/config/invalid.d2:4:5: expected a boolean for "sketch", got "lol"`) + }, + }, + { + name: "not-root", + run: func(t *testing.T) { + assertCompile(t, ` +x: { + vars: { + d2-config: { + sketch: false + } + } +} +`, `d2/testdata/d2compiler/TestCompile2/vars/config/not-root.d2:4:4: "d2-config" can only appear at root vars`) + }, + }, + } + + for _, tc := range tca { + tc := tc + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + if tc.skip { + t.SkipNow() + } + tc.run(t) + }) + } + }) + t.Run("errors", func(t *testing.T) { t.Parallel() @@ -3952,9 +4017,9 @@ z: { }) } -func assertCompile(t *testing.T, text string, expErr string) *d2graph.Graph { +func assertCompile(t *testing.T, text string, expErr string) (*d2graph.Graph, *d2target.Config) { d2Path := fmt.Sprintf("d2/testdata/d2compiler/%v.d2", t.Name()) - g, err := d2compiler.Compile(d2Path, strings.NewReader(text), nil) + g, config, err := d2compiler.Compile(d2Path, strings.NewReader(text), nil) if expErr != "" { assert.Error(t, err) assert.ErrorString(t, err, expErr) @@ -3972,5 +4037,5 @@ func assertCompile(t *testing.T, text string, expErr string) *d2graph.Graph { err = diff.TestdataJSON(filepath.Join("..", "testdata", "d2compiler", t.Name()), got) assert.Success(t, err) - return g + return g, config } diff --git a/d2exporter/export_test.go b/d2exporter/export_test.go index bc6f47010..d98b214ac 100644 --- a/d2exporter/export_test.go +++ b/d2exporter/export_test.go @@ -219,7 +219,7 @@ func run(t *testing.T, tc testCase) { ctx = log.WithTB(ctx, t, nil) ctx = log.Leveled(ctx, slog.LevelDebug) - g, err := d2compiler.Compile("", strings.NewReader(tc.dsl), &d2compiler.CompileOptions{ + g, _, err := d2compiler.Compile("", strings.NewReader(tc.dsl), &d2compiler.CompileOptions{ UTF16: true, }) if err != nil { diff --git a/d2graph/serde_test.go b/d2graph/serde_test.go index 9d52b91f7..d1435a82d 100644 --- a/d2graph/serde_test.go +++ b/d2graph/serde_test.go @@ -13,7 +13,7 @@ import ( func TestSerialization(t *testing.T) { t.Parallel() - g, err := d2compiler.Compile("", strings.NewReader("a.a.b -> a.a.c"), nil) + g, _, err := d2compiler.Compile("", strings.NewReader("a.a.b -> a.a.c"), nil) assert.Nil(t, err) asserts := func(g *d2graph.Graph) { @@ -53,7 +53,7 @@ func TestCasingRegression(t *testing.T) { script := `UserCreatedTypeField` - g, err := d2compiler.Compile("", strings.NewReader(script), nil) + g, _, err := d2compiler.Compile("", strings.NewReader(script), nil) assert.Nil(t, err) _, ok := g.Root.HasChild([]string{"UserCreatedTypeField"}) diff --git a/d2ir/compile.go b/d2ir/compile.go index 31c5512eb..88dd960f0 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -2,11 +2,14 @@ package d2ir import ( "io/fs" + "strconv" "strings" "oss.terrastruct.com/d2/d2ast" "oss.terrastruct.com/d2/d2format" "oss.terrastruct.com/d2/d2parser" + "oss.terrastruct.com/d2/d2themes" + "oss.terrastruct.com/d2/d2themes/d2themescatalog" "oss.terrastruct.com/util-go/go2" ) @@ -116,6 +119,7 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { // don't resolve substitutions in vars with the current scope of vars if f.Name == "vars" { c.compileSubstitutions(f.Map(), varsStack[1:]) + c.validateConfigs(f.Map().GetField("d2-config")) } else { c.compileSubstitutions(f.Map(), varsStack) } @@ -131,6 +135,62 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { } } +func (c *compiler) validateConfigs(configs *Field) { + if configs == nil || configs.Map() == nil { + return + } + + if NodeBoardKind(ParentMap(ParentMap(configs))) == "" { + c.errorf(configs.LastRef().AST(), `"%s" can only appear at root vars`, configs.Name) + return + } + + for _, f := range configs.Map().Fields { + var val string + if f.Primary() == nil { + if f.Name != "theme-colors" { + c.errorf(f.LastRef().AST(), `"%s" needs a value`, f.Name) + continue + } + } else { + val = f.Primary().Value.ScalarString() + } + + switch f.Name { + case "sketch", "center": + _, err := strconv.ParseBool(val) + if err != nil { + c.errorf(f.LastRef().AST(), `expected a boolean for "%s", got "%s"`, f.Name, val) + continue + } + case "theme-colors": + if f.Map() == nil { + c.errorf(f.LastRef().AST(), `"%s" needs a map`, f.Name) + continue + } + case "theme-id", "dark-theme-id": + valInt, err := strconv.Atoi(val) + if err != nil { + c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name, val) + continue + } + if d2themescatalog.Find(int64(valInt)) == (d2themes.Theme{}) { + c.errorf(f.LastRef().AST(), `%d is not a valid theme ID`, valInt) + continue + } + case "pad": + _, err := strconv.Atoi(val) + if err != nil { + c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name, val) + continue + } + case "layout-engine": + default: + c.errorf(f.LastRef().AST(), `"%s" is not a valid config`, f.Name) + } + } +} + func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { var subbed bool var resolvedField *Field diff --git a/d2layouts/d2sequence/layout_test.go b/d2layouts/d2sequence/layout_test.go index 6fe39ce9e..f538e7cb6 100644 --- a/d2layouts/d2sequence/layout_test.go +++ b/d2layouts/d2sequence/layout_test.go @@ -37,7 +37,7 @@ n2 -> n1: right to left n1 -> n2 n2 -> n1 ` - g, err := d2compiler.Compile("", strings.NewReader(input), nil) + g, _, err := d2compiler.Compile("", strings.NewReader(input), nil) assert.Nil(t, err) n1, has := g.Root.HasChild([]string{"n1"}) @@ -177,7 +177,7 @@ a.t2 -> b b -> a.t2` ctx := log.WithTB(context.Background(), t, nil) - g, err := d2compiler.Compile("", strings.NewReader(input), nil) + g, _, err := d2compiler.Compile("", strings.NewReader(input), nil) assert.Nil(t, err) g.Root.Shape = d2graph.Scalar{Value: d2target.ShapeSequenceDiagram} @@ -298,7 +298,7 @@ c container -> c: edge 1 ` ctx := log.WithTB(context.Background(), t, nil) - g, err := d2compiler.Compile("", strings.NewReader(input), nil) + g, _, err := d2compiler.Compile("", strings.NewReader(input), nil) assert.Nil(t, err) container, has := g.Root.HasChild([]string{"container"}) diff --git a/d2lib/d2.go b/d2lib/d2.go index d12423332..bf4902d9f 100644 --- a/d2lib/d2.go +++ b/d2lib/d2.go @@ -15,17 +15,21 @@ import ( "oss.terrastruct.com/d2/d2layouts/d2near" "oss.terrastruct.com/d2/d2layouts/d2sequence" "oss.terrastruct.com/d2/d2renderers/d2fonts" + "oss.terrastruct.com/d2/d2renderers/d2svg" "oss.terrastruct.com/d2/d2target" + "oss.terrastruct.com/d2/d2themes/d2themescatalog" "oss.terrastruct.com/d2/lib/textmeasure" + "oss.terrastruct.com/util-go/go2" ) type CompileOptions struct { - UTF16 bool - FS fs.FS - MeasuredTexts []*d2target.MText - Ruler *textmeasure.Ruler - Layout func(context.Context, *d2graph.Graph) error - ThemeID int64 + UTF16 bool + FS fs.FS + MeasuredTexts []*d2target.MText + Ruler *textmeasure.Ruler + LayoutResolver func(engine string) (d2graph.LayoutGraph, error) + + Layout *string // FontFamily controls the font family used for all texts that are not the following: // - code @@ -37,39 +41,42 @@ type CompileOptions struct { InputPath string } -func Compile(ctx context.Context, input string, opts *CompileOptions) (*d2target.Diagram, *d2graph.Graph, error) { - if opts == nil { - opts = &CompileOptions{} +func Compile(ctx context.Context, input string, compileOpts *CompileOptions, renderOpts *d2svg.RenderOpts) (*d2target.Diagram, *d2graph.Graph, error) { + if compileOpts == nil { + compileOpts = &CompileOptions{} + } + if renderOpts == nil { + renderOpts = &d2svg.RenderOpts{} } - g, err := d2compiler.Compile(opts.InputPath, strings.NewReader(input), &d2compiler.CompileOptions{ - UTF16: opts.UTF16, - FS: opts.FS, + g, config, err := d2compiler.Compile(compileOpts.InputPath, strings.NewReader(input), &d2compiler.CompileOptions{ + UTF16: compileOpts.UTF16, + FS: compileOpts.FS, }) if err != nil { return nil, nil, err } - d, err := compile(ctx, g, opts) - if err != nil { - return nil, nil, err - } - return d, g, nil + applyConfigs(config, compileOpts, renderOpts) + applyDefaults(compileOpts, renderOpts) + + d, err := compile(ctx, g, compileOpts, renderOpts) + return d, g, err } -func compile(ctx context.Context, g *d2graph.Graph, opts *CompileOptions) (*d2target.Diagram, error) { - err := g.ApplyTheme(opts.ThemeID) +func compile(ctx context.Context, g *d2graph.Graph, compileOpts *CompileOptions, renderOpts *d2svg.RenderOpts) (*d2target.Diagram, error) { + err := g.ApplyTheme(*renderOpts.ThemeID) if err != nil { return nil, err } if len(g.Objects) > 0 { - err := g.SetDimensions(opts.MeasuredTexts, opts.Ruler, opts.FontFamily) + err := g.SetDimensions(compileOpts.MeasuredTexts, compileOpts.Ruler, compileOpts.FontFamily) if err != nil { return nil, err } - coreLayout, err := getLayout(opts) + coreLayout, err := getLayout(compileOpts) if err != nil { return nil, err } @@ -96,27 +103,27 @@ func compile(ctx context.Context, g *d2graph.Graph, opts *CompileOptions) (*d2ta } } - d, err := d2exporter.Export(ctx, g, opts.FontFamily) + d, err := d2exporter.Export(ctx, g, compileOpts.FontFamily) if err != nil { return nil, err } for _, l := range g.Layers { - ld, err := compile(ctx, l, opts) + ld, err := compile(ctx, l, compileOpts, renderOpts) if err != nil { return nil, err } d.Layers = append(d.Layers, ld) } for _, l := range g.Scenarios { - ld, err := compile(ctx, l, opts) + ld, err := compile(ctx, l, compileOpts, renderOpts) if err != nil { return nil, err } d.Scenarios = append(d.Scenarios, ld) } for _, l := range g.Steps { - ld, err := compile(ctx, l, opts) + ld, err := compile(ctx, l, compileOpts, renderOpts) if err != nil { return nil, err } @@ -127,7 +134,7 @@ func compile(ctx context.Context, g *d2graph.Graph, opts *CompileOptions) (*d2ta func getLayout(opts *CompileOptions) (d2graph.LayoutGraph, error) { if opts.Layout != nil { - return opts.Layout, nil + return opts.LayoutResolver(*opts.Layout) } else if os.Getenv("D2_LAYOUT") == "dagre" { defaultLayout := func(ctx context.Context, g *d2graph.Graph) error { return d2dagrelayout.Layout(ctx, g, nil) @@ -137,3 +144,53 @@ func getLayout(opts *CompileOptions) (d2graph.LayoutGraph, error) { return nil, errors.New("no available layout") } } + +// applyConfigs applies the configs read from D2 and applies it to passed in opts +// It will only write to opt fields that are nil, as passed-in opts have precedence +func applyConfigs(config *d2target.Config, compileOpts *CompileOptions, renderOpts *d2svg.RenderOpts) { + if config == nil { + return + } + + if compileOpts.Layout == nil { + compileOpts.Layout = config.LayoutEngine + } + + if renderOpts.ThemeID == nil { + renderOpts.ThemeID = config.ThemeID + } + if renderOpts.DarkThemeID == nil { + renderOpts.DarkThemeID = config.DarkThemeID + } + if renderOpts.Sketch == nil { + renderOpts.Sketch = config.Sketch + } + if renderOpts.Pad == nil { + renderOpts.Pad = config.Pad + } + if renderOpts.Center == nil { + renderOpts.Center = config.Center + } +} + +func applyDefaults(compileOpts *CompileOptions, renderOpts *d2svg.RenderOpts) { + if compileOpts.Layout == nil { + compileOpts.Layout = go2.Pointer("dagre") + } + + if renderOpts.ThemeID == nil { + renderOpts.ThemeID = &d2themescatalog.NeutralDefault.ID + } + if renderOpts.Sketch == nil { + renderOpts.Sketch = go2.Pointer(false) + } + if *renderOpts.Sketch { + compileOpts.FontFamily = go2.Pointer(d2fonts.HandDrawn) + } + if renderOpts.Pad == nil { + renderOpts.Pad = go2.Pointer(int64(d2svg.DEFAULT_PADDING)) + } + if renderOpts.Center == nil { + renderOpts.Center = go2.Pointer(false) + } +} diff --git a/d2oracle/edit.go b/d2oracle/edit.go index d3231aba3..01f54d391 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -305,7 +305,7 @@ func pathFromScopeObj(g *d2graph.Graph, key *d2ast.Key, fromScope *d2graph.Objec func recompile(ast *d2ast.Map) (*d2graph.Graph, error) { s := d2format.Format(ast) - g, err := d2compiler.Compile(ast.Range.Path, strings.NewReader(s), nil) + g, _, err := d2compiler.Compile(ast.Range.Path, strings.NewReader(s), nil) if err != nil { return nil, fmt.Errorf("failed to recompile:\n%s\n%w", s, err) } diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index f942fc3f9..424deec72 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -7002,7 +7002,7 @@ type editTest struct { func (tc editTest) run(t *testing.T) { d2Path := fmt.Sprintf("d2/testdata/d2oracle/%v.d2", t.Name()) - g, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) + g, _, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) if err != nil { t.Fatal(err) } @@ -7265,7 +7265,7 @@ scenarios: { t.Parallel() d2Path := fmt.Sprintf("d2/testdata/d2oracle/%v.d2", t.Name()) - g, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) + g, _, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) if err != nil { t.Fatal(err) } @@ -7725,7 +7725,7 @@ z t.Parallel() d2Path := fmt.Sprintf("d2/testdata/d2oracle/%v.d2", t.Name()) - g, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) + g, _, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) if err != nil { t.Fatal(err) } @@ -8095,7 +8095,7 @@ layers: { t.Parallel() d2Path := fmt.Sprintf("d2/testdata/d2oracle/%v.d2", t.Name()) - g, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) + g, _, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) if err != nil { t.Fatal(err) } @@ -8325,7 +8325,7 @@ scenarios: { t.Parallel() d2Path := fmt.Sprintf("d2/testdata/d2oracle/%v.d2", t.Name()) - g, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) + g, _, err := d2compiler.Compile(d2Path, strings.NewReader(tc.text), nil) if err != nil { t.Fatal(err) } diff --git a/d2renderers/d2animate/d2animate.go b/d2renderers/d2animate/d2animate.go index 7fca92dd7..9eed2bf10 100644 --- a/d2renderers/d2animate/d2animate.go +++ b/d2renderers/d2animate/d2animate.go @@ -49,10 +49,10 @@ func Wrap(rootDiagram *d2target.Diagram, svgs [][]byte, renderOpts d2svg.RenderO // TODO account for stroke width of root border tl, br := rootDiagram.NestedBoundingBox() - left := tl.X - renderOpts.Pad - top := tl.Y - renderOpts.Pad - width := br.X - tl.X + renderOpts.Pad*2 - height := br.Y - tl.Y + renderOpts.Pad*2 + left := tl.X - int(*renderOpts.Pad) + top := tl.Y - int(*renderOpts.Pad) + width := br.X - tl.X + int(*renderOpts.Pad)*2 + height := br.Y - tl.Y + int(*renderOpts.Pad)*2 fitToScreenWrapperOpening := fmt.Sprintf(``, version.Version, @@ -93,7 +93,7 @@ func Wrap(rootDiagram *d2target.Diagram, svgs [][]byte, renderOpts d2svg.RenderO fmt.Fprintf(buf, ``, css) } - if renderOpts.Sketch { + if renderOpts.Sketch != nil && *renderOpts.Sketch { d2sketch.DefineFillPatterns(buf) } diff --git a/d2renderers/d2sketch/sketch_test.go b/d2renderers/d2sketch/sketch_test.go index 7b494c416..e7d147223 100644 --- a/d2renderers/d2sketch/sketch_test.go +++ b/d2renderers/d2sketch/sketch_test.go @@ -17,6 +17,7 @@ import ( "oss.terrastruct.com/util-go/diff" "oss.terrastruct.com/util-go/go2" + "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" "oss.terrastruct.com/d2/d2layouts/d2elklayout" "oss.terrastruct.com/d2/d2lib" @@ -1339,16 +1340,22 @@ func run(t *testing.T, tc testCase) { return } - layout := d2dagrelayout.DefaultLayout - if strings.EqualFold(tc.engine, "elk") { - layout = d2elklayout.DefaultLayout + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + if strings.EqualFold(engine, "elk") { + return d2elklayout.DefaultLayout, nil + } + return d2dagrelayout.DefaultLayout, nil + } + renderOpts := &d2svg.RenderOpts{ + Sketch: go2.Pointer(true), + ThemeID: go2.Pointer(tc.themeID), } diagram, _, err := d2lib.Compile(ctx, tc.script, &d2lib.CompileOptions{ - Ruler: ruler, - Layout: layout, - FontFamily: go2.Pointer(d2fonts.HandDrawn), - ThemeID: tc.themeID, - }) + Ruler: ruler, + Layout: &tc.engine, + LayoutResolver: layoutResolver, + FontFamily: go2.Pointer(d2fonts.HandDrawn), + }, renderOpts) if !tassert.Nil(t, err) { return } @@ -1356,11 +1363,7 @@ func run(t *testing.T, tc testCase) { dataPath := filepath.Join("testdata", strings.TrimPrefix(t.Name(), "TestSketch/")) pathGotSVG := filepath.Join(dataPath, "sketch.got.svg") - svgBytes, err := d2svg.Render(diagram, &d2svg.RenderOpts{ - Pad: d2svg.DEFAULT_PADDING, - Sketch: true, - ThemeID: tc.themeID, - }) + svgBytes, err := d2svg.Render(diagram, renderOpts) assert.Success(t, err) err = os.MkdirAll(dataPath, 0755) assert.Success(t, err) diff --git a/d2renderers/d2svg/appendix/appendix_test.go b/d2renderers/d2svg/appendix/appendix_test.go index d9bec84a9..3a152d92b 100644 --- a/d2renderers/d2svg/appendix/appendix_test.go +++ b/d2renderers/d2svg/appendix/appendix_test.go @@ -16,6 +16,7 @@ import ( "oss.terrastruct.com/util-go/assert" "oss.terrastruct.com/util-go/diff" + "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" "oss.terrastruct.com/d2/d2lib" "oss.terrastruct.com/d2/d2renderers/d2svg" @@ -152,11 +153,17 @@ func run(t *testing.T, tc testCase) { return } + renderOpts := &d2svg.RenderOpts{ + ThemeID: &tc.themeID, + } + + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + return d2dagrelayout.DefaultLayout, nil + } diagram, _, err := d2lib.Compile(ctx, tc.script, &d2lib.CompileOptions{ - Ruler: ruler, - Layout: d2dagrelayout.DefaultLayout, - ThemeID: tc.themeID, - }) + Ruler: ruler, + LayoutResolver: layoutResolver, + }, renderOpts) if !tassert.Nil(t, err) { return } @@ -164,10 +171,7 @@ func run(t *testing.T, tc testCase) { dataPath := filepath.Join("testdata", strings.TrimPrefix(t.Name(), "TestAppendix/")) pathGotSVG := filepath.Join(dataPath, "sketch.got.svg") - svgBytes, err := d2svg.Render(diagram, &d2svg.RenderOpts{ - Pad: d2svg.DEFAULT_PADDING, - ThemeID: tc.themeID, - }) + svgBytes, err := d2svg.Render(diagram, renderOpts) assert.Success(t, err) svgBytes = appendix.Append(diagram, ruler, svgBytes) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 57b9f61dd..7b940fcf5 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -69,10 +69,10 @@ var grain string var paper string type RenderOpts struct { - Pad int - Sketch bool - Center bool - ThemeID int64 + Pad *int64 + Sketch *bool + Center *bool + ThemeID *int64 DarkThemeID *int64 Font string // the svg will be scaled by this factor, if unset the svg will fit to screen @@ -1689,26 +1689,28 @@ func appendOnTrigger(buf *bytes.Buffer, source string, triggers []string, newCon } } -const DEFAULT_THEME int64 = 0 - var DEFAULT_DARK_THEME *int64 = nil // no theme selected func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { var sketchRunner *d2sketch.Runner pad := DEFAULT_PADDING - themeID := DEFAULT_THEME + themeID := d2themescatalog.NeutralDefault.ID darkThemeID := DEFAULT_DARK_THEME var scale *float64 if opts != nil { - pad = opts.Pad - if opts.Sketch { + if opts.Pad != nil { + pad = int(*opts.Pad) + } + if opts.Sketch != nil && *opts.Sketch { var err error sketchRunner, err = d2sketch.InitSketchVM() if err != nil { return nil, err } } - themeID = opts.ThemeID + if opts.ThemeID != nil { + themeID = *opts.ThemeID + } darkThemeID = opts.DarkThemeID scale = opts.Scale } @@ -1792,7 +1794,7 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { upperBuf := &bytes.Buffer{} if opts.MasterID == "" { EmbedFonts(upperBuf, diagramHash, buf.String(), diagram.FontFamily, diagram.GetCorpus()) // EmbedFonts *must* run before `d2sketch.DefineFillPatterns`, but after all elements are appended to `buf` - themeStylesheet, err := ThemeCSS(diagramHash, themeID, darkThemeID) + themeStylesheet, err := ThemeCSS(diagramHash, &themeID, darkThemeID) if err != nil { return nil, err } @@ -1913,7 +1915,7 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { } alignment := "xMinYMin" - if opts.Center { + if opts.Center != nil && *opts.Center { alignment = "xMidYMid" } fitToScreenWrapperOpening := "" @@ -1954,8 +1956,11 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { } // TODO include only colors that are being used to reduce size -func ThemeCSS(diagramHash string, themeID int64, darkThemeID *int64) (stylesheet string, err error) { - out, err := singleThemeRulesets(diagramHash, themeID) +func ThemeCSS(diagramHash string, themeID *int64, darkThemeID *int64) (stylesheet string, err error) { + if themeID == nil { + themeID = &d2themescatalog.NeutralDefault.ID + } + out, err := singleThemeRulesets(diagramHash, *themeID) if err != nil { return "", err } diff --git a/d2renderers/d2svg/dark_theme/dark_theme_test.go b/d2renderers/d2svg/dark_theme/dark_theme_test.go index caf81ce00..6439b93c9 100644 --- a/d2renderers/d2svg/dark_theme/dark_theme_test.go +++ b/d2renderers/d2svg/dark_theme/dark_theme_test.go @@ -17,6 +17,7 @@ import ( "oss.terrastruct.com/util-go/diff" "oss.terrastruct.com/util-go/go2" + "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" "oss.terrastruct.com/d2/d2lib" "oss.terrastruct.com/d2/d2renderers/d2fonts" @@ -426,12 +427,18 @@ func run(t *testing.T, tc testCase) { return } + renderOpts := &d2svg.RenderOpts{ + ThemeID: go2.Pointer(int64(200)), + } + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + return d2dagrelayout.DefaultLayout, nil + } + diagram, _, err := d2lib.Compile(ctx, tc.script, &d2lib.CompileOptions{ - Ruler: ruler, - Layout: d2dagrelayout.DefaultLayout, - FontFamily: go2.Pointer(d2fonts.HandDrawn), - ThemeID: 200, - }) + Ruler: ruler, + LayoutResolver: layoutResolver, + FontFamily: go2.Pointer(d2fonts.HandDrawn), + }, renderOpts) if !tassert.Nil(t, err) { return } @@ -439,10 +446,7 @@ func run(t *testing.T, tc testCase) { dataPath := filepath.Join("testdata", strings.TrimPrefix(t.Name(), "TestDarkTheme/")) pathGotSVG := filepath.Join(dataPath, "dark_theme.got.svg") - svgBytes, err := d2svg.Render(diagram, &d2svg.RenderOpts{ - Pad: d2svg.DEFAULT_PADDING, - ThemeID: 200, - }) + svgBytes, err := d2svg.Render(diagram, renderOpts) assert.Success(t, err) err = os.MkdirAll(dataPath, 0755) assert.Success(t, err) diff --git a/d2target/d2target.go b/d2target/d2target.go index fb7cd0cf2..a4502ef90 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -38,8 +38,24 @@ const ( var BorderOffset = geo.NewVector(5, 5) +type Config struct { + Sketch *bool `json:"sketch"` + ThemeID *int64 `json:"themeID"` + DarkThemeID *int64 `json:"darkThemeID"` + Pad *int64 `json:"pad"` + Center *bool `json:"center"` + LayoutEngine *string `json:"layoutEngine"` + ThemeOverrides *ThemeOverrides `json:"themeOverrides"` +} + +type ThemeOverrides struct { + N1 *string `json:"n1"` + // TODO +} + type Diagram struct { - Name string `json:"name"` + Name string `json:"name"` + Config *Config `json:"config,omitempty"` // See docs on the same field in d2graph to understand what it means. IsFolderOnly bool `json:"isFolderOnly"` Description string `json:"description,omitempty"` diff --git a/docs/examples/lib/1-d2lib/d2lib.go b/docs/examples/lib/1-d2lib/d2lib.go index 1a0472970..58f2ddc40 100644 --- a/docs/examples/lib/1-d2lib/d2lib.go +++ b/docs/examples/lib/1-d2lib/d2lib.go @@ -11,21 +11,24 @@ import ( "oss.terrastruct.com/d2/d2renderers/d2svg" "oss.terrastruct.com/d2/d2themes/d2themescatalog" "oss.terrastruct.com/d2/lib/textmeasure" + "oss.terrastruct.com/util-go/go2" ) // Remember to add if err != nil checks in production. func main() { ruler, _ := textmeasure.NewRuler() - defaultLayout := func(ctx context.Context, g *d2graph.Graph) error { - return d2dagrelayout.Layout(ctx, g, nil) + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + return d2dagrelayout.DefaultLayout, nil } - diagram, _, _ := d2lib.Compile(context.Background(), "x -> y", &d2lib.CompileOptions{ - Layout: defaultLayout, - Ruler: ruler, - }) - out, _ := d2svg.Render(diagram, &d2svg.RenderOpts{ - Pad: d2svg.DEFAULT_PADDING, - ThemeID: d2themescatalog.GrapeSoda.ID, - }) + renderOpts := &d2svg.RenderOpts{ + Pad: go2.Pointer(int64(5)), + ThemeID: &d2themescatalog.GrapeSoda.ID, + } + compileOpts := &d2lib.CompileOptions{ + LayoutResolver: layoutResolver, + Ruler: ruler, + } + diagram, _, _ := d2lib.Compile(context.Background(), "x -> y", compileOpts, renderOpts) + out, _ := d2svg.Render(diagram, renderOpts) _ = ioutil.WriteFile(filepath.Join("out.svg"), out, 0600) } diff --git a/docs/examples/lib/2-d2oracle/d2oracle.go b/docs/examples/lib/2-d2oracle/d2oracle.go index 8f37024e2..b59dca1fe 100644 --- a/docs/examples/lib/2-d2oracle/d2oracle.go +++ b/docs/examples/lib/2-d2oracle/d2oracle.go @@ -5,6 +5,7 @@ import ( "fmt" "oss.terrastruct.com/d2/d2format" + "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" "oss.terrastruct.com/d2/d2lib" "oss.terrastruct.com/d2/d2oracle" @@ -15,10 +16,14 @@ import ( func main() { // From one.go ruler, _ := textmeasure.NewRuler() - _, graph, _ := d2lib.Compile(context.Background(), "x -> y", &d2lib.CompileOptions{ - Layout: d2dagrelayout.DefaultLayout, - Ruler: ruler, - }) + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + return d2dagrelayout.DefaultLayout, nil + } + compileOpts := &d2lib.CompileOptions{ + LayoutResolver: layoutResolver, + Ruler: ruler, + } + _, graph, _ := d2lib.Compile(context.Background(), "x -> y", compileOpts, nil) // Create a shape with the ID, "meow" graph, _, _ = d2oracle.Create(graph, nil, "meow") diff --git a/docs/examples/lib/3-lowlevel/lowlevel.go b/docs/examples/lib/3-lowlevel/lowlevel.go index 55bcea233..f120df278 100644 --- a/docs/examples/lib/3-lowlevel/lowlevel.go +++ b/docs/examples/lib/3-lowlevel/lowlevel.go @@ -16,15 +16,14 @@ import ( // Remember to add if err != nil checks in production. func main() { - graph, _ := d2compiler.Compile("", strings.NewReader("x -> y"), nil) + graph, _, _ := d2compiler.Compile("", strings.NewReader("x -> y"), nil) graph.ApplyTheme(d2themescatalog.NeutralDefault.ID) ruler, _ := textmeasure.NewRuler() _ = graph.SetDimensions(nil, ruler, nil) _ = d2dagrelayout.Layout(context.Background(), graph, nil) diagram, _ := d2exporter.Export(context.Background(), graph, nil) out, _ := d2svg.Render(diagram, &d2svg.RenderOpts{ - Pad: d2svg.DEFAULT_PADDING, - ThemeID: d2themescatalog.NeutralDefault.ID, + ThemeID: &d2themescatalog.NeutralDefault.ID, }) _ = ioutil.WriteFile(filepath.Join("out.svg"), out, 0600) } diff --git a/e2etests-cli/main_test.go b/e2etests-cli/main_test.go index c968c6f42..32f5ec26f 100644 --- a/e2etests-cli/main_test.go +++ b/e2etests-cli/main_test.go @@ -111,6 +111,38 @@ func TestCLI_E2E(t *testing.T) { shape: text } +steps: { + 1: { + Approach road + } + 2: { + Approach road -> Cross road + } + 3: { + Cross road -> Make you wonder why + } +} +`) + err := runTestMain(t, ctx, dir, env, "--animate-interval=1400", "animation.d2") + assert.Success(t, err) + svg := readFile(t, dir, "animation.svg") + assert.Testdata(t, ".svg", svg) + }, + }, + { + name: "vars-animation", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "animation.d2", `vars: { + d2-config: { + theme-id: 300 + } +} +Chicken's plan: { + style.font-size: 35 + near: top-center + shape: text +} + steps: { 1: { Approach road @@ -404,6 +436,17 @@ steps: { assert.Testdata(t, ".svg", svg) }, }, + { + name: "import_vars", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "hello-world.d2", `vars: { d2-config: @config }; x -> y`) + writeFile(t, dir, "config.d2", `theme-id: 200`) + err := runTestMain(t, ctx, dir, env, filepath.Join(dir, "hello-world.d2")) + assert.Success(t, err) + svg := readFile(t, dir, "hello-world.svg") + assert.Testdata(t, ".svg", svg) + }, + }, { name: "import_spread_nested", run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { @@ -449,6 +492,26 @@ steps: { }) }, }, + { + name: "vars-config", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "hello-world.d2", `vars: { + d2-config: { + sketch: true + layout-engine: elk + } +} +x -> y -> a.dream +it -> was -> all -> a.dream +i used to read +`) + env.Setenv("D2_THEME", "1") + err := runTestMain(t, ctx, dir, env, "--pad=10", "hello-world.d2") + assert.Success(t, err) + svg := readFile(t, dir, "hello-world.svg") + assert.Testdata(t, ".svg", svg) + }, + }, } ctx := context.Background() diff --git a/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg new file mode 100644 index 000000000..565762cdf --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg @@ -0,0 +1,96 @@ +xy + + + + 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 763c539b9822b93b1cc157155275f42bdc34ae08..99f8e0982eadddb8c6d3f06a184ed5bd2a2f5edb 100644 GIT binary patch delta 21584 zcmdSAbyOW+vM_p(;BpATg9djC?ixI}yE}y7(l`f)kl+#^f#B{0mk=}|xCIMt!TmLv z`OP=;?tSZhcfNUlJl3MuKDDcAS5?=ps$Jdv^9b?V5n`nTBETmig68)6m8Gd8nit#$ zHH9b=4(OhH&I(JC^cthwM>|KQ%!J*{lSe1EM2azys25k_=J7=4R`^_xKhZ~?=Vqgb z%60`;PP@?%a{U)9t3@Q&f-neDgCO#4LmUWo}BBwxwUCR46>i!ag%l#vwO zMu$7s)4HfF*kgbQ*UNJPiB0K~BEP2k!bf{~CJL30brtGIT(vgj-=%BVQ=DWETI;cvk@<(7YgI_S^Fwr?Z4iC7m zG(InNI5BF#*cz$Qw*SO-!ct}ZLMmbI^t9<|>{e^>{6>xNq~J_8O(R_`GY$o>5p&ztu(9*?Tu!Ex3wWUw#+ z`LJO6D32NsPAo(iULrCUQpF`omG~Eg@-6S@hUsqg$)!dYQ!T&Om#AQo>|WRk&|~9$ z1kK=7ZgIuXPG1+vnrQ&$+lZ}!YW5wG0|zO7$?9Dd#s0F$OB$FQZjTh9&>d%9%p+Iq z^B_iX#dHeVuAfH*N!I^B0si2y^1I=puaNyO#;Z#sX}!UX5!YhxC}@?SxTc3*?Z-X; zp!!2p?zY5--y=MaT#U$J8=Q&~(vNfg)l7W8+yA{hG>P^>+<7TCqJQQ4i+Du`dhSC0 z>2c2oR5L0Jb~0fn{egd3Y130E?q39UWjt`O{EKf=Vm}+u^^+s<+a9Roy5k#gp$oS| zle~i^5v7}5oO$H9LmoNkgXRTX&HVcavR)a~C}vdI+3mY6?W_fQ_MhAQvae1HH$+^X zJ10R0Bzne=r~I$0Y|Ui!?ESs`FZq7Y(YcVb>dngRV_yq%tn>_kU!fAW^awcSQsU1|mm{=uYrvg6{xQ0zc#7K$6%%U=rH^ zHDQNk{DMFM90VzturJ4*!`$vap%k*5;i(cdkk*KL=xZCx+jAtbCF$cp-d={%!UfCmO zbWKBE!4zZpw2Y*ucJP$@+S+5+omems)^i?`pf^>sm@#qp`t>gi&oE#huMh_UVK!xN zJeHZv*DEEy&#AcXJD55z2WH0>6RG^+oSzluFpPBrIeHu z!8F~qluUbh)-5OGj&EOA>Mtm!_0qUHG0K!4;po<}%TplX7n5;7AeGfTfyI2*Xe_Exo>u?(3xk zWEZ5B3Yt^5DK`uMo@p5W@Qoxc&hqLuq+(kEE>#+IoS)1RS5I*C8*gvfZgPmXOf()D zGXzPE5y=J5J=hxKMgLpAjggRXR3c7tu>caq(!DK8DmeM}k6 zV;O@aB$wi=ZwL?w6M&k?TMmazc^xk1XMQ-4E_bs;@W>{S_GfZ225CSSp)b^(Qrl-P zzxZ3;RrQkc)CU*M&o+QL0cj;QJg6~K%jMC+2c42+L-sRq-ZGxv*~)xY2-8xmpJNyr$q%^WgX(5pb`6FhmoJM zVs^BC>b%YMAMA+@sJHTO@0lB(D3shSFS@(*{k=OAoPz*`{-L&^&`NBz#le#Bl*-hS z)KHqgF{zV(F~m0Lv0T>qVlWM70veU{>1+OsPtAc)J!|VSQ6o}jlo$r234sJ!*4a)p z$rY+JWD(%RrlJI0tRItOV`FawFuaZEe!4OywyQxtJQzVuEX#_ioJL4UpwR(lxg#7{Sa)NdH2mYv;hG*Al-8`O`X4fp7JOm`$J+K}`D=3J(cwf zVa5H^*Kg66iz@-5Onzs3el2+br!5u`rxK8zpBJW(y?d$085pMQ^92IwU~oF~d~EOM zI!$M4yyt&ke0w?7jPdl~6Z-c%r?h1KVl&Hv3Cd(}%QSr46w{2G+N*J%OKq7Mjd6E7 zaK}r#JG$B$ckYsa7`kC&K_D0UUEHX68Emut$puB_hR2TB+eU@~x81<)b>ZFO>CQ~A zXOGQt2J_=2;Cx0-!D(TZ;jwW}y?RU4@*GU%iuP}}K-7wFD6Xy)Dtn6o8R7qPUlqn% zyzeYMb!#!p7mtvB-aLaMKq}MA_7a^9p>k2Hx3?ADD~+N$v4eti({Ow_C_NBJDXqX> z*Qg7WBS6#;xCGpD_oq!D8@jifpxI~~9W9;8*y&m&H%1m9E_V+*g%2Ij$-0u{EY`O5 z=8jPO=*8LQnLG%0aiF0BZb82M(${^xkP)~CaUjZP1YkxCfj|*eHQ=nE!8)NPNC>Yt z0*6%gKiefa7Tgf{f%yrdjr&juc(siJaR(djPCu9a=NbRMr0svJkP!HPt3l+Dj=&5~ z3+_KtD9?Q{T?knuB5N@rWQ-#zVSpXX@ovD-0{AD~;{F2Ezk{L_*y;ai79A*o7WjrT zJc<%25IvlbF`N*>N@(_p&AwJaPc484N5ZC?1Jps3IoC{SZw` z_<;h*V0l*DZbvt~b-M9#cx^TvK5?%AG0DE~-db`JJ!naJdtiGdAZmO?s3QiJdx8Q zXp{J*I}Tg#$-v5|Y@w~Z=3__{=sy5rqphK}0Kk`yrA;F*b-2i7cHlhe)E%!VN;bw0WwA9uU)?c#B8e=GFF-DmV{ zFrefLymVPK6ERNjy)b{E76w<9%F>&f`7RDtVF1Lmz5GG0SWv{)eD^FC($|kcH$VTg zei?|%+-3SeHvBN`K5uqPug|!)e2Q|1E{-8KZFeg)N}j}In_h5qx{@+YVs5a@<9U7V zViZgmSUGX!n!O;_y zgSNLXhO0=6S?&GCQ}>0<~4fdk{@ zz^B&aME{jF1^0adB`uNJ6$S^yJUrC`w#C&0i6Jt3Ls>8iMPRpr$%UtiNMdxP{`*M4 ze~#7vh*O2I$IdUBVji)W)eGHNkzlMEZ%$0!?^20r(G*m9DeWy3L{vRgThjDy^z_dX zv_=rQ*b|Z0^cvgBqeiVyTlmlUqie4243`L!aHhw=dOQ-5;}Z0c-n&|gY(?6Nv&DMR zkKB@z3Asfy{2f*c3+0;&Xxsl(=&&97_!`#>!`c`w|a~#P1o|2LJADlMZ+ozB%wzst2 z0N23D(DLE<(NTQOYTs$e@v+<9(VE4H)4hL7M!}Y`(SZj6P@&$!c4k#Gv*nPSj9+mw zHD|cKgt}t9yWss&bBYxC(3mi*D3MVOmRHp%S?h!y{R0K{g_t6>Yb44FD-P-?DGnZQ z2PQ+8BsV=hPF*niV-FWpRtlsi@M!cn^QZvcE{4gt>6QT&8C(1mwL;;1|46=#;hl;Tc?|5g-a)^0YV8_f?gt2pYgT@DMLDAa3uFR*eX|}{u^CIprn^Nij*qMy2uV_E$1M3vBI(&XtmBR` za;bbyHn&iEkxOZ*WFv|wJLkgWMNoPugir6!z^p+1Am=w^J^k3|jBPXU^7C2?3p=~b{a~WN!6{P;n;~;{Sy@@ebL)YRgSsnn z93hLsDt9bh(>BnI`IQzy9rwTqsanf?Fq%e(M%nBMEFmn*>L^i%ZuwKTghtWRoCc3O zXlvQu)O?H(!}u-nsxQ=BPTnh73 zQvI3hlCc<=*G7u*dy`7~uzFj9%uHixec$WI2rR@Zl~}GEYLV{Asc{y@Aq#~TkBHq9 z?W%MbCmS6WQA{$b*D3{AiUbZBrHGZ5EoiQqvL`}0nC^{eG^n)MXsQF|i?=sIV*8`C zLMa4&lU)K@>G)!RLV&NZAnV$rV4PqjesgC_PcNN-U}<2mohDnmnQeA=Ph4tZ^q%9( zm$z(3&c0fj!fT(C7g6_pw6+89!ll-JZg!2f*VVNoFAUqxHBoY8LPJg-s&z4|JyEEj zpwiN>mNvJI5n!QaRMe!xs~rhz)01AvYx-q=hW8^}hl0oyK)F}S&*n%3hZJn9!G%N?JdZv1LKKBfB2 zPfowZUbSnfpPK|hzD6L6({Ac|%E-0eUa%YK=L>inZoze*;4u@&5%{;%OQIjO$xyYKb6 z63=pmvz-+1-@X%N$642)YSzzOkSuI@`Mf4$H#IA3&HznAd@jpM*>O&0cPke#sF_`` z`W};+DMaN1WNy7Hndw4);YC^TQzm@YpLjz}C7zf+MwsFmqFDmjL&f=J_c>Y*CMM>= z34S@vubv>U_3hY1S>;0-eAv#;j_=v!M+Uc|@0R1?6EibS9!aE^=g@C8QD)2JY%DIi z0X(c*>#)f(!+N{0G0)sd83zDVZ@Mk8?N+vm&X8bq@N?p5(#bh5XI`Al!8~b~R^+D@ zRntP{tWbHahwY6B_D~XZ`>}eIl$3lv#{kRt&N>Zdy_{2-^Fkyo$-cp9U+Eey!|R}Tg&-a3rnR%8RnEZZ+LzF9kmjNY6 z8PX~%V^)3&xZ7v^laIua!XjUo+8G+%1s?qF!z^j`Jm`xsvoh}|B*CIoMRglUy5==2X1#R*5}5ynQknxhAWe2JZ2+378Z79ug%TP?>o&egze3+2Y*j5 zI97vUZ;SFzI1=!qC@=BNy{LIND~;P7P8>@pQd&^Y!?Yuy-)!h|3XtB4Rsuv}4N)x2 zd%DB6H?slCchs%=uK3y$5qRMGZJy5#1qlfSH1ncyVP}8=S)%ebDuR zamj&*-xB{2cQI5;RPN&OWB5w))aX-)WkXMk;o!V|a2ZJU#C0GuIskBQ-vrRdsVg!KBOk;E8!`nkDyxJKuj^5X^u_&SmBMy;&{i*;*Pl zwzj7{o6q03F9ZG=d$!V+GoODKifU~Go3D4q=S&XY!?mB1GyKyoS3>VOJpM>XmD%F>S3iG~M6|XFTeN4cdq^I)K&!Aq`Mhc2B zmPYXlSA57B1u%mMWc-@ryNc&4E_QDs)3)hAKoqkc_al#(dLKDcR6O3C=}A&c2^JNw zhc5Yl`a}VF z@yz)%d`(58LZB37N5bC`i0}gXok+*Q;*%Za_`ruJc`Tb=EDR-y<4z$-?DiSup~dc` zI8Got21NW(syK=nPB0N-U{pc;-1CI9!~t*g)g;m!@+69DTpFP@zJt@Gw$o?RBO~yk zt)qBXdm?c=3BBUXVfGHJ;A5NYvm0*db~y_&B(sIeoGPY+<2*hkG&m zhX)mt;9&?-_VBbq59}I2Y9GvQqXY)?v2+S6rKNB7mMRF4I4YQ~I*(~hAsj>&r^j!I zRkL|e7%mV)Tyefg+4di_S2$=bC zz4RpD?eNO3JVcCNd`RJ_OP?-`+_J_i=Eeykh6+MvD2!^tovQ(*%mqxyCn{J|f>QH4 z^$XUyo;zHG4kSbl0%D{i!e!bKCltsU>WW9eOiNA{PaI$1YWqyxlt~7>%v;*xA5>pI zsyX|Iwkr94`r(T`pZLmVu`eDxOc6Z(W+YFK3BdC#0$dY5RD)5L1A;B~4#&5dPZdZG zZLp1HL`O$%f)oI@rjOHZ__?dPi@|=QHwEnIQG?Sn znDuf!*c5)CYWs=rIDvFDuytg`m9V^5+`3z!Y4&y_683EtV~KYbLo~8!M^^OyuI$H@&)bQE-YbjcR6Wo`=-Q z;CI%Lgt}IcpI)23vGaX5c~x;f1ymT_n%?U^e(-BeF{pVDB}}1Y+39?<      jBSj2N` zAfD4NOV3e4B}n{m^{f7T487*Q=SBK<`{>}XSp=b#C>&X~ z^!fIj{&4F!4k+Z&up?s56GmrMK0T)Tljjbf1Ro||F)=h?9@0#glHYjLE@KLiH=8ESA z;FC@86kc4fiatF!g9n~m_o z$d$DmY|p+_jh*hx=Ny6$cxb_dO~KQj!)pqie^g)Z^)6buM_{%Pg&y^;XTd(mby@=+ zic55NIiFi}oo1s}AOYnT{cmvRXvVf)+sKO2&#wKK-EWIfvKy?$4t|SEK_lJ?V1iVZ&t)Fa=2tSvPHq#2<%pS z=fb0{EnX}$TT%qv-83}2hxF|J!UT-9*mF{C&-Wr)Jb}-F#X zg?+jzW5BJZ5~&O8CGWJ-Bwx@&QB~;$g_+)n3E6skVP(*)1ouS};YIdWdenn7EIUXta_QjEyQj^}FpZowLksjaaN8J{;0ITE!^B9T2MYfbe{~$KPg$Coa>N zU2&$8kPomTH!I(rs*(N?i)N~_i2NF+8R34C_M?L6pOQW3p#p?o3pdSn(mnliE1LgXS-YD zh2=X}Er8$6g=>+)V;|$jdngzdkG1Oa14Z_kwt$X*LFO;-eY4VD}~Lt_?VP)L2P%_*qnic zLHm^q=);f)9oUsAl)2o7bJ!?Db&Oleu{f*d8l2mGP8nT!$1!`PYJtPVG`iI19GtkL zt4i)xj_SAZfoPzW*J7@&Lgq<`M!qAi@Cu$sKXQyZrm-S|-3IjtYX>Y{@K1;W@saSZ zMS28eRmz2B3%U6f1SxV%C}*|%k&-81ta(h>$HK^rN;!ZR=VmJS=hm&^!gE+?Ql6#Q z-{onwX=NyT9wgDJ#KpzIz8tsup6?goVk>=?@cU6K`g{*H*|klIf~OdhlAG#P`doMw zrF=7tRgq!u@UDL4w~RO&45&#dwU9I1e;w}T)=|py!p3?@>P-{w&SO^1o#wGrdI47C z1Ffej-%pD-)%URz ziYm?;A5w+MD@q>40kXmI$uxm--I|`C@YY4aHN{f0Q+^tBM#ZH&d17`y^(s|KY1V3g z{GMBW25v|u`ir{|z>g%f2E4^ver@(s)4C`_ZQ?<(mQ$-&q=3@-rzUnx9NPsEaB( z;}GU*EOJU_n&|y)FM;j)W6s5tqTCTF#dTWJz+jOc|A&F8`{+}_Z>jZP(g?Vp=kaPc zSgwek?H4vguEruiAa=Dw3VrNifL^1*eBF;6cCSFN*A18hMLZEHUG zaOf|1ebI)U_}R(H$+?E&MI!a}_j=BaM*25ucf*@%1iVn$$(t24 zj&Id9F4Fh89zMY(QVaKlFOQnLpH2!JDNp+1hH09+R>Vu3nqK62zv5}7dWBZ|-e<40 zkZLpkP_AA=8_ZOxj#vHwew$mQ2F%k)RF|1Qvnt1lxz~6J6?sMU96Ri->_p#!ete8m zKui!{X6nQUKf_0hE-F@E-Bj4@UcGN|xHMwscPn1Tl9$XMpTxL!QXeQ@-j(=kQ*88_1<8j$>!%+)|4c%!+OLM`X9pX+I7Z+I}Y z5%}Z>N}VQn*M`VIH9~9d6yc9DJXMZo9Qsyx%h}G_Uv2LKLUz}ATg|+@bJSNlHRx$EG(=VPhwWRXe52`rdUd4S48DQS>D8TgJa|e>1rvXQ z2?cH50ya=-F;b%NVvgXNJpRLn-?Kl3{rss3!Honl*##A!5xWUEAlfj`c+LTb98s4v zo(whXt_%WSgn6h8iowdDI!I?Uog$B9ihwIwK!tDkwRbAaY$!$SA+M%#g6lX?09qj! z0@5qNNrt+tMF;AN@#JyZWPcLx0|L7R1&>fi8mzv7yu#VQJf@EmVBue|wSRNA2()<~ zc#hK%7X*1-JO>XPfjyMa?ib5L7L$mo=Y$)6BSwb0FP93x7k-_x8axi0R;>5cA@L$a z1I?$10?(mH1x1!#S^o&E+!!beTYt^WtjEH#Ph!N5ul)t0BrqeI5i(>FX~8rTz0RB7 zsa7;R;ZfeSiX4IaVpihdA&|vm(cbgI9(<7mGN1mppwhM8;Ie5PViY30fzLqECR(Sv50u+W|qmK)v=a(Vw?Ah6B z-EXRmOq*B7k*BSuRF5V6U~{|<$>G4m`z(;}peVHpC_S^+pEsIg`EqJ1j2Ni38J+4| zSJ_Uj2A}0k<4(dO-9G*!#1{DY11?0-VNvGknbSFc1L009A-b}Mt*eN6QT0({t-q_+ zYc=OaDQcR_Hkjv?OsY5qkB)U9!!euhdChkj0wk9UMUm%}S3!H2ufG91EGJ#fOs~f^ zE8a^yU(2!nYEc@B7|ZXboJl=e!-bwmKp<*lqc(}< z&tCR;b@=qKd(Zux*+`^s$rJk=yM`ysoD{I+OVR+eRQp6`wzi@#?E{ts?pr*d?Hu&whIzVE?)uP_JWqP&M;T}te^=k2kR?fby-1m3aMk8hC}&dq zqFD&>T5#QqX^}l_ZcRdjaN_o~Qv3FiD&TIEnf5=1jCls9YOgu29Am7sav?%~gVR*b zL!{DBeQbn|8JwQo*CM)^4dKTlm=JntXpQ<=<<16B%;$_LNQxAgPYLsGiLsn-pdHca zCMraHFvhPv`45ZN$*z4^0a|8YCrLaw)gKSD?YqB0USJMh76#;H6h%SwV^p0_k?0>? zBEjAtGWbG=1Xem^j0Bh|3n30SBSZ_n(M^%G^QT!Pf+R0F3d0v7a@^a?n7TcOFjK>b zxEt!8H0;9%3WyIimMu5B6F`2Tnu#3Czij(W2Vs|lx)shaW_?D2l!6_qafhxEBLs*R zP7?XG#6xe700QX`*q!76cMwJh`+a$#InCuI4l8?7?wxVc`%G+t!=Wnu2t+VZLE*0( zjKU&4=V`>MhoAp_{xLy&9QY;`*z^g4{#tT(Jju3@fe1hX<&uupEs`iQQ3(SCJ$4en zP=O?2azBaAejC+-_~Hi~#QZM={GT8~Dj3ZJ#Z!T)nySz%pHX)6F$%lnE#`8D+f#N#%lg_T)laL6XFG)e`s!0@gWO#siLmXHJfy9@d z!Xyedn1^{^aKOeTElTa9hwl`cZ;~YMci}ke*x`zyz*J}Kq!?6c850Q=aSMv&`G%4d z3h=<5J%-u&&Ker}EG;Z%xeAwQ-QqAvs_^$;iEBa~48M-4kBC?1l>iJCA{$hen+zK| zqMxF60MiO<&s#a{zc39j&a~Vb$aoSsPu{wfl56ySG;zlFJU(*$2LdW^=H%j;lau^+ z3~Ax%>!t;uyYy{tVW#=*dq%s?Y`MK5{a+t2gx8<$AZz9#`?A)!Ij1N7ogj>Oci@Y1 zo4v$?NL2wZ@zg3K&;@Ur`#=7j;AqK&WZTYbJzp(6`&Ha&Nb!YdrN8d!=S!kLLI9vb zH^S44AAFV;+5S>QG}!;shll{hjK8Fy6(R2QNxe8@smCrhTgi89Uy2mmN%+Gq^}+^m z$8=?`VOr!Dlr4f*a8EHjk&#to?Yp@tLysq!6R(+Un zFSrlwxmntm5(RglxVsw_2Lk*3V>^QlK}&Y$wCJ1)f&bD7_7PH569g50Do1~Le!mL<4q8m&S;6ggh4p~oV znHR%UhwRkE5u<0`^L;T*SM3JS;Am48p1`32BRhQ|Y)j<^^Gny4mrEbnruOgeU4-`ZJw*aUF%bv( z_l!iEK2KJ3PpRxIx9lAbPsN|vmo=yW&h};QUap>HtJnRa^;N#7yH|R^qR@Q{OR@=F zqsfMoWKAg1XU4>RRd3PZT&ynbXo*#=m~-B~3punMv2i-!M3z_4DN9%XC~CMgKf<6zqn6 z{mS^fslvW&YJ!D%U)b-=h|KmJyBM&9QsCT%T|6WvaGgM4L=BL z>xai0;gztl>YPT4Y_FA;R=l0GLuDDR@DAll|i|uhuNth|MvfIcH#ARKsVL z40D0a_WQouqLKL~3Vz#(Xz{0?=ryw^b$ZwDH8`{jUy%$+IhIG+YXCa=7KxHz6j=gSn4c{JU7|YYnhVwU?Uv0#CmpzSBy>l^3a|6S_{l91!x0=20?j z-$Fw~SMl+ypx+^AnMQ6%6E57cKb1%$&9Gk{Aennk%`Hrpg8AuyK6a5ZE9*j8=ux!E z@&HVDmWRh^=UlO7qZY6$2!9HrtB=uiRT>%aGD#b4q_wp@Uh@$|0L2(s9o;OV@hEF^ zukV+n*|uvRN>u(upKogLPAz8+ms+!&3&7Vhrfd6Q8)vdCXIa$e&|v>gYu0`l-H;f# zxte5{&{x2>`7w7EN=t;kp)k-|5Lpjm4(um3JC_*RFKE;N8y3MzH@0;3ao?J4(~mRz zoU2!VIf>F+=Gcmi7vL}p>0VYQ55N0SzM`5YOy}=Yb4AV-t>UYyI(kfORF*=Q<~m!q zu?w~Zxqns)!#B`&WkhH(F_vncrMG-P=XXr~P^>0*Yxg+)vziqN|1Ew7u$?C$Bzk%` z{AQMXI9`AU5XKmrJiRHN$h~upUy{B?{r)e z?l@qN+SijkxWmVlFs)$?X>UIm5NopB|Ngwh>W03^A@;4?y0d$*U~m|@v2n%b&!GEw z<~O1RGuNT6&r$FLp0rMietvm{12Mo14x`(njUk(+E53HQdR<|LTeh)JV z!VmrPj}zG5s4$6>qCf<pAZ!O&<&F%Hk#n0c){m8QO zQ05TjMRJ3?-#0&DB*B*7JNGSIuedrnxAwuoETxXj!b}#kvLNE%r@5A-UfXz+GcbkK>&FUtI+)Ncum}S zBVDj%=XwRnoio{F&PDeX@f}B}GA=VZqM%YGGjx}`vs$cj9B~l-zW{;%7Wy|J6Y3fA z_3M{^eVwN}Er=%)87i@Zal_#-T#139&&7<;J&7^cQTe=^ll|WV0sl7Te})kFKa~If zP>Oy)=xi&MXB2`GOrNHKn$;mk&RJltU}X;PBy&}EtL#(JW>%4!<1brjA4~(?O*cVB zY@yYG?<_}67WBM zmJE)a!3B(+(9SN(;4o+ZDwTddoF1_!Qp2~{n5akcEz{YoCq{g#`p5RaWK)9R;3!g@ z$>DTTD#_sp9xm9xJ^%ES^EK8j&BdwD54i&oxu(~xE#N21{&6<87q6GccfBK=h@3{p za_Y`8^DHYrn*$w@$TrDE%DcCD>Kh8lY04~j!Q+L|$==EpcM1B|(aE|_EI>(ytU|J! zlM|5A!poE_z8?ofToWiHbL@}at7Hpk*9;wMz~y+IXbk|Io%uMe>-J@JlX~{ImG;PT z?g$*v@TFUoEHpWBvZ}uQWGm|8JLf$z+gv347gZ9k@%QL=-Jam@1<0FP@5)(zbCAK= zADVgdHE$x5vBzrfh2=LJEu!+FxrDEI!>t0X8BOHxq?6LZE;!vp(V}U&(2s1leYo+3 z3wTz#*VaD)%mRx0J!=a_-1wxk@}17~Hx`DyTj>g>NBQn}h4%Zgx%Rga?YJ(JLsmoc z+i0=9s?SO|UKK%Nd*zzB%4 z4E+rb;%F|J=N3OWsTiYiY27WpvjPId(FjQIEXEk|iKB0k>K+DY(YL>9EkpH5#BL3wNnI9|1RDpM%l=XkPMKwy!w5PLW-VwG@_*r*` z>Ppg5n8_CfWpm@R+&8L4E@>quA0!lSWTP?%^z+>6;&;M`2Ci(aY6Dn!K)gn6*$O6w zn(Kz#Bc>-pN7~{`XxR{W_rm?J&I!P>@nze(F$BJ@-{}h*_|ve>`H~>eeqyRzepE%& zh0?I`1fipj^t}Ab$mp*MOZ1dsgdkz$dmRry9`XSm)(qtGz2*z+SL1G5f=wgq-^EN0 zzAecqsz{M5)Ux6{GNaoEMBWl+!_XerDM$s4rFCOpbl-mHtH{bhG%IAielhT5{0jK1%|1h8 znOl11?dQp2WGu+?1Gh;C9c6uwVfnqIyigMQ04$*~9R%0fi%TRkgx=90|})X zHKea_KV{T0PpW+KGQWvFgJ-|qa^*H`Nx`FR zT7G#$=Y;j;(L6bX>J>@#T9BRCtYP>9Jvcw}SOrxE2<{iDe*vAZnUnDyD=nEX8L7qZdZKz6|wOuyG_?e*KLqn z!a&O$iKOY&e~52~Q{rx(XHu5fp2#R4x$!>f@q7so zx3+&1Dv?X+D+>96DOsS}zJaZ)lz*Ki;Vc{CS=myvW?1~!WZ%*O$IoJ0hYI!SM%8RX zb$NgP#V>X%A6@NS>P@{4dHkMyvSXZ~b3fsUvzI7x^L+K}eN>9Pe6B_J;j;Y&y-Tk~ zz3ld9*;Ax?r+3daTQ$BTW;z0doY~>=2-=F4(Q2j}m|uC>y$Tz3OXXAK(*tWTC1o5g zbYAvqRMX=j>-G0O!dl&kEycqoC|UXVMvZ=kU1*b7knWQiqwX8M2rJxGQu`$3uf>1O zy&xsWEKZfj|FCk%yp4HdoyOk(k2w@la_oZCzIT~G*Jz>9%oDRUJ6lmLT=v+cuEy|X z$?Z!U_FnGtH4K}0-U&hj{T9(6S`%WrFjvg(h#$w_D57jN1}<0nF!BjT_iY{*xE4c; zO}!G+MTn(1!WbDy1-UTql(*2(qwMqg|fQJT|6tqHxK; zKR5JWP$FhZ?&!Fx{eIsU=eRq*?V?+>4|@K)Z|@rLg4P8WGjY4e@QL#&&(p_S5~Jp$ zvsB6~HpYTx(R%3~=IfL3)O#Z(ivW7;wG~{b@|IwTafIJ}#bF`I%HY*elXbQdIbnwF z13$-`zp=AuW9E=<6spP`B+j|z)?56&rzv(V@-r((H-&koYL9IIGw}G}ZcPFr3)G9E z{0!0GFhb0PtK1|XkXUC6B$P3q?~6xPW%|_I#f?~Bh@RpPpawRGgy>(FFl`T|Bdq(f z_-em%4ifgfB`06dyhT2~Giu_cxd~5v)Nr&4TCJ$-cWz1g(@VCwd4kl;>TK3b9T+KH zR8GfN%AeEaqV4A020tD9;f5~c0Fp|#dwY>u{EI6jgMg{bxj;6!#skH5OS<;ArWO*L zH#X2ZiQ-B>ANc5Trg*rzKq6qGXX{=4rjaOU|+PnI~whVD}aTmG>Q#O+Orq_|{PLihAqF{^;_$YK@-#UgPr7 zq8rrfRu{b#2O;vYk6nJFunW^Ly#$UPDPi4w;XHqoNmNff{avw?upIF$IfDH)=KcjfnL>Mo>ubvL zt9OqkVL|^OI(hoK_>sqD(z}ku6JepM$K>}&WJ>KUr|~Jvx5&(uG8myF@kpvnAJ7I1 zpI5dUMv;)0AlADHw)v8jFGV~%C@yUx+6e3gsym1|0H}Z{u~ganZ8W6-9poscET87@ zL}$w$4lNCjr-M9BUYl2ZZG)P{kk z&>jDtOvjaQAa2M1opHv(apLcNhh^`dnC5kL{NA3^?3~Ly0YWf6@d>GfORZiDKGfH>kbueX<&k^C8ROfyR}UQwUg#p z=8_%^MerAKUoC(-*Bh;;Oe$#D(8g*|{d0aC@N!*AoJleM4cw>~7T+spm190ba9Vn> ztk$Ddga!L2HXaqrZeH84*9DhTaGySR=;By8{P1Nc z{huP8yacX#=`CUMQIy#BwGMk-SGmcPIO~OI(w17E`r7QnOhO(z_Ht7%=&T4p_7Jk^ z)7Vs=v~j2=u~UWqJ@O)}D(0fePcrbVA`X5SgSTG`8aq9rh+@!?+nP?ZJ+Uv*ex@XW z!x8pI;#2st^!Akvw3oYh&7yf;Zk9reCgug@pSZu3-}z*`@y+oUVxNndIB1eKiJnQU zP=b#Lu_8w-6Mq;baK;6Zoeh1~Qyj=aX<^WPNO|hV{gBZTqPlB7@v_(7eAxL%wtL80 zU`9*+FnOzJ);~LMY&11oVSofiOR~R`-N%(@S7m12zB&YKj3I9w2+4Zl;vfAjyQZ9d zQNOpcz1K`(Wev`BB;+*f?hgi-3aW+Q{N9c85~2HwU-jq={A_x6{#&e(G)C_c6Y-bi z1hn^IuM@CfHV}cILGWT@a5Nu6ek922powkHB`jQ5trC&Xae0#6wex;h-HBYwhq9Q? zRE+Rl$bE1uuf)4LoV&oT2JXkM4rrVV+DV%wjO9!_%t&vZ&hn_t4hh`=7wY%U@IrTY zvd6{|&O)cZEsShzJ50!Ko~-bw%#R4&Tzx)@ZoECfixvGWa#TB*#E-Komf?TE1)CE( zGWxYQda(4gUvz2yR?X@D;^HW!58F7$dv<*w6XyE9%=6&1$1(eY;&>s#^ZuS_bVCKG z4><8zu}z_Kqv{K)@BB;vs5dnI&L5jQcaHPy?{4VdXpd9rU+rH!DB~@6YWlzCq@E?0 zAr)J#TRA)Zz~sP+T~ANmnaJKS?NzpX!1c;c^Lh?l*7bkpbCx;x>UFyX>x!SoDgu`* z#Viyy<==8u?)QXU=ca#OT2piN)6%#Vl?&E>x@LQ&_S_z0vnM*!jK2Z3wXLf6{vPzb z^7Flz`P(Dz-3iZ{)_rKIetaufeH4-y}SHRXTLOF8x%Eb|EgxA zkHYX5Mfx)O*h8 z{o&B#C#{bfB4UAkD)HVtpDDoBlvi8>zo~oZ;I2Sx#r1T>DYiCu}Zy@LSA~_JJsPP-CTSMRJ zs(JYK5athN6ye(~eQK^cP2G*P z^O~v~D=?a{ZF)}&t~H(?yu9>ZD*Z-@|&(T|CY16 zD%QXG_ogPgep~*{$^!<^AN;-a`?7q7$9LVoj0_j+`inO`V7FtweIwO zh5xOaYi@svXW-d-TrTKCOOyYfE|&}c)YjD>60-J@bi>j|=RTi`6Z{(x zdG?eY%N7^?Juw%Zljdu#ioBT45d7wVx<+-!zlEFTO|9iHc=5d6*7KqB7Jt!gYd!=! zOfI`4>|5dSf3ol`(}$A}%>5UrzvZkmu+yJ*dzt!e8);d-F|B z{#TdlH|-O3`cezmMWh|B%BlacMDJHu>9(BX)B249!q;p`HQ!b<1!&Py-Q9sdSAZt> zue3EPbS&ESf2FfnWD83&w{N-Vp7JKC%kn?J^lL__rEZ(J^Ob#7YDk9E!p;9KXm1WW z?Q!?(>^RA3(r)iI$rq)@6p5X@t+#WNqE*+ELc8@j9(j*;B|SemRrcY*ws-ZHwY^!Y z+Y=%u$>lsU4_mk9B)^$%FFJb!r zjajOW!5g~Io|?*&dT^b|>ae6Qtk!?8N33JX&kxW(IM4Q*?fE^HFrVxFnXODrmS^85tNE8<@l7rn8zcP8Bs*FaQCC zJOwT=!`#Bs*nIkWGsdKPLjyE9prIzl=we2OMy42IriPZ7VixFj85o&cVwh)aU}gx` zTaR#*fr+`H1-gMI7N!^$n;IKqSZr!;Y=W-W)WX0BUCa#VJ!G+ZP zLv)LcEDep&L(ACG#1dVvnW?cEy2a*}MkeT<1BQzkFy{L$7(F=647gNPUH#p-0LEBj Ag8%>k delta 21583 zcmdSAWmuKn+9*0{Bqt3brF0|RsnRGV-AH%mLw70Csh~8{-Aq8Fq#Fbjq`PCDhxc9Y zTHm_%ch1@0T5JE}PhsYID$N;~X7>0|hv$?Syh9^S4s)F?s zF6gdX&MKP)@skvF=Av5OHL`bE1o{#=$(^v&)POHkgu?W_w9zt%M0AH@69g;%w6-tG zA{-y3;6($r(uab)`q9Kz=Fac!(*2YN*%Ic7^JeQms^nr4CXz3wXI^~y^U0A_N0&U7wq z7N6#`^i7dJ^ZVfNKvep1kY4%7hRrrp+X>V_{RRb)M^iusw4z~YUT_!7GOLgm=Q;M zm`9pM&N_DN1tWcCtJsB!cJCXlrHUtQUm!NPcO%!41HdyVf$>3hGWELd9+E~-DvzXM zNT-jpboC4eOmqRQ7@5l|C>1@pFGJg$HNvL>SN(y>7%~?gYCP`q_m$LpD`GF{BIF2Q zGNdA6wTG<4f5!ptk?3^oO(Yk({c`1@iS!YXoSwdR8QT9$X4{S-4#f%gJdjyZF`b&e z>xWZDU++H?p7K;D#$2WRhj?r3=>uBOb4RK|d|3VilgC(;9@EgipoZ{ki6m-zrF(^b zi#jdK|3ey3m>2D*PXEkWsj({QpICFf9o+>L`epYnF|>~ZSiSwxDFcV!reDlHX}~RA zv3o~-uY;n6tIGn~)B&Fy6eja14mk6H>nql>4qTr2Y)w04Uv~_(C`r*`;)Sm*-|m?g zM3Px)CsS>VkGx$L3%u?qYf(}~b{b>3cDD_dz(RTTok6t_C35%!l-4?sFfAk?;cK(d z5aEvrjtgMh4sz!%vRv2w$aL`h%)7xP+zpuvqAs9czIM$qvavXdQ~D$VA-8LP;kzrA zCO!=EQW7d1MU5JO5k#tb4+(`OJO%-RsKW>)u^>dqT>0oGkV5JRnrBcX2^2{zrXW%X zGrEZ^-hYc~@NeM$9d+=|ccv^DA7aE9WqhYU0?XZ(Ud^p%MpS;9_+u=O4D04_rp)vq z#E3e=_(q#VCVWAGFJSOhpi1J)e(S`5ejzdhcAuRoE^G)V6vla18vQ{{nS)%i*HRpo zNHcDdh&wI~+<5QIbXreJ5C*Jp%jxR5uXOb#2Gxf?bo})#nNck8wLG?1PJ;{6YOA2? z2fGR9vO-$U<$8>tW^ahrE$#+dsKXk;UC~08#Bu@mp#nXKbRCr52oITS5ZtDY$LJ=h z(cqpw1NoDHyC^XU?kq%u00x1mD?yPUF9F{FZuWn7vZLL}^~4w6DOtx=YPjsulbGng zK;<(3ekk0S)c;yz+AU|zkz;MNyKeuQ;<#k**({&AEjx!tECL>Qc6W1!n_fV2e_Hxm zrJ4*U+l+{>Tw&3#$CW6>w{iJQ`>BRk1{Vg-R#*4@{hYluAIqmLnVItq9jyOy{S~1l zDjFY?(Rp*{`%*K@SC>FFyyD=n_J#$c&q;wVv0-!BMW+}w!?C~{D~Oos+T90M;1jZFdCV74Uw;}?_|8MvyiY_PY}UQA-=A_Y&r3uT zlU{B~qKj1NXLdemQR+@wGMaAh&BJhV;4Dt(Urpx;P@9aWgg~?axri1gYytFHe&kj1 zV3jGwRd^etL^KaVy}J4D1A^X};6lvCv3W|3SmMc)TlXgV(2}iZ*W}H=1L*KTjkRWn z;`ix$bZU2kDsh{vYMG|ODBPTMhBC^RwdN^C)g$Irh+k=#DlR;IH66pkT+F_lQKXBc z6(NBI>G(Ew7gq`VlI6{^Lcx&=6>#MUQIXj-)2m19`-ruxOK*Qt&AWX~w`5-~Mq%Qi zbULz}XfZ;3^C%$T4{Rx<%BY`8(T>ojC#y9NKU%M@qm^h#nfPnhVLD(x*BOo}411X= zqd_?|mEpHh>9&GB(!u*f9oYl|(Ig%#Bjw-BRHzpu1unHMR+}G6dC2^>Kxb>Ov=6h# z?A@YYn-rq@76^OYCG2l(jRp+~M}a_COO#56m4y77c3UDWVKV42jvTnBr>DTV!UvH@ z>(FpilY%SDI@Ff@A^$fSpQB+!K0fEkdgwRH(EE+jwoHpC$kv!EW!;Sv5|{Z%hGG2q z?1vHXxrpD)5KnuYf31>=v_){C@~V#Smmn3+zAFQE{W+8Sk>mOc1mwTOjvyQsWsin! zzQ~ChzZiPxKG75CSswU-e^6$A$mPR_$CPHHZ1@g1&)1dSZHTRXwqhpXyFu_OMtj93 zI8c@2Uo?UixsTkDc~J@Kqrf!s@fbks(NNd8A#>t(nDl&+MTOszMOGC2MLcA-Q0=f! zAj3PU*uaPXLAb~@-O#JSHj3GiM|F{jMTK1DdY=-Huv!{;y9}Sb%Oi0%?;3E3yCdyW=07}N=qH?c4Ad;B z60vZX;Z%Yy)5`V?t=PH6KF4pqcLCh{(hQ$3C0|eCr&V(N35XGYr~5cUARWv2pXCZ? zd`HFVc$D0B(;a+Xo^Ks(QvrL+;-}~3h9m54Po85go4rlFX&zD5ao(O%etU6MlQkEM zz5LvFjQ`IgxZ~`|? zl?{uFO{m}sg^iy?fOvKaeMA#@v&5*jlZJ(*YECMh&aQX-YYDsAKef|e?84H*m@R7Mn!PF)Tg;jtV?f=xG(ElG(`KJ*8n8HET zu!1WtUyG8R$kIB#>VX8rCFb@&yif9f`ymGQ?*Gk}Nh3la5LDw^U2#+rU1UO4$a^d< zbu2E39w+Q27YyRq36<^vQ!|P*7Lha-gycWA2>g3=rEPcSxsW^v?$=(+t@*wxSz|?PhKwXxA+{e{iC^ zFVArP7=lJ`MAkO#HeR#1z_BKAU#r;KtUo8Ou*ZUxFnWDD)nc4*a=t+{zs>Pzthi9aoP-hu3WOwVZqW+aN1R9kx~RW z_J$8kJG2^jxSg)%p`B}LvS<1<@>0TmZ_KWLtR4LR?ek??U$^<>;BN8PFZg_c1x|QQ zTs)9T0q~a_X65AA#4|ADd0g+$FY+kCkG$)fFMP7*{3`h~hLkO;Yic|{wJ+^4!|QGS$^ zj4UM5OQ;A|a75tBg}#)C{GnWEWC6**QP^-k06e`~K3j1&k{n)NGPJu4`#Gd0_Wu;N z@IM!6bcfz~po6y<>gqG%h&2M$4fdBuN=3fT*G4k$r@h6+y7TG!7@x;8HmV6Z1XeZV zzgK#iP5Et-WwEBFW+vg9UaV(ee!qVWL#(@jJ$s|sd{@_@2(HrD)+R>FBf|N+Bt2c{ z44~y-J65^%o!UJ6zQR3KH}0@-lZ|Vt@+>``-?V$CAwQITKwC*B5JAi((*m7nH1CDV z3q~;`UOYh|MeGMl?CM97)To<9@Om^*&dPf^+vL*PEt!^)ZCIjDj>&w#Zf#%B7G5?#E@`Z0~-KISZ)x(rhhN#>j8DxI|) zHc@1g1j_qD{%dI#+A4gc1L3x+oc2(9m0+~eUVbD8UYuvRpJ8d!lcT-bMh^(Bvr<`` zSuNHUIc|!#p=PuOi|~9pPu4c}aUnR@ato|H_zNcdl00te`z=Qs%vv zpwm~Q8pRHBG_V+fn4L8to7nA^Kg11=42jUbJZJuZ-{{Ts_H<2CL!8Q1M6>2G^6YGN z$nlzJr}2$&k09^vLOpj@8x#O!3{|Gb##$OKlnw6K4qL|jM&CH#J}&mZik#Q(0WY_WF7UU_~PJ8~t2G(Q}yVIWU!;DIx zr&+=tciY*1cL+W`*SwAr?b0iq-C++G2U${$xRqL5ndw)hqt7FM8v!!!3sP_mpHexv zum3bo7EXLOA~@ocyFB>As) zW6~T+@bR(qEamOVc)K^;NuVUn$HQ3*lLN1j<5b9hwdN%+=E3q)hhfFXPbtq*>ad9( zUfQ0y>Q?2J-ULQ67T}LAuI^9@Eru4SEt>W1>@2LS=3>n4@wiye^O>mN{z{+R<4b(= z^XE?hZ}fUi@r&LNv6w^`rWXqT(}}%tffR4=iLb^x2xK(S;FJ5BQ{v5+SJd{FmYxOm zj%-{EI53vi4lyFmK^&D5dWMF})gv5AX$nc~8GNO~!^5>1J73$wBeFFJG2xz8fdfa? zPI4SCYV3EbG+08~Fl+hlwd*=VIoTDD0z@~PJPr0@eY5l1+u!23@py0SLF?pYh~hDX z-L`1etE52prUAPs0fR#B)b`faW83C8nDw6BO++lojq5+xXJ={`2nN-~8izPasXq!H zFB0I7hZN6(HvGwF0NZAj&qTVr%`kK?`=V0%SglLa+1PmWt|Iv?{ww-q(M$-?&|p?) zZD;PZdQqY~Z}txxaodqll)+Hj2G7Yih2LIlvek!QjF6jLxOc|#<-GE*n+1pKlg*x- znu;2ZmeZ|40b9e4nxdSF$sw`3;)Gx@T9jo>*)EJZ|8mrER+N+5Oi`G|z@*K5&On== zboa71jGVtz=d&%~_9avg8X@WZXQ0KQilDGyQ&wvK>Y;rj?ewsAw`!)+E_k48c4uYv z-I&vQqSjD8{j&^49fK|fE58ER?^oTIBh#YHBOLAU1Yl}Hy>p%+f{|-)W~P!}ijMyu zHr0)`I&QJ5ulG9A<8tQhZ5>~-?Po9&17cidl^=|^-Y2UWJU%)(5+uc=Qy;3SZO#_- z(&F-lRTo=>?w;*bbSb}`=R!~aM2#SioSgg`m$G|bo4`jaxo^)tkphuR z7Wa>EG_``{q`!#SlT$Xqo=(a)VF^1h=B=&O)}Edn+YKt&{|yhk9bjzHumy~*My!?B zID&VUYQ63jG#!3K&PNE|T~jDm>#M199C-B(+A4O<=9MP@6LBs){pMuu{w2A>yJ`;N zq1nCq>@VSa;y+uh(7FW+`LTtdvYIgY zo8saeTt3PH>*t0l^@W^?lf1mOVMs)!>;8v_#bDFua+ zddV*cx7hIQd0Q10=7GH=@!Lw(7X`XGOQ^wU*cU(@@iN=PGvp zT$2L-!J_nkR7w7=1_u6(BKV*9tv2`BQ)ECONL*M8z;?|Z5+AMyQeiS;2g(0ux&42s z{_Dk{w)50j!IGp(h1H6v2ydS4NQTkyire8w26btzE^YfJv0S@2T#(OGhm~!tRf$SH z2_g*`M&`;vH}MB=P2XpEmU~A581PD?Y~Zv(3W<^$B9yUyEzp9hG^nhRHTA1yJ{SAG zZ_e|7@|Q31+K@d30oY-YKtJAZ;`3H{`UJuTaY_7eEtZ&Y!$|_CXm*nYdksi56~H!8 zs$Y*jA}t0&*k9|!2g2^#sbEbJAejnGS67Cd$sjPxkS5aHs=Ujld>p`FT8|S22{DGC zGk0J~L8GCA)DU$ZzlHL^ns~)wT~dZbXbxLq!a6eDDovl)mzOkEK0kq@yfh!TISKTIUeAtm}@QIGQg6pJ+E)Zvzt#1`*mKIY%JQUk&` zhclJI^QcmcQ6End>Br5k`n%r!itUT@Tt>JPoPP^#nVhUyqJRWE1Mk8Ro%@H18t|G7 zvAln+_zrfBAh~}$PS}7wfq*GwE}N@30~Vi$5Jy7E!St#J8KT$_fhg*AQ}?1V{k;be zGjx+xW$bTi%P5e=2jCFE?)%$#{gkyQ`wMCS(gTw>5mK0tjx%H~Zf55Li*>0HKT$YO zo(TfvM;hh(+y)rkLgbjB#1n^iNQD2!*pKXM8Ix!#~va;CjC!%yH zz~1%_0?Cy^=AtLUZJ3l@aWVtZSfZ(W^MfQ?ym@VjY*&LyFd&d(DX8f?m!>jnjChw} zlMM~9y*v3hf~%ixFT+qzYIT5L`5cM>di&l=$i|U$OQopVUjpCal{cO214#gB`2C{1Pck$S_M;`E`w&_${rR&+S*z zW?fbj8FIgCsAjcACVvE5y&LFQ8Z;4HtHjpks801hC%2M)?Cfs}&XuO~Q?dOFx1%`cXBJ$&KE<&Mph zGfUQ!H@5N(5ww&1^{wFsskaQz$JF6|2KL0lJeA!-V7ZBb2P1VtuXPT(*tsQNetq`F zwj513%l(j$G9~|N?Nl1h^=)aeYUUB;&AV211TaQ*j6I1k7M!S%1;`|C_HJVNMFdRB zUM(+KuV=-jfMjaR|i-?OdJ#l9|4 z-}*pe;MYRJWK*1a-%8%ZgH=2VYWUs)>)$+dZ~h>n!gP9+q2yx*^Tq1A=x)!6;d;KE zfsd2xXlW8Yi3#Tp78S=jUxptR5zw#IG{-Zat`aib%;|uPWD~ z9)J-bnOqXf#$VFc*?VDDizLYpu=lX&#(|FHOsyYnsqv}W{=B-Y?2zmMTWyemSn9BD zkCuh=u;#_Q+u*pPmUZun`fH7|?wpC9U!a*Q3J~QuK+`8hVlMy{I&!}8GCB8!<=n-_Ur8XYyD>-a$zWXeM_tQi@NBxF4zlahc z1KhWPyEk8lYWPd!EDZ?v3JUv51l!}y6!ptXUUc9%<0}!iof)Ez;b7mFp;f{V1FB80 z#17#*i$l)inuKTvE_A}lnKSHx$_3JD__|gWO)Dr`M?7|En*^?-48IX)DolGS%m*sg zP>krg6~Dg77*j@*tsqc{V_O_=oC;6U>Ws5(bU%TYnG7To;&#C^1%=LU((bP$kU>nM zm(=IIxE4%EhsPW3lV#+zZ}=U6i>jbYm}0Yo_(JRTw)rw8c!dGIM+6;&;!2quc58V4RpKAu;P*MC=V9Oiuh}QFL;ouPzfwk z)YbP^sf?+tl~sCIN8ZmwvrXY`4ztQ0^aKolJPWL&Aaa?JM@#}wA88~;Oxc$YkC;V9 zH)M-=ddSLzmzAb$N!$yPN`ekcu%kXh!{w0inmNB)JCwV2t$KVYkOjNHgFucE14*l} zVa?aLa;(q2W=IGl)3&z7uSWF#XliskmZT2DLOPr}+wUDym7E6I6t5{pzCW6+wou6t zbJL$*27aye#VdSz2S5IavqaI9z2n*}ZhQC6+9CR3M2aSBtSq{FoQLY|D##1-K_KZ< zEZE(c>tvMI?Oc`6uvzNm>Gm{-L5t_f@6o9#O<#*$_hvozzMM2zU!ME+%-eTmu{o-{ z7O#*hwQED5Fx&d2&sRO*%KiE0AeJye*L zZG6Xl-0Xt2sBfgviA_SEzrZ-e6pMLJ6(-==v| zIuvu;WNZP*>R^tfwwRcv`nmMgF_|9PKHF%>YN?jV!8IVUgG;;Dcy!%6QgjD+DH28~ zOg0@vxCzGJ7 zcT7@yR6FO|E8`zX{9(8=}d?A%8WV* zde*OczEgILr+`58%s1K?X>y(xK~+SdFPawj8q@GGDIx}lqOaagnyN6wnxwtXJ`>9F zd;GLGnb=1xE^=mVxc}v1{ZUp?KjT_<_n>l#^hwH`m${l+ph(*8Ss_q144%i2Vkzpd zw?wNvxA-zO)#nnHCORGyJww#c@bgKhC%@!+qQrhIUR@D@4rLp{(R(9R+gws$u9V&@{0#T+0olw(yp3tGHxjqSsD$;aN>=q+U z!KdV994e5ho@D1a74UPOI+IS4T6yDGpCEWd1OtXqJz#$>VDR?#vmWowj{z8tN8zV$ zO)_Tb*slmX=`{{1U{lURsuWPaol1fdsth8Qtq%$1(^hD^#J`Rn5@Da>EU1I+MM2O% zXEh=w2Wx9HN>D@#?Ue_xm|=_A*LyiC1d0XYF6B@~6#BE|p=1&;!=7}pB#zH%TDWVz_d{cYvS>=;a_oMSzvINOZ_q`Xv5zz`>4PXm>HL$rDuPK(Y)Ktjq7MXL@Z8nFlO z%iNiB#6+pFQJ+rxG=1rzFPf9ab|38*{fq@D!D#lC1=-{)Gt~53$dx6B>!!rQw$q5% zGIr?|RhJe1E0t%BQ`D+{^9wn4r3O5-)=!dGzVh7%!LMw{CKA-j2kkNXc|VgQbL#_X z=lkRW1#HpdwmK^*v8poq0|l(p9L-0ltOM^`j*Vbse1gRFs+e!J-UpXQsnkFhDA!P| zjo(b`RC24 zjR0QhA>OL=$l*~(PTJ|50fRd=P5X_iOvZ#9GYt(bOyNhY<0nySr~N=-d^E<_2C@cH z0yH!<5mMwdTVb?D40qMrSw+33fP=f$qxotB3%j-)HT=@kH$T4`Qi>ld9w>k*<7Cp0 zA#{I!w(s08b*F@UU(T(suP;gd*>d)FQ@z9Tl%b8Vu&|4Zi;UU4d!yczc+3;gKmo(K zof9M$xKjPwK>QE%YcJ)KPrv(`u>DR!kNWnlD<0)r5r?||?2{-(0OXJg7=r;`J@jIC zk6XBVW5ans;n^weVTx1G`=(+nu zZ$83`DYfJ#nuP0Yrh6k&i9w8JVWoZiubAYk8XB%PhXuf-jD?H?RJBkuVSdl z;ZJNRPdL$;fb_|>QEtPVH16#Tac#Mu*JGlQKj#vtFg{5&B$QgW)5=x3;I^viZhKpZ zq2=d3FDyd@)i|SuO4DYZTHr@4xA>%wyx}Hpck-)*C#hM$*Ivz&C{4FEUVi_*{u~qb zq<>?&--NaM(?LcM;~f2HU%LKRGuHly+EBQXMUU4MkoitY@mt-Gv6AWY5g*V;I(8(e z!;q1<@OJ$#g6Uig^rhz7X5gN*bV<{w`zzZ|I`16`VhXl>`cYTUeMSVR=1U_V2ndvB zW!8m2$-}VkKZF4x)KCIR-(kbNr;za$8`@GUC%n3>J`Z%u5Sq3j|B+YUgSCMf5>WZj z>^l=aN#@QsXF0zd6Ym?xmLtx;1JEEEBe=O{_V;J8t!9 z&k!5s#D;Z$5d<01;slaD$FQKUrjKaq6WDM$+xixCC6*+n(Z;8n%>jE;wb(t^(ftyH zG?Icw7~=;DFyeD?07RhCZwacc|EzIy)XGrz^33N2!*_rg4YXT!Ww1i3Gz!){QWoRg z`l-T6ieJGMM}k<_yn1}IhUS{?xsD4+PBs~X@nDgBbIs>iu@tv_EvD=aps}$~t=cJ{ zzB@U8O=I5jCX(iS4CQa&P(&_Lb(S?V6W(M28$h>&<+VWjO-c^*NbOg2iBR|&79}Mw zHhJkEI{i8#c#z*wI4OTDQJNk(5FJxsj*+n>%MdyWqwiV_c$z-o)z(CpyWo4NHs1`tt(d>5&PZ*HiIOv(j}?+_S3)D)l+>*A`#q> zNz70w-M}Vz3tg37Xfv+n0b=g$DS;iNt1m@8wX`ofZ3nx|^gETOX;gKp{zU;4@#|9J z^<-BNbN){Gqb8LFA3xAZ%}kE@Rx3Q3M;d#yHhQ!is}!P-$rO@e`#$YPcjqN~chfy) z>OX(hGS1(Hg;?1sgrt}T%r@sF@ilP-d?OzD5fDECGoDyD&p zsL`9!(OM3sxvbK9WoKzefNx!gN6xDwC~*VDlDTi8)?PsZA?v=Y;~Vk8>$<|}R1W3g zRQ6w*Ee?;k?%I4BfYe&1N81-H-Dxl(@S^v^L4)eMEc$A>1&n;^OO!M^2^_n3ZRPaB zdRaJX)AkVHOjDt+{$*-wR`FS7-K7bcDTP$3a>m+^Szo~{c9TWlG5gSMp{2zUArbBy3{Zdq z323$PGV8EAZ{=>^$d}h7DH??(lL~|mulZy3hEjlNdt9vj8VBgUurA~W6q$>B>|>b` zaeX{7T%58_L&Wo{z_0kHP;bQ*ZP*)@N2V9tOf|R$^$r;IV{b4a@983D6Nv51gBt+w zzL$w3Ian7$PYe^LQzU{2AcKF^xC-ac*HNMdBtDLqO(uq=YyUOC!P$2SnFx%~H`+{j0h0RPDDdb84dW^5V@U9EuxQfihu}KNrj6lNTXh-o8{iqN*8dz7EXo)v=P8s9y<`^SU@+jXdnqW)ayiErhAM*Gv1_- z;W+9y1;_oXExef?V8e$gC^f4pTwfe`-Q#65v&jj0ge^HZZ_c{b#_QDka9DuukIis+ z{rGgLK8D-K1$kR~vslkl| zGV#Eq*ABa{tQnH43_VVJ9dwi=ju1c=lqx)=xw*p&F#$A^IXCc#mn(JqctBUj>bhypj-{(%z<3Ek=K^uD z(eFPLWSZXQGRMI~MY9(V8AShrbmE**8_M#Yk@)sqZMf3^B~f^gsP;mCU*D%cNdX#8 zv@_M6S$_UHe?goYjcmBzVOOh$Wjn{61{W8i_$XOVx0oyc1>jvVZSKC9@#ZfcA5eYF z&0e?JNc{z%T0uhMez`szq+|j>HTte3 zHEzUbmh!!qmpIISGi_*z7e)a=tws46cWHe0irzyg`tk&wavtvL+JXdOFXsK*2|T7~ z{@4z#!%_69ZdkoTrQb^;0xG-fTjd4q@IP6@UOdslC0K6jIlCuOvwJS=WI>@ie0Xu$ zw&u-xD|5wpP@TNI|24}k;=$QkJwL^{>F>+SzK$<*e(l^K19~mnv(4?bf%74>2JFtR zj{W-h4dLMBm3SlLANzn6*E5uQrO>62o@UM{Z6)RiBQA16G{K#xnd6!dr_e^mr`VU-Ie;rP>X}p{ zrXQh750Vjs{)fMS|2fKk6hrQRD)9d+_mnt?Yx1OTy@@mw-?DTAN->$3{hhwkY%@=;r z$LIbfTiO0K2bAV^4T$&`~e$9Va)7Z$?_2$7tYZF;H zOFq0D)rW5YW^)!frSD5-(nk+irN=4PeZR>QWSGc>CDC!ac<40NG)N~>vg#gxTg}`y z$kxdw+L0;*l)7xCX@?aP82eH zuQ@oj{Rvz3oICA0T;5?J@542n(wyJ$ybTsbXIIMI3nC(4W6g{$0A=+RRR8!%Wu_-Nc{}iQOLv;I!XPbojM+u1 z|HWB|1r@h=TDZgLXQmx~{XnA?x%hn|^IH>=>mPj88$5nx28`9FE^H!Rrp;j?pZnIT z5KbvRjSA;i6D&s-7~!#skX62z@9nj@&9*wr1T=>x5|9pI$(79I{eon;tjA>2v}|_S zdJYywP*xGI8#2*aSoviA@R?_!jQ(zl;8_17bDo$I)h!pFp!{!c>myxT+prX&A&_nn z>tyP#d)b)051a1?g|&FYWuZ^rHvNdP-t*btX-!vrnbM|tMyEi?Sy9z1ywrNgh}l0AN*Z7_BKc-|nkH1?#3$6WT;PU!PtN=SvU4yyEP)Vx# z^*7rm1%ovY*_yv#khV;aLGKPvSsqC$D z`AwO!J&u9zLCDg>Di9;N_gCGFzyCbvPN&ZiqYu4{Yz7Ubc2 z1gtJ`?37e`ce@uqBFKZxzxQ7U4;W@sJ#vz+P!yWUVpRs{wdfZY!GSRHK%sDRVvkk0 z5t*BhN0q=X9&5Gzt}=0fXps4g!~IH%5t)0nuy*FzgJi3AcZTS3vCgNv8+&F>80g7> z(=-UeM6I>1e~%Mll;+V0f<6xV)G=Gs!}LT8B^aD^NVFj4V0O*e1-}XeQm5jI{2J z7V5t^1^mmH{~1K!-<1E~lj1BD=o6zDUnhe|Lg^BjKM)9PO82_j_S-6U49T|FF3ast zzTP1^uHHv?SE@h`(kEaIG@3?Mpq}CF#Q)Ds0sl#2{{k)6|3#(!_U=P&-y5&qI1)V8 z&SiLe*C~PTosUmfOiIdkN(7daeo6#f>Vqpj#*|l72o@;`2nbjy5(o&)z)x|s>npqE5ADe92Ju3hiwsODaURp63k4&1Y}h&M zzUiX--`To%$*!u;+9YeR>O6LE1r8xYPbVW=4PCc<`=5>%^%y!{xsE;^*_@5LS3F@k9*QBe3&XiIVu|6DP?oRR|2WQe=hkJ0J=T%ugt%e%D*?VC; zYW9XkOi4e!_haA0bKlgKM?liE@cyjSmig%3kJ7qK7ucaWr6mITE=;WcHRY?WL#Mi5q@GKZtXdW^w8!4myUO_OX(IVt?TXxwp{qh%X8oU+rk^NS z{ID7hZff{hbY+0TQVVlj1ccibekL85&*ws`XCn}r{f?3(yA?5Y&DyH)0G7Sb*UYmY zfYrBAbs8-QGR%7-MMj}P40p`Gbvp?pa`z_mFR_m}ZdjJm4fa~hkMn`rF$m?{2{hPt&SqS?#Yn_AnIDlh7ajUQA4aU<(bW_!(#J8Jbw;EML% z?0yW>jd~B!cSNs*BR3;|n?_F2eU#XN0gK`I-2|^BKe|UULWNu|5P*i9iHq9fM2Ve= zUxv=%&4S^&BK&BjnJu^bJG1WJjYvjt5Gxbw;aS4-LtYE3jeK{gPm61e_ralUj&QH5ZqtCP+OafoKnHsN;ymmnCd- zF9Z)Hbg_SSI_G9CNC-j}EQPws#`)&qTeg@xGCbJqq=uh~vWFZKxSlUOhA%w<&Ya|I7d+B76m)M2N+wf@>)6wVR`?OxUq)>4^4wfXQwL1v0YPVvM016Fp|KVyz=DvvKUHk`sSF*>L#j`TR_+ ztckW`bkw1_O;0awEsJi64kEoY1My}>=N;mi$SBU_1jWWRfOXJL8J zWqti}W1&8+s0^}3BsB%#j9}=-pUC+kJ`KuOz7AWVu?e>bE$h3?)W;=}9Ioql*!Z@! zr@C`${MvgwTrAAH8gZLEEPQ=FGq|kawAR41rgO}jsnmg#^2o|n)K>J*9XABUEH9z{~#-YwB7XbFF7coMJZWr>mQYLzJ@yU1yVc$>{_#v8lz zmC1iEEa(CUkPklRPq*OR920O$XfpoFvvqz$Q)1=XuJ(J^@&L!(Be_N4?~51LqNsYj zvAb><)_?J3(Ms~@V$F}=4X z74yZWLMc!Eb|%|;UbxgTRaW&mDn&j$pc=rI?j1jH`Vm!R`-*v|Me-6Ab)S$wT4PgH zj=-_b_-h0<6=rd&Jn^ShiS34l4&$4ax3#M)CK@g3su* zc$;t_KfwvRJNWwTgJ>^98z1OXuM7h>o{{=soLj2IGD0< zv;o|nWof(Q`hGFrFFsjh2>K&Oe7Nb5{M}^B0NGq0!J1bJa+E0yodN zMod(j8V@DFtXz{hB+wE>el&l&;bEJK*|IATKqd}YA-V4XL*Y}1hRXp1`{^#^2Xv70 ztfH2kpD9mc6w$M&us>?b5+$ps7&&?W;)0N5XGVX>P#|sp-KXGq;0Kukup7J}9iI(; zq|+EJRaf|FJ#h#bjz@jPl8-TvAyR_0*)sgzsBLVDXFUJlILLo4MuEJAd-X z$HxnA82HelD?Gv%8GC~#B>qsQEPR390hLv|x zEO(i1p7X}B!!+8fIv#RC|3b>i4py%1Up$HcK5c;qpiD&s ze!m>0whmP{zN|q#t5j{7=webS9Vs-rw z{kYo_PM_3NUJG@LEyUTKYa$ANkIS}a^~1Nk^zfRb^RT#`Mzn!-*xh(SYlDhe6i1Sj zCzV#+a1q%){j3>YT}EQTc{1zN`sK)`+DA-vDT_@6x5c=$j*np-vU7NA^+VE46JtYj&-zvl5?bnQ{j#+Dn!o*4QBal4aX9{OFOHGtOS#l@8lCO(&l7%xpdQcQuBRn`<==rZQlp{ zIkd#~{;6tXp4jyQ_}Z z2J&|(dw15(&E`Hw;70un`U^SrjKjFu^VL9+X~Fi?bf^Mxrq2~FhqB1i>mvmq8`x4m zT`n50H8$(my#{x-tJvtq#+|^F%El?@(XiG`Y5*7t!@vJ6gjI0h^BbI^`+@OU^E*+< z=e95Wk952>S=)Fu0cdfsFjr4i~F#fm_i#3*IB zLYbK;gt=q=?M|)pS5Bh29^Q2706k$1XSaAp*6YYK6=k?=BHF@~j znNnLCS9~7Nd1>=rq51v1)KoPAN7Z9hGU2p5hr~}j18$+es(-6n9(p* zoji$8QG1hfT>buQ*1FGV?AFUlpErj@KE)E0s^`pd6kd2yU3cU&-!pT z{5;InSM;qf;YT{w>q#;+@yMDXqB}U%gP3gCq=UgZQVZ*m^J(FR?fm|D_3+k@hXvCN+3sFX z8B88oR`2_vI%O~{4Yb@|-e#;_Y-BVWe%qy@62BX}SlQ-QX%t9Kl-P4?%cWOJ9CzM=KeW%&ONql z*~F{iY4_goNp)ju27^W&(y;yIkEuY?Ytg*J0zsw;BtJ)&A5l8Vs;E z(p=uc63i+^SG9z zO|PtSTf5N88D+$O)E{zaaxAa<;(oBX$E#12e)AX9wZ@IQ$Z~jlf@Mij&3k%Y{l)$B zo4a((^WySp9|2FW#p>F2!N(;n|5~eBra7_h!Xzn=%vSYTG?<=L24)PFtTY>b4T)4y$^7 zx&mHjrd0>?yE=Xhw@A<)M(s>>Q4k8S3GtfNG{{)lm3_|qwJic_5mRe z%4jq#Z?m;f5x=yBeeu#aP4oxlfxaZZ&)j5%!0jgcQh9$r-lqME{kG4%JtIo*>|EY4 zNZF%WuzRreL}yp8M?~qp#MvD$y;i9f)W?KmpypDQS43$;)=;}9&}1M@TsEl8${+-U zT)n|T*4Vyrt>&Ki6|gi8+&bpYy|?n%31&>Ly7=&zf547+tE5xl?E3r%Bm({Y#%srM zeyieJZTXzw=*5NAiI4Gj)pwEitXTFXkQ=N|~W; zR)ZQOxXAu1+=0^2%9FWH?c$v+KF4LuOVdm0#dhD_PET*eZ(eicd*9$<_G)wO6SbP< z(5U{=eNZJRJ*ieHGAOSxl_v+}wX{R1);!vw{ik1KeP<4SE8g3uZDVMam; zO==&^7w|j%7(e@6vgQj_>#c8ZnE(Gy%73fV6zE>`^xvvXHt4!qaGR-hoe$Dtk|ZJs zn=a{wurB(=)aLy1iTJ+@3R2s>9xdtasaq^*hOmoGZS)ld`LD8_^c4k?Fe27N(m=!l zk{luyluYSJM+yYMB!EKXkiZ>mHbCAI1tdE_KkW9{;XZ5-G6g0`E|9P+6rdRJ z0FXo^7-9sFK%9ZWAbBQ6Hnas05XuaF5I_Px$fEx^1rQMsF;qw-!!r!S5H!Ouj6jf~ zEKCMKLyQD~@V_xs9}g0N{HHhna)u0ohK30g5HySyL?KcPWl1nZGCYVb1|&lV5ekH0 T5s8S5-DHZuI0pwWnm6tbt~@j` diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg new file mode 100644 index 000000000..c48b464ec --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg @@ -0,0 +1,883 @@ +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/vars-config.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg new file mode 100644 index 000000000..40d76dd75 --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg @@ -0,0 +1,117 @@ + + + + + + + + +xyaitwasalli used to readdream + + + + + + + + + + diff --git a/e2etests/e2e_test.go b/e2etests/e2e_test.go index 74bec7b16..53201f8d7 100644 --- a/e2etests/e2e_test.go +++ b/e2etests/e2e_test.go @@ -15,6 +15,7 @@ import ( "oss.terrastruct.com/util-go/assert" "oss.terrastruct.com/util-go/diff" + "oss.terrastruct.com/util-go/go2" "oss.terrastruct.com/d2/d2compiler" "oss.terrastruct.com/d2/d2graph" @@ -87,7 +88,7 @@ type testCase struct { dagreFeatureError string elkFeatureError string expErr string - themeID int64 + themeID *int64 } func runa(t *testing.T, tcs []testCase) { @@ -109,7 +110,7 @@ func runa(t *testing.T, tcs []testCase) { func serde(t *testing.T, tc testCase, ruler *textmeasure.Ruler) { ctx := context.Background() ctx = log.WithTB(ctx, t, nil) - g, err := d2compiler.Compile("", strings.NewReader(tc.script), &d2compiler.CompileOptions{ + g, _, err := d2compiler.Compile("", strings.NewReader(tc.script), &d2compiler.CompileOptions{ UTF16: false, }) trequire.Nil(t, err) @@ -146,28 +147,39 @@ func run(t *testing.T, tc testCase) { layoutsTested = append(layoutsTested, "elk") } + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + if strings.EqualFold(engine, "elk") { + return d2elklayout.DefaultLayout, nil + } + return d2dagrelayout.DefaultLayout, nil + } + for _, layoutName := range layoutsTested { - var layout func(context.Context, *d2graph.Graph) error var plugin d2plugin.Plugin if layoutName == "dagre" { - layout = d2dagrelayout.DefaultLayout plugin = &d2plugin.DagrePlugin } else if layoutName == "elk" { // If measured texts exists, we are specifically exercising text measurements, no need to run on both layouts if tc.mtexts != nil { continue } - layout = d2elklayout.DefaultLayout plugin = &d2plugin.ELKPlugin } - diagram, g, err := d2lib.Compile(ctx, tc.script, &d2lib.CompileOptions{ - Ruler: ruler, - MeasuredTexts: tc.mtexts, - Layout: layout, - ThemeID: tc.themeID, - }) + compileOpts := &d2lib.CompileOptions{ + Ruler: ruler, + MeasuredTexts: tc.mtexts, + Layout: go2.Pointer(layoutName), + LayoutResolver: layoutResolver, + } + renderOpts := &d2svg.RenderOpts{ + Pad: go2.Pointer(int64(0)), + ThemeID: tc.themeID, + // To compare deltas at a fixed scale + // Scale: go2.Pointer(1.), + } + diagram, g, err := d2lib.Compile(ctx, tc.script, compileOpts, renderOpts) if tc.expErr != "" { assert.Error(t, err) assert.ErrorString(t, err, tc.expErr) @@ -205,12 +217,6 @@ func run(t *testing.T, tc testCase) { dataPath := filepath.Join("testdata", strings.TrimPrefix(t.Name(), "TestE2E/"), layoutName) pathGotSVG := filepath.Join(dataPath, "sketch.got.svg") - renderOpts := &d2svg.RenderOpts{ - Pad: 0, - ThemeID: tc.themeID, - // To compare deltas at a fixed scale - // Scale: go2.Pointer(1.), - } if len(diagram.Layers) > 0 || len(diagram.Scenarios) > 0 || len(diagram.Steps) > 0 { masterID, err := diagram.HashID() assert.Success(t, err) diff --git a/e2etests/themes_test.go b/e2etests/themes_test.go index 42600ec94..702cfda66 100644 --- a/e2etests/themes_test.go +++ b/e2etests/themes_test.go @@ -11,7 +11,7 @@ func testThemes(t *testing.T) { tcs := []testCase{ { name: "dark terrastruct flagship", - themeID: d2themescatalog.DarkFlagshipTerrastruct.ID, + themeID: &d2themescatalog.DarkFlagshipTerrastruct.ID, script: ` network: { cell tower: { @@ -118,7 +118,7 @@ ex: |tex }, { name: "terminal", - themeID: d2themescatalog.Terminal.ID, + themeID: &d2themescatalog.Terminal.ID, script: ` network: { cell tower: { @@ -225,7 +225,7 @@ ex: |tex }, { name: "terminal_grayscale", - themeID: d2themescatalog.TerminalGrayscale.ID, + themeID: &d2themescatalog.TerminalGrayscale.ID, script: ` network: { cell tower: { @@ -279,7 +279,7 @@ network.data processor -> api server }, { name: "origami", - themeID: d2themescatalog.Origami.ID, + themeID: &d2themescatalog.Origami.ID, script: ` network: 通信網 { cell tower: { diff --git a/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json b/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json new file mode 100644 index 000000000..bff64593a --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json @@ -0,0 +1,291 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,0:0:0-8:0:54", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,1:0:1-5:1:45", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,1:6:7-5:1:45", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,2:1:10-4:3:43", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,2:1:10-2:10:19", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,2:1:10-2:10:19", + "value": [ + { + "string": "d2-config", + "raw_string": "d2-config" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,2:12:21-4:3:43", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,3:4:27-3:16:39", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,3:4:27-3:10:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,3:4:27-3:10:33", + "value": [ + { + "string": "sketch", + "raw_string": "sketch" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,3:12:35-3:16:39", + "value": true + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:0:47-7:6:53", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:0:47-7:6:53", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:0:47-7:1:48", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:0:47-7:1:48", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:5:52-7:6:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:5:52-7:6:53", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "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": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:0:47-7:1:48", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:0:47-7:1:48", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:5:52-7:6:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/basic.d2,7:5:52-7:6:53", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "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/TestCompile2/vars/config/invalid.exp.json b/testdata/d2compiler/TestCompile2/vars/config/invalid.exp.json new file mode 100644 index 000000000..aebf3ac63 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/config/invalid.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/invalid.d2,3:4:27-3:10:33", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/config/invalid.d2:4:5: expected a boolean for \"sketch\", got \"lol\"" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile2/vars/config/not-root.exp.json b/testdata/d2compiler/TestCompile2/vars/config/not-root.exp.json new file mode 100644 index 000000000..3bdfc55ce --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/config/not-root.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/vars/config/not-root.d2,3:3:19-3:12:28", + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/config/not-root.d2:4:4: \"d2-config\" can only appear at root vars" + } + ] + } +} From 3dee14eb0cdfd5e490da55de02f6ff2e913db77d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 22:04:01 -0700 Subject: [PATCH 092/138] bold mono --- .../testdata/dots-real/sketch.exp.svg | 9 +- .../testdata/paper-real/sketch.exp.svg | 9 +- .../d2sketch/testdata/terminal/sketch.exp.svg | 9 +- d2renderers/d2svg/d2svg.go | 11 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 80081 -> 80081 bytes .../TestCLI_E2E/vars-animation.exp.svg | 13 +- e2etests/stable_test.go | 6 + .../patterns/real-lines/dagre/sketch.exp.svg | 9 +- .../patterns/real/dagre/sketch.exp.svg | 9 +- .../stable/bold-mono/dagre/board.exp.json | 130 ++++++++++++++++++ .../stable/bold-mono/dagre/sketch.exp.svg | 103 ++++++++++++++ .../stable/bold-mono/elk/board.exp.json | 130 ++++++++++++++++++ .../stable/bold-mono/elk/sketch.exp.svg | 103 ++++++++++++++ .../stable/mono-font/dagre/sketch.exp.svg | 9 +- .../stable/mono-font/elk/sketch.exp.svg | 9 +- .../themes/terminal/dagre/sketch.exp.svg | 4 +- .../themes/terminal/elk/sketch.exp.svg | 4 +- .../terminal_grayscale/dagre/sketch.exp.svg | 9 +- .../terminal_grayscale/elk/sketch.exp.svg | 9 +- 19 files changed, 563 insertions(+), 22 deletions(-) create mode 100644 e2etests/testdata/stable/bold-mono/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/bold-mono/elk/board.exp.json create mode 100644 e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg diff --git a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg index 1f4097ba0..8ff515e44 100644 --- a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg @@ -6,6 +6,13 @@ font-family: d2-1726486961-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAABUcAAoAAAAAIzAAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAxgAAARQGFgaNZ2x5ZgAAAhwAAAqvAAAOcLSEw6FoZWFkAAAMzAAAADYAAAA2GanOOmhoZWEAAA0EAAAAJAAAACQGMwC6aG10eAAADSgAAACRAAAAzHeIEjRsb2NhAAANvAAAAGgAAABoYHpkJm1heHAAAA4kAAAAIAAAACAAZwJhbmFtZQAADkQAAAa4AAAQztydAx9wb3N0AAAU/AAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icjM67LkMBHIDx32mPKq37/X4o1TptJd5AxNBYRCQGMRjFIhZvhVWQ8AY8gnewSCR/SdMH8M2/4UOiKEFVmpRRl0mVZGqacm0de/Yd6jp26sy5C1du3EXQcw25Vt8d6Dpy0neXrt1GxJeKgjR+4ye+4z3e4jVe4jme4jM+4jEe4r538Z8SHTtyuxqattUVFKUGlAwqGzKsomrEqDHjWtomTJoybcasOfMWLFqybMWqNZl1G2o2bfEHAAD//wEAAP//QwwtiwAAeJyMV31sG/X5f77fs315cV8uztl14vjt4nPil1zi89l5cR2/xc5r6zhx06Z5o3UbNzS0TaH9hV/pCmqB0W5yUQVlBDStSAhNIBBSu2nSkCibUikgRscEWpkGQ1k1JpiiDA2tOU9357Tp9g+KzndS7nm+z/N5Ps/neQ7UEAbANfgSEFAOWqgCGoCnbJTD5nQyJBl0GvhgkLFgKoxuiQWEevyqwCNnzvxc1RL7KvbAD/CltcPtZ6en08u3fzlx8uSPltEHgMEKgFtxAcqBAtCRvJNlnYxGQ+h4HeNkyNuW9yyUbYtqq/XTzyY+2x3+uhMdyeWCs21ts+IoLqwdXVwEAEAQLa5iF16AOgC1nWUFfyDA+/QGkmUZu0ZDV+v1vC8QNGg0aHLw8f7+c9mOMRNnjDV2jvv9453ebgvn3K8dvPzgzOVMs1WotUVPZDLzMZbhvT4AwDACgBtxAcqkOHmK9+npag3j5H0Bwc8yzMjPLi28eHGo59iRI8d6cOG1hZfeSJw/deqcHNscAK7CBaiU8aLX/+bQc+Kv0VbxH6gfF5IfpL5OAYJJAPRd6V2BpxjBRjMUT09euYJ+cuVKChPJ5NpaSsl5HwBO4AJo5YgoHvGkjiFIet8wgaonP7w98c4xXBCvoZ7vxENo91O/k2yeBMB1uABqxcZGP5lBXbiwdq3ksxsAb8UFqJX/rzPwQR1PMZQ/EAgyJMEQTsaMaar74JhVZRk/mFaTmHBMhMZYTGjUuCDenplB29aOom7rSNZ0RhQRPmPKjljFX0i+MwBYgwugW/fNsgLFU5JTvZ6mMmMfdWJcnlZuuCDmnm550I+G146ihad9eV58DTA0F1dxA16ALVKEGyotlUPjVKphl+qNPL1zkchcr/Lbt3dvX9/evdrMC4dnnk+nn585/EKmp3D61IULp04XpPoeBMAWGUu6VF/ZI8NQ1HqND/62Z3b79oe6jx/aNTScPYQL9dnurlGPeAd1R5OpIMg8yZV4shkMG/xIddngKbcUn+5Ix1+dfPmR2YHBwYFZXGAGE/3jlPgFosWv0J7OSNSv1CNeXMVGvABeOVtnUOax4GdZp7MJ389yieQGgxlLcaOW7kc9Psf+1kSfRbBP2KKe4AOd4Xy9x7qDb0syAdNYY9TZmtcKnnaHt72JcZk2N25yxZp9O73e+kCdze+xNNRoG7Z6oy3+rA8QuABwEy4ACWArsRLhT7DqE9ybTK5dlWOtAMA78EVwAPAErzNjAx/GwSBvKD3peIIhlP4miYdyE82EWoUITUWFJpIOkxXlGhUmVETT6FQ+QmrVhLqiLIIvirlaL2ezcZ7a1dVaj/KEXlo7gsrM7WZzu1n8l4z7YHEVE2gFTOAEMJR4EWzCjF1DOmWUaIqRTnb6AkFhM6ar9d96+7yphceQsZXj9titjuOR3ANxkmjImRuHGvMnW6JaW9gd7PFU2IJ2B926rWl2r/iHmIWLsfYzZbYWa6MDMIwXV7EJL0I12JQKMaTUrySvnLmRlCSt16MIM8gQZCxDELYR9758OJeKDEd6rD0sk9IylgBefHfC3vDksaET4a7p0fR+hl2x1EjYpouruBatfA99G+3/v2TvqZ6O3eZGc5RtzTZzw63ePrOjYb82NJfOzIVcdUKNmcu2Boe5eqNQ3yDjFyquon9vyGP9AN4pqZACXFC4exraMvlw54E2T9JCqDIJkjAPmbqjtk6rq6uxX3tufufxsM08+qu11ojF29WzYqnhhlpH9kvnJIqruAatgAYsAMiuIW0sS9xLSOoV271cwqGJShRQ7/D1nEwmj0UPPYKx+HjZoX5PymauH0dvDXT39Yrx0PHBnXPbH5veXFORGTbSgW12pXemAXAM/x70UicyQlDwB3jferPQPM1QK+fPT+W6Ezozb422Ly2hK2F1457DpvDm8kSHJy6OS34I6C5acQCtQDOEoL+EjoSF4A+UbpJfnmZKmmFnnTJIfIkBxAZZ0pUkYP0d1DBzIq2zmE1GRhjhGy03TlPbfFlB566uqhaaZyf2xuZ3c9Eo1xSLtWX3BVsnacdWu2nwz6lIuElVyVoMLTqVLuIWdri1ccpf5+9rKC+vNFEmkz/s3cGhtzr9fGcn7+8Uz4cczDaVStdIs15AMA6AK/FiSe3u8lWSepmr1HhGTbAjbbsyGX/InXDjxXePNwZyU+JHiOmKezzi6wBQLMIoAHoZL2EWmgFAAy3NCvYzADiMF++fTU6SnsmokGbi3Vtjbx/Hi6IZwTvip/88dla26ZW1bhG2KhhTjMBT1XreJ1Ph+YGh14uC291M21u1e3ahL+JrHwvN+u2bt8i27ZI+oRWJvTzFG+R0DPdyklO6m1t7jMQ6nytF07yLb8v4jbbqfkOt0VGFliN217DTO9AjvoJ2ZR2s+FO0y+WW7uuYoRWo3nDGfZAlSBW7+y5kaHnovxGT+wyb0Mr3mV+R2Xh8NqL8JrPZZDKbLXVwaC6TngslpoeG8/nhIYnmMF7kZb9y/xruRVfiI2OgdRt1aDxBEvY93n3T4VyHfaeVUD0RzSoylHwfvx22up46ljkRtpnHXkGa+3ToWQBsRCtQtRGDUk+R1LMJkmCPxms5vc5YXxc84EHLxzsS5ZWp8rLOfvEvgCBVXMWb0Qo0/M88k6G4b5qtz7JA6pSHdR2Mh7fT0djE1MFca76+wZ7hwr547+CIzTel9VoC5nqvRWc2baqOBzt2OoyCweQyWexbKVfA4Yw1yBzpKq5iO34CtpWQFxghGOQlIZCatSQ5z6QyzA8vVCa++UZIMq01VbYeLT8aWg6rFxbif40mtBUhLQUIBoqr6Du0LHHBYJfXGMUFVVLLb0cyQ/x2V1dDJk6qHLu1uSnUJH7WFXdzaFCsyboDgIAHwA60DJsAbASv0+slOKUpieD9oaNbajepNhm3HN15Ay2Lf3ekGCblQNVijdJfZQA4jZYlFeXv2QZ5wz0vjFMatSQ5N5NpJytVKvWWslCmvaxKpdKUk+39+ZlWrVal1QbQsrhsjzJM1H7njnJHNWLNbX58nL+t4AaAK/Az8k4ohHGJRc67BCMDAZ6new4/N5BIeQcsnDsXnzrae27EvN30UctU4WEhmPRaOY8wnQ39/1M7sUrac/9YXEWPwUvSnqtMG8UX8tg5zm7nOC3nYDmOdXCA4DdFN7oAL0qcMzgDgaBM6bsmtwzhMFZVqK1NzVZP0/jHflO6AyHW4XB2deyelzQqi9yYQIewBnxyPh8W0+hP+JaEu1pRcYOsxQb0Vn5+Pu/NTU3l3hz88uLFLwdd2RunT9/IKpg/WkyjpxU7KQ7BL/OXrta86j0wOXnAm5+ff7Nk4JLNAcHnxTz6Fr8n7U0GStnlP0f0zZuXiTFuDXPKHl/Mo5Old5Sdn9p38yaiL3NY5O68cvf7g8TPACFVXMcHGSLICLx88aR80Yx8MUGG/PJs1dm8MT1SlR0zCPqzBkEvPxsDxrNGpL4kTi+1XWq/du3atfZLbUtLS1IMWchjAnukejgERuAFpS9Q5dWrsatX89fD16+HrwOS9f7HaFn6fpD3QAqFvkB+dCUuExPB33A/eggvSX7QfXU1sazJxLK4n6mrY6RLwbRUGyAAdIKNzqI3kDscBoD/AAAA//8BAAD//4zwFXkAAAEAAAACCbpbbCEZXw889QADA+gAAAAA3B0N9wAAAADcHHNL/z/+OgMZBCQAAAADAAIAAAAAAAAAAQAAA9j+7wAAAlj/P/8/AxkAAQAAAAAAAAAAAAAAAAAAADN4nCyOMUpDUQAEh6nEU1hbCXbyEURFEQQV5A+CCCIKlpYewAN4p/TpU6XNKcKHV+3uwC5rnBsYR8aFMRs/xpvxbvwZt8aTcWJ8Gh/GpXFsHBqPxqvxYEzGlfE1egt/Mb6NO+NssGnov3FjXBv3xqlxMPLGWBnPxtr4Nbbj1zz4sr1b/B4AAP//AQAA//9ynyQjAAAAAAAAKgAqAE4AfgCcALIAyADiAPIBIAFCAW4BkgG6Af4CEAJOAooCvgLuAyIDWAN8A+YECgQWBDAETgSABKIEzgUCBSIFYAWGBagFxgX8BiYGPAZcBmQGgAaaBqwGvgbuBwIHEgcqBzgAAQAAADMB+AAqAGUABgABAAAAAAAAAAAAAAAAAAMAA3icnJZLbJPZFcd/zrkBv3gZVA0IVVcjhKYIjJ1JwE0g4JABwiBCSWbaClHVJMaxSOzIdmDoYhZdVl11XXUzXbQStAolaiaBQiCkagWq1EU1q666qLroqppFV9V3vuPEcRI6g5DI7z7O/57Xvf6Ai3ILIeKiEUiCcYQkSeMODvGOsZDklLEjyUXjTpKMGm8jyQ+Nt5Ni0jjKYT41jnGYXxrHOcKfjROc4D/GSQYjR4x30hupGO/iYORXxrvpiiwb72nxM8XByJfGe1d1YsBKR8o4wjc7vjDuYGfHl8bCZXHGrmVPJ+Ny1XgbR+SR8Xaeyd+No3S7XxjH6HZ/NU7Q1bnNeIf4zpzxTrqj3ws5ArujPzWOsDv6c+MODkTvGwvJ6IqxIxU1/Ugnqeg/jLeRilosQf5jUeMoh2IHjGP4WL9xnKOxHxgnyMR+YpwkHVsw3kFX7J/GO8nFmzq7OBy/ZrybU/FPjPe0+Jzi3bjlKrK3RXPfqub+CKTifzOOkIo35zt4N/5fY2Ff4qCx40AiY9zJgcQl420cSIwbb2df4lPjKJnEz4xjvJd4bhznaOJfxgm6k98wTpJLNjV3cir5Y+NdZJJ/MN7NxeS/jfe0+Jmia8cJ472BjszKM1mUV3gKLVyijOcwnkm8PJY5vMzKgizJnDyWV/JE5uS5fCb35bH8Hh+5JEvyQP4kT/DysIXnW3hFPpMHsiQP5XNZkKd4l5UFeSlL8rksyqLOvjL7WfmjvMZzveMLbgRnyCN5oCqhLwtyX+ZlTpYDHa6T4YYsy0t5Jk/ld2q/onq/wcszmZXXsiizuvPYFjufynON8YUsy5wsyW/lRXOW6xzhhryQ1/JYHspTWQxODc6Wl3h5pDOzahPObO7joS1Ovo+XOXkis5qFIMvLzXn196ie3pJfjqqna3VryXfbWknHG/PeUhXbsVpJfo2niwxZMniO2ahLR3nGqXKTIp4R7lGnQZEp6niGqDBGlRrT+n9B18bxvMcEDRpM08txjnNX/6UprKql1XKK43wr8Ie7lGkwgecaReoUqXHH1M5TpUIDzxUKTAW++HcYocoMNcYo+v2kW8d4zlFlXOkqNaqqWmKGSQrU6CJNhvfJ0UeeQQYYpm+dQtM+tD7WZh9aDTPAB3ysvtYpq5d+nfYEVRoaaYU7eLK6liZLlhP0MUWB2xR11y2KfKIeBwo9pDlBDye0Ll/ds/VZKGudCngaWp9xrV2w7zaeKrfeusJljTWoWGD3ERWtX7g2QsN2hqdXGOe42nuNdEIz5lV5Ritbo6y702/lzVUKGr9nkDSei6Ya9NWoZjf4O6P9FvhdpPI1+rPBPaYpMsqE5XOtH0c0hw3uak7XMj5JWStQ0U4OcjKjWQjjbmZthCEu4xlW/co65cvrFIJI2vssq32U1tgmNj13rf53KFDWDrnJpK6s3beCnpvnO8oNevFt2akzphWapqE1qqtWWmtQ4jjDnOdymyf/P0fj+jes/U1mVrsnjC7omuCW5xnRyo/4/XgGdDzEiGbkuwwxykWG+YhRHee5xjXyXGGUIT5Q22Gu6XswzBUG1WJIOVw7rzfgCt/H8yFDuifQLlp+wooFN3Nava+r72Evl5liWnMeeJ7WWIsa4devsOeWqTZt62ozRplbutNr/Sp61wuUrCum1cMpzWWzN9ZuXdgRUxpLUNu19RJVfV9renMDVc89ezuCbg19Cl+Ixleoavqteqa+msOi+rx+XLLfgbK+jeGr0/xGGdFfgrL+fo2p14FtEFHwe9k+M79hZkVrVeMm5bDXZIVz3NPTJu0eeW5qbGoRfplQ1yrUtUaBRz9SlWrzm8ReiyolfZ+mNXNjeqPu6SjsAv0q2XJvwV69mmb9dvN7ZMPZwVs1ae++19hKpn6IGxSYNJWKvZSeCjP6+1nT1fCuaWxk3+hPu1K99UtlQxWP6tveXpP22m62S79m2ivjsuuqvZndijvjzrp+l3cDrt99G+8y7TOU3Md4l8O7v+BdHu9OuozLux53wfW6jDvlci7vMkp51+tygVXkknK/ap3RHafdh8GKPNxyZX7LlRU976zLrp3gskpnXc71uT6Xcxdcj65m3DDe9bqzLuMGgnGzB9XvC6rT6067c24gVHenXb/rc5ebvegGXM6dcf3ufdUYbDmz2/W4wcCzZi9uujf04KTrcj3upOt2/WGmmv24pR8n3WmXcb16Tr9GlQlUm525hV89VpFTGn+wZ8D1BBlp7bWNdQ764Y012pBvtdjQHW/Umd+sM95osfI/AAAA//8BAAD//5uVuAcAAwAAAAAAAP+1ADIAAAABAAAAAAAAAAAAAAAAAAAAAA=="); } +.d2-1726486961 .text-mono-bold { + font-family: "d2-1726486961-font-mono-bold"; +} +@font-face { + font-family: d2-1726486961-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAABO0AAwAAAAAIJgAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAxgAAARQGFgaNZ2FzcAAAAkQAAAAIAAAACAAAABBnbHlmAAACTAAACuEAAA7M/4dD92hlYWQAAA0wAAAANgAAADYbI9ohaGhlYQAADWgAAAAkAAAAJAYzAMdobXR4AAANjAAAAIgAAADMd4gOoGxvY2EAAA4UAAAAaAAAAGhjkmdGbWF4cAAADnwAAAAgAAAAIABnAmpuYW1lAAAOnAAABO8AAA2sAwZtKnBvc3QAABOMAAAAIAAAACD/uAAzcHJlcAAAE6wAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nIzOuy5DARyA8d9pjyqt+/1+KNU6bSXeQMTQWEQkBjEYxSIWb4VVkPAGPIJ3sEgkf0nTB/DNv+FDoihBVZqUUZdJlWRqmnJtHXv2Heo6durMuQtXbtxF0HMNuVbfHeg6ctJ3l67dRsSXioI0fuMnvuM93uI1XuI5nuIzPuIxHuK+d/GfEh07crsamrbVFRSlBpQMKhsyrKJqxKgx41raJkyaMm3GrDnzFixasmzFqjWZdRtqNm3xBwAA//8BAAD//0MMLYsAAAABAAH//wAPeJyMV2tMG2e6fr9vfAFsHIw9HvAY38b22BjfZjw2l9hgAoSLMZdACIFAkibn0AJtCiShp9Bz6amatqbNOaQntD09OlUT6VRqe7LbbUSbRNpV+yNJq1XV1e5qW626XbWJ1JVWVGX3xwrGq5khJKRdaX/kmwDzve/3PO/zPu83oAYGAAv4HBBQDHooBxJg1ugyenmWZbTaJEvxySTjwEYGl4sXL/j9qsDC+PhFVdCx4jg5hs9tTo10Hz1a+t77J8YbGt54D80CYCgGwD04D6VgBJg18SaG8PlYRqPREqzgIos/uvTRfw/obXqV3lo6WIZqcX5zDnXGHub5h2Pi5VdmZwFBorCO6/EK2AFa3WEsxBMJnrNQWp+PcWs0pNli4blEktJo0LHU9EB039JQ+pirj0p6wu3V1V0xT31Fn39KXz242D/1Uh/vHLFU8mOZPeOc0zociQGGNgAcx3koURDznMVCmjUahuW5REKI+3wM0/aT8aVc97MHAxXxbDCYjVfgfMsLJ078597T/tFcbtgLAAhGAbAF50En80a6SJ5kSBc5ii6JX337LfLh/MKTj//XgvxuJwA2bL0r8EZGcJGMkSc7V1bQhysrC+jcwoI4Jb0KGFoAcD/OQxHo5fMZeROPSJ5ImlpeJH72uvjSr1aGvsJ58U9IJ/p+jCKz4picYxIAO3Ee1MouFzm5jNw4v7kmx0VQD4DtOA9V8t8pqbzSSeJpnGS0WoZlGTtBkvUvN1lUlqaXF1QaLSY4rp2PEFirUeH87YMHb2/O3aT7DvRa33711betvQf66JtK7OYtLkxybBPF+3yChJNgGYuFJJvPP1OrUpctKQ+cF6+ejf9L3e3NOdT6vLBYf1vG7SusYw6vwC5wSJX3+bYqL1eHvVObLQmgmtyp5uZTOWV1czTNueVVnzt/YvrF7u4Xp0+cz/1zbLytZTQaHW1pG49JOboAcAznQX9f7RnSyHNSAobpur13trVtrnWgK9WQaujCeXa0J3s08lvUn+DiASBk/bRvxaj8W1FMSRPTdrt1prV1pnWgvT6Vqm+v+4dPLuK8d7i7ayz0B3Q4Fo36xL+Mi2cl/rjCOmbxCoRk5GxS1riEl2Xv7wAJPUXZsZQRVTf/qzDoHY5EQhVhx4CniU1N7m2Yqelyt0Q9YVvU0VOTdjc8qo+Gj9t9zkqKJks9hkhrNDEk1FQfqqTtVSarWe8ui7SEE6O1gCTmcR3Og1bCpaj09x9g6we4bGFhc02ptQoAD+A8eAFmCd5ktlhIPo2TSZ6yY0r6n4knGHar7bUjQy+ZMVKpdHp1zVhAU6JXqRBCqPyF3v/xaUowQRRpfDgvXrQJgt0uJOjLl+l40m5Pxmk0sjl309FUVdXkuCnVLlVYxxTaADtUAwwp+kiGsaQILZvGchWMjJSV5RJJwYAlpn7HdfjPXyIqQu6KKG+Lu7v6qtuOJeZ1Ku9B7Kq3dvQ5jQ69v6V634ESymnUkYbDZrsx9kBW/KrW5p+hzf0qi9uyy1ICGNoL6ziArwEJHqVKjFbqYS3/gyrVkhYL6nfvtav0s8tqomqvp3E4mjo6TNdYzayzIkSRIb3bmcDX3szR9vSj2cHHGuftGT7UYCcrbxjLAMGewjpm0IbUr/d0ww/54FBusaP3yWzDYUdLlWCrbvYwjQE2QzfUTOtTJ/v7T6a89hGzyd0UDDa5baZDXo/cb5HCOi7D18AMbjnDnQQ8K3WuxKMg8bidDsHYbOqoENhdodIuz+sIuqMyaDIHLHSY5vTPPdY312ir7H5jcw9Pe+bJyhvlu+ypSEeropnkFhbP9zpb6xJc2vj3IHV2L3Z0nmrunhDUWDyDSIqPeRJ2T0vUnXLFghMSrr6T6cbJFrO3+AHb7pSzmeMzznLjMC1JGPoBcAe+AWVKn+9sICMSki7yl5EjuWDWYavgqyJh8ZszqA5t1h1KGEumikuqQyJGi9OaWQAC4oUQ3o02gINm2Ld9fomYu48Ez1E8yWz5gNvHymh4npN/QdxnXiblZ2b7RURmjjewPrLKZaV9DUdqw54bx4pLk6P1Bk+5viQQHD36j+1P9ZNus9lNmqXV5d/trgmmacZgKmv5BV1bY+dMKoPfUcmVq8qbg7t7/fopHWOq6/Co1UVlpaby+j3xvjC6Ue6lrR6TyWOlveXiuTLaWFmqIvSUga5S6tQOgG2yxiVfu6Nt0sgY5RJpje3LRYStr3age9nlt4es+Nqb41WhqTHx58jBhelK8V0AKBQgB4Cu4O80PogCgAZiIWW2ZeW6XLtntiWl2cYmTdll1eXXxIsfnR34HF8TJ6+LS4tfjogfAgK+sI4d+Kp0o5BUKtmS0bwtlOcOHX4FhTl7uZdy+hr1J8bQ07MihJmioin9LhmTdM9Jow1J5dLcUyBRd4HJuLYBMo+UqAxc0BkuMghBoT5PG8iSWYPBYC5Bayl7MOB3R/Z3ihdQf4iqFH+E+imL9NzmDm2A+d4891I3r1M599UO5BTq0FqzM7yTOaUnA2jj752Bmbn29rmMsrpDFBVyy+tW1yvraaXvlRVkH2uXc8g+NrR90m3pMhRp2ulj7fM6wtHtT0sGVutqtKq0g7a7NraK/4+jmfRMdnC+0Wbt+w/k2eljcwDYgzagfAf/Si9qjXPzesL7YIMrYLFTXlt42InWplINJSWPa7WJPaIICITCusxr9c7ZGMasTM9OT7wzGP3N/xZpDB1PBHw6OuI9fuCfHtozzTZ7BwKUvSzemN3vSk7rQ47RKnulUberVF9kyda1DQYrD1AVxSad2WQw1tQFQu3BO7PZh89Is16uiMAIySQv3/buMax/7zlUvfCk6bFPP7WEPVVRi9XVo08ezfz/tGZlZfZtb5gsKXqoxCjFSxfWcSlak3QyJOmZ31Kzcct1vxjMLjsCtprK5XmdytWrnxpDnPglF65woTaxbK83fGdOozUolWcwZbFItCaTPPHZlXM5vUWn0pH63NJltPaNN+v3Z73fiGV3ZzdaA9d9++6JcHd0D/Y971BrVYRap3VMOrWlapVarbKdyb5Fq4rVKqJIY0VrtzwdPl8nc+GC9Ozw3BLLXnO1VztaI6/J+XgATOGnwSbde9NYUFqBvSs4bSLB82T9yDPZZMzXSPfEHuxoPl6XmUzRTRXnB7oXHwxFYqy1h+e4kVTi4UcShHpBirtaWEf/C19I92llcilOi2r4TIaPNzXpW2Kx1tZYrAUQXC6w6C34teRpQ2wiwbKUrPO7uz737slg9W6Dy2Tj7M3hdHryN/upzujpY3pdRcgVrhvpG3+qUIA2ZMHl6AmNBjgZ27uFbvQZ/kKqQasyCyhFgujMkZmZI/0He3sPvjP09dLSrf2ZofdPn7oypHjsE4Vu9LqyTzqPEJc1TZo1n8hb+o/MzLyTGbpy6vT7Q5n9t5aWvgYE1wsTaA1/KN3LhozKt8N15F9dXSFGc5tNOTnuRGECnd16R/nGME6sriL/Sg7/NLdxAQBU8t3Vgp8FArSgg10AR0w84TLxBCG4SLXgIlGyd6BH/GPvQM9JdFWMoqv42c1T0j/09NjYx2NjgKANxnA5TkjcnxYYgReUXvjzpUtTly6NrU6srk6sSueRZsAbaE36HjkinwZZrqMRtDi7pcWbOI2ex99JcTI7alhdW1sdTCZxOuYP8HzAH1N42+IfCIB9gotsQx8jy8QEAPwVAAD//wEAAP//nBwSogAAAAABAAAAAQScwf8lCF8PPPUAAwPoAAAAANwcc6QAAAAA3ZceoP9M/joDDAQkAAEABgACAAAAAAAAAAEAAAPY/u8AAAJY/0z/TAMMAAEAAAAAAAAAAAAAAAAAAAAzeJxMjS2qQgEUBoePV94qDIJV8BcEDSqXi4rBNMEFCFazu1JcgrgquXCC6Rw+hplIP0LkPzKLNJFzZBfZRq6RRWQdGUT2xYwivchfZBlpI5vIMDKPnCKT2o+RQ2Rcvba47t4i0/Ktfpwd+4o8q/eI3CPvyKW2ptyf7v8CAAD//wEAAP//ANggjwAAACoAKgBMAHwAoAC2AMwA6AD4ASYBSAF6AZwBxgIKAhwCWAKYAtADAAM2A24DlAQKBC4EOgRUBHQEqATKBPwFNAVUBZQFvAXeBfoGMgZeBnQGmAagBrwG1gboBvoHHAcwB0AHWAdmAAEAAAAzAfgAKgBuAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWTW8b1RfGf2OntsdN+88/lNIUKJcSSholEztKoypFArdpVUNISpxSoVIJx3acUfwme9w2rFmwZMVnAMSqqy4QYpUFC5aIFSvEig+AWCA0Z449Y9ckbVWpee7c8/o8595r4J3Y38SxxmzgABRbnONAcYwUvyuOs8KfiseYsS4oPkbZWlecYNp6pDjJj9YvilMsxb5SbLMU+0nxcRZj/yg+ETfxjOKTLCVuKZ5iOvF5gC1IJ75WbDGe0FxWjInED4rjTCR+VjzG2cRvio8xnvhLcYLJ5JjiJJPJ04pTTCZnFNtMJlcUp5lOrik+jkm2FI8zl/xS8Qkyye8Vn8RJKlfW/1hMnVU8weVUL87/uZDq9TXJ26lvFb8QqfkU51N/KH4x0vvpSO8vRXKdieSa4qSdUnyWcbvX48sR31c4ZZ9X/Cppe1nxuYjva4zb7yo2TNi9+l8PZ8M6z6T9ieI3SNsNxdOROG9GaniLJfuh4ovM2t8pnsWxdWasOebSPY3mI3kdMmmdE2shUkOGmfSniheZTX+h+Fqk31Xh8BsMi2TIksEwr6tFWeUo02SbCoYC+3TwqFCngyFPgxJN2rTk/6LslTHMsIuHR4sVFljggfxzKPajOeJZZ4GLzGF4gIvHLoZNKnSo0Oa+RrtBkwYehnWK1P1azBkKNOnSpkTFTOFE1xiu0aQs6BZtmlylSY0yWRzp9DJXyLHKVTa4MuDb8wz85vueh8c3fbuPpPYOrlRtBjLu0sSTzhvc7+85ZMmyzBXqFNmjIlY7VHgoGRZxuITDMpdYlljPXq8rihUxeKJUWVQs0mYPQ5Od59balS597Xy/2zREyWCvgKeWQfYGZRbE30iPu8KVkchd0biNK9bOc1VziyJdahhWcTDc1Kj+hG0Jr/7frkyeX3eFxjNMqsc+LSpssat8hpNZEA49HginIeM1XFGgITPtc9IVFoK+e6wVyLOGYUPiNwYirw1E8DsZNWFZ6TesbDBvqP99irjUKLJNTXbCk1eUvDk+FOyxghlip0NJFGrhiUYdieWIBlUW2OAGa0OVHM1RWf4G2m/T7U9P0J0/Nf55z1EQ5QtmSk5bTlgrCCN3yLPFTTa4zZasc2yySY51tshzXXw32JSTu8E6q+KRFxzs3ZATsM7HGN4nLzZ+7IryEyjmn8mWVN+R2oNZdqnTEs79yh3ptSIdPrvChh2N2vPtiE8Jlx2xNKJfgypdilR1KlpSYV247M1GeOqCiahLL7624X6Vpty0bTm5flTDvt4d/rQGNQU3hPcUqjrPNTP/faNtyunzuwhRXroIZrzTZ78i3Q6uq/qWuHKfBveV4YLwUZDXxMVY71GS7L6vz4WJP3riy+MnvhyIym22cYMpjR9wjX3JVtPqDNvCinhwN/Yr9+iIfh1R16/oM4ni3013yXBP75kmVbnZWsJ5Sc7ivqyC+bnL/CG2Rb0v26LXntjPjshdlteiJtoZ6a2q0ae5Jxx7OhvBHWto0JU3uC27wSmV3sgeWs9wpI72MKd1Dao4J6/CsCbD2o6yeixfh5QZyw6oPcrvQH55VOX98Nm4Iye/KtN8nYf6bq71v4XoA+HSFV4K8kb591jwCoeevXf5qsQvsTdy5sMZnx+Z9Sifp7cc7PYo68EeD7cd5uAo+1G/WEbbKXP/AgAA//8BAAD///u8HqIAAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAC4Af+FsASNAA=="); +} .d2-1726486961 .text-mono-italic { font-family: "d2-1726486961-font-mono-italic"; } @@ -159,7 +166,7 @@ -NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND +NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND diff --git a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg index cef9800de..3226eb736 100644 --- a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg @@ -6,6 +6,13 @@ font-family: d2-1635834384-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAAA0oAAoAAAAAF6wAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAaAAAAHwBUgHoZ2x5ZgAAAbwAAAOxAAAEVLnFpmFoZWFkAAAFcAAAADYAAAA2GanOOmhoZWEAAAWoAAAAJAAAACQGMwCXaG10eAAABcwAAABAAAAAQCWABFRsb2NhAAAGDAAAACIAAAAiCM4Hkm1heHAAAAYwAAAAIAAAACAARAJhbmFtZQAABlAAAAa4AAAQztydAx9wb3N0AAANCAAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icVMxPqkFhAIfh57vfuf4enCXYimRwMlBStmF5EsVSrOQnMvEOn8GLoipoNU7odCqWVjZ6OwfH5Ctrva39W/LMI/fccs0l58/jt+JP1fg3MDQyNjHVmplb8AIAAP//AQAA//9uLRUueJxUk0tsG1UUhs89Y880wbSZOmPTJrE9uc1MEtl5+I49SYr8SnDsJC22aZTSODZtrSa4CXlIpQJFJUi0VKJIEymiLbgsyAJVSCwpbGDDogtUAasi0Q2LKlKlioUXdOEJGtuRQCPNHGnu+fWf8/0X7BABwOO4Axy0gAOOggTARFnskVWVCoKuupmuUy+KEfKnaRCS1mzhK1tb39iGE88S5z/Andry2EeLi5mnez8Url799Cl5BAg+ABxBA1pABHAKTFUUlfI852ROqlJhz/uzV5SP2Np8fzwpPDkbeR4lq6WSvjI6umKeQ6O29vAhAACB+H4V+7ECXQD2bkUJaeEwC7rcgqLQbp6X2l0uFgzrbp4nxeyHMzPXZ0/mOwePJfqiC5q2EA2kvIPqRUf2zuXyndyQL9Qhx9/N5d5LKJQFggCAMAeAfWjAIcsnE1nQJbXzVGXBcEhTKJ37aqfyxfYb6fXV1fU0Gvcr976d+GRz83rd2wYAHkUDXqrvSzp4Nshn5o+kzfybzKCRfDT5fBIIFAHIi+bZEBNpSJaoyKTi7i75fHd3ErlkslabbMx8AQAn0ABH3ZHICBOclBOkC2c40l78da/w0zoa5gOSfmG+Tc5+/JvVcwMAu9AAe6NHlm7kyGto1B40NVMA2IYGdNT/O91MdzKRilo4rFOBo5xKPSiJqUt5n827cCljF5DrKbyaV5Dj7WiYe+UyeaW2RlK+udnOLdMkuNU5O+czv7e0cwDIowHOA21FCYlMtERdLknM5X+PIrZkGh80zNLN4csaOVNbI5WbwSVm3geEof0q9mIFjlgO/0PawsGrDRrdFm/in9qIxTamGu/p+fnp6fl5R+7ucvl2JnO7vHw3lzaubd66tXnNsPiWmnwPg7vJ11K09klF8YBy6ZfxxZOZ8a+LX15ZOZXNnlpBg2YnZhZE8y8imc/Im9FYXGvscXy/isewAoG6S1Wv5y+kKYqqDuD/02mF0+32oDUBGU697w/2XByZmPaGugty3K+fj0aWTvh9p9lokoY7831xdWTJEfKP9QTGBmh/5+G+l/sTQ8HXA4ET4S5Z83t7jzt62wLxYW02CAT6AXAADRAA5GaaCD5G22OcSiZr39W9tgLgadyGHgDGMacH3SyCus7czcrJOMo17qXAvVMqDHF2G+H41lY+lokIrS28DTkbN3DuraWY4LBz9tZDMdw2Sx2BQVke9HdUqx3+RkXu1VbJIc+YxzPmMf8B+BcAAP//AQAA//8PIvLPAAAAAAEAAAACCbquIZQXXw889QADA+gAAAAA3B0N9wAAAADcHHNL/z/+OgMZBCQAAAADAAIAAAAAAAAAAQAAA9j+7wAAAlj/P/8/AxkAAQAAAAAAAAAAAAAAAAAAABACWAA+AlgAAAJYACACWABBAlgAVwJYAHICWABfAlgAYgJYAIYCWABIAlgAUgJYADACWABkAlgAQwJYACoCWAAKAAAAKgAqAE4AfgCcALIAyADiAPIBIAFCAW4BlgHaAewCKgAAAAEAAAAQAfgAKgBlAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWS2yT2RXHf865Ab94GVQNCFVXI4SmCIydScBNIOCQAcIgQklm2gpR1STGsUjsyHZg6GIWXVZddV11M120ErQKJWomgUIgpGoFqtRFNauuuqi66KqaRVfVd77jxHESOoOQyO8+zv+e173+gItyCyHiohFIgnGEJEnjDg7xjrGQ5JSxI8lF406SjBpvI8kPjbeTYtI4ymE+NY5xmF8axznCn40TnOA/xkkGI0eMd9IbqRjv4mDkV8a76YosG+9p8TPFwciXxntXdWLASkfKOMI3O74w7mBnx5fGwmVxxq5lTyfjctV4G0fkkfF2nsnfjaN0u18Yx+h2fzVO0NW5zXiH+M6c8U66o98LOQK7oz81jrA7+nPjDg5E7xsLyeiKsSMVNf1IJ6noP4y3kYpaLEH+Y1HjKIdiB4xj+Fi/cZyjsR8YJ8jEfmKcJB1bMN5BV+yfxjvJxZs6uzgcv2a8m1PxT4z3tPic4t245Sqyt0Vz36rm/gik4n8zjpCKN+c7eDf+X2NhX+KgseNAImPcyYHEJeNtHEiMG29nX+JT4yiZxM+MY7yXeG4c52jiX8YJupPfME6SSzY1d3Iq+WPjXWSSfzDezcXkv433tPiZomvHCeO9gY7MyjNZlFd4Ci1cooznMJ5JvDyWObzMyoIsyZw8llfyRObkuXwm9+Wx/B4fuSRL8kD+JE/w8rCF51t4RT6TB7IkD+VzWZCneJeVBXkpS/K5LMqizr4y+1n5o7zGc73jC24EZ8gjeaAqoS8Lcl/mZU6WAx2uk+GGLMtLeSZP5Xdqv6J6v8HLM5mV17Ios7rz2BY7n8pzjfGFLMucLMlv5UVzlusc4Ya8kNfyWB7KU1kMTg3Olpd4eaQzs2oTzmzu46EtTr6Plzl5IrOahSDLy8159feont6SX46qp2t1a8l321pJxxvz3lIV27FaSX6Np4sMWTJ4jtmoS0d5xqlykyKeEe5Rp0GRKep4hqgwRpUa0/p/QdfG8bzHBA0aTNPLcY5zV/+lKayqpdVyiuN8K/CHu5RpMIHnGkXqFKlxx9TOU6VCA88VCkwFvvh3GKHKDDXGKPr9pFvHeM5RZVzpKjWqqlpihkkK1OgiTYb3ydFHnkEGGKZvnULTPrQ+1mYfWg0zwAd8rL7WKauXfp32BFUaGmmFO3iyupYmS5YT9DFFgdsUddctinyiHgcKPaQ5QQ8ntC5f3bP1WShrnQp4Glqfca1dsO82niq33rrCZY01qFhg9xEVrV+4NkLDdoanVxjnuNp7jXRCM+ZVeUYrW6Osu9Nv5c1VChq/Z5A0noumGvTVqGY3+Duj/Rb4XaTyNfqzwT2mKTLKhOVzrR9HNIcN7mpO1zI+SVkrUNFODnIyo1kI425mbYQhLuMZVv3KOuXL6xSCSNr7LKt9lNbYJjY9d63+dyhQ1g65yaSurN23gp6b5zvKDXrxbdmpM6YVmqahNaqrVlprUOI4w5zncpsn/z9H4/o3rP1NZla7J4wu6JrglucZ0cqP+P14BnQ8xIhm5LsMMcpFhvmIUR3nucY18lxhlCE+UNthrul7MMwVBtViSDlcO6834Arfx/MhQ7on0C5afsKKBTdzWr2vq+9hL5eZYlpzHnie1liLGuHXr7Dnlqk2betqM0aZW7rTa/0qetcLlKwrptXDKc1lszfWbl3YEVMaS1DbtfUSVX1fa3pzA1XPPXs7gm4NfQpfiMZXqGr6rXqmvprDovq8flyy34Gyvo3hq9P8RhnRX4Ky/n6NqdeBbRBR8HvZPjO/YWZFa1XjJuWw12SFc9zT0ybtHnluamxqEX6ZUNcq1LVGgUc/UpVq85vEXosqJX2fpjVzY3qj7uko7AL9Ktlyb8FevZpm/Xbze2TD2cFbNWnvvtfYSqZ+iBsUmDSVir2Ungoz+vtZ09XwrmlsZN/oT7tSvfVLZUMVj+rb3l6T9tputku/Ztor47Lrqr2Z3Yo74866fpd3A67ffRvvMu0zlNzHeJfDu7/gXR7vTrqMy7sed8H1uow75XIu7zJKedfrcoFV5JJyv2qd0R2n3YfBijzccmV+y5UVPe+sy66d4LJKZ13O9bk+l3MXXI+uZtww3vW6sy7jBoJxswfV7wuq0+tOu3NuIFR3p12/63OXm73oBlzOnXH97n3VGGw5s9v1uMHAs2Yvbro39OCk63I97qTrdv1hppr9uKUfJ91pl3G9ek6/RpUJVJuduYVfPVaRUxp/sGfA9QQZae21jXUO+uGNNdqQb7XY0B1v1JnfrDPeaLHyPwAAAP//AQAA//+blbgHAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAA="); } +.d2-1635834384 .text-mono-bold { + font-family: "d2-1635834384-font-mono-bold"; +} +@font-face { + font-family: d2-1635834384-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAAAukAAwAAAAAFNAAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAaAAAAHwBUgHoZ2FzcAAAAeQAAAAIAAAACAAAABBnbHlmAAAB7AAAA70AAARsBEbVx2hlYWQAAAWsAAAANgAAADYbI9ohaGhlYQAABeQAAAAkAAAAJAYzAKRobXR4AAAGCAAAAEAAAABAJYADOmxvY2EAAAZIAAAAIgAAACIJAgfAbWF4cAAABmwAAAAgAAAAIABEAmpuYW1lAAAGjAAABO8AAA2sAwZtKnBvc3QAAAt8AAAAIAAAACD/uAAzcHJlcAAAC5wAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nFTMT6pBYQCH4ee737n+Hpwl2IpkcDJQUrZheRLFUqzkJzLxDp/Bi6IqaDVO6HQqllY2ejsHx+Qra72t/VvyzCP33HLNJefP47fiT9X4NzA0MjYx1ZqZW/ACAAD//wEAAP//bi0VLgABAAH//wAPeJxck89PHGUYx5/3mWG2LUNlWWYGdmGW3Rdm+Lk/5t3ZgSUQxF1KoGyhQiiwsqapXoAGWawHt1HjSTPYRkGWar0oBy9NYwxJjRdTT/TiyT/ANOHgpU3wYrKDmVk86OWdSeaZ5/l+n8/3hTqgAGjiLnBwEURoAgmg5I/4u5iuU5/P0hVmWTSMfopNzuF33d18T7lYPOT7wpXwu6u4W11fmbl5s+HJT5vF4eHvn5ASAMJFALyGNjSAH6AUYAHKaZpOBcHH6WZEuvjs8bOv58U2kReDDQuNZBDt6jaZSt5m7HbSOfqqVAIC6bNTzGAFVIBcNIZmKp1mhqz4NI1GBUFqlmVmpC1FEMitkY35xOs7i6O3InOK1Rmb7O2dTnZmWua618XehbvX1w/mWMeK3MpWX32taHQEl+JJQJgAwBTacKnmmBmyLDULAtWZkU6bKU2jdOLH4k5+5tPlnpbU1b6+q6kWtLP3Njc/v/JedyGfX+oCAAIFAJTRhnpvb1JEYhKVIlKBPHaev3xJNLTLH7//ZdmrnQLAy+e1JvNTMyJRP5OmKhXya6VSJrvlsrPulgJCFgCvow0XQPT0+VmAEYlxViC7x/3yrXPwe2XxOdrOX6Te0X4g8ZKz6s1YA8AOtKGu9ldEWvuCRNGuvvD6EsgAoIo2tHvfFRevqyQ1ihb1+aiuU5WTpMyDMZmXxx6UecGHnGFMsjiHPoFH+2R5+aS6fRyauzEbfPTw4aPg7I250HGt9/j5LgJe74DCNM10fXI6lWVJGt//ZJCva9ypPdB2fr6f+nDopLpNcp+ZdzMnnm/t7BQNrMArEHbJa9o5eY+O/i+b8wiQ/vyd8fE7+doZNUIhI+qdYn5/c2NvZmZvY3M//0GyOJEtJBKF7EQxCcB57CfRBhEkaP0PfSr5meGOoDRgBejESW4rl9vKzU9mRkYyk0Nv/3aIdtfSzPTqwJ/kzWQioTl/F537rnfj7BR1rMCAp1q3vHy6WnX9/+l1lSuKiu5E0jv+kbnQtRSPD7TEwvOdY/rI2pXhrf7paDbRGWtLhK/1j0aH3xETsbdUraNVCUkNnZfjuUR60ezvfaM1pLYHgs1itDGejaULg0DcreEQ2uBzfdUS9sdTDD7FxnK5+qLGiQfAebShC6DEsUCzLEtsFC2LKSoq7luAcVQ/v7K+lcWDZiQ8Xy/W9a/2CJdEnieEkKZ7s99owiXkuAuChrZz2GaaqmqmQ0dHoZSlqlYqRFaq28fhsfb2sfAx/AMAAP//AQAA//8/DPIvAAAAAAEAAAABBJwbf0lWXw889QADA+gAAAAA3BxzpAAAAADdlx6g/0z+OgMMBCQAAQAGAAIAAAAAAAAAAQAAA9j+7wAAAlj/TP9MAwwAAQAAAAAAAAAAAAAAAAAAABACWAAjAlgAAAJYAAkCWAA2AlgARgJYAFwCWABKAlgARAJYAGsCWAA6AlgAQgJYACYCWABGAlgAMgJYAB8CWAAEAAAAKgAqAEwAfACgALYAzADoAPgBJgFIAXoBpAHoAfoCNgAAAAEAAAAQAfgAKgBuAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWTW8b1RfGf2OntsdN+88/lNIUKJcSSholEztKoypFArdpVUNISpxSoVIJx3acUfwme9w2rFmwZMVnAMSqqy4QYpUFC5aIFSvEig+AWCA0Z449Y9ckbVWpee7c8/o8595r4J3Y38SxxmzgABRbnONAcYwUvyuOs8KfiseYsS4oPkbZWlecYNp6pDjJj9YvilMsxb5SbLMU+0nxcRZj/yg+ETfxjOKTLCVuKZ5iOvF5gC1IJ75WbDGe0FxWjInED4rjTCR+VjzG2cRvio8xnvhLcYLJ5JjiJJPJ04pTTCZnFNtMJlcUp5lOrik+jkm2FI8zl/xS8Qkyye8Vn8RJKlfW/1hMnVU8weVUL87/uZDq9TXJ26lvFb8QqfkU51N/KH4x0vvpSO8vRXKdieSa4qSdUnyWcbvX48sR31c4ZZ9X/Cppe1nxuYjva4zb7yo2TNi9+l8PZ8M6z6T9ieI3SNsNxdOROG9GaniLJfuh4ovM2t8pnsWxdWasOebSPY3mI3kdMmmdE2shUkOGmfSniheZTX+h+Fqk31Xh8BsMi2TIksEwr6tFWeUo02SbCoYC+3TwqFCngyFPgxJN2rTk/6LslTHMsIuHR4sVFljggfxzKPajOeJZZ4GLzGF4gIvHLoZNKnSo0Oa+RrtBkwYehnWK1P1azBkKNOnSpkTFTOFE1xiu0aQs6BZtmlylSY0yWRzp9DJXyLHKVTa4MuDb8wz85vueh8c3fbuPpPYOrlRtBjLu0sSTzhvc7+85ZMmyzBXqFNmjIlY7VHgoGRZxuITDMpdYlljPXq8rihUxeKJUWVQs0mYPQ5Od59balS597Xy/2zREyWCvgKeWQfYGZRbE30iPu8KVkchd0biNK9bOc1VziyJdahhWcTDc1Kj+hG0Jr/7frkyeX3eFxjNMqsc+LSpssat8hpNZEA49HginIeM1XFGgITPtc9IVFoK+e6wVyLOGYUPiNwYirw1E8DsZNWFZ6TesbDBvqP99irjUKLJNTXbCk1eUvDk+FOyxghlip0NJFGrhiUYdieWIBlUW2OAGa0OVHM1RWf4G2m/T7U9P0J0/Nf55z1EQ5QtmSk5bTlgrCCN3yLPFTTa4zZasc2yySY51tshzXXw32JSTu8E6q+KRFxzs3ZATsM7HGN4nLzZ+7IryEyjmn8mWVN+R2oNZdqnTEs79yh3ptSIdPrvChh2N2vPtiE8Jlx2xNKJfgypdilR1KlpSYV247M1GeOqCiahLL7624X6Vpty0bTm5flTDvt4d/rQGNQU3hPcUqjrPNTP/faNtyunzuwhRXroIZrzTZ78i3Q6uq/qWuHKfBveV4YLwUZDXxMVY71GS7L6vz4WJP3riy+MnvhyIym22cYMpjR9wjX3JVtPqDNvCinhwN/Yr9+iIfh1R16/oM4ni3013yXBP75kmVbnZWsJ5Sc7ivqyC+bnL/CG2Rb0v26LXntjPjshdlteiJtoZ6a2q0ae5Jxx7OhvBHWto0JU3uC27wSmV3sgeWs9wpI72MKd1Dao4J6/CsCbD2o6yeixfh5QZyw6oPcrvQH55VOX98Nm4Iye/KtN8nYf6bq71v4XoA+HSFV4K8kb591jwCoeevXf5qsQvsTdy5sMZnx+Z9Sifp7cc7PYo68EeD7cd5uAo+1G/WEbbKXP/AgAA//8BAAD///u8HqIAAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAC4Af+FsASNAA=="); +} .d2-1635834384 .text-mono-italic { font-family: "d2-1635834384-font-mono-italic"; } @@ -1205,7 +1212,7 @@ -NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND +NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND diff --git a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg index 2a6fd361f..6fae82519 100644 --- a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg @@ -6,6 +6,13 @@ font-family: d2-4175782703-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAAA5oAAoAAAAAGXAAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAbAAAAIgBlgIwZ2x5ZgAAAcAAAATPAAAF6JK784RoZWFkAAAGkAAAADYAAAA2GanOOmhoZWEAAAbIAAAAJAAAACQGMwCdaG10eAAABuwAAABTAAAAWDOQBd5sb2NhAAAHQAAAAC4AAAAuEIIPPG1heHAAAAdwAAAAIAAAACAASgJhbmFtZQAAB5AAAAa4AAAQztydAx9wb3N0AAAOSAAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icVMw5DkFRGEDh77rP/HBNva2IiIhGNGIvlmZcipX8QjRO+RUHSZZQq5xRFBkLS2tbe0eniJ+sbOwcPhKveMYj7nGLa1y+j/+ShqzS1NLW0dXTVxsYGinGJqZm5rwBAAD//wEAAP//engVunicdJRLbBNXFIbPPWOPSWogE2dsIA/HGXsmSe08fD0eYoofITg2CcQ2NknzcApxQhIICakAtYpoEIUilUoTCZVHDYtGaoWQuiztppXaqkJqhaArKsGmCxRBi7rwokh4UvkRiS6qkWaONPf++s/5v3tBD34A3IFXgIEKMEI18ACUs3EOmyQJBoMiWaiiCFbk/OSxphIS9ei8p5aX7+g6u593H/4Ar+SP+z48ejT2dO3b9Jkznzwl9wGhEQB3ogoVwAGYDFQSRUlgWcZETYIkGNasP1k521ZdVePvT9JPhvwvAmQ+k1HmurrmtGFU8wv37gEAEAit57AVs1APoG8SRdnj9VK32WIQRaGJZfkas5m6vYqFZcl4/Fx//4XUrtG69u3dLYExj2cs4IpY26UJY/zasdlriY5GudYWOp1IvNctCtTlBgCEQQBsQRU2FXxSjrrNfA0rSNTtlT2iIAx+fiX72crB6Mn5+ZNRVG9nb37V8/HS0oWit0UArEYV3ijOi994Fsmn2nekSvub9KMavt/7ohcIyOs55DEL1v/rg7oVWZApx7IknjgX7TufCg3VtW8LtO8epTOHoy3nH1gny43QenlHU+h0YmlFurNX+9PqAgIDAFix4aWQHuUEzsYNJEl1Mqm9QFX7i5jyC0TWfil6HwcgL8vrZcoJso0XOMqPr66SG6urvciEw/l8bymDIwDYgyoYS9qUUINJYAz8kSRDasYfrKW/P4mqdpdEX2ozZOijh4U9FwGwHlXQl/3wFxNkL6r5u2XNCABWoQq1xf8mC1VMBccer1cRDIzASEID8lxkarRRZx2biukNyDjSb42KyLB6VLW12VmyLb9AIo2DqbplTSO4XJcabNS+KWgnAJBFFUwb2qIoF+bBSILZzHOJ0d8CiBWx0gdVLXOp85iHJPMLJHvJPU2124DQsZ7DZszC1oLD1xIr4MFKJTqaCrkR577FYHBxX+ndNzLS1zcyYkxcPz57NRa7Onv8eiKqnl26fHnprFrgbQoArcVZ8mXeioqCwHEbzE39HJ3bvftE5N2ZQweTqRlU7anI3mGn9opEQuFeBYrcZsrcbgHLazqFXF5Tyvy65+iu2J4vx2+dmtsfj++fQ1WI9/SPcdofhNeek7cDwZCnlMee9Rxuxyy4it1KSvFcyR5RlKQ2/C+thUNnsTRgwTfpjLzvdDsmdvb0WeWmtC3kVA4H/NN2Z+MB2hUWvHWjLSFp57RRdvocLl+b0Fq3pWVza3eHe8DlsnvrbR6ntXmHsbnKFer0pNxAoBUA21AFA4CtTCXBR6h7hPvC4fzXRa8D67ki63w5GY5ypXvAWyxZlriCk11Je0Bq9jviXRNGz2KaXNOmeuJ2e7yH3NCm04seIPAmALpQhc0AlKEms9lCvV7FRJlXD4dmubpqXXV91UzqAaraLd+kzzfpI0fyC0CgEgAP4Ao4Svsa0EL9qCjUUq5MlBGY0n1nYE5k0h2MXkcYtrKSDcb8hsoKVoeMjmkbfmc6aDDqGX3lpiCuaJlaV7vN1u6szeVqnaWK3MzPk00NvoYGX4P2T7F3EQDdqMJWAJvMUEvZtEIZnuDjoQmTvUZXI5rGDz1+Rr740dHf3Nwv/qANP4N/AQAA//8BAAD//5nUUNkAAAEAAAACCbrQGNkZXw889QADA+gAAAAA3B0N9wAAAADcHHNL/z/+OgMZBCQAAAADAAIAAAAAAAAAAQAAA9j+7wAAAlj/P/8/AxkAAQAAAAAAAAAAAAAAAAAAABZ4nCzKIQ6CAABA0b8fPYXJoMVidXMWmxuF39gY4wAcgnNT6M94GxhX42OMxma8jL8xGbOxGz9jMJ7GaizG17if9mFcjNsBAAD//wEAAP//XxANmwAAAAAqACoATgB+AJwAsgDiAPoBEAEqAToBaAGKAbYB2gICAkYCWAJ8ApgC1gL0AAAAAQAAABYB+AAqAGUABgABAAAAAAAAAAAAAAAAAAMAA3icnJZLbJPZFcd/zrkBv3gZVA0IVVcjhKYIjJ1JwE0g4JABwiBCSWbaClHVJMaxSOzIdmDoYhZdVl11XXUzXbQStAolaiaBQiCkagWq1EU1q666qLroqppFV9V3vuPEcRI6g5DI7z7O/57Xvf6Ai3ILIeKiEUiCcYQkSeMODvGOsZDklLEjyUXjTpKMGm8jyQ+Nt5Ni0jjKYT41jnGYXxrHOcKfjROc4D/GSQYjR4x30hupGO/iYORXxrvpiiwb72nxM8XByJfGe1d1YsBKR8o4wjc7vjDuYGfHl8bCZXHGrmVPJ+Ny1XgbR+SR8Xaeyd+No3S7XxjH6HZ/NU7Q1bnNeIf4zpzxTrqj3ws5ArujPzWOsDv6c+MODkTvGwvJ6IqxIxU1/Ugnqeg/jLeRilosQf5jUeMoh2IHjGP4WL9xnKOxHxgnyMR+YpwkHVsw3kFX7J/GO8nFmzq7OBy/ZrybU/FPjPe0+Jzi3bjlKrK3RXPfqub+CKTifzOOkIo35zt4N/5fY2Ff4qCx40AiY9zJgcQl420cSIwbb2df4lPjKJnEz4xjvJd4bhznaOJfxgm6k98wTpJLNjV3cir5Y+NdZJJ/MN7NxeS/jfe0+Jmia8cJ472BjszKM1mUV3gKLVyijOcwnkm8PJY5vMzKgizJnDyWV/JE5uS5fCb35bH8Hh+5JEvyQP4kT/DysIXnW3hFPpMHsiQP5XNZkKd4l5UFeSlL8rksyqLOvjL7WfmjvMZzveMLbgRnyCN5oCqhLwtyX+ZlTpYDHa6T4YYsy0t5Jk/ld2q/onq/wcszmZXXsiizuvPYFjufynON8YUsy5wsyW/lRXOW6xzhhryQ1/JYHspTWQxODc6Wl3h5pDOzahPObO7joS1Ovo+XOXkis5qFIMvLzXn196ie3pJfjqqna3VryXfbWknHG/PeUhXbsVpJfo2niwxZMniO2ahLR3nGqXKTIp4R7lGnQZEp6niGqDBGlRrT+n9B18bxvMcEDRpM08txjnNX/6UprKql1XKK43wr8Ie7lGkwgecaReoUqXHH1M5TpUIDzxUKTAW++HcYocoMNcYo+v2kW8d4zlFlXOkqNaqqWmKGSQrU6CJNhvfJ0UeeQQYYpm+dQtM+tD7WZh9aDTPAB3ysvtYpq5d+nfYEVRoaaYU7eLK6liZLlhP0MUWB2xR11y2KfKIeBwo9pDlBDye0Ll/ds/VZKGudCngaWp9xrV2w7zaeKrfeusJljTWoWGD3ERWtX7g2QsN2hqdXGOe42nuNdEIz5lV5Ritbo6y702/lzVUKGr9nkDSei6Ya9NWoZjf4O6P9FvhdpPI1+rPBPaYpMsqE5XOtH0c0hw3uak7XMj5JWStQ0U4OcjKjWQjjbmZthCEu4xlW/co65cvrFIJI2vssq32U1tgmNj13rf53KFDWDrnJpK6s3beCnpvnO8oNevFt2akzphWapqE1qqtWWmtQ4jjDnOdymyf/P0fj+jes/U1mVrsnjC7omuCW5xnRyo/4/XgGdDzEiGbkuwwxykWG+YhRHee5xjXyXGGUIT5Q22Gu6XswzBUG1WJIOVw7rzfgCt/H8yFDuifQLlp+wooFN3Nava+r72Evl5liWnMeeJ7WWIsa4devsOeWqTZt62ozRplbutNr/Sp61wuUrCum1cMpzWWzN9ZuXdgRUxpLUNu19RJVfV9renMDVc89ezuCbg19Cl+Ixleoavqteqa+msOi+rx+XLLfgbK+jeGr0/xGGdFfgrL+fo2p14FtEFHwe9k+M79hZkVrVeMm5bDXZIVz3NPTJu0eeW5qbGoRfplQ1yrUtUaBRz9SlWrzm8ReiyolfZ+mNXNjeqPu6SjsAv0q2XJvwV69mmb9dvN7ZMPZwVs1ae++19hKpn6IGxSYNJWKvZSeCjP6+1nT1fCuaWxk3+hPu1K99UtlQxWP6tveXpP22m62S79m2ivjsuuqvZndijvjzrp+l3cDrt99G+8y7TOU3Md4l8O7v+BdHu9OuozLux53wfW6jDvlci7vMkp51+tygVXkknK/ap3RHafdh8GKPNxyZX7LlRU976zLrp3gskpnXc71uT6Xcxdcj65m3DDe9bqzLuMGgnGzB9XvC6rT6067c24gVHenXb/rc5ebvegGXM6dcf3ufdUYbDmz2/W4wcCzZi9uujf04KTrcj3upOt2/WGmmv24pR8n3WmXcb16Tr9GlQlUm525hV89VpFTGn+wZ8D1BBlp7bWNdQ764Y012pBvtdjQHW/Umd+sM95osfI/AAAA//8BAAD//5uVuAcAAwAAAAAAAP+1ADIAAAABAAAAAAAAAAAAAAAAAAAAAA=="); } +.d2-4175782703 .text-mono-bold { + font-family: "d2-4175782703-font-mono-bold"; +} +@font-face { + font-family: d2-4175782703-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAAAzgAAwAAAAAFpgAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAbAAAAIgBlgIwZ2FzcAAAAegAAAAIAAAACAAAABBnbHlmAAAB8AAABNgAAAYE50aU0mhlYWQAAAbIAAAANgAAADYbI9ohaGhlYQAABwAAAAAkAAAAJAYzAKpobXR4AAAHJAAAAFIAAABYM5AEUGxvY2EAAAd4AAAALgAAAC4Q4g+UbWF4cAAAB6gAAAAgAAAAIABKAmpuYW1lAAAHyAAABO8AAA2sAwZtKnBvc3QAAAy4AAAAIAAAACD/uAAzcHJlcAAADNgAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nFTMOQ5BURhA4e+6z/xwTb2tiIiIRjRiL5ZmXIqV/EI0TvkVB0mWUKucURQZC0trW3tHp4ifrGzsHD4Sr3jGI+5xi2tcvo//koas0tTS1tHV01cbGBopxiamZua8AQAA//8BAAD//3p4FboAAQAB//8AD3icdJRPbBNHFMbfvHXWEJzExtndJE7s2JvsJiHE9o53F+Imco0dAiYmgaAQksaAoBcSmmKXVqpRW/VSquVPGwIOJahSm0MvCKEKiaqXCnoJF4RQT/RCkXLoBaT0UuFNtWtzKBKX2ZH2zffeb943D2pABEAVrwADm8EFW4EDyHuCnk4qy6LTqcsC1XUxgB4Rt5orP3Z1ObqLudyKY1ugFPhoBq+UZ6dGjh+vu/fLfC4e/+keyQMgbAbA/WhAHXgA8l7qFRlJkkWWdTKyGuQ2P7z98Ma4q9XlcLXUHXKTHWiUC2Rv9DSlp6Pm3e/yeSCgbaxjP5bAD5AO9aEa0zSq8IJTksQQy3KNPE8VTRdYlpwYmBuPHLwwMXgiOCboHX3DPT2ZaEd/01jXrKvn0LkDs0tjtH2Kb6Yz7+7KKe0tk+EoIAwBYAwNqK0QU4XnuUaWFWWqaJoakyRRHPo5dyE78vWR7qbYvm3b9sWa0Ehdmp//dvfHXdPZ7GQnABCYBkAeDdhi3xsX5CgnckFumtw2n798SSQ0il9+erVox/ZurKOIJQhaTJL0FiZVVKmHZcnEwa9GR8+PJ2cCY5wi96Tk0BD1irW5v4Jzrszi6bmlUdo+xbVUsGpr5z8xnwQidp4EADa9rolyVKUe0SN6Egt3FhbuoPHqVblA3OYLO3YvANZXY604NciJHsrtLZXIg1KpSK4Ui+asVT4gpADwABqwCVy2sod6KeEoo3tTi8xvP5hLf5QmnqNh/kO2mNIdEs6bM3aOUwDYjgbUVE4FuVMLJIRG+YWtS6AfAP1oQJv9X7AsZ1USG0RddDpFWRb9DMf1X0/wDj5xvehgncgoyjANM+hkHWisHTmyVi6s+sYOj7bcWl6+1TJ6eMy3WtFOVvvjtbW9ApUk1eJkZJHnOS557fwOR437QuWDhvnr5djnO9fKBZK+qJ7rX7O5pY11VLAEDRD4X+dsx8iv/VJtIenNnk0mz2Yra0jx+ZSQvbqy1+bnFkdGFufmr2U/i+aGUtORyHRqKBe1cmQAMIoGuN7wo8h5qGIlEMXM2u58eqiQHs8MxAfiGTTk6f37jof/JAc0JdYNjO3p4apG89tUvLpXHFpLn0mnz6THh/sHBvqHd77/aAWNzsmRzMz2v8nRaCQimf/mzMvW/Skb6yhjCbbb5LJue9TileU3X6VFLwh+tDKSnuQX6qHOyXB4e1NfYLwjIQ+c2h0/05sJpSIdfa2RwP7ewVD8Q1ek76Rfam8WfFxdR304HdEm1N6e95p9/jZvS6Mr5A6n+rTpHUCsm8edaIDT4qq49Nl9bLmP7mKx/KLS68TGuu17oTozPNRTeVOava1H0vfOZNy/0NgVCHQ3XmyNH3aJu44lyDfmUVlrbdVk8r35QeLYLhEINADgHnuGQZ6hXp4XqKbpXso8+f1GtkGod7iF+pGrD9AwH2knNe2kRiLlAhBwAOA4GtBZOdfI8xwdRF2ngh8Fa+eljChXx6FzamKpEYnDscVV0zvTzda6HA5CCNl6afSmxNYiw2xiJTTMlVZV9ftVzXf3ri+m+/16zEemyoXVQKKtLRFYtdjd1d43WO+YoUK1YJ0y3LPHN5MNbQ0Od6A+ef3xU3J7uXOPLO/pXDZHnwL8BwAA//8BAAD//zfET6MAAQAAAAEEnCkLqShfDzz1AAMD6AAAAADcHHOkAAAAAN2XHqD/TP46AwwEJAABAAYAAgAAAAAAAAABAAAD2P7vAAACWP9M/0wDDAABAAAAAAAAAAAAAAAAAAAAFnicLMqhDcJQAADRywWDgg0QJCgUAoEiTVPRLnCiG3R/X/P9M54GxtX4GouxG2/jb6zGbBzGz5iMl7EN+zEew96Mi3E/AQAA//8BAAD//x2mDA0AAAAAACoAKgBMAHwAoAC2AOoBAAEWATIBQgFwAZIBxAHmAhACVAJmAowCqALkAwIAAAABAAAAFgH4ACoAbgAGAAEAAAAAAAAAAAAAAAAAAwADeJyclk1vG9UXxn9jp7bHTfvPP5TSFCiXEkoaJRM7SqMqRQK3aVVDSEqcUqFSCcd2nFH8JnvcNqxZsGTFZwDEqqsuEGKVBQuWiBUrxIoPgFggNGeOPWPXJG1VqXnu3PP6POfea+Cd2N/EscZs4AAUW5zjQHGMFL8rjrPCn4rHmLEuKD5G2VpXnGDaeqQ4yY/WL4pTLMW+UmyzFPtJ8XEWY/8oPhE38YzikywlbimeYjrxeYAtSCe+VmwxntBcVoyJxA+K40wkflY8xtnEb4qPMZ74S3GCyeSY4iSTydOKU0wmZxTbTCZXFKeZTq4pPo5JthSPM5f8UvEJMsnvFZ/ESSpX1v9YTJ1VPMHlVC/O/7mQ6vU1ydupbxW/EKn5FOdTfyh+MdL76UjvL0VynYnkmuKknVJ8lnG71+PLEd9XOGWfV/wqaXtZ8bmI72uM2+8qNkzYvfpfD2fDOs+k/YniN0jbDcXTkThvRmp4iyX7oeKLzNrfKZ7FsXVmrDnm0j2N5iN5HTJpnRNrIVJDhpn0p4oXmU1/ofhapN9V4fAbDItkyJLBMK+rRVnlKNNkmwqGAvt08KhQp4MhT4MSTdq05P+i7JUxzLCLh0eLFRZY4IH8cyj2ozniWWeBi8xheICLxy6GTSp0qNDmvka7QZMGHoZ1itT9WswZCjTp0qZExUzhRNcYrtGkLOgWbZpcpUmNMlkc6fQyV8ixylU2uDLg2/MM/Ob7nofHN327j6T2Dq5UbQYy7tLEk84b3O/vOWTJsswV6hTZoyJWO1R4KBkWcbiEwzKXWJZYz16vK4oVMXiiVFlULNJmD0OTnefW2pUufe18v9s0RMlgr4CnlkH2BmUWxN9Ij7vClZHIXdG4jSvWznNVc4siXWoYVnEw3NSo/oRtCa/+365Mnl93hcYzTKrHPi0qbLGrfIaTWRAOPR4IpyHjNVxRoCEz7XPSFRaCvnusFcizhmFD4jcGIq8NRPA7GTVhWek3rGwwb6j/fYq41CiyTU12wpNXlLw5PhTssYIZYqdDSRRq4YlGHYnliAZVFtjgBmtDlRzNUVn+Btpv0+1PT9CdPzX+ec9REOULZkpOW05YKwgjd8izxU02uM2WrHNsskmOdbbIc118N9iUk7vBOqvikRcc7N2QE7DOxxjeJy82fuyK8hMo5p/JllTfkdqDWXap0xLO/cod6bUiHT67woYdjdrz7YhPCZcdsTSiX4MqXYpUdSpaUmFduOzNRnjqgomoSy++tuF+labctG05uX5Uw77eHf60BjUFN4T3FKo6zzUz/32jbcrp87sIUV66CGa802e/It0Orqv6lrhynwb3leGC8FGQ18TFWO9Rkuy+r8+FiT964svjJ74ciMpttnGDKY0fcI19yVbT6gzbwop4cDf2K/foiH4dUdev6DOJ4t9Nd8lwT++ZJlW52VrCeUnO4r6sgvm5y/whtkW9L9ui157Yz47IXZbXoibaGemtqtGnuSccezobwR1raNCVN7gtu8Epld7IHlrPcKSO9jCndQ2qOCevwrAmw9qOsnosX4eUGcsOqD3K70B+eVTl/fDZuCMnvyrTfJ2H+m6u9b+F6APh0hVeCvJG+fdY8AqHnr13+arEL7E3cubDGZ8fmfUon6e3HOz2KOvBHg+3HebgKPtRv1hG2ylz/wIAAP//AQAA///7vB6iAAADAAAAAAAA/7UAMgAAAAEAAAAAAAAAAAAAAAAAAAAAuAH/hbAEjQA="); +} .d2-4175782703 .text-mono-italic { font-family: "d2-4175782703-font-mono-italic"; } @@ -137,7 +144,7 @@ -NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST +NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 7b940fcf5..f1b62458a 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -1220,12 +1220,11 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape fontClass := "text" if targetShape.FontFamily == "mono" { fontClass = "text-mono" - } else { - if targetShape.Bold { - fontClass += "-bold" - } else if targetShape.Italic { - fontClass += "-italic" - } + } + if targetShape.Bold { + fontClass += "-bold" + } else if targetShape.Italic { + fontClass += "-italic" } if targetShape.Underline { fontClass += " text-underline" 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 99f8e0982eadddb8c6d3f06a184ed5bd2a2f5edb..effd04588a213c418865e7bfa23b2857bd1e1400 100644 GIT binary patch delta 53 zcmcckk>%n?mWC~imra$83@i;Sj0`ln^nLSFToOxC6*OF|j0}v74a|+8a@)U|GTvqa E0PLa=od5s; delta 53 zcmcckk>%n?mWC~imra!o49yJ8jSV%q^nLSFToOxC6*OF|j0}v74a|+8a@)U|GTvqa E0PFk^mjD0& diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg index c48b464ec..6066c0780 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg @@ -5,6 +5,13 @@ @font-face { font-family: d2-1132014075-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAAA4IAAoAAAAAGOAAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAdgAAAJwCIwKbZ2x5ZgAAAcwAAARrAAAFUKhQnJNoZWFkAAAGOAAAADYAAAA2GanOOmhoZWEAAAZwAAAAJAAAACQGMwCbaG10eAAABpQAAABPAAAAUC7gBklsb2NhAAAG5AAAACoAAAAqDX4MOG1heHAAAAcQAAAAIAAAACAASAJhbmFtZQAABzAAAAa4AAAQztydAx9wb3N0AAAN6AAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icbMxNCgEBGIDhZ8wYf4NBWds5h6TIRiS5lev4jaPYu8OnxM67fBYvEqkEhcwBQ6VUbmRsYmZhZWNrZx/B16fmltY/j2e84hH3uMU1LnGOUxw/138lBipSmapcTV1DU0uhraOr1NPnDQAA//8BAAD//3M4HKwAAHicVJRdaBTnF8bPe2Z3xuS/f824md3GxP3IuzuTyK5J9p3dMbHuR4zJxkTdXTfG5mOjZhtjNB+mWGkJNoVqhVoYQepHYy8aaJFCe2l700JbitAibe8KemEvJCiVXmyhQndSZnYDloGZA/Oeh2ee8zsDdogD4Da8BhzUgAO2ggTARL8Y9CsKFQRNcTNNo14U4+SBoRPSr9pi55aXP7N1dD/tPv4WXiuf6Xrn5MnM47WvCufPv/+Y3AcEHwDuQh1qQARwCkyRZYXyPOdkTqpQYc37vVf0b7HV+X57WHh4NP4sQeaLRW22s3PWGEG9vHDvHgAAgdR6CXfgCmwHsDfLclSNxVjE5RZkmTbzvFTvcrFITHPzPJnIvj04eHFo91hTW0N3a2JcVccT4bS3TZl0ZG+cnrmRa/dFG/2p13O5N7plysIRAEAYBsBW1GGT6ZOJLOKS6nmqsEgsqsqUDn98beXDq4f7z87Pn+1H/c7K7c973ltaumh5WwTArajD/6y8pI1rkXxgfE3qjD/JIOq99/ue9QGBQwBYs3HWTJeJVPSLh/Jkaz5vPEPd+IM4ywskavxoaU8AkOfV81Em0qhfoiKTJlZXya3V1T7kenvL5b5KRicAsAd1cFS0GWGCk3KCdCLPkfqJn9cK35xF3bhL+p8bp8jRd38xey4B4HbUwV71I13KkX2ol+9WNdMAWIc6NFrvnW6mOU3HaiymUYGjnEI9KInpqTGfzTs+lbELyAULL4/JyPF21I21mRnyUnmBpH3DQ03LhkFwuWlo2Gd8aWrnAJBHHZwb2rIcNfPgFOpySWJu7NcEYk2m8kDdKF7uOK2SfHmBrFyOTDPjDiC0r5ewBVdgi+nwBTLM8fFKZXrNJh8ktH8xmVzcX7kPjI4ODIyOOnI3z8xcz2Suz5y5mevXLyxdubJ0QTd5mAJAr5WlVOXBUqRUFDeYmPqhf3bPnrn0a6eOHM4PnUI9MJTeNxIy/iHpVG+fBhZXxSpXm8H9go45lxeUij/tPbk7s/fTiY/OzR7IZg/Mok6zPYPjovE7kYyn5JVEMqVW5rF3vYQNuAJh62sVzeI+qsqyouzE/26FuRRutwdN36Qj/WYoEpzc1TPgjTYX/KmQdjwRnw6EfAdZZy+NNY21ppRd045oqCsY7tpJdzRtbv3/ju72yKFwOBDb7ldD3pZtjpa6cKpDHYqYHK+XLI6lauoiEys7GLNKnifh5Kud+UBCaYkHs52TDnWxQG4YUz3ZQCDbQ24Z04VFFQjUAuBBvApBAMYxpwfdLI6axtzVysk4ylX+GQI3Vyy0c3Yb4fjaWj6ZiQu1NbwNORu3c+TYdFJw2Dl77aYkXjWKjeE2v78t1FgqNYYqFbldniebPF0eT5fH+NvKUgbACOqwBcAf5Zjb5XKzWEzTGCcRfHB00hmot9XLzokjD56QT74LDra0DMrfGiNPzN6/yDEyiV+Ye0MUhQkCqWvAOWwgxx7NzT0CgH8BAAD//wEAAP//ZaMsVgAAAQAAAAIJurNBj59fDzz1AAMD6AAAAADcHQ33AAAAANwcc0v/P/46AxkEJAAAAAMAAgAAAAAAAAABAAAD2P7vAAACWP8//z8DGQABAAAAAAAAAAAAAAAAAAAAFHicLMohCoMAAEDRz487xdLyTjAYK2uCxd8EEQ/gIbyx3WJ/xsfAeBpfYzJ2YzBmYzEO42+MxtvYjNX43e5hvIzzAgAA//8BAAD///sEDVIAAAAAKgAqAE4AfgCcALIAygDgAPoBCgE4AVoBhgGqAdICFgI6AngClgKoAAAAAQAAABQB+AAqAGUABgABAAAAAAAAAAAAAAAAAAMAA3icnJZLbJPZFcd/zrkBv3gZVA0IVVcjhKYIjJ1JwE0g4JABwiBCSWbaClHVJMaxSOzIdmDoYhZdVl11XXUzXbQStAolaiaBQiCkagWq1EU1q666qLroqppFV9V3vuPEcRI6g5DI7z7O/57Xvf6Ai3ILIeKiEUiCcYQkSeMODvGOsZDklLEjyUXjTpKMGm8jyQ+Nt5Ni0jjKYT41jnGYXxrHOcKfjROc4D/GSQYjR4x30hupGO/iYORXxrvpiiwb72nxM8XByJfGe1d1YsBKR8o4wjc7vjDuYGfHl8bCZXHGrmVPJ+Ny1XgbR+SR8Xaeyd+No3S7XxjH6HZ/NU7Q1bnNeIf4zpzxTrqj3ws5ArujPzWOsDv6c+MODkTvGwvJ6IqxIxU1/Ugnqeg/jLeRilosQf5jUeMoh2IHjGP4WL9xnKOxHxgnyMR+YpwkHVsw3kFX7J/GO8nFmzq7OBy/ZrybU/FPjPe0+Jzi3bjlKrK3RXPfqub+CKTifzOOkIo35zt4N/5fY2Ff4qCx40AiY9zJgcQl420cSIwbb2df4lPjKJnEz4xjvJd4bhznaOJfxgm6k98wTpJLNjV3cir5Y+NdZJJ/MN7NxeS/jfe0+Jmia8cJ472BjszKM1mUV3gKLVyijOcwnkm8PJY5vMzKgizJnDyWV/JE5uS5fCb35bH8Hh+5JEvyQP4kT/DysIXnW3hFPpMHsiQP5XNZkKd4l5UFeSlL8rksyqLOvjL7WfmjvMZzveMLbgRnyCN5oCqhLwtyX+ZlTpYDHa6T4YYsy0t5Jk/ld2q/onq/wcszmZXXsiizuvPYFjufynON8YUsy5wsyW/lRXOW6xzhhryQ1/JYHspTWQxODc6Wl3h5pDOzahPObO7joS1Ovo+XOXkis5qFIMvLzXn196ie3pJfjqqna3VryXfbWknHG/PeUhXbsVpJfo2niwxZMniO2ahLR3nGqXKTIp4R7lGnQZEp6niGqDBGlRrT+n9B18bxvMcEDRpM08txjnNX/6UprKql1XKK43wr8Ie7lGkwgecaReoUqXHH1M5TpUIDzxUKTAW++HcYocoMNcYo+v2kW8d4zlFlXOkqNaqqWmKGSQrU6CJNhvfJ0UeeQQYYpm+dQtM+tD7WZh9aDTPAB3ysvtYpq5d+nfYEVRoaaYU7eLK6liZLlhP0MUWB2xR11y2KfKIeBwo9pDlBDye0Ll/ds/VZKGudCngaWp9xrV2w7zaeKrfeusJljTWoWGD3ERWtX7g2QsN2hqdXGOe42nuNdEIz5lV5Ritbo6y702/lzVUKGr9nkDSei6Ya9NWoZjf4O6P9FvhdpPI1+rPBPaYpMsqE5XOtH0c0hw3uak7XMj5JWStQ0U4OcjKjWQjjbmZthCEu4xlW/co65cvrFIJI2vssq32U1tgmNj13rf53KFDWDrnJpK6s3beCnpvnO8oNevFt2akzphWapqE1qqtWWmtQ4jjDnOdymyf/P0fj+jes/U1mVrsnjC7omuCW5xnRyo/4/XgGdDzEiGbkuwwxykWG+YhRHee5xjXyXGGUIT5Q22Gu6XswzBUG1WJIOVw7rzfgCt/H8yFDuifQLlp+wooFN3Nava+r72Evl5liWnMeeJ7WWIsa4devsOeWqTZt62ozRplbutNr/Sp61wuUrCum1cMpzWWzN9ZuXdgRUxpLUNu19RJVfV9renMDVc89ezuCbg19Cl+Ixleoavqteqa+msOi+rx+XLLfgbK+jeGr0/xGGdFfgrL+fo2p14FtEFHwe9k+M79hZkVrVeMm5bDXZIVz3NPTJu0eeW5qbGoRfplQ1yrUtUaBRz9SlWrzm8ReiyolfZ+mNXNjeqPu6SjsAv0q2XJvwV69mmb9dvN7ZMPZwVs1ae++19hKpn6IGxSYNJWKvZSeCjP6+1nT1fCuaWxk3+hPu1K99UtlQxWP6tveXpP22m62S79m2ivjsuuqvZndijvjzrp+l3cDrt99G+8y7TOU3Md4l8O7v+BdHu9OuozLux53wfW6jDvlci7vMkp51+tygVXkknK/ap3RHafdh8GKPNxyZX7LlRU976zLrp3gskpnXc71uT6Xcxdcj65m3DDe9bqzLuMGgnGzB9XvC6rT6067c24gVHenXb/rc5ebvegGXM6dcf3ufdUYbDmz2/W4wcCzZi9uujf04KTrcj3upOt2/WGmmv24pR8n3WmXcb16Tr9GlQlUm525hV89VpFTGn+wZ8D1BBlp7bWNdQ764Y012pBvtdjQHW/Umd+sM95osfI/AAAA//8BAAD//5uVuAcAAwAAAAAAAP+1ADIAAAABAAAAAAAAAAAAAAAAAAAAAA=="); +} +.d2-1132014075 .text-mono-bold { + font-family: "d2-1132014075-font-mono-bold"; +} +@font-face { + font-family: d2-1132014075-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAAAyAAAwAAAAAFfwAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAdgAAAJwCIwKbZ2FzcAAAAfQAAAAIAAAACAAAABBnbHlmAAAB/AAABHEAAAVgFWtwUGhlYWQAAAZwAAAANgAAADYbI9ohaGhlYQAABqgAAAAkAAAAJAYzAKhobXR4AAAGzAAAAE4AAABQLuAEzWxvY2EAAAccAAAAKgAAACoNrgxubWF4cAAAB0gAAAAgAAAAIABIAmpuYW1lAAAHaAAABO8AAA2sAwZtKnBvc3QAAAxYAAAAIAAAACD/uAAzcHJlcAAADHgAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nGzMTQoBARiA4WfMGH+DQVnbOYekyEYkuZXr+I2j2LvDp8TOu3wWLxKpBIXMAUOlVG5kbGJmYWVja2cfwden5pbWP49nvOIR97jFNS5xjlMcP9d/JQYqUpmqXE1dQ1NLoa2jq9TT5w0AAP//AQAA//9zOBysAAAAAQAB//8AD3icdFRLbBNXFL3vjmPzcT7GnpkkTuzYL55JQvBnnmcG7CZyjR0CJiaBoBDixoBoNwSa4pQuatSirloNvwaKoQ2q1GbRSkUIVZGouqnUVdhULNoN3VRIWVRIIKWbCk+qmZgNUjdvrjRnzp1z7zkPmoACoIo3gIOt4IYdwANUPCFPhMkydbl0WWS6ToPoobjDXP62r8/RXy2Xlx07g7Xg+7N4oz43M3bqVPPDn+bL6fR3D0kFAGErAB5CA5rBA1DxMi/lJEmmTqeLk9UQv/XR/UdfTbq73A53Z/PRNrIbjfoCOZA4x9i5hLnyZaUCBLSNdUxhDQIA+XAU1aSmMUUQXZJEw04n7xMEpmi66HSS00NnJ+NHLk8Nnw5NiHpvdHRgoJDoTbVP9M25B45ePDx3e4L1zAgdbPbNvWWlp3M6lgCEEQBMogHbNhUzRRB4n9NJZaZompqUJEpHfixfLo59dry/PXlw586DyXY0clfn5z/f90FfqVicjgAAgRIACmjAdntufIhnPOVDfIncN5++eEEkNKqffPhF1cZmALD9FZbxTGUe6qGezOKDxcUHaLx8WV8gbeZzG3sAAFsaWAunhnjqYfyBWo38WqtVyY1q1ZyzaAEhB4CH0YAt4LaZPczLCM843Zu7yf3yjXn799rUUzTMf8h2U3pAYhVz1u5xBgB70ICmza9C/JlFEkaj/tzmJZACwAAa0G2/Fy0rWH+SHEadulxUlmmA4/nUnYzgEDJ3qg6nCzlFGWUxDl1OBxprx4+v1RdW/RPHxjvvLS3d6xw/NuFf3eTONubmtbm9IpMk1dLJyVQQeD5769Pdjqa2y5sPNMyfryU/3rNWXyD5K+rF1JqtW9pYRwVr0ApByyWS1HCJvUn51R4bdiGDxQvZ7IXi5hlW/H4lbJ/u4q35szfHxm6enb9V/ChRHsmV4vFSbqScsHoUADCBBrhf8wnlPUyxGlBaWNtXyY8s5CcLQ+mhdAENuXTo4KnYn+SwpiT7gbO9Ntrg6Pg/Fq/upSNr+fP5/Pn85GhqaCg1uued35bRiEyPFWZ3/U1OJOJxyfy3bF6z5qdsrKOMNdhlK5d1Ow+WXll+PS2WelEMoNWRDGQvqUcj07HYrvZocLI3Iw+d2Zc+P1gI5+K90a548NDgcDj9njsefTsg9XSIfr65tyWWj2tT6uDAWx3+QLe30+cOt8VyUa202/L0xrrtabGRUw/zbGZTs8sWJNE3ptOBRV9fMNjvu9KVPuame09myHXzhKx1dWky+dp8N3NyLwUCDgCcRAMiABWOeX2CwLNh1HUmBlC0Ki/jqNy4SlwzU7d9SByO7e6mwdl+5za3w0EIITuujt+VnNuQ47Y4JTTM5S5VDQRUzb+y4k/qgYCe9JOZ+sJqMNPdnQmuWrNsa+yn1coax0RBEJmm6Trj+L8e3822drc62oIt2TuPn5D7S5H9srw/smSOP7F9/AeJkUv4g5WhI7LMXK4N2vR9EyWxZ9evP/sPAAD//wEAAP//ILErbAAAAAABAAAAAQSc23P72F8PPPUAAwPoAAAAANwcc6QAAAAA3ZceoP9M/joDDAQkAAEABgACAAAAAAAAAAEAAAPY/u8AAAJY/0z/TAMMAAEAAAAAAAAAAAAAAAAAAAAUeJwsyqENg1AAANHLpaauOzTpABUVVYQQBCxwgg0YmHUw3z/jbWA8jZ+xGocxGZuxGKfxN2bjY+zDfYd7GC/jugEAAP//AQAA///DRAvWAAAAAAAqACoATAB8AKAAtgDMAOIA/gEOATwBXgGQAbIB3AIgAkYCggKgArAAAAABAAAAFAH4ACoAbgAGAAEAAAAAAAAAAAAAAAAAAwADeJyclk1vG9UXxn9jp7bHTfvPP5TSFCiXEkoaJRM7SqMqRQK3aVVDSEqcUqFSCcd2nFH8JnvcNqxZsGTFZwDEqqsuEGKVBQuWiBUrxIoPgFggNGeOPWPXJG1VqXnu3PP6POfea+Cd2N/EscZs4AAUW5zjQHGMFL8rjrPCn4rHmLEuKD5G2VpXnGDaeqQ4yY/WL4pTLMW+UmyzFPtJ8XEWY/8oPhE38YzikywlbimeYjrxeYAtSCe+VmwxntBcVoyJxA+K40wkflY8xtnEb4qPMZ74S3GCyeSY4iSTydOKU0wmZxTbTCZXFKeZTq4pPo5JthSPM5f8UvEJMsnvFZ/ESSpX1v9YTJ1VPMHlVC/O/7mQ6vU1ydupbxW/EKn5FOdTfyh+MdL76UjvL0VynYnkmuKknVJ8lnG71+PLEd9XOGWfV/wqaXtZ8bmI72uM2+8qNkzYvfpfD2fDOs+k/YniN0jbDcXTkThvRmp4iyX7oeKLzNrfKZ7FsXVmrDnm0j2N5iN5HTJpnRNrIVJDhpn0p4oXmU1/ofhapN9V4fAbDItkyJLBMK+rRVnlKNNkmwqGAvt08KhQp4MhT4MSTdq05P+i7JUxzLCLh0eLFRZY4IH8cyj2ozniWWeBi8xheICLxy6GTSp0qNDmvka7QZMGHoZ1itT9WswZCjTp0qZExUzhRNcYrtGkLOgWbZpcpUmNMlkc6fQyV8ixylU2uDLg2/MM/Ob7nofHN327j6T2Dq5UbQYy7tLEk84b3O/vOWTJsswV6hTZoyJWO1R4KBkWcbiEwzKXWJZYz16vK4oVMXiiVFlULNJmD0OTnefW2pUufe18v9s0RMlgr4CnlkH2BmUWxN9Ij7vClZHIXdG4jSvWznNVc4siXWoYVnEw3NSo/oRtCa/+365Mnl93hcYzTKrHPi0qbLGrfIaTWRAOPR4IpyHjNVxRoCEz7XPSFRaCvnusFcizhmFD4jcGIq8NRPA7GTVhWek3rGwwb6j/fYq41CiyTU12wpNXlLw5PhTssYIZYqdDSRRq4YlGHYnliAZVFtjgBmtDlRzNUVn+Btpv0+1PT9CdPzX+ec9REOULZkpOW05YKwgjd8izxU02uM2WrHNsskmOdbbIc118N9iUk7vBOqvikRcc7N2QE7DOxxjeJy82fuyK8hMo5p/JllTfkdqDWXap0xLO/cod6bUiHT67woYdjdrz7YhPCZcdsTSiX4MqXYpUdSpaUmFduOzNRnjqgomoSy++tuF+labctG05uX5Uw77eHf60BjUFN4T3FKo6zzUz/32jbcrp87sIUV66CGa802e/It0Orqv6lrhynwb3leGC8FGQ18TFWO9Rkuy+r8+FiT964svjJ74ciMpttnGDKY0fcI19yVbT6gzbwop4cDf2K/foiH4dUdev6DOJ4t9Nd8lwT++ZJlW52VrCeUnO4r6sgvm5y/whtkW9L9ui157Yz47IXZbXoibaGemtqtGnuSccezobwR1raNCVN7gtu8Epld7IHlrPcKSO9jCndQ2qOCevwrAmw9qOsnosX4eUGcsOqD3K70B+eVTl/fDZuCMnvyrTfJ2H+m6u9b+F6APh0hVeCvJG+fdY8AqHnr13+arEL7E3cubDGZ8fmfUon6e3HOz2KOvBHg+3HebgKPtRv1hG2ylz/wIAAP//AQAA///7vB6iAAADAAAAAAAA/7UAMgAAAAEAAAAAAAAAAAAAAAAAAAAAuAH/hbAEjQA="); }]]>CHICKEN'S PLAN -APPROACH ROADCHICKEN'S PLAN +APPROACH ROADCHICKEN'S PLAN -APPROACH ROADCROSS ROADCHICKEN'S PLAN +APPROACH ROADCROSS ROADCHICKEN'S PLAN -APPROACH ROADCROSS ROADMAKE YOU WONDER WHYCHICKEN'S PLAN +APPROACH ROADCROSS ROADMAKE YOU WONDER WHYCHICKEN'S PLAN diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index c2d3a50f6..3d2b0b444 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -221,6 +221,12 @@ committee chair -> committee: Accept appeal`, name: "mono-edge", script: `direction: right x -> y: hi { style.font: mono }`, + }, + { + name: "bold-mono", + script: `not bold mono.style.font: mono +not bold mono.style.bold: false +bold mono.style.font: mono`, }, { name: "mono-font", diff --git a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg index a6e6641a8..59da9bd7d 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg @@ -13,6 +13,13 @@ font-family: d2-1230874723-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAABK8AAoAAAAAH7AAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAoAAAANQD5gTNZ2x5ZgAAAfQAAAipAAALfLw9RbJoZWFkAAAKoAAAADYAAAA2GanOOmhoZWEAAArYAAAAJAAAACQGMwCtaG10eAAACvwAAAB1AAAAmFkQC3psb2NhAAALdAAAAE4AAABOOC41bm1heHAAAAvEAAAAIAAAACAAWgJhbmFtZQAAC+QAAAa4AAAQztydAx9wb3N0AAASnAAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icdM3LKgUBAIfx35jjPjjut8HgSSSLyUZSlpIkZSEbD0XYCkVZeA1P8leT7fm2v8WHQqlApecHtb5SpbHnQOvIiVNnzl26dus+odN9rUPH/3rhyo27JL/5ymc+8p63vOY7L3nOUx7z0H0GVxhS6hk2YtSYcRMmVaZMm9G3a9aceQsWLVm2YtWadbUNm7Y0tu3wBwAA//8BAAD//8UuJp54nIxWf2gb5/l/3vcknX8osc/SSZEsSzqddfphybL16nSyo+i3JctWElm24sSJ7TRRY8etm8Rpm2+/pF1a1h9bs6GWsrabW8ZSGGV0UAbrRmGDMUYKbdkKGx2sUDrQwjraYURZWX0ad5KbdPunGN97oHuf5/N5ns/zeV/QQgIAW/FzQEE36GEAWADCcIyb83h4mpY8ZiJJvAMzCfQXuY5QMaKJPnDt2k8045mPM3d9Az+3e+/kN9fWyo1bv1y5cuU7DfQuYHAC4BiuQzcwAAaaeATBw+t0lIEYeA9P33L81sFwfZp+558/WPngeOKTJLpQq0mbExOb8hKu7168eRMAAEG61cR+vA1DAFqXIIiRaJSETWZaEHiXTscaTSYSjkpmnQ6tzj1aKj1ePXjKFrJkfMnlSGQ5GZx2hDxn9XMv3LPxQmXMKQ5y6QcrlYcyAk+CYQDAsAiAfbgOXQpOwpCwiTXqeA8JR8WIwPOLP3pu+wfPzBcvXbhwqYjrr26/9NPc01evPq5i2wLAA7gOvWq92L2/LfQ9+VeoX/4nKuF6/t3CJwVAsAqAPu98KxKGFzmWZwi7euMG+v6NGwVM5fO7u4U25zMAOIfroFcRMQQR2sBTNHtmgULG1d/fWvn1JVyX30DFz+Xz6PiTf1D2PAGAh3AdtO09HPtEBU3h+u4bnZjTALgf12FQ/d1gJpKBMDwTiUYlnqZ4ysPbMctMnzvl1DiWz5W1NKbcK/FTAqZ0WlyXb21soAO7F9G0c7FquybLCF+zVRed8i+U2BUArMN1MOzFFgSRIYwS1GRimcqp95IYd5fbC67LtafG74mghd2LaPup8DqRXwUMY60m9uJt6FMQ3tFppR06T7sbLqXfKDCzlUptzbSfsydPzs6ePKmvvHjvxvPl8vMb975YKdYfuXr9+tVH6kp/zwFgh1pLttNfNSLPM8xej8/9rrh56NB905fPH5tfqJ7H9eHq9NRSQP4CTafzBQlUndQ6OtkP5jviKH25I1Lt7ezawXL2x6svP7B5eG7u8Cau83O50jIjf4RY+WN0IplKR9r9yLaa2IK3Iaiy9UiqjsWIIHg8o/irKldEbjbbsYIbjU//fyDsPhvLzTpE1wqXDkh3JRPrwwHnETKR56O2U760J7auFwOT7uDkKO+37fft82fGwkeDweHoEBcJOLxWvbc/mB6PVMOAwA+AR3EdaACuo0qE38ea9/FMPr/7cxVrDwA+gp8BNwChiMGOzSSBJYmYO28GQvFUe75p6r7ayhil1SBK19OjS5UTdE+3ToMpDTW6dHo9Reu1lLanK4WfkWuDwRDHhQKDzeZgoP2GXtq9gLrsk3b7pF3+l1r3uVYTU2gHbOABMHd0IY1i3qWjPWqVWIZXMnvCUUncj1mj6bPgbLCw/TCyxEKhEy6n+3KqdleWprw1u2/et35lPK3nEiNSMdDDSS43GzswunlS/lPGEcoIrmtd3LjT5wYE5VYTD6Kdr+E7S6X/y89cLR48bvfZ00KsOhZaiAVn7W7vWX18q1zZivuHRKs9VI1JC6FhizjsVXnFW030b3wTjMCpGfYSEI/iDm1CkvhlNtS3en/y7olA3kFpKjmass/bptNc0umf8pX0jz909HKCsy+9uRtLOYJTxR2HNTQfWzyr5Mm1mtiKdkAHDgDk0tGcIFC3CSka5m5zScRXelFUeyRcvJLPX0qffwBj+dGu86VAgbMPL6PXD0/PzsjZ+OW5o1uHHl7bb+2pLFjY6AGXomkKpltOHEU7MAZxKHVYKRzESLSzREnYTFi+M4MuwaOSI20gOuqOMTd0RmrvG+TdeLBscNhtFl5cJD7HW48wB8JV0TBiHDCKY5srJzMPHQ+l06HRTGaiekaKrbLufpdt7sNCKjGq6RUc5nGDxpAaEY+M6LNMZCgy6+3u7rUxNlskETwSQq8nIySZJJGk/HTczR/QaAw+VggCgmUA3ItvdtyDpcme5hgVKc0sV7SUsDhxrFKJxEdyI/jmby77orXT8nuIn8oGAvJrANBqwRIAehm/jQUYBgAduMfaPjCj+sBN6G/Xi+FFwhhNJKy24/nD86+1xJGRMdYV0584hj7K7v5RHDMd2t+n7p1UZhftKAoiDDGr0My38anwvsQ5maGxIewvsCzxk4lKxMIZS+ZBi3sANVIu/4IneLgov4KOVd2C/EN0zD+irHv80Q4Y78jxFfo5WiMc/5I+asz/N3tV69iGdr6Ot6c2s9nNVPuZr1bz+Wq1M0XxrUp5K55bm19YX1+YX1PiLreIGledIfNtdB1t8WbWsBecZk2m5RxNuU4Ez6wlagddR52U5rF0NVV0FgU+/w7+WcLpf/JS5cEEZz/1CtKtLZXP8sKOw6rU+VkAbEE7MHBnDTpWQDPP5mhKuJgdDJkMluEh6e4Aalw+mOvuLXR3JUvyXwFBodXE+9EOeP/H69VSfMXp93w+WrgaEPznsolDbDqzcvpcLbY+7HVVQolwdmZukQuf1gcdUftw0GGw2/YZs9LBo26LaLb5bQ5XP+OPuj0Zr6qRqVYTu/BjcKBTeZEXJYmwhOWVweuM/bcLFf5b13tzn34q5vmYdYAr6slSvJHQbm9n/5bO6XviegYQHG410eeooWjB7FKP+HYIpuNYny1W5skh/5S3kqU17uP62mk0Kn8wlR0JoTnZWh2JAgICgN2oAfsAOIoYTCalnMoJguCd+Yt9g/s0+yx9F4++hRryP9wFni+4kVG2tmelCwCXUUNxMnJ7r0TMt6PwHuUYoumtjcok3avRaPu64pXJrgGNRtdNT5bWN2J6vUavj6KG3HCleT7t+uKL9oqssvUWWV4mt9Rc8db92NZ6EygAs8ixcfTh9YJyj1Pm+Luoodyz1POSQfGPUATdyKogEfwdl9B9+G3lnodcne6yRh0K2ATBZhMEXOKHhnjlHwD+AwAA//8BAAD//2YKZkEAAAAAAQAAAAIJut39prtfDzz1AAMD6AAAAADcHQ33AAAAANwcc0v/P/46AxkEJAAAAAMAAgAAAAAAAAABAAAD2P7vAAACWP8//z8DGQABAAAAAAAAAAAAAAAAAAAAJnicLItBSoJhAAWHWUWnaN0qaBc/QVQogqBuHAQRRDyAh/AAHtNTiPCtHo+ZMb4NjDfjx9gaF+NgHI2rMTc2xodxNk7Gr/FuvBprY2VMxt/w98bOWBhf409jb8bM+DeWxqfxMvizuT8AAAD//wEAAP//McMY1wAAAAAAACoAKgBOAH4AnACyAMgA4gDyASABQgFuAZIBugH+AhACTgKKAroC7gMkA44DsgO+A9wEDgQwBFwEkASwBO4FFAU2BVQFigWWBaYFvgAAAAEAAAAmAfgAKgBlAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWS2yT2RXHf865Ab94GVQNCFVXI4SmCIydScBNIOCQAcIgQklm2gpR1STGsUjsyHZg6GIWXVZddV11M120ErQKJWomgUIgpGoFqtRFNauuuqi66KqaRVfVd77jxHESOoOQyO8+zv+e173+gItyCyHiohFIgnGEJEnjDg7xjrGQ5JSxI8lF406SjBpvI8kPjbeTYtI4ymE+NY5xmF8axznCn40TnOA/xkkGI0eMd9IbqRjv4mDkV8a76YosG+9p8TPFwciXxntXdWLASkfKOMI3O74w7mBnx5fGwmVxxq5lTyfjctV4G0fkkfF2nsnfjaN0u18Yx+h2fzVO0NW5zXiH+M6c8U66o98LOQK7oz81jrA7+nPjDg5E7xsLyeiKsSMVNf1IJ6noP4y3kYpaLEH+Y1HjKIdiB4xj+Fi/cZyjsR8YJ8jEfmKcJB1bMN5BV+yfxjvJxZs6uzgcv2a8m1PxT4z3tPic4t245Sqyt0Vz36rm/gik4n8zjpCKN+c7eDf+X2NhX+KgseNAImPcyYHEJeNtHEiMG29nX+JT4yiZxM+MY7yXeG4c52jiX8YJupPfME6SSzY1d3Iq+WPjXWSSfzDezcXkv433tPiZomvHCeO9gY7MyjNZlFd4Ci1cooznMJ5JvDyWObzMyoIsyZw8llfyRObkuXwm9+Wx/B4fuSRL8kD+JE/w8rCF51t4RT6TB7IkD+VzWZCneJeVBXkpS/K5LMqizr4y+1n5o7zGc73jC24EZ8gjeaAqoS8Lcl/mZU6WAx2uk+GGLMtLeSZP5Xdqv6J6v8HLM5mV17Ios7rz2BY7n8pzjfGFLMucLMlv5UVzlusc4Ya8kNfyWB7KU1kMTg3Olpd4eaQzs2oTzmzu46EtTr6Plzl5IrOahSDLy8159feont6SX46qp2t1a8l321pJxxvz3lIV27FaSX6Np4sMWTJ4jtmoS0d5xqlykyKeEe5Rp0GRKep4hqgwRpUa0/p/QdfG8bzHBA0aTNPLcY5zV/+lKayqpdVyiuN8K/CHu5RpMIHnGkXqFKlxx9TOU6VCA88VCkwFvvh3GKHKDDXGKPr9pFvHeM5RZVzpKjWqqlpihkkK1OgiTYb3ydFHnkEGGKZvnULTPrQ+1mYfWg0zwAd8rL7WKauXfp32BFUaGmmFO3iyupYmS5YT9DFFgdsUddctinyiHgcKPaQ5QQ8ntC5f3bP1WShrnQp4Glqfca1dsO82niq33rrCZY01qFhg9xEVrV+4NkLDdoanVxjnuNp7jXRCM+ZVeUYrW6Osu9Nv5c1VChq/Z5A0noumGvTVqGY3+Duj/Rb4XaTyNfqzwT2mKTLKhOVzrR9HNIcN7mpO1zI+SVkrUNFODnIyo1kI425mbYQhLuMZVv3KOuXL6xSCSNr7LKt9lNbYJjY9d63+dyhQ1g65yaSurN23gp6b5zvKDXrxbdmpM6YVmqahNaqrVlprUOI4w5zncpsn/z9H4/o3rP1NZla7J4wu6JrglucZ0cqP+P14BnQ8xIhm5LsMMcpFhvmIUR3nucY18lxhlCE+UNthrul7MMwVBtViSDlcO6834Arfx/MhQ7on0C5afsKKBTdzWr2vq+9hL5eZYlpzHnie1liLGuHXr7Dnlqk2betqM0aZW7rTa/0qetcLlKwrptXDKc1lszfWbl3YEVMaS1DbtfUSVX1fa3pzA1XPPXs7gm4NfQpfiMZXqGr6rXqmvprDovq8flyy34Gyvo3hq9P8RhnRX4Ky/n6NqdeBbRBR8HvZPjO/YWZFa1XjJuWw12SFc9zT0ybtHnluamxqEX6ZUNcq1LVGgUc/UpVq85vEXosqJX2fpjVzY3qj7uko7AL9Ktlyb8FevZpm/Xbze2TD2cFbNWnvvtfYSqZ+iBsUmDSVir2Ungoz+vtZ09XwrmlsZN/oT7tSvfVLZUMVj+rb3l6T9tputku/Ztor47Lrqr2Z3Yo74866fpd3A67ffRvvMu0zlNzHeJfDu7/gXR7vTrqMy7sed8H1uow75XIu7zJKedfrcoFV5JJyv2qd0R2n3YfBijzccmV+y5UVPe+sy66d4LJKZ13O9bk+l3MXXI+uZtww3vW6sy7jBoJxswfV7wuq0+tOu3NuIFR3p12/63OXm73oBlzOnXH97n3VGGw5s9v1uMHAs2Yvbro39OCk63I97qTrdv1hppr9uKUfJ91pl3G9ek6/RpUJVJuduYVfPVaRUxp/sGfA9QQZae21jXUO+uGNNdqQb7XY0B1v1JnfrDPeaLHyPwAAAP//AQAA//+blbgHAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAA="); } +.d2-1230874723 .text-mono-bold { + font-family: "d2-1230874723-font-mono-bold"; +} +@font-face { + font-family: d2-1230874723-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAABE8AAwAAAAAHRwAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAoAAAANQD5gTNZ2FzcAAAAhwAAAAIAAAACAAAABBnbHlmAAACJAAACMMAAAvckY0FdmhlYWQAAAroAAAANgAAADYbI9ohaGhlYQAACyAAAAAkAAAAJAYzALpobXR4AAALRAAAAHAAAACYWRAI2mxvY2EAAAu0AAAATgAAAE457jcKbWF4cAAADAQAAAAgAAAAIABaAmpuYW1lAAAMJAAABO8AAA2sAwZtKnBvc3QAABEUAAAAIAAAACD/uAAzcHJlcAAAETQAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nHTNyyoFAQCH8d+Y4z447rfB4Ekki8lGUpaSJGUhGw9F2ApFWXgNT/JXk+35tr/Fh0KpQKXnB7W+UqWx50DryIlTZ85dunbrPqHTfa1Dx/964cqNuyS/+cpnPvKet7zmOy95zlMe89B9BlcYUuoZNmLUmHETJlWmTJvRt2vWnHkLFi1ZtmLVmnW1DZu2NLbt8AcAAP//AQAA///FLiaeAAEAAf//AA94nIxWWWwb19U+986QlMgRzW1mRA7FbcgZLuI2w0UWRUqiJZlabcpSZNmy5Cj2/+ePJf+uKSdKI6NLWjRt6CStnVpJmgJBbaAB2jQtWqNpkocifagdoChSoA8FiqZFEAPpi4KoL4U0LGZIy0taoC/3crlzvnO+7zv3DOiAB8BZfAUIaAcKbEAD1Kx+a0gWRd5gyIusnM/zXmzlsU25fi0cJiMbS0vXyZh303thEV/ZXTk+ubzc8davzi0VCq+/hWoAGNoB8CFchw6wAtTssp0nBEHk9XoDIWb9dPv7b77/vRnKTZGUq2PWgnpwfXcNjaXPyvLZtHLjlVoNEOQa27gXb4IHYDiQwNlMLidLDGsQBD6g19MOhpGlXJ7V69Gp4upM6siludIpf5XNBxOVaHQ8HeztrIZXqOjsxemVl6qy7zjjlBcHDyxJPtd8Mg0YRgBwBtfB2KxYlhiGduj1vChLuVw2Iwg8P/LzpUtTk986FunMTMRiE5lOXB96/ty57xx8IrwwNTUfAgAECwCYwXUwabzRflqmedpPL6A3lY8+/RQJuL7x9FPf3dDOjgFgc+tsVrbyWT/NW2V6bHMT/WZzcwNd2dhQVtSjgGEIAE/jOrQBpeVnle0yomUibx96kfj1D5SX/rg59xGuK/9AJkX4GUrWlEUN4wwA9uE66JpP+ekzl1EA13e3tLgIegGwB9ehS/ufVeVVM8mUcJ43GHhR5D0ETfe+PMCQzMDLG6TegAlJqshJAhv0JK7fPnbs9u7aLa569LDrjVdffcN1+GiVu9WMXW5xYddi21lZELJqnYTIMwxNl69+s4fUWS41N1xX3nkh8+X9t3fX0PBz2Yu9t7W6hcY2lvAm7AOvqrwgtJTX1BHvaNOyAOqeerxcfnyquQYkjpMC2kpNXT23+uLk5Iur565OfSm9NDK0kEotDI0spVWMcQCcxnWgHtCep62ypALw/Pjtg7XhkbXhmfFioVgYx3Vx4dDEcvLPaDonZSJAaP6ptGI4/1MUe97Oj9wePj88fH54ptJbLPZW9v/P76/jemh+cnwx/nd0Mp1KCco/l5QXVP6kxjYW8SbEtcrFvOZxtV5RfLAD1OpZ1oNVRBQtfyU7G5pPJuOdCe9McEAsnjlYON89HhhKBRPulPdQdylQ+AKVSpz2CD4ny9EdQXNyOJWby3ZHTzg5T5fd5aACluRQIrfQA0hlHu/HdTCodTVd+rf3sOs9bNnY2N1qak0C4BlchxBAjZDtDoah5RLO52XWg1n1k10meLHV9objcy85MCJJE6XrXozojRRJIoSQ7fnD3xf0RkwQbXoB15Xr7mzW48nmuBs3uEze48lnOHR8d+2Wd6Cra8B7S9Wu2NjGLNoBD0QB5pr+yCew6giDWMKaClZeRRWlXD5rxipTH0qj4atvEp3xQGdKdmcC49XoyKncuokMHcP+Xtdo1Wf1UuGh6JGjRtZnNdHmkw6PNf3IhPJRjzt8nnNMk0yA2ccYAcGBxjbm0Y7aP/e489/dS3NTF0cPPz1ROOkd6sq6o+Ug3x8RB7lC9ypVvDA9faEY8hx32AMDsdhAwG0/EQpq/k82trEFvwsOCGgIdwBkUe0kta6sWtceHILFWnE5G+nrJA2X100EN+qM2R0RhktwEvXsk9W1frdz8vXdAzIXXKedN237PMXk6HBTw3yrluDnOs3gz/oNmc+VNDZ5cXTs8fLko1kdVp5BNCungzlPcCgVKPrTsUfVuqoXSv1nhhyh9kfcfUVfWZIHfTbrPOcFICDTiOM+tAMSlOHIHqZazN0tJ0usTPOtXgoIopaBLEvaD8QDF4C9+Z3fO4jowdMFUaC7/C5OKDzckwjePNXekV/oNQdtlDESW1j+38rXp+mAwxGgHerqD/cFumMljjfbLUN/4Hq6PZKdNIe9TslG2sqxvsNhasXE2/ePBnW6NkuH3dZ7IFNNoJu2EOcK2u1BFxeyKVcsnNXZQRIUa+a6mtxWALAbv9u6YWiDrHFLW3mrRqvBWrncRrirPTOTl/1hT9yF3/3RUld8ZVH5HfJKCc6p/AIAGg2YAkBv48/0gqoS6CEUb8aXG9vYi99RJ6zqErVNrY49oZ49cfIVlJA8thDrE/qpc4voGzUFEnxb2wq1T3tenfsltKO6TJ0DzfTYu0lqOe4ly/+/kTRLMV+izZyNZXvrnJk21sxms8OItoqeWCQcSD40plxD03HWqfwUTbOMuu/xgHbAcS/OvTSsm0jfkZ6ZqSYNaKvsS9zPQrMnImjnv50Jg2uVytpgcw3EWTYe0NZW1zXXJ5p911xVjEqjomHQKs9ze5nu2ZBnaftdJAPNMJV1E+GdDJfmU8XlHn+/izTMurtdDtHXGWfp+C/xDyWOL52fmF3vd7uq30ZBz6AcL3ho502rBRCsAeAg2gHbffw3rxGDdW2dIkL/V/BHGA8bcifmfWhrpVgwGp8yGHIHFAUQZBvbGq/R+2dFAosaPfffSXcGRbj81WR//HQuIpi4ZOj00S8+dmBVLIdmIqzHkumfeMifX6Xi3oUuj9Nq2tdBtTET+0dmY86jbGe73eSwm63d+yPxSuzOrBLwM+rs0xTJ8tl8Xtbefu65ML526ER042n7kx98wCSCXSnG5T9E5ZcHf7Kq39ysvRFK0Ma2x4xWNV6psY070JbqkznVz3LLzdbWrfeX2YnL3oi723l53UT6D1Mri0hS/iolOv1oRLEcDCXuzC20BR3aTGIZRqU1n5eJP719ZYpiTKSJpqYu3UBbn4QmwuGJ0CeK5e4sQ1vgf+C5eyLcHWWz1ee8OgNJ6EwG7xmfoUNH6nSk+5mJH3Nku44k2vQutPVxcFQQxvhr19R9NPixYnnNX4l6h5OvaXh9jQXsbtwCAmAu66f70IfXzp4FpPX662hLfXd7WGtoxPwWHUcXa608b+ESeg5/pr4/DgZaKtMOPeqO9vREY/k8LqXDEVmOhNMA8C8AAAD//wEAAP//I6Fe8wAAAQAAAAEEnDKmMIpfDzz1AAMD6AAAAADcHHOkAAAAAN2XHqD/TP46AwwEJAABAAYAAgAAAAAAAAABAAAD2P7vAAACWP9M/0wDDAABAAAAAAAAAAAAAAAAAAAAJnicTI07aoJhAASHIU1OkSKQNpD4AFELFflRsJ7CG9h6Sk8lwldYbbG7M8a3gfFpLIyjcTVOxsG4GStjZ/wY57H5M76MD2Nj7I1fY2nMjMm4GP/DMY3+lXdjPhjbN856fB5PAAAA//8BAAD//2iUFjcAAAAqACoATAB8AKAAtgDMAOgA+AEmAUgBegGcAcYCCgIcAlgCmALIAv4DNgOsA9AD3AP8BDAEUgSEBLwE3AUcBUQFZgWCBboFxgXWBe4AAAABAAAAJgH4ACoAbgAGAAEAAAAAAAAAAAAAAAAAAwADeJyclk1vG9UXxn9jp7bHTfvPP5TSFCiXEkoaJRM7SqMqRQK3aVVDSEqcUqFSCcd2nFH8JnvcNqxZsGTFZwDEqqsuEGKVBQuWiBUrxIoPgFggNGeOPWPXJG1VqXnu3PP6POfea+Cd2N/EscZs4AAUW5zjQHGMFL8rjrPCn4rHmLEuKD5G2VpXnGDaeqQ4yY/WL4pTLMW+UmyzFPtJ8XEWY/8oPhE38YzikywlbimeYjrxeYAtSCe+VmwxntBcVoyJxA+K40wkflY8xtnEb4qPMZ74S3GCyeSY4iSTydOKU0wmZxTbTCZXFKeZTq4pPo5JthSPM5f8UvEJMsnvFZ/ESSpX1v9YTJ1VPMHlVC/O/7mQ6vU1ydupbxW/EKn5FOdTfyh+MdL76UjvL0VynYnkmuKknVJ8lnG71+PLEd9XOGWfV/wqaXtZ8bmI72uM2+8qNkzYvfpfD2fDOs+k/YniN0jbDcXTkThvRmp4iyX7oeKLzNrfKZ7FsXVmrDnm0j2N5iN5HTJpnRNrIVJDhpn0p4oXmU1/ofhapN9V4fAbDItkyJLBMK+rRVnlKNNkmwqGAvt08KhQp4MhT4MSTdq05P+i7JUxzLCLh0eLFRZY4IH8cyj2ozniWWeBi8xheICLxy6GTSp0qNDmvka7QZMGHoZ1itT9WswZCjTp0qZExUzhRNcYrtGkLOgWbZpcpUmNMlkc6fQyV8ixylU2uDLg2/MM/Ob7nofHN327j6T2Dq5UbQYy7tLEk84b3O/vOWTJsswV6hTZoyJWO1R4KBkWcbiEwzKXWJZYz16vK4oVMXiiVFlULNJmD0OTnefW2pUufe18v9s0RMlgr4CnlkH2BmUWxN9Ij7vClZHIXdG4jSvWznNVc4siXWoYVnEw3NSo/oRtCa/+365Mnl93hcYzTKrHPi0qbLGrfIaTWRAOPR4IpyHjNVxRoCEz7XPSFRaCvnusFcizhmFD4jcGIq8NRPA7GTVhWek3rGwwb6j/fYq41CiyTU12wpNXlLw5PhTssYIZYqdDSRRq4YlGHYnliAZVFtjgBmtDlRzNUVn+Btpv0+1PT9CdPzX+ec9REOULZkpOW05YKwgjd8izxU02uM2WrHNsskmOdbbIc118N9iUk7vBOqvikRcc7N2QE7DOxxjeJy82fuyK8hMo5p/JllTfkdqDWXap0xLO/cod6bUiHT67woYdjdrz7YhPCZcdsTSiX4MqXYpUdSpaUmFduOzNRnjqgomoSy++tuF+labctG05uX5Uw77eHf60BjUFN4T3FKo6zzUz/32jbcrp87sIUV66CGa802e/It0Orqv6lrhynwb3leGC8FGQ18TFWO9Rkuy+r8+FiT964svjJ74ciMpttnGDKY0fcI19yVbT6gzbwop4cDf2K/foiH4dUdev6DOJ4t9Nd8lwT++ZJlW52VrCeUnO4r6sgvm5y/whtkW9L9ui157Yz47IXZbXoibaGemtqtGnuSccezobwR1raNCVN7gtu8Epld7IHlrPcKSO9jCndQ2qOCevwrAmw9qOsnosX4eUGcsOqD3K70B+eVTl/fDZuCMnvyrTfJ2H+m6u9b+F6APh0hVeCvJG+fdY8AqHnr13+arEL7E3cubDGZ8fmfUon6e3HOz2KOvBHg+3HebgKPtRv1hG2ylz/wIAAP//AQAA///7vB6iAAADAAAAAAAA/7UAMgAAAAEAAAAAAAAAAAAAAAAAAAAAuAH/hbAEjQA="); +} .d2-1230874723 .text-mono-italic { font-family: "d2-1230874723-font-mono-italic"; } @@ -138,7 +145,7 @@ -NETWORKcostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCELL TOWERSATELLITESTRANSMITTER SENDSENDSEND +NETWORKcostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCELL TOWERSATELLITESTRANSMITTER SENDSENDSEND diff --git a/e2etests/testdata/patterns/real/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real/dagre/sketch.exp.svg index 8c64f93d4..8aae754de 100644 --- a/e2etests/testdata/patterns/real/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real/dagre/sketch.exp.svg @@ -6,6 +6,13 @@ font-family: d2-1635834384-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAAA0oAAoAAAAAF6wAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAaAAAAHwBUgHoZ2x5ZgAAAbwAAAOxAAAEVLnFpmFoZWFkAAAFcAAAADYAAAA2GanOOmhoZWEAAAWoAAAAJAAAACQGMwCXaG10eAAABcwAAABAAAAAQCWABFRsb2NhAAAGDAAAACIAAAAiCM4Hkm1heHAAAAYwAAAAIAAAACAARAJhbmFtZQAABlAAAAa4AAAQztydAx9wb3N0AAANCAAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icVMxPqkFhAIfh57vfuf4enCXYimRwMlBStmF5EsVSrOQnMvEOn8GLoipoNU7odCqWVjZ6OwfH5Ctrva39W/LMI/fccs0l58/jt+JP1fg3MDQyNjHVmplb8AIAAP//AQAA//9uLRUueJxUk0tsG1UUhs89Y880wbSZOmPTJrE9uc1MEtl5+I49SYr8SnDsJC22aZTSODZtrSa4CXlIpQJFJUi0VKJIEymiLbgsyAJVSCwpbGDDogtUAasi0Q2LKlKlioUXdOEJGtuRQCPNHGnu+fWf8/0X7BABwOO4Axy0gAOOggTARFnskVWVCoKuupmuUy+KEfKnaRCS1mzhK1tb39iGE88S5z/Andry2EeLi5mnez8Url799Cl5BAg+ABxBA1pABHAKTFUUlfI852ROqlJhz/uzV5SP2Np8fzwpPDkbeR4lq6WSvjI6umKeQ6O29vAhAACB+H4V+7ECXQD2bkUJaeEwC7rcgqLQbp6X2l0uFgzrbp4nxeyHMzPXZ0/mOwePJfqiC5q2EA2kvIPqRUf2zuXyndyQL9Qhx9/N5d5LKJQFggCAMAeAfWjAIcsnE1nQJbXzVGXBcEhTKJ37aqfyxfYb6fXV1fU0Gvcr976d+GRz83rd2wYAHkUDXqrvSzp4Nshn5o+kzfybzKCRfDT5fBIIFAHIi+bZEBNpSJaoyKTi7i75fHd3ErlkslabbMx8AQAn0ABH3ZHICBOclBOkC2c40l78da/w0zoa5gOSfmG+Tc5+/JvVcwMAu9AAe6NHlm7kyGto1B40NVMA2IYGdNT/O91MdzKRilo4rFOBo5xKPSiJqUt5n827cCljF5DrKbyaV5Dj7WiYe+UyeaW2RlK+udnOLdMkuNU5O+czv7e0cwDIowHOA21FCYlMtERdLknM5X+PIrZkGh80zNLN4csaOVNbI5WbwSVm3geEof0q9mIFjlgO/0PawsGrDRrdFm/in9qIxTamGu/p+fnp6fl5R+7ucvl2JnO7vHw3lzaubd66tXnNsPiWmnwPg7vJ11K09klF8YBy6ZfxxZOZ8a+LX15ZOZXNnlpBg2YnZhZE8y8imc/Im9FYXGvscXy/isewAoG6S1Wv5y+kKYqqDuD/02mF0+32oDUBGU697w/2XByZmPaGugty3K+fj0aWTvh9p9lokoY7831xdWTJEfKP9QTGBmh/5+G+l/sTQ8HXA4ET4S5Z83t7jzt62wLxYW02CAT6AXAADRAA5GaaCD5G22OcSiZr39W9tgLgadyGHgDGMacH3SyCus7czcrJOMo17qXAvVMqDHF2G+H41lY+lokIrS28DTkbN3DuraWY4LBz9tZDMdw2Sx2BQVke9HdUqx3+RkXu1VbJIc+YxzPmMf8B+BcAAP//AQAA//8PIvLPAAAAAAEAAAACCbquIZQXXw889QADA+gAAAAA3B0N9wAAAADcHHNL/z/+OgMZBCQAAAADAAIAAAAAAAAAAQAAA9j+7wAAAlj/P/8/AxkAAQAAAAAAAAAAAAAAAAAAABACWAA+AlgAAAJYACACWABBAlgAVwJYAHICWABfAlgAYgJYAIYCWABIAlgAUgJYADACWABkAlgAQwJYACoCWAAKAAAAKgAqAE4AfgCcALIAyADiAPIBIAFCAW4BlgHaAewCKgAAAAEAAAAQAfgAKgBlAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWS2yT2RXHf865Ab94GVQNCFVXI4SmCIydScBNIOCQAcIgQklm2gpR1STGsUjsyHZg6GIWXVZddV11M120ErQKJWomgUIgpGoFqtRFNauuuqi66KqaRVfVd77jxHESOoOQyO8+zv+e173+gItyCyHiohFIgnGEJEnjDg7xjrGQ5JSxI8lF406SjBpvI8kPjbeTYtI4ymE+NY5xmF8axznCn40TnOA/xkkGI0eMd9IbqRjv4mDkV8a76YosG+9p8TPFwciXxntXdWLASkfKOMI3O74w7mBnx5fGwmVxxq5lTyfjctV4G0fkkfF2nsnfjaN0u18Yx+h2fzVO0NW5zXiH+M6c8U66o98LOQK7oz81jrA7+nPjDg5E7xsLyeiKsSMVNf1IJ6noP4y3kYpaLEH+Y1HjKIdiB4xj+Fi/cZyjsR8YJ8jEfmKcJB1bMN5BV+yfxjvJxZs6uzgcv2a8m1PxT4z3tPic4t245Sqyt0Vz36rm/gik4n8zjpCKN+c7eDf+X2NhX+KgseNAImPcyYHEJeNtHEiMG29nX+JT4yiZxM+MY7yXeG4c52jiX8YJupPfME6SSzY1d3Iq+WPjXWSSfzDezcXkv433tPiZomvHCeO9gY7MyjNZlFd4Ci1cooznMJ5JvDyWObzMyoIsyZw8llfyRObkuXwm9+Wx/B4fuSRL8kD+JE/w8rCF51t4RT6TB7IkD+VzWZCneJeVBXkpS/K5LMqizr4y+1n5o7zGc73jC24EZ8gjeaAqoS8Lcl/mZU6WAx2uk+GGLMtLeSZP5Xdqv6J6v8HLM5mV17Ios7rz2BY7n8pzjfGFLMucLMlv5UVzlusc4Ya8kNfyWB7KU1kMTg3Olpd4eaQzs2oTzmzu46EtTr6Plzl5IrOahSDLy8159feont6SX46qp2t1a8l321pJxxvz3lIV27FaSX6Np4sMWTJ4jtmoS0d5xqlykyKeEe5Rp0GRKep4hqgwRpUa0/p/QdfG8bzHBA0aTNPLcY5zV/+lKayqpdVyiuN8K/CHu5RpMIHnGkXqFKlxx9TOU6VCA88VCkwFvvh3GKHKDDXGKPr9pFvHeM5RZVzpKjWqqlpihkkK1OgiTYb3ydFHnkEGGKZvnULTPrQ+1mYfWg0zwAd8rL7WKauXfp32BFUaGmmFO3iyupYmS5YT9DFFgdsUddctinyiHgcKPaQ5QQ8ntC5f3bP1WShrnQp4Glqfca1dsO82niq33rrCZY01qFhg9xEVrV+4NkLDdoanVxjnuNp7jXRCM+ZVeUYrW6Osu9Nv5c1VChq/Z5A0noumGvTVqGY3+Duj/Rb4XaTyNfqzwT2mKTLKhOVzrR9HNIcN7mpO1zI+SVkrUNFODnIyo1kI425mbYQhLuMZVv3KOuXL6xSCSNr7LKt9lNbYJjY9d63+dyhQ1g65yaSurN23gp6b5zvKDXrxbdmpM6YVmqahNaqrVlprUOI4w5zncpsn/z9H4/o3rP1NZla7J4wu6JrglucZ0cqP+P14BnQ8xIhm5LsMMcpFhvmIUR3nucY18lxhlCE+UNthrul7MMwVBtViSDlcO6834Arfx/MhQ7on0C5afsKKBTdzWr2vq+9hL5eZYlpzHnie1liLGuHXr7Dnlqk2betqM0aZW7rTa/0qetcLlKwrptXDKc1lszfWbl3YEVMaS1DbtfUSVX1fa3pzA1XPPXs7gm4NfQpfiMZXqGr6rXqmvprDovq8flyy34Gyvo3hq9P8RhnRX4Ky/n6NqdeBbRBR8HvZPjO/YWZFa1XjJuWw12SFc9zT0ybtHnluamxqEX6ZUNcq1LVGgUc/UpVq85vEXosqJX2fpjVzY3qj7uko7AL9Ktlyb8FevZpm/Xbze2TD2cFbNWnvvtfYSqZ+iBsUmDSVir2Ungoz+vtZ09XwrmlsZN/oT7tSvfVLZUMVj+rb3l6T9tputku/Ztor47Lrqr2Z3Yo74866fpd3A67ffRvvMu0zlNzHeJfDu7/gXR7vTrqMy7sed8H1uow75XIu7zJKedfrcoFV5JJyv2qd0R2n3YfBijzccmV+y5UVPe+sy66d4LJKZ13O9bk+l3MXXI+uZtww3vW6sy7jBoJxswfV7wuq0+tOu3NuIFR3p12/63OXm73oBlzOnXH97n3VGGw5s9v1uMHAs2Yvbro39OCk63I97qTrdv1hppr9uKUfJ91pl3G9ek6/RpUJVJuduYVfPVaRUxp/sGfA9QQZae21jXUO+uGNNdqQb7XY0B1v1JnfrDPeaLHyPwAAAP//AQAA//+blbgHAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAA="); } +.d2-1635834384 .text-mono-bold { + font-family: "d2-1635834384-font-mono-bold"; +} +@font-face { + font-family: d2-1635834384-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAAAukAAwAAAAAFNAAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAaAAAAHwBUgHoZ2FzcAAAAeQAAAAIAAAACAAAABBnbHlmAAAB7AAAA70AAARsBEbVx2hlYWQAAAWsAAAANgAAADYbI9ohaGhlYQAABeQAAAAkAAAAJAYzAKRobXR4AAAGCAAAAEAAAABAJYADOmxvY2EAAAZIAAAAIgAAACIJAgfAbWF4cAAABmwAAAAgAAAAIABEAmpuYW1lAAAGjAAABO8AAA2sAwZtKnBvc3QAAAt8AAAAIAAAACD/uAAzcHJlcAAAC5wAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nFTMT6pBYQCH4ee737n+Hpwl2IpkcDJQUrZheRLFUqzkJzLxDp/Bi6IqaDVO6HQqllY2ejsHx+Qra72t/VvyzCP33HLNJefP47fiT9X4NzA0MjYx1ZqZW/ACAAD//wEAAP//bi0VLgABAAH//wAPeJxck89PHGUYx5/3mWG2LUNlWWYGdmGW3Rdm+Lk/5t3ZgSUQxF1KoGyhQiiwsqapXoAGWawHt1HjSTPYRkGWar0oBy9NYwxJjRdTT/TiyT/ANOHgpU3wYrKDmVk86OWdSeaZ5/l+n8/3hTqgAGjiLnBwEURoAgmg5I/4u5iuU5/P0hVmWTSMfopNzuF33d18T7lYPOT7wpXwu6u4W11fmbl5s+HJT5vF4eHvn5ASAMJFALyGNjSAH6AUYAHKaZpOBcHH6WZEuvjs8bOv58U2kReDDQuNZBDt6jaZSt5m7HbSOfqqVAIC6bNTzGAFVIBcNIZmKp1mhqz4NI1GBUFqlmVmpC1FEMitkY35xOs7i6O3InOK1Rmb7O2dTnZmWua618XehbvX1w/mWMeK3MpWX32taHQEl+JJQJgAwBTacKnmmBmyLDULAtWZkU6bKU2jdOLH4k5+5tPlnpbU1b6+q6kWtLP3Njc/v/JedyGfX+oCAAIFAJTRhnpvb1JEYhKVIlKBPHaev3xJNLTLH7//ZdmrnQLAy+e1JvNTMyJRP5OmKhXya6VSJrvlsrPulgJCFgCvow0XQPT0+VmAEYlxViC7x/3yrXPwe2XxOdrOX6Te0X4g8ZKz6s1YA8AOtKGu9ldEWvuCRNGuvvD6EsgAoIo2tHvfFRevqyQ1ihb1+aiuU5WTpMyDMZmXxx6UecGHnGFMsjiHPoFH+2R5+aS6fRyauzEbfPTw4aPg7I250HGt9/j5LgJe74DCNM10fXI6lWVJGt//ZJCva9ypPdB2fr6f+nDopLpNcp+ZdzMnnm/t7BQNrMArEHbJa9o5eY+O/i+b8wiQ/vyd8fE7+doZNUIhI+qdYn5/c2NvZmZvY3M//0GyOJEtJBKF7EQxCcB57CfRBhEkaP0PfSr5meGOoDRgBejESW4rl9vKzU9mRkYyk0Nv/3aIdtfSzPTqwJ/kzWQioTl/F537rnfj7BR1rMCAp1q3vHy6WnX9/+l1lSuKiu5E0jv+kbnQtRSPD7TEwvOdY/rI2pXhrf7paDbRGWtLhK/1j0aH3xETsbdUraNVCUkNnZfjuUR60ezvfaM1pLYHgs1itDGejaULg0DcreEQ2uBzfdUS9sdTDD7FxnK5+qLGiQfAebShC6DEsUCzLEtsFC2LKSoq7luAcVQ/v7K+lcWDZiQ8Xy/W9a/2CJdEnieEkKZ7s99owiXkuAuChrZz2GaaqmqmQ0dHoZSlqlYqRFaq28fhsfb2sfAx/AMAAP//AQAA//8/DPIvAAAAAAEAAAABBJwbf0lWXw889QADA+gAAAAA3BxzpAAAAADdlx6g/0z+OgMMBCQAAQAGAAIAAAAAAAAAAQAAA9j+7wAAAlj/TP9MAwwAAQAAAAAAAAAAAAAAAAAAABACWAAjAlgAAAJYAAkCWAA2AlgARgJYAFwCWABKAlgARAJYAGsCWAA6AlgAQgJYACYCWABGAlgAMgJYAB8CWAAEAAAAKgAqAEwAfACgALYAzADoAPgBJgFIAXoBpAHoAfoCNgAAAAEAAAAQAfgAKgBuAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWTW8b1RfGf2OntsdN+88/lNIUKJcSSholEztKoypFArdpVUNISpxSoVIJx3acUfwme9w2rFmwZMVnAMSqqy4QYpUFC5aIFSvEig+AWCA0Z449Y9ckbVWpee7c8/o8595r4J3Y38SxxmzgABRbnONAcYwUvyuOs8KfiseYsS4oPkbZWlecYNp6pDjJj9YvilMsxb5SbLMU+0nxcRZj/yg+ETfxjOKTLCVuKZ5iOvF5gC1IJ75WbDGe0FxWjInED4rjTCR+VjzG2cRvio8xnvhLcYLJ5JjiJJPJ04pTTCZnFNtMJlcUp5lOrik+jkm2FI8zl/xS8Qkyye8Vn8RJKlfW/1hMnVU8weVUL87/uZDq9TXJ26lvFb8QqfkU51N/KH4x0vvpSO8vRXKdieSa4qSdUnyWcbvX48sR31c4ZZ9X/Cppe1nxuYjva4zb7yo2TNi9+l8PZ8M6z6T9ieI3SNsNxdOROG9GaniLJfuh4ovM2t8pnsWxdWasOebSPY3mI3kdMmmdE2shUkOGmfSniheZTX+h+Fqk31Xh8BsMi2TIksEwr6tFWeUo02SbCoYC+3TwqFCngyFPgxJN2rTk/6LslTHMsIuHR4sVFljggfxzKPajOeJZZ4GLzGF4gIvHLoZNKnSo0Oa+RrtBkwYehnWK1P1azBkKNOnSpkTFTOFE1xiu0aQs6BZtmlylSY0yWRzp9DJXyLHKVTa4MuDb8wz85vueh8c3fbuPpPYOrlRtBjLu0sSTzhvc7+85ZMmyzBXqFNmjIlY7VHgoGRZxuITDMpdYlljPXq8rihUxeKJUWVQs0mYPQ5Od59balS597Xy/2zREyWCvgKeWQfYGZRbE30iPu8KVkchd0biNK9bOc1VziyJdahhWcTDc1Kj+hG0Jr/7frkyeX3eFxjNMqsc+LSpssat8hpNZEA49HginIeM1XFGgITPtc9IVFoK+e6wVyLOGYUPiNwYirw1E8DsZNWFZ6TesbDBvqP99irjUKLJNTXbCk1eUvDk+FOyxghlip0NJFGrhiUYdieWIBlUW2OAGa0OVHM1RWf4G2m/T7U9P0J0/Nf55z1EQ5QtmSk5bTlgrCCN3yLPFTTa4zZasc2yySY51tshzXXw32JSTu8E6q+KRFxzs3ZATsM7HGN4nLzZ+7IryEyjmn8mWVN+R2oNZdqnTEs79yh3ptSIdPrvChh2N2vPtiE8Jlx2xNKJfgypdilR1KlpSYV247M1GeOqCiahLL7624X6Vpty0bTm5flTDvt4d/rQGNQU3hPcUqjrPNTP/faNtyunzuwhRXroIZrzTZ78i3Q6uq/qWuHKfBveV4YLwUZDXxMVY71GS7L6vz4WJP3riy+MnvhyIym22cYMpjR9wjX3JVtPqDNvCinhwN/Yr9+iIfh1R16/oM4ni3013yXBP75kmVbnZWsJ5Sc7ivqyC+bnL/CG2Rb0v26LXntjPjshdlteiJtoZ6a2q0ae5Jxx7OhvBHWto0JU3uC27wSmV3sgeWs9wpI72MKd1Dao4J6/CsCbD2o6yeixfh5QZyw6oPcrvQH55VOX98Nm4Iye/KtN8nYf6bq71v4XoA+HSFV4K8kb591jwCoeevXf5qsQvsTdy5sMZnx+Z9Sifp7cc7PYo68EeD7cd5uAo+1G/WEbbKXP/AgAA//8BAAD///u8HqIAAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAC4Af+FsASNAA=="); +} .d2-1635834384 .text-mono-italic { font-family: "d2-1635834384-font-mono-italic"; } @@ -129,7 +136,7 @@ -NETWORKCELL TOWERSATELLITESTRANSMITTER SENDSENDSEND +NETWORKCELL TOWERSATELLITESTRANSMITTER SENDSENDSEND diff --git a/e2etests/testdata/stable/bold-mono/dagre/board.exp.json b/e2etests/testdata/stable/bold-mono/dagre/board.exp.json new file mode 100644 index 000000000..842e2a92e --- /dev/null +++ b/e2etests/testdata/stable/bold-mono/dagre/board.exp.json @@ -0,0 +1,130 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "not bold mono", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 169, + "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": "not bold mono", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 124, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "bold mono", + "type": "rectangle", + "pos": { + "x": 229, + "y": 0 + }, + "width": 130, + "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": "bold mono", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 85, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "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/bold-mono/dagre/sketch.exp.svg b/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg new file mode 100644 index 000000000..c0abb089c --- /dev/null +++ b/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg @@ -0,0 +1,103 @@ +not bold monobold mono + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/bold-mono/elk/board.exp.json b/e2etests/testdata/stable/bold-mono/elk/board.exp.json new file mode 100644 index 000000000..9da9855d4 --- /dev/null +++ b/e2etests/testdata/stable/bold-mono/elk/board.exp.json @@ -0,0 +1,130 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "not bold mono", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 169, + "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": "not bold mono", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 124, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "bold mono", + "type": "rectangle", + "pos": { + "x": 201, + "y": 12 + }, + "width": 130, + "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": "bold mono", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 85, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "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/bold-mono/elk/sketch.exp.svg b/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg new file mode 100644 index 000000000..bc4ea7f4a --- /dev/null +++ b/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg @@ -0,0 +1,103 @@ +not bold monobold mono + + + + \ 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 f15f4a05f..5eca9bfc7 100644 --- a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg @@ -6,6 +6,13 @@ font-family: d2-1710037582-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAAAvkAAoAAAAAFgwAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAVgAAAGIAzgF1Z2x5ZgAAAawAAAKfAAAC7EiYK6VoZWFkAAAETAAAADYAAAA2GanOOmhoZWEAAASEAAAAJAAAACQGMwCSaG10eAAABKgAAAAsAAAALBnIA3dsb2NhAAAE1AAAABgAAAAYA9QEmm1heHAAAATsAAAAIAAAACAAPwJhbmFtZQAABQwAAAa4AAAQztydAx9wb3N0AAALxAAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icRMsxCgIxAAXRl92oUbxUQIuAWIh4VEEE8WZfSOM0Uz0Uq4Kj6jHfLKrubLi6J+hOhotbkm8+eeeV53T/isWq2tjaafYO/AAAAP//AQAA//8ZPRA6AAB4nDSRTUgbaRjHn/eZZGZlXTevcSa7bjQZXzOjksgmM5lRd0k26iZxV3eju5LdJUZkg4q7wQ8QoQjNoRWhFKYgPbRpD82hSKHHflx66sFD8dCThXrpQQRBeuilh5mWxMh7eA//hx/P//eAGxIA2Il7wEELtEI7iAAalWlIVlUmCKbq00yTBZAmyFvHImRCdxmblcojV3T0bHThKu7Z/49cW1rKnZw+L25t3Twhh4AQBMAhtKAFKIBX0FRFURnPc17Ny1QmnAZeBqj8tcsTfHNcPP4rcZ4kq6WSWR4eLjv/oGWvHRwAACDkAbAfLfiiztGoFpPEDp6pWsyI6wpj+Qd71bu3/phYX11dn0Brv3rv8fiN7e3rAEBgAwDb0YIvG33Ey7dBbjsviMd5TybRSh9mzjNAYB6AfGzOxjXK4rLIqCbO12rkTq2WQS6dtu0MNLg7ANiFFrgbG1FZ3JkhP6NlP23mWQD0oAXfNXKvTzO9GmVUNwyTCRzjVNaNIs0uFoKuwNxizi0gFyr+WFCQ491oOacrK+Qbe41kg/lZf8VxCFb8s/mg86zOngFAHi3wXrIVJU41WodKkkhnCq+TiC25iw8tp7Qb/U8nf9prpLobW9acfUAoNZ22ga/ptC5V8DKOUXpptvRqbOmH3NjD+fub5anp6akyWmx6fHKOOu+I6JyRv5M/pfSLvmOfPuC3WIUIgLtHUU1JuoAoqjqIcd0wtJjkExSF9fBihyT5fN0odvA8iWavhGOhf4fGfw3Ee4pyKmwuJBPLveHgb9pwmhn+Qn9KHVpujYdHQpGRQTbgb+v/amD0+9jvkUiv0SXr4UBfZ2ufJ5KK6rMxIDAAgINogQAgNy9I8AhdR/hLOm0/AfgMAAD//wEAAP//sgOlMwAAAQAAAAIJurLyntVfDzz1AAMD6AAAAADcHQ33AAAAANwcc0v/P/46AxkEJAAAAAMAAgAAAAAAAAABAAAD2P7vAAACWP8//z8DGQABAAAAAAAAAAAAAAAAAAAACwJYAD4CWAAgAlgAVwJYAHICWABfAlgAhgJYAEgCWABSAlgAZAJYAEMCWAAqAAAAKgBOAGwAggCYAKgA1gD4ASABZAF2AAEAAAALAfgAKgBlAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWS2yT2RXHf865Ab94GVQNCFVXI4SmCIydScBNIOCQAcIgQklm2gpR1STGsUjsyHZg6GIWXVZddV11M120ErQKJWomgUIgpGoFqtRFNauuuqi66KqaRVfVd77jxHESOoOQyO8+zv+e173+gItyCyHiohFIgnGEJEnjDg7xjrGQ5JSxI8lF406SjBpvI8kPjbeTYtI4ymE+NY5xmF8axznCn40TnOA/xkkGI0eMd9IbqRjv4mDkV8a76YosG+9p8TPFwciXxntXdWLASkfKOMI3O74w7mBnx5fGwmVxxq5lTyfjctV4G0fkkfF2nsnfjaN0u18Yx+h2fzVO0NW5zXiH+M6c8U66o98LOQK7oz81jrA7+nPjDg5E7xsLyeiKsSMVNf1IJ6noP4y3kYpaLEH+Y1HjKIdiB4xj+Fi/cZyjsR8YJ8jEfmKcJB1bMN5BV+yfxjvJxZs6uzgcv2a8m1PxT4z3tPic4t245Sqyt0Vz36rm/gik4n8zjpCKN+c7eDf+X2NhX+KgseNAImPcyYHEJeNtHEiMG29nX+JT4yiZxM+MY7yXeG4c52jiX8YJupPfME6SSzY1d3Iq+WPjXWSSfzDezcXkv433tPiZomvHCeO9gY7MyjNZlFd4Ci1cooznMJ5JvDyWObzMyoIsyZw8llfyRObkuXwm9+Wx/B4fuSRL8kD+JE/w8rCF51t4RT6TB7IkD+VzWZCneJeVBXkpS/K5LMqizr4y+1n5o7zGc73jC24EZ8gjeaAqoS8Lcl/mZU6WAx2uk+GGLMtLeSZP5Xdqv6J6v8HLM5mV17Ios7rz2BY7n8pzjfGFLMucLMlv5UVzlusc4Ya8kNfyWB7KU1kMTg3Olpd4eaQzs2oTzmzu46EtTr6Plzl5IrOahSDLy8159feont6SX46qp2t1a8l321pJxxvz3lIV27FaSX6Np4sMWTJ4jtmoS0d5xqlykyKeEe5Rp0GRKep4hqgwRpUa0/p/QdfG8bzHBA0aTNPLcY5zV/+lKayqpdVyiuN8K/CHu5RpMIHnGkXqFKlxx9TOU6VCA88VCkwFvvh3GKHKDDXGKPr9pFvHeM5RZVzpKjWqqlpihkkK1OgiTYb3ydFHnkEGGKZvnULTPrQ+1mYfWg0zwAd8rL7WKauXfp32BFUaGmmFO3iyupYmS5YT9DFFgdsUddctinyiHgcKPaQ5QQ8ntC5f3bP1WShrnQp4Glqfca1dsO82niq33rrCZY01qFhg9xEVrV+4NkLDdoanVxjnuNp7jXRCM+ZVeUYrW6Osu9Nv5c1VChq/Z5A0noumGvTVqGY3+Duj/Rb4XaTyNfqzwT2mKTLKhOVzrR9HNIcN7mpO1zI+SVkrUNFODnIyo1kI425mbYQhLuMZVv3KOuXL6xSCSNr7LKt9lNbYJjY9d63+dyhQ1g65yaSurN23gp6b5zvKDXrxbdmpM6YVmqahNaqrVlprUOI4w5zncpsn/z9H4/o3rP1NZla7J4wu6JrglucZ0cqP+P14BnQ8xIhm5LsMMcpFhvmIUR3nucY18lxhlCE+UNthrul7MMwVBtViSDlcO6834Arfx/MhQ7on0C5afsKKBTdzWr2vq+9hL5eZYlpzHnie1liLGuHXr7Dnlqk2betqM0aZW7rTa/0qetcLlKwrptXDKc1lszfWbl3YEVMaS1DbtfUSVX1fa3pzA1XPPXs7gm4NfQpfiMZXqGr6rXqmvprDovq8flyy34Gyvo3hq9P8RhnRX4Ky/n6NqdeBbRBR8HvZPjO/YWZFa1XjJuWw12SFc9zT0ybtHnluamxqEX6ZUNcq1LVGgUc/UpVq85vEXosqJX2fpjVzY3qj7uko7AL9Ktlyb8FevZpm/Xbze2TD2cFbNWnvvtfYSqZ+iBsUmDSVir2Ungoz+vtZ09XwrmlsZN/oT7tSvfVLZUMVj+rb3l6T9tputku/Ztor47Lrqr2Z3Yo74866fpd3A67ffRvvMu0zlNzHeJfDu7/gXR7vTrqMy7sed8H1uow75XIu7zJKedfrcoFV5JJyv2qd0R2n3YfBijzccmV+y5UVPe+sy66d4LJKZ13O9bk+l3MXXI+uZtww3vW6sy7jBoJxswfV7wuq0+tOu3NuIFR3p12/63OXm73oBlzOnXH97n3VGGw5s9v1uMHAs2Yvbro39OCk63I97qTrdv1hppr9uKUfJ91pl3G9ek6/RpUJVJuduYVfPVaRUxp/sGfA9QQZae21jXUO+uGNNdqQb7XY0B1v1JnfrDPeaLHyPwAAAP//AQAA//+blbgHAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAA="); } +.d2-1710037582 .text-mono-bold { + font-family: "d2-1710037582-font-mono-bold"; +} +@font-face { + font-family: d2-1710037582-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAAApUAAwAAAAAEyQAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAVgAAAGIAzgF1Z2FzcAAAAdQAAAAIAAAACAAAABBnbHlmAAAB3AAAAp4AAAL4p7sURWhlYWQAAAR8AAAANgAAADYbI9ohaGhlYQAABLQAAAAkAAAAJAYzAJ9obXR4AAAE2AAAACwAAAAsGcgClmxvY2EAAAUEAAAAGAAAABgD5ASybWF4cAAABRwAAAAgAAAAIAA/AmpuYW1lAAAFPAAABO8AAA2sAwZtKnBvc3QAAAosAAAAIAAAACD/uAAzcHJlcAAACkwAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nETLMQoCMQAF0ZfdqFG8VECLgFiIeFRBBPFmX0jjNFM9FKuCo+ox3yyq7my4uifoToaLW5JvPnnnled0/4rFqtrY2mn2DvwAAAD//wEAAP//GT0QOgAAAAEAAf//AA94nFSRzU8TURTF79wpnaAt6VDeFFpoaR+d4bMtfZ0W2kAIodDwTQIRsFJDohsIQYpx4ZhoXGkeSpRog7KThRvCwphg3OEKNv4NxqQLN5C4Mmk107Jx9Rbn5LxzfhdqgAKgjnsgQi3YoB4IQF72y0GmaVSSEpqLJRLUhzLF+vLhh/Z2S4eRyx1aunwF3/0V3Cut35xaXbWffNnMpVIfT4Q8AEItAM4gBzvIAHknc1JRVTVqtUqipvtJ7fnx+ft5W7PNYnPbFxxCH/LStjDeu8HYRm/587t8HhBGATCGHK5VG7GoopAGq5VqLBqP6zFVpXT0U25neur5ckdjbLKrazLWiHzk5ebmq7EH7dnp6aUgAAiQBUAFOVyv7CJ+wgglfpIVjss/Ly8FFbnx9OEbo+IdB8C6K6/OZKr7CZUZGS8UhG+FgiHsGUZ53bSCAGsA2IocairtZD9Zey0EkJcurvQkAHqRQ0tFd5kYzcTYICaoJFFNo16RkOT+kGJRhvYNi1VCMRrNsLCIktWCvLi8XCxtn3nmFmfdRwcHR+7ZxTnPWTV7+GqTs5LtdDFV1c2+okYVhZDht8/6LDWOneqDvPx1N/a4v1jaFtIv9EfJIgCIFb4Z5GADAk3/EaZEZlETMaXOhJOOFtNb6fRWej6THBhIZvrvfj9EHlyamljp+SXc7o1E1PKfXHnX7BX9+xs1LEAPQDqgaglFqQapmhZCPRaPs6jiklSVBqykQVFcLi+aPwqdw0/0heBSONzTGPLNtw1pA2tjqa3uicBIpC3UHPHNdA8GUvdskdAdr9ra5PIQe1tdOB2J39C7O281ebwtTneDLeAIj4Ti2T4QwAeA/chBMndVr/jjFN2n6DCM0gUA/AMAAP//AQAA//+uS6NAAAAAAQAAAAEEnPdU435fDzz1AAMD6AAAAADcHHOkAAAAAN2XHqD/TP46AwwEJAABAAYAAgAAAAAAAAABAAAD2P7vAAACWP9M/0wDDAABAAAAAAAAAAAAAAAAAAAACwJYACMCWAAJAlgARgJYAFwCWABKAlgAawJYADoCWABCAlgARgJYADICWAAfAAAAKgBMAHAAhgCcAKwA2gD8ASYBagF8AAEAAAALAfgAKgBuAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWTW8b1RfGf2OntsdN+88/lNIUKJcSSholEztKoypFArdpVUNISpxSoVIJx3acUfwme9w2rFmwZMVnAMSqqy4QYpUFC5aIFSvEig+AWCA0Z449Y9ckbVWpee7c8/o8595r4J3Y38SxxmzgABRbnONAcYwUvyuOs8KfiseYsS4oPkbZWlecYNp6pDjJj9YvilMsxb5SbLMU+0nxcRZj/yg+ETfxjOKTLCVuKZ5iOvF5gC1IJ75WbDGe0FxWjInED4rjTCR+VjzG2cRvio8xnvhLcYLJ5JjiJJPJ04pTTCZnFNtMJlcUp5lOrik+jkm2FI8zl/xS8Qkyye8Vn8RJKlfW/1hMnVU8weVUL87/uZDq9TXJ26lvFb8QqfkU51N/KH4x0vvpSO8vRXKdieSa4qSdUnyWcbvX48sR31c4ZZ9X/Cppe1nxuYjva4zb7yo2TNi9+l8PZ8M6z6T9ieI3SNsNxdOROG9GaniLJfuh4ovM2t8pnsWxdWasOebSPY3mI3kdMmmdE2shUkOGmfSniheZTX+h+Fqk31Xh8BsMi2TIksEwr6tFWeUo02SbCoYC+3TwqFCngyFPgxJN2rTk/6LslTHMsIuHR4sVFljggfxzKPajOeJZZ4GLzGF4gIvHLoZNKnSo0Oa+RrtBkwYehnWK1P1azBkKNOnSpkTFTOFE1xiu0aQs6BZtmlylSY0yWRzp9DJXyLHKVTa4MuDb8wz85vueh8c3fbuPpPYOrlRtBjLu0sSTzhvc7+85ZMmyzBXqFNmjIlY7VHgoGRZxuITDMpdYlljPXq8rihUxeKJUWVQs0mYPQ5Od59balS597Xy/2zREyWCvgKeWQfYGZRbE30iPu8KVkchd0biNK9bOc1VziyJdahhWcTDc1Kj+hG0Jr/7frkyeX3eFxjNMqsc+LSpssat8hpNZEA49HginIeM1XFGgITPtc9IVFoK+e6wVyLOGYUPiNwYirw1E8DsZNWFZ6TesbDBvqP99irjUKLJNTXbCk1eUvDk+FOyxghlip0NJFGrhiUYdieWIBlUW2OAGa0OVHM1RWf4G2m/T7U9P0J0/Nf55z1EQ5QtmSk5bTlgrCCN3yLPFTTa4zZasc2yySY51tshzXXw32JSTu8E6q+KRFxzs3ZATsM7HGN4nLzZ+7IryEyjmn8mWVN+R2oNZdqnTEs79yh3ptSIdPrvChh2N2vPtiE8Jlx2xNKJfgypdilR1KlpSYV247M1GeOqCiahLL7624X6Vpty0bTm5flTDvt4d/rQGNQU3hPcUqjrPNTP/faNtyunzuwhRXroIZrzTZ78i3Q6uq/qWuHKfBveV4YLwUZDXxMVY71GS7L6vz4WJP3riy+MnvhyIym22cYMpjR9wjX3JVtPqDNvCinhwN/Yr9+iIfh1R16/oM4ni3013yXBP75kmVbnZWsJ5Sc7ivqyC+bnL/CG2Rb0v26LXntjPjshdlteiJtoZ6a2q0ae5Jxx7OhvBHWto0JU3uC27wSmV3sgeWs9wpI72MKd1Dao4J6/CsCbD2o6yeixfh5QZyw6oPcrvQH55VOX98Nm4Iye/KtN8nYf6bq71v4XoA+HSFV4K8kb591jwCoeevXf5qsQvsTdy5sMZnx+Z9Sifp7cc7PYo68EeD7cd5uAo+1G/WEbbKXP/AgAA//8BAAD///u8HqIAAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAC4Af+FsASNAA=="); +} .d2-1710037582 .text-mono-italic { font-family: "d2-1710037582-font-mono-italic"; } @@ -96,7 +103,7 @@ .d2-1710037582 .color-AA4{color:#EDF0FD;} .d2-1710037582 .color-AA5{color:#F7F8FE;} .d2-1710037582 .color-AB4{color:#EDF0FD;} - .d2-1710037582 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND + .d2-1710037582 .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}]]>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 657a4943d..07d7b19ca 100644 --- a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg @@ -6,6 +6,13 @@ font-family: d2-1743257672-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAAAvkAAoAAAAAFgwAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAVgAAAGIAzgF1Z2x5ZgAAAawAAAKfAAAC7EiYK6VoZWFkAAAETAAAADYAAAA2GanOOmhoZWEAAASEAAAAJAAAACQGMwCSaG10eAAABKgAAAAsAAAALBnIA3dsb2NhAAAE1AAAABgAAAAYA9QEmm1heHAAAATsAAAAIAAAACAAPwJhbmFtZQAABQwAAAa4AAAQztydAx9wb3N0AAALxAAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icRMsxCgIxAAXRl92oUbxUQIuAWIh4VEEE8WZfSOM0Uz0Uq4Kj6jHfLKrubLi6J+hOhotbkm8+eeeV53T/isWq2tjaafYO/AAAAP//AQAA//8ZPRA6AAB4nDSRTUgbaRjHn/eZZGZlXTevcSa7bjQZXzOjksgmM5lRd0k26iZxV3eju5LdJUZkg4q7wQ8QoQjNoRWhFKYgPbRpD82hSKHHflx66sFD8dCThXrpQQRBeuilh5mWxMh7eA//hx/P//eAGxIA2Il7wEELtEI7iAAalWlIVlUmCKbq00yTBZAmyFvHImRCdxmblcojV3T0bHThKu7Z/49cW1rKnZw+L25t3Twhh4AQBMAhtKAFKIBX0FRFURnPc17Ny1QmnAZeBqj8tcsTfHNcPP4rcZ4kq6WSWR4eLjv/oGWvHRwAACDkAbAfLfiiztGoFpPEDp6pWsyI6wpj+Qd71bu3/phYX11dn0Brv3rv8fiN7e3rAEBgAwDb0YIvG33Ey7dBbjsviMd5TybRSh9mzjNAYB6AfGzOxjXK4rLIqCbO12rkTq2WQS6dtu0MNLg7ANiFFrgbG1FZ3JkhP6NlP23mWQD0oAXfNXKvTzO9GmVUNwyTCRzjVNaNIs0uFoKuwNxizi0gFyr+WFCQ491oOacrK+Qbe41kg/lZf8VxCFb8s/mg86zOngFAHi3wXrIVJU41WodKkkhnCq+TiC25iw8tp7Qb/U8nf9prpLobW9acfUAoNZ22ga/ptC5V8DKOUXpptvRqbOmH3NjD+fub5anp6akyWmx6fHKOOu+I6JyRv5M/pfSLvmOfPuC3WIUIgLtHUU1JuoAoqjqIcd0wtJjkExSF9fBihyT5fN0odvA8iWavhGOhf4fGfw3Ee4pyKmwuJBPLveHgb9pwmhn+Qn9KHVpujYdHQpGRQTbgb+v/amD0+9jvkUiv0SXr4UBfZ2ufJ5KK6rMxIDAAgINogQAgNy9I8AhdR/hLOm0/AfgMAAD//wEAAP//sgOlMwAAAQAAAAIJurLyntVfDzz1AAMD6AAAAADcHQ33AAAAANwcc0v/P/46AxkEJAAAAAMAAgAAAAAAAAABAAAD2P7vAAACWP8//z8DGQABAAAAAAAAAAAAAAAAAAAACwJYAD4CWAAgAlgAVwJYAHICWABfAlgAhgJYAEgCWABSAlgAZAJYAEMCWAAqAAAAKgBOAGwAggCYAKgA1gD4ASABZAF2AAEAAAALAfgAKgBlAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWS2yT2RXHf865Ab94GVQNCFVXI4SmCIydScBNIOCQAcIgQklm2gpR1STGsUjsyHZg6GIWXVZddV11M120ErQKJWomgUIgpGoFqtRFNauuuqi66KqaRVfVd77jxHESOoOQyO8+zv+e173+gItyCyHiohFIgnGEJEnjDg7xjrGQ5JSxI8lF406SjBpvI8kPjbeTYtI4ymE+NY5xmF8axznCn40TnOA/xkkGI0eMd9IbqRjv4mDkV8a76YosG+9p8TPFwciXxntXdWLASkfKOMI3O74w7mBnx5fGwmVxxq5lTyfjctV4G0fkkfF2nsnfjaN0u18Yx+h2fzVO0NW5zXiH+M6c8U66o98LOQK7oz81jrA7+nPjDg5E7xsLyeiKsSMVNf1IJ6noP4y3kYpaLEH+Y1HjKIdiB4xj+Fi/cZyjsR8YJ8jEfmKcJB1bMN5BV+yfxjvJxZs6uzgcv2a8m1PxT4z3tPic4t245Sqyt0Vz36rm/gik4n8zjpCKN+c7eDf+X2NhX+KgseNAImPcyYHEJeNtHEiMG29nX+JT4yiZxM+MY7yXeG4c52jiX8YJupPfME6SSzY1d3Iq+WPjXWSSfzDezcXkv433tPiZomvHCeO9gY7MyjNZlFd4Ci1cooznMJ5JvDyWObzMyoIsyZw8llfyRObkuXwm9+Wx/B4fuSRL8kD+JE/w8rCF51t4RT6TB7IkD+VzWZCneJeVBXkpS/K5LMqizr4y+1n5o7zGc73jC24EZ8gjeaAqoS8Lcl/mZU6WAx2uk+GGLMtLeSZP5Xdqv6J6v8HLM5mV17Ios7rz2BY7n8pzjfGFLMucLMlv5UVzlusc4Ya8kNfyWB7KU1kMTg3Olpd4eaQzs2oTzmzu46EtTr6Plzl5IrOahSDLy8159feont6SX46qp2t1a8l321pJxxvz3lIV27FaSX6Np4sMWTJ4jtmoS0d5xqlykyKeEe5Rp0GRKep4hqgwRpUa0/p/QdfG8bzHBA0aTNPLcY5zV/+lKayqpdVyiuN8K/CHu5RpMIHnGkXqFKlxx9TOU6VCA88VCkwFvvh3GKHKDDXGKPr9pFvHeM5RZVzpKjWqqlpihkkK1OgiTYb3ydFHnkEGGKZvnULTPrQ+1mYfWg0zwAd8rL7WKauXfp32BFUaGmmFO3iyupYmS5YT9DFFgdsUddctinyiHgcKPaQ5QQ8ntC5f3bP1WShrnQp4Glqfca1dsO82niq33rrCZY01qFhg9xEVrV+4NkLDdoanVxjnuNp7jXRCM+ZVeUYrW6Osu9Nv5c1VChq/Z5A0noumGvTVqGY3+Duj/Rb4XaTyNfqzwT2mKTLKhOVzrR9HNIcN7mpO1zI+SVkrUNFODnIyo1kI425mbYQhLuMZVv3KOuXL6xSCSNr7LKt9lNbYJjY9d63+dyhQ1g65yaSurN23gp6b5zvKDXrxbdmpM6YVmqahNaqrVlprUOI4w5zncpsn/z9H4/o3rP1NZla7J4wu6JrglucZ0cqP+P14BnQ8xIhm5LsMMcpFhvmIUR3nucY18lxhlCE+UNthrul7MMwVBtViSDlcO6834Arfx/MhQ7on0C5afsKKBTdzWr2vq+9hL5eZYlpzHnie1liLGuHXr7Dnlqk2betqM0aZW7rTa/0qetcLlKwrptXDKc1lszfWbl3YEVMaS1DbtfUSVX1fa3pzA1XPPXs7gm4NfQpfiMZXqGr6rXqmvprDovq8flyy34Gyvo3hq9P8RhnRX4Ky/n6NqdeBbRBR8HvZPjO/YWZFa1XjJuWw12SFc9zT0ybtHnluamxqEX6ZUNcq1LVGgUc/UpVq85vEXosqJX2fpjVzY3qj7uko7AL9Ktlyb8FevZpm/Xbze2TD2cFbNWnvvtfYSqZ+iBsUmDSVir2Ungoz+vtZ09XwrmlsZN/oT7tSvfVLZUMVj+rb3l6T9tputku/Ztor47Lrqr2Z3Yo74866fpd3A67ffRvvMu0zlNzHeJfDu7/gXR7vTrqMy7sed8H1uow75XIu7zJKedfrcoFV5JJyv2qd0R2n3YfBijzccmV+y5UVPe+sy66d4LJKZ13O9bk+l3MXXI+uZtww3vW6sy7jBoJxswfV7wuq0+tOu3NuIFR3p12/63OXm73oBlzOnXH97n3VGGw5s9v1uMHAs2Yvbro39OCk63I97qTrdv1hppr9uKUfJ91pl3G9ek6/RpUJVJuduYVfPVaRUxp/sGfA9QQZae21jXUO+uGNNdqQb7XY0B1v1JnfrDPeaLHyPwAAAP//AQAA//+blbgHAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAA="); } +.d2-1743257672 .text-mono-bold { + font-family: "d2-1743257672-font-mono-bold"; +} +@font-face { + font-family: d2-1743257672-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAAApUAAwAAAAAEyQAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAVgAAAGIAzgF1Z2FzcAAAAdQAAAAIAAAACAAAABBnbHlmAAAB3AAAAp4AAAL4p7sURWhlYWQAAAR8AAAANgAAADYbI9ohaGhlYQAABLQAAAAkAAAAJAYzAJ9obXR4AAAE2AAAACwAAAAsGcgClmxvY2EAAAUEAAAAGAAAABgD5ASybWF4cAAABRwAAAAgAAAAIAA/AmpuYW1lAAAFPAAABO8AAA2sAwZtKnBvc3QAAAosAAAAIAAAACD/uAAzcHJlcAAACkwAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nETLMQoCMQAF0ZfdqFG8VECLgFiIeFRBBPFmX0jjNFM9FKuCo+ox3yyq7my4uifoToaLW5JvPnnnled0/4rFqtrY2mn2DvwAAAD//wEAAP//GT0QOgAAAAEAAf//AA94nFSRzU8TURTF79wpnaAt6VDeFFpoaR+d4bMtfZ0W2kAIodDwTQIRsFJDohsIQYpx4ZhoXGkeSpRog7KThRvCwphg3OEKNv4NxqQLN5C4Mmk107Jx9Rbn5LxzfhdqgAKgjnsgQi3YoB4IQF72y0GmaVSSEpqLJRLUhzLF+vLhh/Z2S4eRyx1aunwF3/0V3Cut35xaXbWffNnMpVIfT4Q8AEItAM4gBzvIAHknc1JRVTVqtUqipvtJ7fnx+ft5W7PNYnPbFxxCH/LStjDeu8HYRm/587t8HhBGATCGHK5VG7GoopAGq5VqLBqP6zFVpXT0U25neur5ckdjbLKrazLWiHzk5ebmq7EH7dnp6aUgAAiQBUAFOVyv7CJ+wgglfpIVjss/Ly8FFbnx9OEbo+IdB8C6K6/OZKr7CZUZGS8UhG+FgiHsGUZ53bSCAGsA2IocairtZD9Zey0EkJcurvQkAHqRQ0tFd5kYzcTYICaoJFFNo16RkOT+kGJRhvYNi1VCMRrNsLCIktWCvLi8XCxtn3nmFmfdRwcHR+7ZxTnPWTV7+GqTs5LtdDFV1c2+okYVhZDht8/6LDWOneqDvPx1N/a4v1jaFtIv9EfJIgCIFb4Z5GADAk3/EaZEZlETMaXOhJOOFtNb6fRWej6THBhIZvrvfj9EHlyamljp+SXc7o1E1PKfXHnX7BX9+xs1LEAPQDqgaglFqQapmhZCPRaPs6jiklSVBqykQVFcLi+aPwqdw0/0heBSONzTGPLNtw1pA2tjqa3uicBIpC3UHPHNdA8GUvdskdAdr9ra5PIQe1tdOB2J39C7O281ebwtTneDLeAIj4Ti2T4QwAeA/chBMndVr/jjFN2n6DCM0gUA/AMAAP//AQAA//+uS6NAAAAAAQAAAAEEnPdU435fDzz1AAMD6AAAAADcHHOkAAAAAN2XHqD/TP46AwwEJAABAAYAAgAAAAAAAAABAAAD2P7vAAACWP9M/0wDDAABAAAAAAAAAAAAAAAAAAAACwJYACMCWAAJAlgARgJYAFwCWABKAlgAawJYADoCWABCAlgARgJYADICWAAfAAAAKgBMAHAAhgCcAKwA2gD8ASYBagF8AAEAAAALAfgAKgBuAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWTW8b1RfGf2OntsdN+88/lNIUKJcSSholEztKoypFArdpVUNISpxSoVIJx3acUfwme9w2rFmwZMVnAMSqqy4QYpUFC5aIFSvEig+AWCA0Z449Y9ckbVWpee7c8/o8595r4J3Y38SxxmzgABRbnONAcYwUvyuOs8KfiseYsS4oPkbZWlecYNp6pDjJj9YvilMsxb5SbLMU+0nxcRZj/yg+ETfxjOKTLCVuKZ5iOvF5gC1IJ75WbDGe0FxWjInED4rjTCR+VjzG2cRvio8xnvhLcYLJ5JjiJJPJ04pTTCZnFNtMJlcUp5lOrik+jkm2FI8zl/xS8Qkyye8Vn8RJKlfW/1hMnVU8weVUL87/uZDq9TXJ26lvFb8QqfkU51N/KH4x0vvpSO8vRXKdieSa4qSdUnyWcbvX48sR31c4ZZ9X/Cppe1nxuYjva4zb7yo2TNi9+l8PZ8M6z6T9ieI3SNsNxdOROG9GaniLJfuh4ovM2t8pnsWxdWasOebSPY3mI3kdMmmdE2shUkOGmfSniheZTX+h+Fqk31Xh8BsMi2TIksEwr6tFWeUo02SbCoYC+3TwqFCngyFPgxJN2rTk/6LslTHMsIuHR4sVFljggfxzKPajOeJZZ4GLzGF4gIvHLoZNKnSo0Oa+RrtBkwYehnWK1P1azBkKNOnSpkTFTOFE1xiu0aQs6BZtmlylSY0yWRzp9DJXyLHKVTa4MuDb8wz85vueh8c3fbuPpPYOrlRtBjLu0sSTzhvc7+85ZMmyzBXqFNmjIlY7VHgoGRZxuITDMpdYlljPXq8rihUxeKJUWVQs0mYPQ5Od59balS597Xy/2zREyWCvgKeWQfYGZRbE30iPu8KVkchd0biNK9bOc1VziyJdahhWcTDc1Kj+hG0Jr/7frkyeX3eFxjNMqsc+LSpssat8hpNZEA49HginIeM1XFGgITPtc9IVFoK+e6wVyLOGYUPiNwYirw1E8DsZNWFZ6TesbDBvqP99irjUKLJNTXbCk1eUvDk+FOyxghlip0NJFGrhiUYdieWIBlUW2OAGa0OVHM1RWf4G2m/T7U9P0J0/Nf55z1EQ5QtmSk5bTlgrCCN3yLPFTTa4zZasc2yySY51tshzXXw32JSTu8E6q+KRFxzs3ZATsM7HGN4nLzZ+7IryEyjmn8mWVN+R2oNZdqnTEs79yh3ptSIdPrvChh2N2vPtiE8Jlx2xNKJfgypdilR1KlpSYV247M1GeOqCiahLL7624X6Vpty0bTm5flTDvt4d/rQGNQU3hPcUqjrPNTP/faNtyunzuwhRXroIZrzTZ78i3Q6uq/qWuHKfBveV4YLwUZDXxMVY71GS7L6vz4WJP3riy+MnvhyIym22cYMpjR9wjX3JVtPqDNvCinhwN/Yr9+iIfh1R16/oM4ni3013yXBP75kmVbnZWsJ5Sc7ivqyC+bnL/CG2Rb0v26LXntjPjshdlteiJtoZ6a2q0ae5Jxx7OhvBHWto0JU3uC27wSmV3sgeWs9wpI72MKd1Dao4J6/CsCbD2o6yeixfh5QZyw6oPcrvQH55VOX98Nm4Iye/KtN8nYf6bq71v4XoA+HSFV4K8kb591jwCoeevXf5qsQvsTdy5sMZnx+Z9Sifp7cc7PYo68EeD7cd5uAo+1G/WEbbKXP/AgAA//8BAAD///u8HqIAAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAC4Af+FsASNAA=="); +} .d2-1743257672 .text-mono-italic { font-family: "d2-1743257672-font-mono-italic"; } @@ -96,7 +103,7 @@ .d2-1743257672 .color-AA4{color:#EDF0FD;} .d2-1743257672 .color-AA5{color:#F7F8FE;} .d2-1743257672 .color-AB4{color:#EDF0FD;} - .d2-1743257672 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND + .d2-1743257672 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg index 20edadb36..318f2a208 100644 --- a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg @@ -883,7 +883,7 @@ -NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

      A TALE

      +NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

      A TALE

      • OF
      • TWO CITIES
        • @@ -934,7 +934,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST +}Cell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST diff --git a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg index fcfe38f98..366f085c3 100644 --- a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg @@ -883,7 +883,7 @@ -NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

        A TALE

        +NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

        A TALE

        • OF
        • TWO CITIES
          • @@ -934,7 +934,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST +}Cell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST diff --git a/e2etests/testdata/themes/terminal_grayscale/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal_grayscale/dagre/sketch.exp.svg index e45e3a3d6..c625ab6b2 100644 --- a/e2etests/testdata/themes/terminal_grayscale/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal_grayscale/dagre/sketch.exp.svg @@ -6,6 +6,13 @@ font-family: d2-4136323113-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAABGgAAoAAAAAHiAAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAngAAANQESwRqZ2x5ZgAAAfQAAAerAAAKECfss9toZWFkAAAJoAAAADYAAAA2GanOOmhoZWEAAAnYAAAAJAAAACQGMwCnaG10eAAACfwAAABnAAAAgEsACNVsb2NhAAAKZAAAAEIAAABCJoYj8G1heHAAAAqoAAAAIAAAACAAVAJhbmFtZQAACsgAAAa4AAAQztydAx9wb3N0AAARgAAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icfM07LgUBAEbhb8z1vq7xfg9bERERjWhkekIxEaGwJQkSau/ONqzkF7OAe9qvOCiUCvT1/KBWKQ3s2LXvwKFjpxrnLrWu3bpL6Hyv8yMnGmcutK7c/Ht+852vfOYj73nLa17ynKc85iH33W1YhRGlnlFjxk2YNGVa34yBWZU58xYsWrJsxao16zZs2lLb5g8AAP//AQAA//9fCyidAAB4nIxVfWgb5/3/Ps+d7/yixj7LJ8W2rLezT36RLEenO9mKrBdLli1biSXZil3HkpP43Y2bRPklIT+8LFmXttAOLiUsaef2j2VslNJBGawbgw26MTzYSloYdJDC6MCYdpRh/MfKotO4k5y4K4MhuDuQnq8+38/bQRUEAXALvgsE1IAOGoEFEBgb02FzODia9jmMgs/HWTATRI8UGaGEl5Su3Lz5Dnls6Iuhs9/Gd4vn/d9dWUnt7P4yf+3a93bQh4DBCoD7sQw1wADoacHB8w6Oogi9oOccHL1r+Z2FsdWTDda/fJr/dCb4ZQhdWFz0bQwMbCizWC5e3N4GAEAQKe3jbrwFbQBVdp4XvZIkeAxGmuc5O0WxTQaD4JF8RopC8+lbyeTt7PE5k7t5qCuU83pzIdeoxe1Y0KXvP7d+P9NnFVttkauZzPUhnhNcHgDAMA2Au7AM1SpOgRE8BraJ4hyCRxK9PMdN//Du1g/uTCYuXbhwKYHlt7fe/Gnslc3N2xq2AgBuxDLUaXyxB58C+r7ya9Sg/AMlsRz/cOTLEUAglvYxi7fA8t/2EDw+kRMFhqJQOnMrMf5CNjJjch8NuQfnhLWzia4XHlqWKosIbWKLPXI1s3nH8c6w8neLCxDMA6CvKlhEgeFEG8sxAjv/4AF648GDEUzE48XiSJnTcwA4hmXQaRszAhJoPUfQ7LkpAjXNP9zN/+YSlpX3UeIrZQ3NvPSReuZFANyGZagqn7GxL2bQMJaL71dmjgLgBixDq/a93ij49ALDMV5J8nE0wREOzoxZZnR5zkpacsupKhoTHfnAHI8JqgrLyu76OjpavIhGrdNZ001FQfimKTttVX6hzs4AYArLoD+YzfMiIzDqUIOBZTJzH4cwrkmVb1hWFl8+9pwXTRUvoq2XPauC8jZg6Cvt4068BfUqwkMKqHJTjrLadlUH5BwrhMOFsfJ1/PTp8fHTp3WZ18+v30ul7q2ffz2TkG9svvrq5g1Z9c8yALZoXLIV/2gTOY5hDjy0/PvExuDg86OX105NTmXXsNyeHR2edSqP0WgkPuIDzYeLFR8eAeOhOaouhyYt/jG6cjwV/cn8W1c2TqTTJzawzKVjyRyjfIZY5Qv0bCgc8Zb1iJb2cTPeApe2rcOn5UT08rzD0Yu/7j41REajGau40bHR/3d6Ohb6Y+MW0Z63RZy+s6HgarvTelIYiHOSaa4r4uhf1YlOf4fL38t1m450PdM91OeZcLnapTab12npbNF1Nrgix7xZDyDoBsC9WAYawFZxJcKfYPITPBaPF3+uYZ0o7au6qQxqyjACU861pD1SFHKFlwam2kOOzmBHemBB5y3k0X1lOZZub0/H0BvKar7gBQQ9ANiFZXgGQCAEvcFgFCTJpxeIxx/NrDOmRrKxrWEt+xDLylv+Jb9/yY/OFS8CgloAfBLfgY7yOTM2CkHs8wnGypNeIDii3F808fxivo+oIhFB1dZS4VSQrq2hSEyQRO/smdUwrasiqmqrw/iOstjqcttsbmfr/n6rs/yE3ixeQNVmv9nsNyv/1HbnAbAHy1APYBMJwVgB7RMIFuFHMwv69iayidfPn3r0OfrxbzuSnZ1J/gNl9nPVM4HSPvoX3oYmsGnMHcgqONQGUOE6PD7xScOg+vn/Cy0NOOMWgszEaMI8aRqN2ELW7uGupO729YnLQZt59lfF/rDFNZzYs7S4J/unF9T/iZX2cQvaA0ptL2SnaBvPE08jpPrU9rSHg4F8HZKqTnoS1+LxS5G1Kxgrt6rXks4Rm7k9h947MTo+pkQDl9MThcFvrRxpqc1MNbPSUbvqWwJGS1YsoT3ogwAkK1upO4heqXKTBI9RYLlKzuy8o1yfZSAUcSjK+kpsDn6DOtevpvQWs6mZE6eFLssfbjBHPVlR39PU2CT2beRPD12fcUci7t6hoYHsOV//PNvRYDel/zoSDvaSdbzFeExP6sM94skeXZTxtnnHO2tq6kyMyeQNuk660XshrxAKCd6Q8kqggztKkvoulle7OQeA6/B2pSFYWijTptajipRmcpkqgp8eOJXJeAM9sR68/cHlLmnxjPIx4oajTqfybjnTY1qmt6GhzAujvi60F4dK+70Tk++WxJ6ePtber3v2FPosWvyz2GcYPFKvndUwoD1o0jAYvwkhRpP8zBMIaGfyPxFofsMmtPe/dGh4IxrdCJev8Ww2Hs9mdYFCKlMIBAqZVCEQW5mcWl2dmlxR5+ZKgjZX87HxKbqKvpyR1R8Mp1mDIRejCfuzrnMrwcXj9gkrQX4nkg0nrAmei/8J/yxo7X7pUuZq0Gae+xGiVmZTCxy/Z2lROXgNADejPWg8zEGlBGnmtRhN8BejrW6Dvrm9zbfkRDuXj8dq6kZqqkNJ5W+AYKS0j4+gPej8RqdqVHytUQ/6VBrZdPLdy9HgIBsZyp9ZXuxfbe+0Z9xBT3QsPW3znNG5LJK53WXRm03PNEV9xyc6mkWjqdtksTcw3VKHY6hT068aAKfQjprAQ93me1IYakc51Iqi6cJ6xk/XkWRVfXUg469uJEmqhvYnV9f7dTpSp5PQjrJjj3BcxP74cfmOWpSWXSGXE3YB/g0AAP//AQAA//+gxiUlAAABAAAAAgm6RVD/iV8PPPUAAwPoAAAAANwdDfcAAAAA3BxzS/8//joDGQQkAAAAAwACAAAAAAAAAAEAAAPY/u8AAAJY/z//PwMZAAEAAAAAAAAAAAAAAAAAAAAgeJwsy6GpgmEAQNHLTY83hcmgxWL7EURBsQgWbxFBxAEcwgGc2PKlk46xMTBmxta4Gm9jbdyNh/ExjsbFWBkv42nsjIVxNpbGvzE3JmM/zs04Dafh1zgYfz8AAAD//wEAAP//AJQUFgAAAAAqACoATgB+AJwAsgDiAPgBEgEiAVABcgGeAcIB6gIuAkACZAKAAr4C3AMQA0YDsAPUA/IEFARABHQElATSBQgAAAABAAAAIAH4ACoAZQAGAAEAAAAAAAAAAAAAAAAAAwADeJyclktsk9kVx3/OuQG/eBlUDQhVVyOEpgiMnUnATSDgkAHCIEJJZtoKUdUkxrFI7Mh2YOhiFl1WXXVddTNdtBK0CiVqJoFCIKRqBarURTWrrrqouuiqmkVX1Xe+48RxEjqDkMjvPs7/nte9/oCLcgsh4qIRSIJxhCRJ4w4O8Y6xkOSUsSPJReNOkowabyPJD423k2LSOMphPjWOcZhfGsc5wp+NE5zgP8ZJBiNHjHfSG6kY7+Jg5FfGu+mKLBvvafEzxcHIl8Z7V3ViwEpHyjjCNzu+MO5gZ8eXxsJlccauZU8n43LVeBtH5JHxdp7J342jdLtfGMfodn81TtDVuc14h/jOnPFOuqPfCzkCu6M/NY6wO/pz4w4ORO8bC8noirEjFTX9SCep6D+Mt5GKWixB/mNR4yiHYgeMY/hYv3Gco7EfGCfIxH5inCQdWzDeQVfsn8Y7ycWbOrs4HL9mvJtT8U+M97T4nOLduOUqsrdFc9+q5v4IpOJ/M46QijfnO3g3/l9jYV/ioLHjQCJj3MmBxCXjbRxIjBtvZ1/iU+MomcTPjGO8l3huHOdo4l/GCbqT3zBOkks2NXdyKvlj411kkn8w3s3F5L+N97T4maJrxwnjvYGOzMozWZRXeAotXKKM5zCeSbw8ljm8zMqCLMmcPJZX8kTm5Ll8JvflsfweH7kkS/JA/iRP8PKwhedbeEU+kweyJA/lc1mQp3iXlQV5KUvyuSzKos6+MvtZ+aO8xnO94wtuBGfII3mgKqEvC3Jf5mVOlgMdrpPhhizLS3kmT+V3ar+ier/ByzOZldeyKLO689gWO5/Kc43xhSzLnCzJb+VFc5brHOGGvJDX8lgeylNZDE4NzpaXeHmkM7NqE85s7uOhLU6+j5c5eSKzmoUgy8vNefX3qJ7ekl+OqqdrdWvJd9taSccb895SFduxWkl+jaeLDFkyeI7ZqEtHecapcpMinhHuUadBkSnqeIaoMEaVGtP6f0HXxvG8xwQNGkzTy3GOc1f/pSmsqqXVcorjfCvwh7uUaTCB5xpF6hSpccfUzlOlQgPPFQpMBb74dxihygw1xij6/aRbx3jOUWVc6So1qqpaYoZJCtToIk2G98nRR55BBhimb51C0z60PtZmH1oNM8AHfKy+1imrl36d9gRVGhpphTt4srqWJkuWE/QxRYHbFHXXLYp8oh4HCj2kOUEPJ7QuX92z9Vkoa50KeBpan3GtXbDvNp4qt966wmWNNahYYPcRFa1fuDZCw3aGp1cY57jae410QjPmVXlGK1ujrLvTb+XNVQoav2eQNJ6Lphr01ahmN/g7o/0W+F2k8jX6s8E9pikyyoTlc60fRzSHDe5qTtcyPklZK1DRTg5yMqNZCONuZm2EIS7jGVb9yjrly+sUgkja+yyrfZTW2CY2PXet/ncoUNYOucmkrqzdt4Kem+c7yg168W3ZqTOmFZqmoTWqq1Zaa1DiOMOc53KbJ/8/R+P6N6z9TWZWuyeMLuia4JbnGdHKj/j9eAZ0PMSIZuS7DDHKRYb5iFEd57nGNfJcYZQhPlDbYa7pezDMFQbVYkg5XDuvN+AK38fzIUO6J9AuWn7CigU3c1q9r6vvYS+XmWJacx54ntZYixrh16+w55apNm3rajNGmVu602v9KnrXC5SsK6bVwynNZbM31m5d2BFTGktQ27X1ElV9X2t6cwNVzz17O4JuDX0KX4jGV6hq+q16pr6aw6L6vH5cst+Bsr6N4avT/EYZ0V+Csv5+janXgW0QUfB72T4zv2FmRWtV4yblsNdkhXPc09Mm7R55bmpsahF+mVDXKtS1RoFHP1KVavObxF6LKiV9n6Y1c2N6o+7pKOwC/SrZcm/BXr2aZv1283tkw9nBWzVp777X2EqmfogbFJg0lYq9lJ4KM/r7WdPV8K5pbGTf6E+7Ur31S2VDFY/q295ek/babrZLv2baK+Oy66q9md2KO+POun6XdwOu330b7zLtM5Tcx3iXw7u/4F0e7066jMu7HnfB9bqMO+VyLu8ySnnX63KBVeSScr9qndEdp92HwYo83HJlfsuVFT3vrMuuneCySmddzvW5PpdzF1yPrmbcMN71urMu4waCcbMH1e8LqtPrTrtzbiBUd6ddv+tzl5u96AZczp1x/e591RhsObPb9bjBwLNmL266N/TgpOtyPe6k63b9Yaaa/bilHyfdaZdxvXpOv0aVCVSbnbmFXz1WkVMaf7BnwPUEGWnttY11DvrhjTXakG+12NAdb9SZ36wz3mix8j8AAAD//wEAAP//m5W4BwADAAAAAAAA/7UAMgAAAAEAAAAAAAAAAAAAAAAAAAAA"); } +.d2-4136323113 .text-mono-bold { + font-family: "d2-4136323113-font-mono-bold"; +} +@font-face { + font-family: d2-4136323113-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAABAoAAwAAAAAG4wAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAngAAANQESwRqZ2FzcAAAAhwAAAAIAAAACAAAABBnbHlmAAACJAAAB8gAAApwC9ZrpmhlYWQAAAnsAAAANgAAADYbI9ohaGhlYQAACiQAAAAkAAAAJAYzALRobXR4AAAKSAAAAGQAAACASwAGkWxvY2EAAAqsAAAAQgAAAEInvCUQbWF4cAAACvAAAAAgAAAAIABUAmpuYW1lAAALEAAABO8AAA2sAwZtKnBvc3QAABAAAAAAIAAAACD/uAAzcHJlcAAAECAAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nHzNOy4FAQBG4W/M9b6u8X4PWxEREY1oZHpCMRGhsCUJEmrvzjas5BezgHvarzgolAr09fygVikN7Ni178ChY6ca5y61rt26S+h8r/MjJxpnLrSu3Px7fvOdr3zmI+95y2te8pynPOYh991tWIURpZ5RY8ZNmDRlWt+MgVmVOfMWLFqybMWqNes2bNpS2+YPAAD//wEAAP//XwsonQAAAAEAAf//AA94nIxWW2zb9vU+vx8p0RfalkRRtERZN0qkZVkXkxJlW5Yv8iXyNZZj/x0nrp34H2/dYmde7KTe6mA3DEtXJW2XpHHSplixBFiBrQiGLViH5mFo95AUGIqu2FP30hX1w15cwHsZYnogpTg3FNjL+VESec75vvOdTwQTCAA4hS8DAZVAgw1YgFWr3xpSJEmgqLTEKem04MVWAdu0WzcbG8nwxvz8LTLi3fSemcOXd5eOji4s1Lz3p5X5TOad99AqAIZKAHwQF6EGrACrjMIIhChKgtlMEVLKz1Z+dPujNydpN03SrpopC2rFxd01NNRySlFOtWh33lhdBQTq3g5ux5vgAegPxHAqqaqK7OAoURQCZjNrdzgUWU1zZjM6kV2eTBy6MN15wl/g0sFYvqlpuCXYXl9oXKKbps5NLF0rKL6jDqcy19M7L/tcM/EWwDAAgJO4CFUlxIrscLB2s1mQFFlVU0lRFISB389fGBv9+ZFwfXIkEhlJ1uNi3ysrK7848ELj7NjYTAgAEMwCYAcuQrXBG+tnFVZg/ewsuq198dVXSMTFjZ+8+PqGcW/z3g4W8Cb4dUyi+DWYUkJKsZrNaPrQ+fHxlyZzc94CK0tNfVJgQGGEqvl/+pfp4Sunlq+NK76jrKsEq6pqZV371Jsw6gwB4NpyTynFKqT8rGBV2KHNTfTh5uYGuryxoS3pLQGGPgA8gYtQAbTBg1VhFMQqRJrpu0L8+Vfatb9vTn+Bi9q/UbUm/g7FV7U5o8ZJAOzDRTCVnvKzJy+hAC7ubht5EbQDYA8uQoPxO6fLSO8k2YnTAkUJkiR4CJZtv97tIB3d1zdIM4UJWc4rcQJTZhIXt44c2dpdu88XDo+73r1x413X+OECf7+UO1fmnDFyM5wiiikdJyEJDgfL5q6+1EqaLBdKBy5q77+a/GHb1u4a6r+YOte+ZeAW93awjDehDrxPTMNQgfRQA+WxoOaxs7nc2bFSDMg8LweMSI9dXVm+Mjp6ZXnl6tgPWuYH+mYTidm+gfkWvcYwAG7BRaCf0pjAWhVZLyAIw1sHVvsH1vonh7OZbGYYF6XZgyML8X+gCVVOhoEwdJov53B+XRYmzQgDW/2n+/tP90/m27PZ9nzbNz6+hYuhmdHhuei/0LGWRELU/jOvvarzJ+/tYAlvQtRALqUN3el4JenpTdPRc5wH6xVRU+5HqanQTDwerY95J4PdUvbkgczp5uFAXyIYcye8B5s7A5nv0onYokf0OTmerQnWxvsT6nSquek5J+9pYFx2OmCJ98XU2VZAOvO4DReB0nGVVPr5B9j1AbZsbOxul2bdvbeD63ERuLIPWBVraU9U47IWo1jHTMZzyd7o9YbtF92Zw7TQe7wbvaYdk1S3W5XQL7XvdB/vFQBBHQAeNHwJVgmFcTg4RVXTjEJ8+pc3x+q4WtLC1Y6+/iEuah+ri6q6qKLE7hogIAHwJC5CqPSc3eFglU6cTiucB3P6FaMQglS2OOro9DU7RiRZTZua58LmKpokEULI9sr4W6K5ChNEhVnERe2WO5XyeFIqf+cOn0x7POkkj47urt33djc0dHvv69gt5dnX6XtMKFy54bRCsJ9/8laurqGOtHhrc9c/+QzdvhEalKTB0A1t/DND3/G9HWzBd8EOAWPKD8eqSPqm6J2mdK/Z1ziCudXsQircUU9Sl9arCX7QGWHsYQcf42X65e8V1rrcztF3dnsVPrjOOu/Z6jzZ+GB/aUZp3dfQAwg+s0mUP+Wnks9Y9tDoucGhs7nR51MmrJ1HLKe0BFVPsC8RyPpbIs/T2TMThTOdXSf77KHK/3d3ZH05Wenx2awzvBeAgOReFHegByBDDg7t19TBPDpUReYUVijvSkCUjA4URTa+IJ5acKb0Wdi/EbE9ixlJZBv8Ll7MHG+NBe+dqKxJz7bXBm10VTgyu/DN/E8n2IDdHmDtevQ3dgSaI528UMtY+v7GtzZ7ZIasbfQ6ZRtpy0U6xhvppWqBaRsMmkwVlhrG1t6bLMTQPVuIdwUZJujiQzbtsoW3OmtIguZq+YYSt3kA7MZ3yw7CUorBLWsVrAatlDV/qYJwF1onRy/5Gz1RF777m/mG6NKc9lfklWO8U/tDKY+yt4O9+H39H1lXg75uVvv+QF5+7tgbKCZ7bCHOJ3bRK3PoZ6saxISKiiW67lEf6AHYS37+bBvr1aTvUOvkWKkNtJ3zxZ7soqTJMHrwv3puz1o+v9ZTioEox0UDRtTVMXEmW4ovBLojke5AKeo18nt5owarq3F6v9N9GQgcyzyqRLEOR369mvCONnbOJLILrf4uF0lNuZtddslXH+XY6B/xr2Ve6Dw9MrXe5XYVXkNBT48SzXhY5z2rBRCsAeAgegC2x3kpmydlXVunidC3Mv6ww8OF3LEZH9peymaqql6kKLVX0wBBam/H4LXpSS+OYcmg58n3g4dG3Jj7cbwruqiGxWo+Hlo8/P1v9y5LudBkmPNYkl0j/+dPL9NR72yDx2mtrquhKxwjbQNTEedhrr6SqbYztdbmtnA0H4GH3oa29XeS1cct5jGzeWRtU4WLXhNFEqZqynvSR9WYSJOJdJ8f+S1PVppIosLsQttfBgdFcUi4eVM/B4Nfapa3/fkmb3/8bYD/AgAA//8BAAD//2izHHoAAQAAAAEEnH3ZmxpfDzz1AAMD6AAAAADcHHOkAAAAAN2XHqD/TP46AwwEJAABAAYAAgAAAAAAAAABAAAD2P7vAAACWP9M/0wDDAABAAAAAAAAAAAAAAAAAAAAIHicLMorqoJhAADRYbjlJt2BQTAJP/gEk4iI6AYmuAOr+0eEL51yjKWB8W8cjJvxMtbGw7gab+NkXIyV8RxvYyyMszEz/oy5MRlHY2fcje1wGn6M/e9/AQAA//8BAAD//3IVEdIAAAAqACoATAB8AKAAtgDqAQABHAEsAVoBfAGuAdAB+gI+AlACdgKSAs4C7AMiA1oD0AP0BBQENgRoBKAEwAUABTgAAAABAAAAIAH4ACoAbgAGAAEAAAAAAAAAAAAAAAAAAwADeJyclk1vG9UXxn9jp7bHTfvPP5TSFCiXEkoaJRM7SqMqRQK3aVVDSEqcUqFSCcd2nFH8JnvcNqxZsGTFZwDEqqsuEGKVBQuWiBUrxIoPgFggNGeOPWPXJG1VqXnu3PP6POfea+Cd2N/EscZs4AAUW5zjQHGMFL8rjrPCn4rHmLEuKD5G2VpXnGDaeqQ4yY/WL4pTLMW+UmyzFPtJ8XEWY/8oPhE38YzikywlbimeYjrxeYAtSCe+VmwxntBcVoyJxA+K40wkflY8xtnEb4qPMZ74S3GCyeSY4iSTydOKU0wmZxTbTCZXFKeZTq4pPo5JthSPM5f8UvEJMsnvFZ/ESSpX1v9YTJ1VPMHlVC/O/7mQ6vU1ydupbxW/EKn5FOdTfyh+MdL76UjvL0VynYnkmuKknVJ8lnG71+PLEd9XOGWfV/wqaXtZ8bmI72uM2+8qNkzYvfpfD2fDOs+k/YniN0jbDcXTkThvRmp4iyX7oeKLzNrfKZ7FsXVmrDnm0j2N5iN5HTJpnRNrIVJDhpn0p4oXmU1/ofhapN9V4fAbDItkyJLBMK+rRVnlKNNkmwqGAvt08KhQp4MhT4MSTdq05P+i7JUxzLCLh0eLFRZY4IH8cyj2ozniWWeBi8xheICLxy6GTSp0qNDmvka7QZMGHoZ1itT9WswZCjTp0qZExUzhRNcYrtGkLOgWbZpcpUmNMlkc6fQyV8ixylU2uDLg2/MM/Ob7nofHN327j6T2Dq5UbQYy7tLEk84b3O/vOWTJsswV6hTZoyJWO1R4KBkWcbiEwzKXWJZYz16vK4oVMXiiVFlULNJmD0OTnefW2pUufe18v9s0RMlgr4CnlkH2BmUWxN9Ij7vClZHIXdG4jSvWznNVc4siXWoYVnEw3NSo/oRtCa/+365Mnl93hcYzTKrHPi0qbLGrfIaTWRAOPR4IpyHjNVxRoCEz7XPSFRaCvnusFcizhmFD4jcGIq8NRPA7GTVhWek3rGwwb6j/fYq41CiyTU12wpNXlLw5PhTssYIZYqdDSRRq4YlGHYnliAZVFtjgBmtDlRzNUVn+Btpv0+1PT9CdPzX+ec9REOULZkpOW05YKwgjd8izxU02uM2WrHNsskmOdbbIc118N9iUk7vBOqvikRcc7N2QE7DOxxjeJy82fuyK8hMo5p/JllTfkdqDWXap0xLO/cod6bUiHT67woYdjdrz7YhPCZcdsTSiX4MqXYpUdSpaUmFduOzNRnjqgomoSy++tuF+labctG05uX5Uw77eHf60BjUFN4T3FKo6zzUz/32jbcrp87sIUV66CGa802e/It0Orqv6lrhynwb3leGC8FGQ18TFWO9Rkuy+r8+FiT964svjJ74ciMpttnGDKY0fcI19yVbT6gzbwop4cDf2K/foiH4dUdev6DOJ4t9Nd8lwT++ZJlW52VrCeUnO4r6sgvm5y/whtkW9L9ui157Yz47IXZbXoibaGemtqtGnuSccezobwR1raNCVN7gtu8Epld7IHlrPcKSO9jCndQ2qOCevwrAmw9qOsnosX4eUGcsOqD3K70B+eVTl/fDZuCMnvyrTfJ2H+m6u9b+F6APh0hVeCvJG+fdY8AqHnr13+arEL7E3cubDGZ8fmfUon6e3HOz2KOvBHg+3HebgKPtRv1hG2ylz/wIAAP//AQAA///7vB6iAAADAAAAAAAA/7UAMgAAAAEAAAAAAAAAAAAAAAAAAAAAuAH/hbAEjQA="); +} .d2-4136323113 .text-mono-italic { font-family: "d2-4136323113-font-mono-italic"; } @@ -129,7 +136,7 @@ -NETWORKUSERAPI SERVERLOGSCell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDphone logsMAKE CALL ACCESSDISPLAYPERSIST +NETWORKUSERAPI SERVERLOGSCell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDphone logsMAKE CALL ACCESSDISPLAYPERSIST diff --git a/e2etests/testdata/themes/terminal_grayscale/elk/sketch.exp.svg b/e2etests/testdata/themes/terminal_grayscale/elk/sketch.exp.svg index 97c11c89d..b85700ff6 100644 --- a/e2etests/testdata/themes/terminal_grayscale/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal_grayscale/elk/sketch.exp.svg @@ -6,6 +6,13 @@ font-family: d2-16868730-font-mono; src: url("data:application/font-woff;base64,d09GRgABAAAAABGgAAoAAAAAHiAAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAAngAAANQESwRqZ2x5ZgAAAfQAAAerAAAKECfss9toZWFkAAAJoAAAADYAAAA2GanOOmhoZWEAAAnYAAAAJAAAACQGMwCnaG10eAAACfwAAABnAAAAgEsACNVsb2NhAAAKZAAAAEIAAABCJoYj8G1heHAAAAqoAAAAIAAAACAAVAJhbmFtZQAACsgAAAa4AAAQztydAx9wb3N0AAARgAAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3icfM07LgUBAEbhb8z1vq7xfg9bERERjWhkekIxEaGwJQkSau/ONqzkF7OAe9qvOCiUCvT1/KBWKQ3s2LXvwKFjpxrnLrWu3bpL6Hyv8yMnGmcutK7c/Ht+852vfOYj73nLa17ynKc85iH33W1YhRGlnlFjxk2YNGVa34yBWZU58xYsWrJsxao16zZs2lLb5g8AAP//AQAA//9fCyidAAB4nIxVfWgb5/3/Ps+d7/yixj7LJ8W2rLezT36RLEenO9mKrBdLli1biSXZil3HkpP43Y2bRPklIT+8LFmXttAOLiUsaef2j2VslNJBGawbgw26MTzYSloYdJDC6MCYdpRh/MfKotO4k5y4K4MhuDuQnq8+38/bQRUEAXALvgsE1IAOGoEFEBgb02FzODia9jmMgs/HWTATRI8UGaGEl5Su3Lz5Dnls6Iuhs9/Gd4vn/d9dWUnt7P4yf+3a93bQh4DBCoD7sQw1wADoacHB8w6Oogi9oOccHL1r+Z2FsdWTDda/fJr/dCb4ZQhdWFz0bQwMbCizWC5e3N4GAEAQKe3jbrwFbQBVdp4XvZIkeAxGmuc5O0WxTQaD4JF8RopC8+lbyeTt7PE5k7t5qCuU83pzIdeoxe1Y0KXvP7d+P9NnFVttkauZzPUhnhNcHgDAMA2Au7AM1SpOgRE8BraJ4hyCRxK9PMdN//Du1g/uTCYuXbhwKYHlt7fe/Gnslc3N2xq2AgBuxDLUaXyxB58C+r7ya9Sg/AMlsRz/cOTLEUAglvYxi7fA8t/2EDw+kRMFhqJQOnMrMf5CNjJjch8NuQfnhLWzia4XHlqWKosIbWKLPXI1s3nH8c6w8neLCxDMA6CvKlhEgeFEG8sxAjv/4AF648GDEUzE48XiSJnTcwA4hmXQaRszAhJoPUfQ7LkpAjXNP9zN/+YSlpX3UeIrZQ3NvPSReuZFANyGZagqn7GxL2bQMJaL71dmjgLgBixDq/a93ij49ALDMV5J8nE0wREOzoxZZnR5zkpacsupKhoTHfnAHI8JqgrLyu76OjpavIhGrdNZ001FQfimKTttVX6hzs4AYArLoD+YzfMiIzDqUIOBZTJzH4cwrkmVb1hWFl8+9pwXTRUvoq2XPauC8jZg6Cvt4068BfUqwkMKqHJTjrLadlUH5BwrhMOFsfJ1/PTp8fHTp3WZ18+v30ul7q2ffz2TkG9svvrq5g1Z9c8yALZoXLIV/2gTOY5hDjy0/PvExuDg86OX105NTmXXsNyeHR2edSqP0WgkPuIDzYeLFR8eAeOhOaouhyYt/jG6cjwV/cn8W1c2TqTTJzawzKVjyRyjfIZY5Qv0bCgc8Zb1iJb2cTPeApe2rcOn5UT08rzD0Yu/7j41REajGau40bHR/3d6Ohb6Y+MW0Z63RZy+s6HgarvTelIYiHOSaa4r4uhf1YlOf4fL38t1m450PdM91OeZcLnapTab12npbNF1Nrgix7xZDyDoBsC9WAYawFZxJcKfYPITPBaPF3+uYZ0o7au6qQxqyjACU861pD1SFHKFlwam2kOOzmBHemBB5y3k0X1lOZZub0/H0BvKar7gBQQ9ANiFZXgGQCAEvcFgFCTJpxeIxx/NrDOmRrKxrWEt+xDLylv+Jb9/yY/OFS8CgloAfBLfgY7yOTM2CkHs8wnGypNeIDii3F808fxivo+oIhFB1dZS4VSQrq2hSEyQRO/smdUwrasiqmqrw/iOstjqcttsbmfr/n6rs/yE3ixeQNVmv9nsNyv/1HbnAbAHy1APYBMJwVgB7RMIFuFHMwv69iayidfPn3r0OfrxbzuSnZ1J/gNl9nPVM4HSPvoX3oYmsGnMHcgqONQGUOE6PD7xScOg+vn/Cy0NOOMWgszEaMI8aRqN2ELW7uGupO729YnLQZt59lfF/rDFNZzYs7S4J/unF9T/iZX2cQvaA0ptL2SnaBvPE08jpPrU9rSHg4F8HZKqTnoS1+LxS5G1Kxgrt6rXks4Rm7k9h947MTo+pkQDl9MThcFvrRxpqc1MNbPSUbvqWwJGS1YsoT3ogwAkK1upO4heqXKTBI9RYLlKzuy8o1yfZSAUcSjK+kpsDn6DOtevpvQWs6mZE6eFLssfbjBHPVlR39PU2CT2beRPD12fcUci7t6hoYHsOV//PNvRYDel/zoSDvaSdbzFeExP6sM94skeXZTxtnnHO2tq6kyMyeQNuk660XshrxAKCd6Q8kqggztKkvoulle7OQeA6/B2pSFYWijTptajipRmcpkqgp8eOJXJeAM9sR68/cHlLmnxjPIx4oajTqfybjnTY1qmt6GhzAujvi60F4dK+70Tk++WxJ6ePtber3v2FPosWvyz2GcYPFKvndUwoD1o0jAYvwkhRpP8zBMIaGfyPxFofsMmtPe/dGh4IxrdCJev8Ww2Hs9mdYFCKlMIBAqZVCEQW5mcWl2dmlxR5+ZKgjZX87HxKbqKvpyR1R8Mp1mDIRejCfuzrnMrwcXj9gkrQX4nkg0nrAmei/8J/yxo7X7pUuZq0Gae+xGiVmZTCxy/Z2lROXgNADejPWg8zEGlBGnmtRhN8BejrW6Dvrm9zbfkRDuXj8dq6kZqqkNJ5W+AYKS0j4+gPej8RqdqVHytUQ/6VBrZdPLdy9HgIBsZyp9ZXuxfbe+0Z9xBT3QsPW3znNG5LJK53WXRm03PNEV9xyc6mkWjqdtksTcw3VKHY6hT068aAKfQjprAQ93me1IYakc51Iqi6cJ6xk/XkWRVfXUg469uJEmqhvYnV9f7dTpSp5PQjrJjj3BcxP74cfmOWpSWXSGXE3YB/g0AAP//AQAA//+gxiUlAAABAAAAAgm6RVD/iV8PPPUAAwPoAAAAANwdDfcAAAAA3BxzS/8//joDGQQkAAAAAwACAAAAAAAAAAEAAAPY/u8AAAJY/z//PwMZAAEAAAAAAAAAAAAAAAAAAAAgeJwsy6GpgmEAQNHLTY83hcmgxWL7EURBsQgWbxFBxAEcwgGc2PKlk46xMTBmxta4Gm9jbdyNh/ExjsbFWBkv42nsjIVxNpbGvzE3JmM/zs04Dafh1zgYfz8AAAD//wEAAP//AJQUFgAAAAAqACoATgB+AJwAsgDiAPgBEgEiAVABcgGeAcIB6gIuAkACZAKAAr4C3AMQA0YDsAPUA/IEFARABHQElATSBQgAAAABAAAAIAH4ACoAZQAGAAEAAAAAAAAAAAAAAAAAAwADeJyclktsk9kVx3/OuQG/eBlUDQhVVyOEpgiMnUnATSDgkAHCIEJJZtoKUdUkxrFI7Mh2YOhiFl1WXXVddTNdtBK0CiVqJoFCIKRqBarURTWrrrqouuiqmkVX1Xe+48RxEjqDkMjvPs7/nte9/oCLcgsh4qIRSIJxhCRJ4w4O8Y6xkOSUsSPJReNOkowabyPJD423k2LSOMphPjWOcZhfGsc5wp+NE5zgP8ZJBiNHjHfSG6kY7+Jg5FfGu+mKLBvvafEzxcHIl8Z7V3ViwEpHyjjCNzu+MO5gZ8eXxsJlccauZU8n43LVeBtH5JHxdp7J342jdLtfGMfodn81TtDVuc14h/jOnPFOuqPfCzkCu6M/NY6wO/pz4w4ORO8bC8noirEjFTX9SCep6D+Mt5GKWixB/mNR4yiHYgeMY/hYv3Gco7EfGCfIxH5inCQdWzDeQVfsn8Y7ycWbOrs4HL9mvJtT8U+M97T4nOLduOUqsrdFc9+q5v4IpOJ/M46QijfnO3g3/l9jYV/ioLHjQCJj3MmBxCXjbRxIjBtvZ1/iU+MomcTPjGO8l3huHOdo4l/GCbqT3zBOkks2NXdyKvlj411kkn8w3s3F5L+N97T4maJrxwnjvYGOzMozWZRXeAotXKKM5zCeSbw8ljm8zMqCLMmcPJZX8kTm5Ll8JvflsfweH7kkS/JA/iRP8PKwhedbeEU+kweyJA/lc1mQp3iXlQV5KUvyuSzKos6+MvtZ+aO8xnO94wtuBGfII3mgKqEvC3Jf5mVOlgMdrpPhhizLS3kmT+V3ar+ier/ByzOZldeyKLO689gWO5/Kc43xhSzLnCzJb+VFc5brHOGGvJDX8lgeylNZDE4NzpaXeHmkM7NqE85s7uOhLU6+j5c5eSKzmoUgy8vNefX3qJ7ekl+OqqdrdWvJd9taSccb895SFduxWkl+jaeLDFkyeI7ZqEtHecapcpMinhHuUadBkSnqeIaoMEaVGtP6f0HXxvG8xwQNGkzTy3GOc1f/pSmsqqXVcorjfCvwh7uUaTCB5xpF6hSpccfUzlOlQgPPFQpMBb74dxihygw1xij6/aRbx3jOUWVc6So1qqpaYoZJCtToIk2G98nRR55BBhimb51C0z60PtZmH1oNM8AHfKy+1imrl36d9gRVGhpphTt4srqWJkuWE/QxRYHbFHXXLYp8oh4HCj2kOUEPJ7QuX92z9Vkoa50KeBpan3GtXbDvNp4qt966wmWNNahYYPcRFa1fuDZCw3aGp1cY57jae410QjPmVXlGK1ujrLvTb+XNVQoav2eQNJ6Lphr01ahmN/g7o/0W+F2k8jX6s8E9pikyyoTlc60fRzSHDe5qTtcyPklZK1DRTg5yMqNZCONuZm2EIS7jGVb9yjrly+sUgkja+yyrfZTW2CY2PXet/ncoUNYOucmkrqzdt4Kem+c7yg168W3ZqTOmFZqmoTWqq1Zaa1DiOMOc53KbJ/8/R+P6N6z9TWZWuyeMLuia4JbnGdHKj/j9eAZ0PMSIZuS7DDHKRYb5iFEd57nGNfJcYZQhPlDbYa7pezDMFQbVYkg5XDuvN+AK38fzIUO6J9AuWn7CigU3c1q9r6vvYS+XmWJacx54ntZYixrh16+w55apNm3rajNGmVu602v9KnrXC5SsK6bVwynNZbM31m5d2BFTGktQ27X1ElV9X2t6cwNVzz17O4JuDX0KX4jGV6hq+q16pr6aw6L6vH5cst+Bsr6N4avT/EYZ0V+Csv5+janXgW0QUfB72T4zv2FmRWtV4yblsNdkhXPc09Mm7R55bmpsahF+mVDXKtS1RoFHP1KVavObxF6LKiV9n6Y1c2N6o+7pKOwC/SrZcm/BXr2aZv1283tkw9nBWzVp777X2EqmfogbFJg0lYq9lJ4KM/r7WdPV8K5pbGTf6E+7Ur31S2VDFY/q295ek/babrZLv2baK+Oy66q9md2KO+POun6XdwOu330b7zLtM5Tcx3iXw7u/4F0e7066jMu7HnfB9bqMO+VyLu8ySnnX63KBVeSScr9qndEdp92HwYo83HJlfsuVFT3vrMuuneCySmddzvW5PpdzF1yPrmbcMN71urMu4waCcbMH1e8LqtPrTrtzbiBUd6ddv+tzl5u96AZczp1x/e591RhsObPb9bjBwLNmL266N/TgpOtyPe6k63b9Yaaa/bilHyfdaZdxvXpOv0aVCVSbnbmFXz1WkVMaf7BnwPUEGWnttY11DvrhjTXakG+12NAdb9SZ36wz3mix8j8AAAD//wEAAP//m5W4BwADAAAAAAAA/7UAMgAAAAEAAAAAAAAAAAAAAAAAAAAA"); } +.d2-16868730 .text-mono-bold { + font-family: "d2-16868730-font-mono-bold"; +} +@font-face { + font-family: d2-16868730-font-mono-bold; + src: url("data:application/font-woff;base64,d09GRgABAAAAABAoAAwAAAAAG4wAAQScAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABgmKbWhWNtYXAAAAF8AAAAngAAANQESwRqZ2FzcAAAAhwAAAAIAAAACAAAABBnbHlmAAACJAAAB8gAAApwC9ZrpmhlYWQAAAnsAAAANgAAADYbI9ohaGhlYQAACiQAAAAkAAAAJAYzALRobXR4AAAKSAAAAGQAAACASwAGkWxvY2EAAAqsAAAAQgAAAEInvCUQbWF4cAAACvAAAAAgAAAAIABUAmpuYW1lAAALEAAABO8AAA2sAwZtKnBvc3QAABAAAAAAIAAAACD/uAAzcHJlcAAAECAAAAAHAAAAB2gGjIUABAJYArwABQAAAooCWAAAAEsCigJYAAABXgAyAR4AAAILAwkDBAMCAgQgAAL3AgA4AwAAAAAAAAAAQURCTwCgACD//wPY/u8AAAQkAcZgAAGfAAAAAAHeApQAAAAgAAN4nHzNOy4FAQBG4W/M9b6u8X4PWxEREY1oZHpCMRGhsCUJEmrvzjas5BezgHvarzgolAr09fygVikN7Ni178ChY6ca5y61rt26S+h8r/MjJxpnLrSu3Px7fvOdr3zmI+95y2te8pynPOYh991tWIURpZ5RY8ZNmDRlWt+MgVmVOfMWLFqybMWqNes2bNpS2+YPAAD//wEAAP//XwsonQAAAAEAAf//AA94nIxWW2zb9vU+vx8p0RfalkRRtERZN0qkZVkXkxJlW5Yv8iXyNZZj/x0nrp34H2/dYmde7KTe6mA3DEtXJW2XpHHSplixBFiBrQiGLViH5mFo95AUGIqu2FP30hX1w15cwHsZYnogpTg3FNjL+VESec75vvOdTwQTCAA4hS8DAZVAgw1YgFWr3xpSJEmgqLTEKem04MVWAdu0WzcbG8nwxvz8LTLi3fSemcOXd5eOji4s1Lz3p5X5TOad99AqAIZKAHwQF6EGrACrjMIIhChKgtlMEVLKz1Z+dPujNydpN03SrpopC2rFxd01NNRySlFOtWh33lhdBQTq3g5ux5vgAegPxHAqqaqK7OAoURQCZjNrdzgUWU1zZjM6kV2eTBy6MN15wl/g0sFYvqlpuCXYXl9oXKKbps5NLF0rKL6jDqcy19M7L/tcM/EWwDAAgJO4CFUlxIrscLB2s1mQFFlVU0lRFISB389fGBv9+ZFwfXIkEhlJ1uNi3ysrK7848ELj7NjYTAgAEMwCYAcuQrXBG+tnFVZg/ewsuq198dVXSMTFjZ+8+PqGcW/z3g4W8Cb4dUyi+DWYUkJKsZrNaPrQ+fHxlyZzc94CK0tNfVJgQGGEqvl/+pfp4Sunlq+NK76jrKsEq6pqZV371Jsw6gwB4NpyTynFKqT8rGBV2KHNTfTh5uYGuryxoS3pLQGGPgA8gYtQAbTBg1VhFMQqRJrpu0L8+Vfatb9vTn+Bi9q/UbUm/g7FV7U5o8ZJAOzDRTCVnvKzJy+hAC7ubht5EbQDYA8uQoPxO6fLSO8k2YnTAkUJkiR4CJZtv97tIB3d1zdIM4UJWc4rcQJTZhIXt44c2dpdu88XDo+73r1x413X+OECf7+UO1fmnDFyM5wiiikdJyEJDgfL5q6+1EqaLBdKBy5q77+a/GHb1u4a6r+YOte+ZeAW93awjDehDrxPTMNQgfRQA+WxoOaxs7nc2bFSDMg8LweMSI9dXVm+Mjp6ZXnl6tgPWuYH+mYTidm+gfkWvcYwAG7BRaCf0pjAWhVZLyAIw1sHVvsH1vonh7OZbGYYF6XZgyML8X+gCVVOhoEwdJov53B+XRYmzQgDW/2n+/tP90/m27PZ9nzbNz6+hYuhmdHhuei/0LGWRELU/jOvvarzJ+/tYAlvQtRALqUN3el4JenpTdPRc5wH6xVRU+5HqanQTDwerY95J4PdUvbkgczp5uFAXyIYcye8B5s7A5nv0onYokf0OTmerQnWxvsT6nSquek5J+9pYFx2OmCJ98XU2VZAOvO4DReB0nGVVPr5B9j1AbZsbOxul2bdvbeD63ERuLIPWBVraU9U47IWo1jHTMZzyd7o9YbtF92Zw7TQe7wbvaYdk1S3W5XQL7XvdB/vFQBBHQAeNHwJVgmFcTg4RVXTjEJ8+pc3x+q4WtLC1Y6+/iEuah+ri6q6qKLE7hogIAHwJC5CqPSc3eFglU6cTiucB3P6FaMQglS2OOro9DU7RiRZTZua58LmKpokEULI9sr4W6K5ChNEhVnERe2WO5XyeFIqf+cOn0x7POkkj47urt33djc0dHvv69gt5dnX6XtMKFy54bRCsJ9/8laurqGOtHhrc9c/+QzdvhEalKTB0A1t/DND3/G9HWzBd8EOAWPKD8eqSPqm6J2mdK/Z1ziCudXsQircUU9Sl9arCX7QGWHsYQcf42X65e8V1rrcztF3dnsVPrjOOu/Z6jzZ+GB/aUZp3dfQAwg+s0mUP+Wnks9Y9tDoucGhs7nR51MmrJ1HLKe0BFVPsC8RyPpbIs/T2TMThTOdXSf77KHK/3d3ZH05Wenx2awzvBeAgOReFHegByBDDg7t19TBPDpUReYUVijvSkCUjA4URTa+IJ5acKb0Wdi/EbE9ixlJZBv8Ll7MHG+NBe+dqKxJz7bXBm10VTgyu/DN/E8n2IDdHmDtevQ3dgSaI528UMtY+v7GtzZ7ZIasbfQ6ZRtpy0U6xhvppWqBaRsMmkwVlhrG1t6bLMTQPVuIdwUZJujiQzbtsoW3OmtIguZq+YYSt3kA7MZ3yw7CUorBLWsVrAatlDV/qYJwF1onRy/5Gz1RF777m/mG6NKc9lfklWO8U/tDKY+yt4O9+H39H1lXg75uVvv+QF5+7tgbKCZ7bCHOJ3bRK3PoZ6saxISKiiW67lEf6AHYS37+bBvr1aTvUOvkWKkNtJ3zxZ7soqTJMHrwv3puz1o+v9ZTioEox0UDRtTVMXEmW4ovBLojke5AKeo18nt5owarq3F6v9N9GQgcyzyqRLEOR369mvCONnbOJLILrf4uF0lNuZtddslXH+XY6B/xr2Ve6Dw9MrXe5XYVXkNBT48SzXhY5z2rBRCsAeAgegC2x3kpmydlXVunidC3Mv6ww8OF3LEZH9peymaqql6kKLVX0wBBam/H4LXpSS+OYcmg58n3g4dG3Jj7cbwruqiGxWo+Hlo8/P1v9y5LudBkmPNYkl0j/+dPL9NR72yDx2mtrquhKxwjbQNTEedhrr6SqbYztdbmtnA0H4GH3oa29XeS1cct5jGzeWRtU4WLXhNFEqZqynvSR9WYSJOJdJ8f+S1PVppIosLsQttfBgdFcUi4eVM/B4Nfapa3/fkmb3/8bYD/AgAA//8BAAD//2izHHoAAQAAAAEEnH3ZmxpfDzz1AAMD6AAAAADcHHOkAAAAAN2XHqD/TP46AwwEJAABAAYAAgAAAAAAAAABAAAD2P7vAAACWP9M/0wDDAABAAAAAAAAAAAAAAAAAAAAIHicLMorqoJhAADRYbjlJt2BQTAJP/gEk4iI6AYmuAOr+0eEL51yjKWB8W8cjJvxMtbGw7gab+NkXIyV8RxvYyyMszEz/oy5MRlHY2fcje1wGn6M/e9/AQAA//8BAAD//3IVEdIAAAAqACoATAB8AKAAtgDqAQABHAEsAVoBfAGuAdAB+gI+AlACdgKSAs4C7AMiA1oD0AP0BBQENgRoBKAEwAUABTgAAAABAAAAIAH4ACoAbgAGAAEAAAAAAAAAAAAAAAAAAwADeJyclk1vG9UXxn9jp7bHTfvPP5TSFCiXEkoaJRM7SqMqRQK3aVVDSEqcUqFSCcd2nFH8JnvcNqxZsGTFZwDEqqsuEGKVBQuWiBUrxIoPgFggNGeOPWPXJG1VqXnu3PP6POfea+Cd2N/EscZs4AAUW5zjQHGMFL8rjrPCn4rHmLEuKD5G2VpXnGDaeqQ4yY/WL4pTLMW+UmyzFPtJ8XEWY/8oPhE38YzikywlbimeYjrxeYAtSCe+VmwxntBcVoyJxA+K40wkflY8xtnEb4qPMZ74S3GCyeSY4iSTydOKU0wmZxTbTCZXFKeZTq4pPo5JthSPM5f8UvEJMsnvFZ/ESSpX1v9YTJ1VPMHlVC/O/7mQ6vU1ydupbxW/EKn5FOdTfyh+MdL76UjvL0VynYnkmuKknVJ8lnG71+PLEd9XOGWfV/wqaXtZ8bmI72uM2+8qNkzYvfpfD2fDOs+k/YniN0jbDcXTkThvRmp4iyX7oeKLzNrfKZ7FsXVmrDnm0j2N5iN5HTJpnRNrIVJDhpn0p4oXmU1/ofhapN9V4fAbDItkyJLBMK+rRVnlKNNkmwqGAvt08KhQp4MhT4MSTdq05P+i7JUxzLCLh0eLFRZY4IH8cyj2ozniWWeBi8xheICLxy6GTSp0qNDmvka7QZMGHoZ1itT9WswZCjTp0qZExUzhRNcYrtGkLOgWbZpcpUmNMlkc6fQyV8ixylU2uDLg2/MM/Ob7nofHN327j6T2Dq5UbQYy7tLEk84b3O/vOWTJsswV6hTZoyJWO1R4KBkWcbiEwzKXWJZYz16vK4oVMXiiVFlULNJmD0OTnefW2pUufe18v9s0RMlgr4CnlkH2BmUWxN9Ij7vClZHIXdG4jSvWznNVc4siXWoYVnEw3NSo/oRtCa/+365Mnl93hcYzTKrHPi0qbLGrfIaTWRAOPR4IpyHjNVxRoCEz7XPSFRaCvnusFcizhmFD4jcGIq8NRPA7GTVhWek3rGwwb6j/fYq41CiyTU12wpNXlLw5PhTssYIZYqdDSRRq4YlGHYnliAZVFtjgBmtDlRzNUVn+Btpv0+1PT9CdPzX+ec9REOULZkpOW05YKwgjd8izxU02uM2WrHNsskmOdbbIc118N9iUk7vBOqvikRcc7N2QE7DOxxjeJy82fuyK8hMo5p/JllTfkdqDWXap0xLO/cod6bUiHT67woYdjdrz7YhPCZcdsTSiX4MqXYpUdSpaUmFduOzNRnjqgomoSy++tuF+labctG05uX5Uw77eHf60BjUFN4T3FKo6zzUz/32jbcrp87sIUV66CGa802e/It0Orqv6lrhynwb3leGC8FGQ18TFWO9Rkuy+r8+FiT964svjJ74ciMpttnGDKY0fcI19yVbT6gzbwop4cDf2K/foiH4dUdev6DOJ4t9Nd8lwT++ZJlW52VrCeUnO4r6sgvm5y/whtkW9L9ui157Yz47IXZbXoibaGemtqtGnuSccezobwR1raNCVN7gtu8Epld7IHlrPcKSO9jCndQ2qOCevwrAmw9qOsnosX4eUGcsOqD3K70B+eVTl/fDZuCMnvyrTfJ2H+m6u9b+F6APh0hVeCvJG+fdY8AqHnr13+arEL7E3cubDGZ8fmfUon6e3HOz2KOvBHg+3HebgKPtRv1hG2ylz/wIAAP//AQAA///7vB6iAAADAAAAAAAA/7UAMgAAAAEAAAAAAAAAAAAAAAAAAAAAuAH/hbAEjQA="); +} .d2-16868730 .text-mono-italic { font-family: "d2-16868730-font-mono-italic"; } @@ -129,7 +136,7 @@ -NETWORKUSERAPI SERVERLOGSCell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDphone logsMAKE CALL ACCESSDISPLAYPERSIST +NETWORKUSERAPI SERVERLOGSCell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDphone logsMAKE CALL ACCESSDISPLAYPERSIST From fc5e80bc2e921ee2ff7edaa48f85c9a3678ae474 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 22 Jul 2023 09:42:39 -0700 Subject: [PATCH 093/138] bump version --- .../testdata/all_shapes/sketch.exp.svg | 2 +- .../testdata/all_shapes_dark/sketch.exp.svg | 2 +- .../d2sketch/testdata/animated/sketch.exp.svg | 2 +- .../testdata/animated_dark/sketch.exp.svg | 2 +- .../testdata/arrowheads/sketch.exp.svg | 2 +- .../testdata/arrowheads_dark/sketch.exp.svg | 2 +- .../d2sketch/testdata/basic/sketch.exp.svg | 2 +- .../testdata/basic_dark/sketch.exp.svg | 2 +- .../testdata/child_to_child/sketch.exp.svg | 2 +- .../child_to_child_dark/sketch.exp.svg | 2 +- .../d2sketch/testdata/class/sketch.exp.svg | 2 +- .../sketch.exp.svg | 2 +- .../testdata/class_dark/sketch.exp.svg | 2 +- .../testdata/connection_label/sketch.exp.svg | 2 +- .../connection_label_dark/sketch.exp.svg | 2 +- .../testdata/crows_feet/sketch.exp.svg | 2 +- .../testdata/crows_feet_dark/sketch.exp.svg | 2 +- .../d2sketch/testdata/dots-3d/sketch.exp.svg | 2 +- .../d2sketch/testdata/dots-all/sketch.exp.svg | 2 +- .../testdata/dots-multiple/sketch.exp.svg | 2 +- .../testdata/dots-real/sketch.exp.svg | 2 +- .../testdata/double-border/sketch.exp.svg | 2 +- .../testdata/elk_corners/sketch.exp.svg | 2 +- .../long_arrowhead_label/sketch.exp.svg | 2 +- .../d2sketch/testdata/opacity/sketch.exp.svg | 2 +- .../testdata/opacity_dark/sketch.exp.svg | 2 +- .../d2sketch/testdata/overlay/sketch.exp.svg | 2 +- .../testdata/paper-real/sketch.exp.svg | 2 +- .../testdata/root-fill/sketch.exp.svg | 2 +- .../testdata/sql_tables/sketch.exp.svg | 2 +- .../testdata/sql_tables_dark/sketch.exp.svg | 2 +- .../d2sketch/testdata/terminal/sketch.exp.svg | 2 +- .../d2sketch/testdata/twitter/sketch.exp.svg | 2 +- .../testdata/twitter_dark/sketch.exp.svg | 2 +- .../diagram_wider_than_tooltip/sketch.exp.svg | 2 +- .../testdata/internal-links/sketch.exp.svg | 2 +- .../appendix/testdata/links/sketch.exp.svg | 2 +- .../testdata/links_dark/sketch.exp.svg | 2 +- .../testdata/tooltip_fill/sketch.exp.svg | 2 +- .../tooltip_wider_than_diagram/sketch.exp.svg | 2 +- .../testdata/all_shapes/dark_theme.exp.svg | 2 +- .../testdata/animated/dark_theme.exp.svg | 2 +- .../testdata/arrowheads/dark_theme.exp.svg | 2 +- .../testdata/basic/dark_theme.exp.svg | 2 +- .../child_to_child/dark_theme.exp.svg | 2 +- .../testdata/class/dark_theme.exp.svg | 2 +- .../testdata/code/dark_theme.exp.svg | 2 +- .../connection_label/dark_theme.exp.svg | 2 +- .../testdata/opacity/dark_theme.exp.svg | 2 +- .../testdata/overlay/dark_theme.exp.svg | 2 +- .../testdata/sql_tables/dark_theme.exp.svg | 2 +- .../testdata/twitter/dark_theme.exp.svg | 2 +- .../testdata/TestCLI_E2E/abspath.exp.svg | 2 +- .../testdata/TestCLI_E2E/animation.exp.svg | 2 +- .../board_import/hello-world-x-y.exp.svg | 2 +- .../board_import/hello-world-x.exp.svg | 2 +- .../board_import/hello-world.exp.svg | 2 +- .../testdata/TestCLI_E2E/center.exp.svg | 2 +- .../testdata/TestCLI_E2E/chain_import.exp.svg | 2 +- .../testdata/TestCLI_E2E/empty-base.exp.svg | 2 +- .../TestCLI_E2E/empty-layer/x.exp.svg | 2 +- .../TestCLI_E2E/hello_world_png.exp.png | Bin 15387 -> 15387 bytes .../TestCLI_E2E/hello_world_png_pad.exp.png | Bin 73590 -> 73590 bytes .../hello_world_png_sketch.exp.png | Bin 28841 -> 28841 bytes .../testdata/TestCLI_E2E/import.exp.svg | 2 +- .../TestCLI_E2E/import_spread_nested.exp.svg | 2 +- .../testdata/TestCLI_E2E/import_vars.exp.svg | 2 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 80081 -> 80081 bytes .../TestCLI_E2E/multiboard/life/index.exp.svg | 2 +- .../multiboard/life/layers/broker.exp.svg | 2 +- .../multiboard/life/layers/core.exp.svg | 2 +- .../multiboard/life/layers/stocks.exp.svg | 2 +- .../multiboard/life/scenarios/why.exp.svg | 2 +- .../multiboard/life_index_d2/index.exp.svg | 2 +- .../life_index_d2/layers/broker.exp.svg | 2 +- .../life_index_d2/layers/core.exp.svg | 2 +- .../life_index_d2/layers/stocks.exp.svg | 2 +- .../life_index_d2/scenarios/why.exp.svg | 2 +- .../testdata/TestCLI_E2E/stdin.exp.svg | 2 +- .../TestCLI_E2E/vars-animation.exp.svg | 2 +- .../testdata/TestCLI_E2E/vars-config.exp.svg | 2 +- .../testdata/TestCLI_E2E/with-font.exp.svg | 2 +- .../measured/empty-class/dagre/sketch.exp.svg | 2 +- .../measured/empty-shape/dagre/sketch.exp.svg | 2 +- .../empty-sql_table/dagre/sketch.exp.svg | 2 +- .../testdata/patterns/3d/dagre/sketch.exp.svg | 2 +- .../patterns/all_shapes/dagre/sketch.exp.svg | 2 +- .../patterns/multiple/dagre/sketch.exp.svg | 2 +- .../patterns/paper/dagre/sketch.exp.svg | 2 +- .../patterns/real-lines/dagre/sketch.exp.svg | 2 +- .../patterns/real/dagre/sketch.exp.svg | 2 +- .../root-dots-with-fill/dagre/sketch.exp.svg | 2 +- .../patterns/root-dots/dagre/sketch.exp.svg | 2 +- .../patterns/shape/dagre/sketch.exp.svg | 2 +- .../ampersand-escape/dagre/sketch.exp.svg | 2 +- .../ampersand-escape/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../bold_edge_label/dagre/sketch.exp.svg | 2 +- .../bold_edge_label/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../code_leading_newlines/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../code_trailing_newlines/elk/sketch.exp.svg | 2 +- .../cylinder_grid_label/dagre/sketch.exp.svg | 2 +- .../cylinder_grid_label/elk/sketch.exp.svg | 2 +- .../dagre-disconnect/dagre/sketch.exp.svg | 2 +- .../dagre-disconnect/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../dagre_broken_arrowhead/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre_special_ids/dagre/sketch.exp.svg | 2 +- .../dagre_special_ids/elk/sketch.exp.svg | 2 +- .../elk_alignment/dagre/sketch.exp.svg | 2 +- .../elk_alignment/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../elk_loop_panic/dagre/sketch.exp.svg | 2 +- .../elk_loop_panic/elk/sketch.exp.svg | 2 +- .../regression/elk_order/dagre/sketch.exp.svg | 2 +- .../regression/elk_order/elk/sketch.exp.svg | 2 +- .../empty_class_height/dagre/sketch.exp.svg | 2 +- .../empty_class_height/elk/sketch.exp.svg | 2 +- .../empty_sequence/dagre/sketch.exp.svg | 2 +- .../empty_sequence/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../grid_in_constant_near/elk/sketch.exp.svg | 2 +- .../regression/grid_oom/dagre/sketch.exp.svg | 2 +- .../regression/grid_oom/elk/sketch.exp.svg | 2 +- .../grid_panic/dagre/sketch.exp.svg | 2 +- .../regression/grid_panic/elk/sketch.exp.svg | 2 +- .../grid_with_latex/dagre/sketch.exp.svg | 2 +- .../grid_with_latex/elk/sketch.exp.svg | 2 +- .../regression/hex-fill/dagre/sketch.exp.svg | 2 +- .../regression/hex-fill/elk/sketch.exp.svg | 2 +- .../icons_on_top/dagre/sketch.exp.svg | 2 +- .../icons_on_top/elk/sketch.exp.svg | 2 +- .../just-width/dagre/sketch.exp.svg | 2 +- .../regression/just-width/elk/sketch.exp.svg | 2 +- .../link_with_ampersand/dagre/sketch.exp.svg | 2 +- .../link_with_ampersand/elk/sketch.exp.svg | 2 +- .../long_arrowhead_label/dagre/sketch.exp.svg | 2 +- .../long_arrowhead_label/elk/sketch.exp.svg | 2 +- .../md_font_weight/dagre/sketch.exp.svg | 2 +- .../md_font_weight/elk/sketch.exp.svg | 2 +- .../md_h1_li_li/dagre/sketch.exp.svg | 2 +- .../regression/md_h1_li_li/elk/sketch.exp.svg | 2 +- .../nested_steps/dagre/sketch.exp.svg | 2 +- .../nested_steps/elk/sketch.exp.svg | 2 +- .../regression/no-lexer/dagre/sketch.exp.svg | 2 +- .../regression/no-lexer/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../opacity-on-label/dagre/sketch.exp.svg | 2 +- .../opacity-on-label/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../overlapping-edge-label/elk/sketch.exp.svg | 2 +- .../query_param_escape/dagre/sketch.exp.svg | 2 +- .../query_param_escape/elk/sketch.exp.svg | 2 +- .../root-container/dagre/sketch.exp.svg | 2 +- .../root-container/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../regression/slow_grid/dagre/sketch.exp.svg | 2 +- .../regression/slow_grid/elk/sketch.exp.svg | 2 +- .../sql_table_overflow/dagre/sketch.exp.svg | 2 +- .../sql_table_overflow/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../unconnected/dagre/sketch.exp.svg | 2 +- .../regression/unconnected/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../root/border-radius/dagre/sketch.exp.svg | 2 +- .../root/border-radius/elk/sketch.exp.svg | 2 +- .../root/double-border/dagre/sketch.exp.svg | 2 +- .../root/double-border/elk/sketch.exp.svg | 2 +- .../even-stroke-width/dagre/sketch.exp.svg | 2 +- .../root/even-stroke-width/elk/sketch.exp.svg | 2 +- .../testdata/root/fill/dagre/sketch.exp.svg | 2 +- .../testdata/root/fill/elk/sketch.exp.svg | 2 +- .../root/stroke-dash/dagre/sketch.exp.svg | 2 +- .../root/stroke-dash/elk/sketch.exp.svg | 2 +- .../root/stroke-no-width/dagre/sketch.exp.svg | 2 +- .../root/stroke-no-width/elk/sketch.exp.svg | 2 +- .../root/stroke-width/dagre/sketch.exp.svg | 2 +- .../root/stroke-width/elk/sketch.exp.svg | 2 +- .../sanity/1_to_2/dagre/sketch.exp.svg | 2 +- .../testdata/sanity/1_to_2/elk/sketch.exp.svg | 2 +- .../sanity/basic/dagre/sketch.exp.svg | 2 +- .../testdata/sanity/basic/elk/sketch.exp.svg | 2 +- .../child_to_child/dagre/sketch.exp.svg | 2 +- .../sanity/child_to_child/elk/sketch.exp.svg | 2 +- .../connection_label/dagre/sketch.exp.svg | 2 +- .../connection_label/elk/sketch.exp.svg | 2 +- .../sanity/empty/dagre/sketch.exp.svg | 2 +- .../testdata/sanity/empty/elk/sketch.exp.svg | 2 +- .../3d_fill_and_stroke/dagre/sketch.exp.svg | 2 +- .../3d_fill_and_stroke/elk/sketch.exp.svg | 2 +- .../stable/all_shapes/dagre/sketch.exp.svg | 2 +- .../stable/all_shapes/elk/sketch.exp.svg | 2 +- .../all_shapes_link/dagre/sketch.exp.svg | 2 +- .../stable/all_shapes_link/elk/sketch.exp.svg | 2 +- .../all_shapes_multiple/dagre/sketch.exp.svg | 2 +- .../all_shapes_multiple/elk/sketch.exp.svg | 2 +- .../all_shapes_shadow/dagre/sketch.exp.svg | 2 +- .../all_shapes_shadow/elk/sketch.exp.svg | 2 +- .../stable/animated/dagre/sketch.exp.svg | 2 +- .../stable/animated/elk/sketch.exp.svg | 2 +- .../stable/array-classes/dagre/sketch.exp.svg | 2 +- .../stable/array-classes/elk/sketch.exp.svg | 2 +- .../arrowhead_adjustment/dagre/sketch.exp.svg | 2 +- .../arrowhead_adjustment/elk/sketch.exp.svg | 2 +- .../arrowhead_labels/dagre/sketch.exp.svg | 2 +- .../arrowhead_labels/elk/sketch.exp.svg | 2 +- .../arrowhead_scaling/dagre/sketch.exp.svg | 2 +- .../arrowhead_scaling/elk/sketch.exp.svg | 2 +- .../stable/binary_tree/dagre/sketch.exp.svg | 2 +- .../stable/binary_tree/elk/sketch.exp.svg | 2 +- .../stable/bold-mono/dagre/sketch.exp.svg | 2 +- .../stable/bold-mono/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../stable/border-radius/dagre/sketch.exp.svg | 2 +- .../stable/border-radius/elk/sketch.exp.svg | 2 +- .../testdata/stable/br/dagre/sketch.exp.svg | 2 +- .../testdata/stable/br/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../stable/chaos2/dagre/sketch.exp.svg | 2 +- .../testdata/stable/chaos2/elk/sketch.exp.svg | 2 +- .../circle_arrowhead/dagre/sketch.exp.svg | 2 +- .../circle_arrowhead/elk/sketch.exp.svg | 2 +- .../circular_dependency/dagre/sketch.exp.svg | 2 +- .../circular_dependency/elk/sketch.exp.svg | 2 +- .../stable/class/dagre/sketch.exp.svg | 2 +- .../testdata/stable/class/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../stable/classes/dagre/sketch.exp.svg | 2 +- .../stable/classes/elk/sketch.exp.svg | 2 +- .../stable/code_snippet/dagre/sketch.exp.svg | 2 +- .../stable/code_snippet/elk/sketch.exp.svg | 2 +- .../complex-layers/dagre/sketch.exp.svg | 2 +- .../stable/complex-layers/elk/sketch.exp.svg | 2 +- .../connected_container/dagre/sketch.exp.svg | 2 +- .../connected_container/elk/sketch.exp.svg | 2 +- .../constant_near_stress/dagre/sketch.exp.svg | 2 +- .../constant_near_stress/elk/sketch.exp.svg | 2 +- .../constant_near_title/dagre/sketch.exp.svg | 2 +- .../constant_near_title/elk/sketch.exp.svg | 2 +- .../container_edges/dagre/sketch.exp.svg | 2 +- .../stable/container_edges/elk/sketch.exp.svg | 2 +- .../crow_foot_arrowhead/dagre/sketch.exp.svg | 2 +- .../crow_foot_arrowhead/elk/sketch.exp.svg | 2 +- .../stable/cycle-order/dagre/sketch.exp.svg | 2 +- .../stable/cycle-order/elk/sketch.exp.svg | 2 +- .../stable/dagger_grid/dagre/sketch.exp.svg | 2 +- .../stable/dagger_grid/elk/sketch.exp.svg | 2 +- .../dagre-container/dagre/sketch.exp.svg | 2 +- .../stable/dagre-container/elk/sketch.exp.svg | 2 +- .../stable/dagre_spacing/dagre/sketch.exp.svg | 2 +- .../stable/dagre_spacing/elk/sketch.exp.svg | 2 +- .../dagre_spacing_right/dagre/sketch.exp.svg | 2 +- .../dagre_spacing_right/elk/sketch.exp.svg | 2 +- .../stable/dense/dagre/sketch.exp.svg | 2 +- .../testdata/stable/dense/elk/sketch.exp.svg | 2 +- .../different_subgraphs/dagre/sketch.exp.svg | 2 +- .../different_subgraphs/elk/sketch.exp.svg | 2 +- .../stable/direction/dagre/sketch.exp.svg | 2 +- .../stable/direction/elk/sketch.exp.svg | 2 +- .../edge-label-overflow/dagre/sketch.exp.svg | 2 +- .../edge-label-overflow/elk/sketch.exp.svg | 2 +- .../elk_border_radius/dagre/sketch.exp.svg | 2 +- .../elk_border_radius/elk/sketch.exp.svg | 2 +- .../elk_container_height/dagre/sketch.exp.svg | 2 +- .../elk_container_height/elk/sketch.exp.svg | 2 +- .../stable/elk_shim/dagre/sketch.exp.svg | 2 +- .../stable/elk_shim/elk/sketch.exp.svg | 2 +- .../stable/ent2d2_basic/dagre/sketch.exp.svg | 2 +- .../stable/ent2d2_basic/elk/sketch.exp.svg | 2 +- .../stable/ent2d2_right/dagre/sketch.exp.svg | 2 +- .../stable/ent2d2_right/elk/sketch.exp.svg | 2 +- .../executive_grid/dagre/sketch.exp.svg | 2 +- .../stable/executive_grid/elk/sketch.exp.svg | 2 +- .../stable/font_colors/dagre/sketch.exp.svg | 2 +- .../stable/font_colors/elk/sketch.exp.svg | 2 +- .../stable/font_sizes/dagre/sketch.exp.svg | 2 +- .../stable/font_sizes/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../giant_markdown_test/dagre/sketch.exp.svg | 2 +- .../giant_markdown_test/elk/sketch.exp.svg | 2 +- .../stable/grid_animated/dagre/sketch.exp.svg | 2 +- .../stable/grid_animated/elk/sketch.exp.svg | 2 +- .../stable/grid_even/dagre/sketch.exp.svg | 2 +- .../stable/grid_even/elk/sketch.exp.svg | 2 +- .../stable/grid_gap/dagre/sketch.exp.svg | 2 +- .../stable/grid_gap/elk/sketch.exp.svg | 2 +- .../stable/grid_icon/dagre/sketch.exp.svg | 2 +- .../stable/grid_icon/elk/sketch.exp.svg | 2 +- .../grid_large_checkered/dagre/sketch.exp.svg | 2 +- .../grid_large_checkered/elk/sketch.exp.svg | 2 +- .../stable/grid_nested/dagre/sketch.exp.svg | 2 +- .../stable/grid_nested/elk/sketch.exp.svg | 2 +- .../grid_nested_gap0/dagre/sketch.exp.svg | 2 +- .../grid_nested_gap0/elk/sketch.exp.svg | 2 +- .../stable/grid_tests/dagre/sketch.exp.svg | 2 +- .../stable/grid_tests/elk/sketch.exp.svg | 2 +- .../stable/hexagon_3d/dagre/sketch.exp.svg | 2 +- .../stable/hexagon_3d/elk/sketch.exp.svg | 2 +- .../testdata/stable/hr/dagre/sketch.exp.svg | 2 +- .../testdata/stable/hr/elk/sketch.exp.svg | 2 +- .../icon-containers/dagre/sketch.exp.svg | 2 +- .../stable/icon-containers/elk/sketch.exp.svg | 2 +- .../stable/icon-label/dagre/sketch.exp.svg | 2 +- .../stable/icon-label/elk/sketch.exp.svg | 2 +- .../icon_positions/dagre/sketch.exp.svg | 2 +- .../stable/icon_positions/elk/sketch.exp.svg | 2 +- .../stable/images/dagre/sketch.exp.svg | 2 +- .../testdata/stable/images/elk/sketch.exp.svg | 2 +- .../stable/investigate/dagre/sketch.exp.svg | 2 +- .../stable/investigate/elk/sketch.exp.svg | 2 +- .../label_positions/dagre/sketch.exp.svg | 2 +- .../stable/label_positions/elk/sketch.exp.svg | 2 +- .../stable/large_arch/dagre/sketch.exp.svg | 2 +- .../stable/large_arch/elk/sketch.exp.svg | 2 +- .../stable/latex/dagre/sketch.exp.svg | 2 +- .../testdata/stable/latex/elk/sketch.exp.svg | 2 +- .../legend_with_near_key/dagre/sketch.exp.svg | 2 +- .../legend_with_near_key/elk/sketch.exp.svg | 2 +- .../testdata/stable/li1/dagre/sketch.exp.svg | 2 +- .../testdata/stable/li1/elk/sketch.exp.svg | 2 +- .../testdata/stable/li2/dagre/sketch.exp.svg | 2 +- .../testdata/stable/li2/elk/sketch.exp.svg | 2 +- .../testdata/stable/li3/dagre/sketch.exp.svg | 2 +- .../testdata/stable/li3/elk/sketch.exp.svg | 2 +- .../testdata/stable/li4/dagre/sketch.exp.svg | 2 +- .../testdata/stable/li4/elk/sketch.exp.svg | 2 +- .../stable/links/dagre/sketch.exp.svg | 2 +- .../testdata/stable/links/elk/sketch.exp.svg | 2 +- .../stable/lone_h1/dagre/sketch.exp.svg | 2 +- .../stable/lone_h1/elk/sketch.exp.svg | 2 +- .../stable/markdown/dagre/sketch.exp.svg | 2 +- .../stable/markdown/elk/sketch.exp.svg | 2 +- .../markdown_stroke_fill/dagre/sketch.exp.svg | 2 +- .../markdown_stroke_fill/elk/sketch.exp.svg | 2 +- .../md_2space_newline/dagre/sketch.exp.svg | 2 +- .../md_2space_newline/elk/sketch.exp.svg | 2 +- .../md_backslash_newline/dagre/sketch.exp.svg | 2 +- .../md_backslash_newline/elk/sketch.exp.svg | 2 +- .../md_code_block_fenced/dagre/sketch.exp.svg | 2 +- .../md_code_block_fenced/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../md_code_block_indented/elk/sketch.exp.svg | 2 +- .../md_code_inline/dagre/sketch.exp.svg | 2 +- .../stable/md_code_inline/elk/sketch.exp.svg | 2 +- .../md_fontsize_10/dagre/sketch.exp.svg | 2 +- .../stable/md_fontsize_10/elk/sketch.exp.svg | 2 +- .../stable/mono-edge/dagre/sketch.exp.svg | 2 +- .../stable/mono-edge/elk/sketch.exp.svg | 2 +- .../stable/mono-font/dagre/sketch.exp.svg | 2 +- .../stable/mono-font/elk/sketch.exp.svg | 2 +- .../multiline_text/dagre/sketch.exp.svg | 2 +- .../stable/multiline_text/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../multiple_box_selection/elk/sketch.exp.svg | 2 +- .../multiple_offset/dagre/sketch.exp.svg | 2 +- .../stable/multiple_offset/elk/sketch.exp.svg | 2 +- .../multiple_offset_left/dagre/sketch.exp.svg | 2 +- .../multiple_offset_left/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../multiple_person_label/elk/sketch.exp.svg | 2 +- .../multiple_trees/dagre/sketch.exp.svg | 2 +- .../stable/multiple_trees/elk/sketch.exp.svg | 2 +- .../stable/n22_e32/dagre/sketch.exp.svg | 2 +- .../stable/n22_e32/elk/sketch.exp.svg | 2 +- .../stable/near-alone/dagre/sketch.exp.svg | 2 +- .../stable/near-alone/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../nested_shape_labels/dagre/sketch.exp.svg | 2 +- .../nested_shape_labels/elk/sketch.exp.svg | 2 +- .../number_connections/dagre/sketch.exp.svg | 2 +- .../number_connections/elk/sketch.exp.svg | 2 +- .../one_container_loop/dagre/sketch.exp.svg | 2 +- .../one_container_loop/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../outside_bottom_labels/elk/sketch.exp.svg | 2 +- .../stable/ovals/dagre/sketch.exp.svg | 2 +- .../testdata/stable/ovals/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../testdata/stable/p/dagre/sketch.exp.svg | 2 +- e2etests/testdata/stable/p/elk/sketch.exp.svg | 2 +- .../stable/people/dagre/sketch.exp.svg | 2 +- .../testdata/stable/people/elk/sketch.exp.svg | 2 +- .../testdata/stable/pre/dagre/sketch.exp.svg | 2 +- .../testdata/stable/pre/elk/sketch.exp.svg | 2 +- .../self-referencing/dagre/sketch.exp.svg | 2 +- .../self-referencing/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../sequence_diagram_note/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../sequence_diagram_real/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../sequence_diagram_span/elk/sketch.exp.svg | 2 +- .../sequence_diagrams/dagre/sketch.exp.svg | 2 +- .../sequence_diagrams/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../stable/sql_tables/dagre/sketch.exp.svg | 2 +- .../stable/sql_tables/elk/sketch.exp.svg | 2 +- .../stable/square_3d/dagre/sketch.exp.svg | 2 +- .../stable/square_3d/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../stable/stylish/dagre/sketch.exp.svg | 2 +- .../stable/stylish/elk/sketch.exp.svg | 2 +- .../stable/teleport_grid/dagre/sketch.exp.svg | 2 +- .../stable/teleport_grid/elk/sketch.exp.svg | 2 +- .../text_font_sizes/dagre/sketch.exp.svg | 2 +- .../stable/text_font_sizes/elk/sketch.exp.svg | 2 +- .../stable/tooltips/dagre/sketch.exp.svg | 2 +- .../stable/tooltips/elk/sketch.exp.svg | 2 +- .../transparent_3d/dagre/sketch.exp.svg | 2 +- .../stable/transparent_3d/elk/sketch.exp.svg | 2 +- .../unnamed_only_height/dagre/sketch.exp.svg | 2 +- .../unnamed_only_height/elk/sketch.exp.svg | 2 +- .../unnamed_only_width/dagre/sketch.exp.svg | 2 +- .../unnamed_only_width/elk/sketch.exp.svg | 2 +- .../stable/us_map/dagre/sketch.exp.svg | 2 +- .../testdata/stable/us_map/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../themes/origami/dagre/sketch.exp.svg | 2 +- .../themes/origami/elk/sketch.exp.svg | 2 +- .../themes/terminal/dagre/sketch.exp.svg | 2 +- .../themes/terminal/elk/sketch.exp.svg | 2 +- .../terminal_grayscale/dagre/sketch.exp.svg | 2 +- .../terminal_grayscale/elk/sketch.exp.svg | 2 +- .../container_icon_label/dagre/sketch.exp.svg | 2 +- .../container_icon_label/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../shape_set_width_height/elk/sketch.exp.svg | 2 +- .../unicode/chinese/dagre/sketch.exp.svg | 2 +- .../unicode/chinese/elk/sketch.exp.svg | 2 +- .../unicode/emojis/dagre/sketch.exp.svg | 2 +- .../unicode/emojis/elk/sketch.exp.svg | 2 +- .../japanese-basic/dagre/sketch.exp.svg | 2 +- .../unicode/japanese-basic/elk/sketch.exp.svg | 2 +- .../japanese-full/dagre/sketch.exp.svg | 2 +- .../unicode/japanese-full/elk/sketch.exp.svg | 2 +- .../japanese-mixed/dagre/sketch.exp.svg | 2 +- .../unicode/japanese-mixed/elk/sketch.exp.svg | 2 +- .../unicode/korean/dagre/sketch.exp.svg | 2 +- .../unicode/korean/elk/sketch.exp.svg | 2 +- .../mixed-language-2/dagre/sketch.exp.svg | 2 +- .../mixed-language-2/elk/sketch.exp.svg | 2 +- .../mixed-language/dagre/sketch.exp.svg | 2 +- .../unicode/mixed-language/elk/sketch.exp.svg | 2 +- .../unicode/with-style/dagre/sketch.exp.svg | 2 +- .../unicode/with-style/elk/sketch.exp.svg | 2 +- lib/version/version.go | 2 +- 519 files changed, 515 insertions(+), 515 deletions(-) diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index 84b8e7c33..f7afd8a15 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,4 +1,4 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - + .d2-2106678569 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + diff --git a/e2etests/testdata/stable/label-near/dagre/board.exp.json b/e2etests/testdata/stable/label-near/dagre/board.exp.json new file mode 100644 index 000000000..58330c06c --- /dev/null +++ b/e2etests/testdata/stable/label-near/dagre/board.exp.json @@ -0,0 +1,202 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 0, + "y": 74 + }, + "width": 123, + "height": 123, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/005-programmer.svg", + "RawPath": "/essentials%2F005-programmer.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_RIGHT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "worker", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 52, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 223, + "y": 74 + }, + "width": 118, + "height": 123, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/profits.svg", + "RawPath": "/essentials%2Fprofits.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_BOTTOM_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "profits", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 47, + "labelHeight": 21, + "labelPosition": "INSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "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": 123, + "y": 151 + }, + { + "x": 163, + "y": 151 + }, + { + "x": 183, + "y": 151 + }, + { + "x": 223, + "y": 151 + } + ], + "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/label-near/dagre/sketch.exp.svg b/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg new file mode 100644 index 000000000..ff9e7cdde --- /dev/null +++ b/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg @@ -0,0 +1,96 @@ +workerprofits + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/label-near/elk/board.exp.json b/e2etests/testdata/stable/label-near/elk/board.exp.json new file mode 100644 index 000000000..77309cf93 --- /dev/null +++ b/e2etests/testdata/stable/label-near/elk/board.exp.json @@ -0,0 +1,193 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 123, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/005-programmer.svg", + "RawPath": "/essentials%2F005-programmer.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_RIGHT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "worker", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 52, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 205, + "y": 12 + }, + "width": 118, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/profits.svg", + "RawPath": "/essentials%2Fprofits.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_BOTTOM_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "profits", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 47, + "labelHeight": 21, + "labelPosition": "INSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "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": 135, + "y": 71 + }, + { + "x": 205, + "y": 71 + } + ], + "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/label-near/elk/sketch.exp.svg b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg new file mode 100644 index 000000000..c86741a3d --- /dev/null +++ b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg @@ -0,0 +1,96 @@ +workerprofits + + + + \ No newline at end of file From 711716a68b29bcb69966eb905efa3c7338235757 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 26 Jul 2023 22:46:28 -0700 Subject: [PATCH 095/138] fix tooltips --- .../diagram_wider_than_tooltip/sketch.exp.svg | 2 +- .../appendix/testdata/links/sketch.exp.svg | 2 +- .../testdata/links_dark/sketch.exp.svg | 2 +- .../testdata/tooltip_fill/sketch.exp.svg | 2 +- .../tooltip_wider_than_diagram/sketch.exp.svg | 2 +- d2renderers/d2svg/d2svg.go | 10 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 80081 -> 80081 bytes e2etests/stable_test.go | 2 +- .../ampersand-escape/dagre/sketch.exp.svg | 4 +- .../ampersand-escape/elk/sketch.exp.svg | 4 +- .../icons_on_top/dagre/sketch.exp.svg | 6 +- .../icons_on_top/elk/sketch.exp.svg | 6 +- .../all_shapes_link/dagre/sketch.exp.svg | 104 +++++----- .../stable/all_shapes_link/elk/sketch.exp.svg | 104 +++++----- .../basic-tooltips/dagre/board.exp.json | 178 ++++++++++++++++++ .../basic-tooltips/dagre/sketch.exp.svg | 125 ++++++++++++ .../stable/basic-tooltips/elk/board.exp.json | 169 +++++++++++++++++ .../stable/basic-tooltips/elk/sketch.exp.svg | 125 ++++++++++++ .../stable/links/dagre/sketch.exp.svg | 6 +- .../testdata/stable/links/elk/sketch.exp.svg | 6 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- 22 files changed, 734 insertions(+), 133 deletions(-) create mode 100644 e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/basic-tooltips/elk/board.exp.json create mode 100644 e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg diff --git a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg index b6a35c35d..655ecc782 100644 --- a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg @@ -99,7 +99,7 @@ .d2-854619440 .color-AA4{color:#EDF0FD;} .d2-854619440 .color-AA5{color:#F7F8FE;} .d2-854619440 .color-AB4{color:#EDF0FD;} - .d2-854619440 .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}]]>customerissuerstoreacquirernetworkcustomer 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 occur1Like starbucks or something2I'm not sure what this is + .d2-854619440 .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}]]>customerissuerstoreLike starbucks or somethingacquirerI'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 occurLike starbucks or something1I'm not sure what this is2 diff --git a/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg index de334d9ab..f7ada866c 100644 --- a/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-2692295619 .color-AA4{color:#EDF0FD;} .d2-2692295619 .color-AA5{color:#F7F8FE;} .d2-2692295619 .color-AB4{color:#EDF0FD;} - .d2-2692295619 .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 12Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!3 + .d2-2692295619 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 diff --git a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg index ef6260b95..415909ae4 100644 --- a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-2055261676 .color-AA4{color:#45475A;} .d2-2055261676 .color-AA5{color:#313244;} .d2-2055261676 .color-AB4{color:#45475A;} - .d2-2055261676 .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}]]>xy 12Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!3 + .d2-2055261676 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg index ed6624671..1a8fa696b 100644 --- a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-820103664 .color-AA4{color:#EDF0FD;} .d2-820103664 .color-AA5{color:#F7F8FE;} .d2-820103664 .color-AB4{color:#EDF0FD;} - .d2-820103664 .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 1Total abstinence is easier than perfect moderation2Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + .d2-820103664 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg index 497320262..f59319bfb 100644 --- a/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-820103664 .color-AA4{color:#EDF0FD;} .d2-820103664 .color-AA5{color:#F7F8FE;} .d2-820103664 .color-AB4{color:#EDF0FD;} - .d2-820103664 .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 1Total abstinence is easier than perfect moderation2Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + .d2-820103664 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index f1b62458a..75d4d487c 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -1341,7 +1341,11 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape } } } - + if targetShape.Tooltip != "" { + fmt.Fprintf(writer, `%s`, + svg.EscapeText(targetShape.Tooltip), + ) + } addAppendixItems(appendixWriter, targetShape, s) fmt.Fprint(writer, closingTag) @@ -1390,12 +1394,12 @@ func addAppendixItems(writer io.Writer, targetShape d2target.Shape, s shape.Shap x := int(math.Ceil(p1.X)) y := int(math.Ceil(p1.Y)) - fmt.Fprintf(writer, `%s`, + fmt.Fprintf(writer, `%s%s`, x-appendixIconRadius, y-appendixIconRadius, + svg.EscapeText(targetShape.Tooltip), TooltipIcon, ) - fmt.Fprintf(writer, `%s`, svg.EscapeText(targetShape.Tooltip)) } if targetShape.Link != "" { if p2 == nil { 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 bea9bcfe6e070199b929fab8fab96b0e82baf747..507153980513cf55e08dac3a92aa89fce57bf0d6 100644 GIT binary patch delta 436 zcmcckk>%n?mJNz*laqusCwsFcPhQVvyjevgj&ZXChcMIRY2qD|A9JZrc9!@)`46|q zW~ZW@>1ODQ01gA!crg zVV<#pnIXD56LUigh*&+sViOBf42w;TjWH}XH8%$O7S++F76wM>VrB-0W*A~d7O0My JE^5KJ2LRGfXy*U` delta 440 zcmcckk>%n?mJNz*lUE68P4;3-o@^y7GKCJ zlfQC{Y@RD2#y&Yu$Y!!4o95&zLTQuNvI$Q15mws#fDNeSjED%+D$pzx7lmBsj zpWG=SvYC@7m92TR{PxZAjITtdpEqIDWHU5TFi;4ZKFfqrXZjBl#@k9p29_oUrY4$P z`o8%oE{P?n3K}j}Mg~U42IfW(x$R#~8I>68ff_+TAy0t|%rG!AG&08!Gc_{A6tl3z z5VJ5aMi( bear `, }, { - name: "tooltips", + name: "basic-tooltips", script: `x: { tooltip: Total abstinence is easier than perfect moderation } y: { tooltip: Gee, I feel kind of LIGHT in the head now,\nknowing I can't make my satellite dish PAYMENTS! } x -> y diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg index 6bf71677d..249d96f66 100644 --- a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-1813696622 .color-AA4{color:#EDF0FD;} .d2-1813696622 .color-AA5{color:#F7F8FE;} .d2-1813696622 .color-AB4{color:#EDF0FD;} - .d2-1813696622 .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}]]>&∈foo&bar + .d2-1813696622 .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}]]>&∈beans & ricefoo&barbeans & rice @@ -105,7 +105,7 @@ -beans & rice + diff --git a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg index a20c59921..53f45f176 100644 --- a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-1299322987 .color-AA4{color:#EDF0FD;} .d2-1299322987 .color-AA5{color:#F7F8FE;} .d2-1299322987 .color-AB4{color:#EDF0FD;} - .d2-1299322987 .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}]]>&∈foo&bar + .d2-1299322987 .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}]]>&∈beans & ricefoo&barbeans & rice @@ -105,7 +105,7 @@ -beans & rice + diff --git a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg index 975a8fe16..98c9c13c4 100644 --- a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-1627174934 .color-AA4{color:#EDF0FD;} .d2-1627174934 .color-AA5{color:#F7F8FE;} .d2-1627174934 .color-AB4{color:#EDF0FD;} - .d2-1627174934 .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}]]>linknonelink, tooltipnone + .d2-1627174934 .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}]]>linknonelink, tooltiptooltipnone @@ -104,7 +104,7 @@ - +tooltip @@ -117,7 +117,7 @@ -tooltip + diff --git a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg index 975a8fe16..98c9c13c4 100644 --- a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-1627174934 .color-AA4{color:#EDF0FD;} .d2-1627174934 .color-AA5{color:#F7F8FE;} .d2-1627174934 .color-AB4{color:#EDF0FD;} - .d2-1627174934 .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}]]>linknonelink, tooltipnone + .d2-1627174934 .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}]]>linknonelink, tooltiptooltipnone @@ -104,7 +104,7 @@ - +tooltip @@ -117,7 +117,7 @@ -tooltip + diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg index 0bc4472fa..6713c8442 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg @@ -99,7 +99,7 @@ .d2-3720214040 .color-AA4{color:#EDF0FD;} .d2-3720214040 .color-AA5{color:#F7F8FE;} .d2-3720214040 .color-AB4{color:#EDF0FD;} - .d2-3720214040 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3720214040 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -303,7 +303,7 @@ - +example @@ -316,7 +316,7 @@ -example +example @@ -329,7 +329,7 @@ -example +example @@ -342,7 +342,7 @@ -example +example @@ -355,7 +355,7 @@ -example +example @@ -368,7 +368,7 @@ -example +example @@ -381,7 +381,7 @@ -example +example @@ -394,7 +394,7 @@ -example +example @@ -407,7 +407,7 @@ -example +example @@ -420,7 +420,7 @@ -example +example @@ -433,7 +433,7 @@ -example +example @@ -446,7 +446,7 @@ -example +example @@ -459,7 +459,7 @@ -example +example @@ -472,7 +472,7 @@ -example +example @@ -485,7 +485,7 @@ -example +example @@ -498,7 +498,7 @@ -example +example @@ -511,7 +511,7 @@ -example +example @@ -524,7 +524,7 @@ -example +example @@ -537,7 +537,7 @@ -example + @@ -549,7 +549,7 @@ - +example @@ -562,7 +562,7 @@ -example + @@ -574,7 +574,7 @@ - +example @@ -587,7 +587,7 @@ -example + @@ -599,7 +599,7 @@ - +example @@ -612,7 +612,7 @@ -example + @@ -624,7 +624,7 @@ - +example @@ -637,7 +637,7 @@ -example + @@ -649,7 +649,7 @@ - +example @@ -662,7 +662,7 @@ -example + @@ -674,7 +674,7 @@ - +example @@ -687,7 +687,7 @@ -example + @@ -699,7 +699,7 @@ - +example @@ -712,7 +712,7 @@ -example + @@ -724,7 +724,7 @@ - +example @@ -737,7 +737,7 @@ -example + @@ -749,7 +749,7 @@ - +example @@ -762,7 +762,7 @@ -example + @@ -774,7 +774,7 @@ - +example @@ -787,7 +787,7 @@ -example + @@ -799,7 +799,7 @@ - +example @@ -812,7 +812,7 @@ -example + @@ -824,7 +824,7 @@ - +example @@ -837,7 +837,7 @@ -example + @@ -849,7 +849,7 @@ - +example @@ -862,7 +862,7 @@ -example + @@ -874,7 +874,7 @@ - +example @@ -887,7 +887,7 @@ -example + @@ -899,7 +899,7 @@ - +example @@ -912,7 +912,7 @@ -example + @@ -924,7 +924,7 @@ - +example @@ -937,7 +937,7 @@ -example + diff --git a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg index 240678a0b..5dcb2ffd9 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg @@ -99,7 +99,7 @@ .d2-2197716131 .color-AA4{color:#EDF0FD;} .d2-2197716131 .color-AA5{color:#F7F8FE;} .d2-2197716131 .color-AB4{color:#EDF0FD;} - .d2-2197716131 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-2197716131 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -303,7 +303,7 @@ - +example @@ -316,7 +316,7 @@ -example +example @@ -329,7 +329,7 @@ -example +example @@ -342,7 +342,7 @@ -example +example @@ -355,7 +355,7 @@ -example +example @@ -368,7 +368,7 @@ -example +example @@ -381,7 +381,7 @@ -example +example @@ -394,7 +394,7 @@ -example +example @@ -407,7 +407,7 @@ -example +example @@ -420,7 +420,7 @@ -example +example @@ -433,7 +433,7 @@ -example +example @@ -446,7 +446,7 @@ -example +example @@ -459,7 +459,7 @@ -example +example @@ -472,7 +472,7 @@ -example +example @@ -485,7 +485,7 @@ -example +example @@ -498,7 +498,7 @@ -example +example @@ -511,7 +511,7 @@ -example +example @@ -524,7 +524,7 @@ -example +example @@ -537,7 +537,7 @@ -example + @@ -549,7 +549,7 @@ - +example @@ -562,7 +562,7 @@ -example + @@ -574,7 +574,7 @@ - +example @@ -587,7 +587,7 @@ -example + @@ -599,7 +599,7 @@ - +example @@ -612,7 +612,7 @@ -example + @@ -624,7 +624,7 @@ - +example @@ -637,7 +637,7 @@ -example + @@ -649,7 +649,7 @@ - +example @@ -662,7 +662,7 @@ -example + @@ -674,7 +674,7 @@ - +example @@ -687,7 +687,7 @@ -example + @@ -699,7 +699,7 @@ - +example @@ -712,7 +712,7 @@ -example + @@ -724,7 +724,7 @@ - +example @@ -737,7 +737,7 @@ -example + @@ -749,7 +749,7 @@ - +example @@ -762,7 +762,7 @@ -example + @@ -774,7 +774,7 @@ - +example @@ -787,7 +787,7 @@ -example + @@ -799,7 +799,7 @@ - +example @@ -812,7 +812,7 @@ -example + @@ -824,7 +824,7 @@ - +example @@ -837,7 +837,7 @@ -example + @@ -849,7 +849,7 @@ - +example @@ -862,7 +862,7 @@ -example + @@ -874,7 +874,7 @@ - +example @@ -887,7 +887,7 @@ -example + @@ -899,7 +899,7 @@ - +example @@ -912,7 +912,7 @@ -example + @@ -924,7 +924,7 @@ - +example @@ -937,7 +937,7 @@ -example + diff --git a/e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json b/e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json new file mode 100644 index 000000000..ade6dee49 --- /dev/null +++ b/e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json @@ -0,0 +1,178 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 1, + "y": 0 + }, + "width": 85, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "Total abstinence is easier than perfect moderation", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 0, + "y": 166 + }, + "width": 86, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "Gee, I feel kind of LIGHT in the head now,\nknowing I can't make my satellite dish PAYMENTS!", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "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": 43, + "y": 66 + }, + { + "x": 43, + "y": 106 + }, + { + "x": 43, + "y": 126 + }, + { + "x": 43, + "y": 166 + } + ], + "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/basic-tooltips/dagre/sketch.exp.svg b/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg new file mode 100644 index 000000000..bdf230c06 --- /dev/null +++ b/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg @@ -0,0 +1,125 @@ +xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation + + + + + + + + + + + + +Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/basic-tooltips/elk/board.exp.json b/e2etests/testdata/stable/basic-tooltips/elk/board.exp.json new file mode 100644 index 000000000..8c92da7b5 --- /dev/null +++ b/e2etests/testdata/stable/basic-tooltips/elk/board.exp.json @@ -0,0 +1,169 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 85, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "Total abstinence is easier than perfect moderation", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 12, + "y": 148 + }, + "width": 86, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "Gee, I feel kind of LIGHT in the head now,\nknowing I can't make my satellite dish PAYMENTS!", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "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, + "y": 78 + }, + { + "x": 55, + "y": 148 + } + ], + "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/basic-tooltips/elk/sketch.exp.svg b/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg new file mode 100644 index 000000000..b76bf6bc1 --- /dev/null +++ b/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg @@ -0,0 +1,125 @@ +xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation + + + + + + + + + + + + +Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/links/dagre/sketch.exp.svg b/e2etests/testdata/stable/links/dagre/sketch.exp.svg index ab71b83ae..99559d2ef 100644 --- a/e2etests/testdata/stable/links/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/links/dagre/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-2692295619 .color-AA4{color:#EDF0FD;} .d2-2692295619 .color-AA5{color:#F7F8FE;} .d2-2692295619 .color-AB4{color:#EDF0FD;} - .d2-2692295619 .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 + .d2-2692295619 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -104,7 +104,7 @@ - +Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -117,7 +117,7 @@ -Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + diff --git a/e2etests/testdata/stable/links/elk/sketch.exp.svg b/e2etests/testdata/stable/links/elk/sketch.exp.svg index 5b59a15b9..d083e0023 100644 --- a/e2etests/testdata/stable/links/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/links/elk/sketch.exp.svg @@ -92,7 +92,7 @@ .d2-640734671 .color-AA4{color:#EDF0FD;} .d2-640734671 .color-AA5{color:#F7F8FE;} .d2-640734671 .color-AB4{color:#EDF0FD;} - .d2-640734671 .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 + .d2-640734671 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -104,7 +104,7 @@ - +Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -117,7 +117,7 @@ -Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + 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 e2aa0e88f..2a1f3abeb 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 @@ -98,7 +98,7 @@ .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}]]>xyab + .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}]]>xyab I like turtles @@ -111,7 +111,7 @@ -I like turtles + \ No newline at end of file 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 921bb8a5b..acd2bf2c9 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 @@ -98,7 +98,7 @@ .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}]]>xyab + .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}]]>xyab I like turtles @@ -111,7 +111,7 @@ -I like turtles + \ No newline at end of file From 64fcb02ae3868f9c93ad733207a61c2cb792770b Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 26 Jul 2023 23:10:05 -0700 Subject: [PATCH 096/138] fix nested links imported --- d2ir/compile.go | 15 +++ e2etests-cli/main_test.go | 11 ++ .../TestCLI_E2E/layer-link/index.exp.svg | 110 ++++++++++++++++++ .../TestCLI_E2E/layer-link/test2.exp.svg | 110 ++++++++++++++++++ 4 files changed, 246 insertions(+) create mode 100644 e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg create mode 100644 e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg diff --git a/d2ir/compile.go b/d2ir/compile.go index 88dd960f0..66eb97818 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -509,6 +509,21 @@ 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" { + val := f.Primary().Value.ScalarString() + link, err := d2parser.ParseKey(val) + if err != nil { + continue + } + + linkIDA := link.IDA() + if len(linkIDA) == 0 { + continue + } + + // When updateLinks is called, all valid board links are already compiled and changed to the qualified path beginning with "root" + if linkIDA[0] != "root" { + continue + } bida := BoardIDA(f) aida := IDA(f) if len(bida) != len(aida) { diff --git a/e2etests-cli/main_test.go b/e2etests-cli/main_test.go index 32f5ec26f..5f036cd61 100644 --- a/e2etests-cli/main_test.go +++ b/e2etests-cli/main_test.go @@ -78,6 +78,17 @@ func TestCLI_E2E(t *testing.T) { assert.TestdataDir(t, filepath.Join(dir, "empty-layer")) }, }, + { + name: "layer-link", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "test.d2", `doh: { link: layers.test2 }; layers: { test2: @test2.d2 }`) + writeFile(t, dir, "test2.d2", `x: I'm a Mac { link: https://example.com }`) + err := runTestMain(t, ctx, dir, env, "test.d2", "layer-link.svg") + assert.Success(t, err) + + assert.TestdataDir(t, filepath.Join(dir, "layer-link")) + }, + }, { // Skip the empty base board so the animation doesn't show blank for 1400ms name: "empty-base", diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg new file mode 100644 index 000000000..e069c408c --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg @@ -0,0 +1,110 @@ +doh + + + + + + + + + + + + + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg new file mode 100644 index 000000000..ec958858e --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg @@ -0,0 +1,110 @@ +I'm a Mac + + + + + + + + + + + + + + + From 120811e68731b3bd626dfb87c5bf229474a73491 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 28 Jul 2023 01:13:29 -0700 Subject: [PATCH 097/138] add dagre_disconnected_edge test --- e2etests/regression_test.go | 1 + .../testdata/files/dagre_disconnected_edge.d2 | 13 ++ .../dagre/board.exp.json | 202 ++++++++++++++++++ .../dagre/sketch.exp.svg | 96 +++++++++ .../elk/board.exp.json | 193 +++++++++++++++++ .../elk/sketch.exp.svg | 96 +++++++++ 6 files changed, 601 insertions(+) create mode 100644 e2etests/testdata/files/dagre_disconnected_edge.d2 create mode 100644 e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json create mode 100644 e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json create mode 100644 e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index e66d250ed..55bc62b14 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -1038,6 +1038,7 @@ cf many required: { loadFromFile(t, "cylinder_grid_label"), loadFromFile(t, "grid_with_latex"), loadFromFile(t, "icons_on_top"), + loadFromFile(t, "dagre_disconnected_edge"), } runa(t, tcs) diff --git a/e2etests/testdata/files/dagre_disconnected_edge.d2 b/e2etests/testdata/files/dagre_disconnected_edge.d2 new file mode 100644 index 000000000..a51b8241c --- /dev/null +++ b/e2etests/testdata/files/dagre_disconnected_edge.d2 @@ -0,0 +1,13 @@ +x -> y + +x: program { + label.near: top-center + icon: https://icons.terrastruct.com/essentials%2F005-programmer.svg + icon.near: outside-top-right +} + +y: profits { + label.near: bottom-right + icon: https://icons.terrastruct.com/essentials%2Fprofits.svg + icon.near: outside-left-center +} diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json new file mode 100644 index 000000000..0c668d3c9 --- /dev/null +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json @@ -0,0 +1,202 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 131, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/005-programmer.svg", + "RawPath": "/essentials%2F005-programmer.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_RIGHT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "program", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 81, + "y": 192 + }, + "width": 118, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/profits.svg", + "RawPath": "/essentials%2Fprofits.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_MIDDLE", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "profits", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 47, + "labelHeight": 21, + "labelPosition": "INSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "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": 139.5, + "y": 92 + }, + { + "x": 139.5, + "y": 132 + }, + { + "x": 139.5, + "y": 152 + }, + { + "x": 139.5, + "y": 192 + } + ], + "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/regression/dagre_disconnected_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg new file mode 100644 index 000000000..af5c010ef --- /dev/null +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg @@ -0,0 +1,96 @@ +programprofits + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json new file mode 100644 index 000000000..4630de718 --- /dev/null +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json @@ -0,0 +1,193 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 40, + "y": 12 + }, + "width": 131, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/005-programmer.svg", + "RawPath": "/essentials%2F005-programmer.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_RIGHT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "program", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 81, + "y": 200 + }, + "width": 118, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/profits.svg", + "RawPath": "/essentials%2Fprofits.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_MIDDLE", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "profits", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 47, + "labelHeight": 21, + "labelPosition": "INSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "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": 105.5, + "y": 130 + }, + { + "x": 105.5, + "y": 200 + } + ], + "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/regression/dagre_disconnected_edge/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg new file mode 100644 index 000000000..37e784f9a --- /dev/null +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg @@ -0,0 +1,96 @@ +programprofits + + + + \ No newline at end of file From 189edf552aa1762eaf3a28664e3bab3a3fb0cec6 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 28 Jul 2023 02:10:27 -0700 Subject: [PATCH 098/138] add check for nodes that need to move with edges even if they start behind the original node --- d2layouts/d2dagrelayout/layout.go | 65 +++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 17 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index ebab1e73e..6d004e25f 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -856,6 +856,7 @@ func shiftUp(g *d2graph.Graph, start, distance float64, isHorizontal bool) { func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) map[*d2graph.Object]struct{} { q := []*d2graph.Object{obj} + needsMove := make(map[*d2graph.Object]struct{}) seen := make(map[*d2graph.Object]struct{}) shifted := make(map[*d2graph.Object]struct{}) shiftedEdges := make(map[*d2graph.Edge]struct{}) @@ -915,23 +916,27 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } // skip other objects behind start if curr != obj { - if isHorizontal { - if curr.TopLeft.X < start { - continue - } - } else { - if curr.TopLeft.Y < start { - continue + if _, in := needsMove[curr]; !in { + if isHorizontal { + if curr.TopLeft.X < start { + continue + } + } else { + if curr.TopLeft.Y < start { + continue + } } } } if isHorizontal { - shift := false - if !isMargin { - shift = start < curr.TopLeft.X - } else { - shift = start <= curr.TopLeft.X + _, shift := needsMove[curr] + if !shift { + if !isMargin { + shift = start < curr.TopLeft.X + } else { + shift = start <= curr.TopLeft.X + } } if shift { @@ -939,11 +944,13 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f shifted[curr] = struct{}{} } } else { - shift := false - if !isMargin { - shift = start < curr.TopLeft.Y - } else { - shift = start <= curr.TopLeft.Y + _, shift := needsMove[curr] + if !shift { + if !isMargin { + shift = start < curr.TopLeft.Y + } else { + shift = start <= curr.TopLeft.Y + } } if shift { curr.TopLeft.Y += distance @@ -977,6 +984,18 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f shiftedEdges[e] = struct{}{} continue } else if e.Src == curr { + last := e.Route[len(e.Route)-1] + if isHorizontal { + if start <= last.X && + e.Dst.TopLeft.X+e.Dst.Width < last.X+distance { + needsMove[e.Dst] = struct{}{} + } + } else { + if start <= last.Y && + e.Dst.TopLeft.Y+e.Dst.Height < last.Y+distance { + needsMove[e.Dst] = struct{}{} + } + } queue(e.Dst) if isHorizontal { for _, p := range e.Route { @@ -993,6 +1012,18 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } shiftedEdges[e] = struct{}{} } else if e.Dst == curr { + first := e.Route[0] + if isHorizontal { + if start <= first.X && + e.Src.TopLeft.X+e.Src.Width < first.X+distance { + needsMove[e.Src] = struct{}{} + } + } else { + if start <= first.Y && + e.Src.TopLeft.Y+e.Src.Height < first.Y+distance { + needsMove[e.Src] = struct{}{} + } + } queue(e.Src) if isHorizontal { for _, p := range e.Route { From adcc52388fcb00621b71363ea554cb210703031f Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 28 Jul 2023 02:11:41 -0700 Subject: [PATCH 099/138] update test --- .../dagre/board.exp.json | 2 +- .../dagre/sketch.exp.svg | 156 +++++++++--------- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json index 0c668d3c9..f74f94ee7 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json @@ -7,7 +7,7 @@ "id": "x", "type": "rectangle", "pos": { - "x": 0, + "x": 74, "y": 0 }, "width": 131, diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg index af5c010ef..3e81e4970 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -programprofits - - + .d2-2262832694 .fill-N1{fill:#0A0F25;} + .d2-2262832694 .fill-N2{fill:#676C7E;} + .d2-2262832694 .fill-N3{fill:#9499AB;} + .d2-2262832694 .fill-N4{fill:#CFD2DD;} + .d2-2262832694 .fill-N5{fill:#DEE1EB;} + .d2-2262832694 .fill-N6{fill:#EEF1F8;} + .d2-2262832694 .fill-N7{fill:#FFFFFF;} + .d2-2262832694 .fill-B1{fill:#0D32B2;} + .d2-2262832694 .fill-B2{fill:#0D32B2;} + .d2-2262832694 .fill-B3{fill:#E3E9FD;} + .d2-2262832694 .fill-B4{fill:#E3E9FD;} + .d2-2262832694 .fill-B5{fill:#EDF0FD;} + .d2-2262832694 .fill-B6{fill:#F7F8FE;} + .d2-2262832694 .fill-AA2{fill:#4A6FF3;} + .d2-2262832694 .fill-AA4{fill:#EDF0FD;} + .d2-2262832694 .fill-AA5{fill:#F7F8FE;} + .d2-2262832694 .fill-AB4{fill:#EDF0FD;} + .d2-2262832694 .fill-AB5{fill:#F7F8FE;} + .d2-2262832694 .stroke-N1{stroke:#0A0F25;} + .d2-2262832694 .stroke-N2{stroke:#676C7E;} + .d2-2262832694 .stroke-N3{stroke:#9499AB;} + .d2-2262832694 .stroke-N4{stroke:#CFD2DD;} + .d2-2262832694 .stroke-N5{stroke:#DEE1EB;} + .d2-2262832694 .stroke-N6{stroke:#EEF1F8;} + .d2-2262832694 .stroke-N7{stroke:#FFFFFF;} + .d2-2262832694 .stroke-B1{stroke:#0D32B2;} + .d2-2262832694 .stroke-B2{stroke:#0D32B2;} + .d2-2262832694 .stroke-B3{stroke:#E3E9FD;} + .d2-2262832694 .stroke-B4{stroke:#E3E9FD;} + .d2-2262832694 .stroke-B5{stroke:#EDF0FD;} + .d2-2262832694 .stroke-B6{stroke:#F7F8FE;} + .d2-2262832694 .stroke-AA2{stroke:#4A6FF3;} + .d2-2262832694 .stroke-AA4{stroke:#EDF0FD;} + .d2-2262832694 .stroke-AA5{stroke:#F7F8FE;} + .d2-2262832694 .stroke-AB4{stroke:#EDF0FD;} + .d2-2262832694 .stroke-AB5{stroke:#F7F8FE;} + .d2-2262832694 .background-color-N1{background-color:#0A0F25;} + .d2-2262832694 .background-color-N2{background-color:#676C7E;} + .d2-2262832694 .background-color-N3{background-color:#9499AB;} + .d2-2262832694 .background-color-N4{background-color:#CFD2DD;} + .d2-2262832694 .background-color-N5{background-color:#DEE1EB;} + .d2-2262832694 .background-color-N6{background-color:#EEF1F8;} + .d2-2262832694 .background-color-N7{background-color:#FFFFFF;} + .d2-2262832694 .background-color-B1{background-color:#0D32B2;} + .d2-2262832694 .background-color-B2{background-color:#0D32B2;} + .d2-2262832694 .background-color-B3{background-color:#E3E9FD;} + .d2-2262832694 .background-color-B4{background-color:#E3E9FD;} + .d2-2262832694 .background-color-B5{background-color:#EDF0FD;} + .d2-2262832694 .background-color-B6{background-color:#F7F8FE;} + .d2-2262832694 .background-color-AA2{background-color:#4A6FF3;} + .d2-2262832694 .background-color-AA4{background-color:#EDF0FD;} + .d2-2262832694 .background-color-AA5{background-color:#F7F8FE;} + .d2-2262832694 .background-color-AB4{background-color:#EDF0FD;} + .d2-2262832694 .background-color-AB5{background-color:#F7F8FE;} + .d2-2262832694 .color-N1{color:#0A0F25;} + .d2-2262832694 .color-N2{color:#676C7E;} + .d2-2262832694 .color-N3{color:#9499AB;} + .d2-2262832694 .color-N4{color:#CFD2DD;} + .d2-2262832694 .color-N5{color:#DEE1EB;} + .d2-2262832694 .color-N6{color:#EEF1F8;} + .d2-2262832694 .color-N7{color:#FFFFFF;} + .d2-2262832694 .color-B1{color:#0D32B2;} + .d2-2262832694 .color-B2{color:#0D32B2;} + .d2-2262832694 .color-B3{color:#E3E9FD;} + .d2-2262832694 .color-B4{color:#E3E9FD;} + .d2-2262832694 .color-B5{color:#EDF0FD;} + .d2-2262832694 .color-B6{color:#F7F8FE;} + .d2-2262832694 .color-AA2{color:#4A6FF3;} + .d2-2262832694 .color-AA4{color:#EDF0FD;} + .d2-2262832694 .color-AA5{color:#F7F8FE;} + .d2-2262832694 .color-AB4{color:#EDF0FD;} + .d2-2262832694 .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}]]>programprofits + + \ No newline at end of file From 92af7a73c9619ffe653b0f0a371edd0470c05a90 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 28 Jul 2023 09:44:45 -0700 Subject: [PATCH 100/138] tests --- .../regression/dagre_disconnected_edge/dagre/sketch.exp.svg | 2 +- .../regression/dagre_disconnected_edge/elk/sketch.exp.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg index 3e81e4970..7fcca0eb3 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - - - - \ No newline at end of file + .d2-121760133 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/sanity/empty/elk/board.exp.json b/e2etests/testdata/sanity/empty/elk/board.exp.json index 193d4edf8..8c31d7ff3 100644 --- a/e2etests/testdata/sanity/empty/elk/board.exp.json +++ b/e2etests/testdata/sanity/empty/elk/board.exp.json @@ -1,6 +1,6 @@ { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "fontFamily": "SourceSansPro", "shapes": [], "connections": [], diff --git a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg index 34a4045c9..19d8c4fc6 100644 --- a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg @@ -1,4 +1,4 @@ - - - - \ No newline at end of file + .d2-121760133 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json index 67a45d48e..3f1c76ab7 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json +++ b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json @@ -602,7 +602,7 @@ }, { "name": "repair", - "isFolderOnly": false, + "isFolderOnly": true, "fontFamily": "SourceSansPro", "shapes": [], "connections": [], diff --git a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg index 0474a0e98..b190f7fe8 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg @@ -100,132 +100,119 @@ 0%, 0.000000% { opacity: 0; } - 0.000000%, 9.990000% { + 0.000000%, 11.100000% { opacity: 1; } - 10.000000%, 100% { + 11.111111%, 100% { opacity: 0; } }@keyframes d2Transition-d2-393299205-1 { - 0%, 9.990000% { + 0%, 11.100000% { opacity: 0; } - 10.000000%, 19.990000% { + 11.111111%, 22.211111% { opacity: 1; } - 20.000000%, 100% { + 22.222222%, 100% { opacity: 0; } }@keyframes d2Transition-d2-393299205-2 { - 0%, 19.990000% { + 0%, 22.211111% { opacity: 0; } - 20.000000%, 29.990000% { + 22.222222%, 33.322222% { opacity: 1; } - 30.000000%, 100% { + 33.333333%, 100% { opacity: 0; } }@keyframes d2Transition-d2-393299205-3 { - 0%, 29.990000% { + 0%, 33.322222% { opacity: 0; } - 30.000000%, 39.990000% { + 33.333333%, 44.433333% { opacity: 1; } - 40.000000%, 100% { + 44.444444%, 100% { opacity: 0; } }@keyframes d2Transition-d2-393299205-4 { - 0%, 39.990000% { + 0%, 44.433333% { opacity: 0; } - 40.000000%, 49.990000% { + 44.444444%, 55.544444% { opacity: 1; } - 50.000000%, 100% { + 55.555556%, 100% { opacity: 0; } }@keyframes d2Transition-d2-393299205-5 { - 0%, 49.990000% { + 0%, 55.544444% { opacity: 0; } - 50.000000%, 59.990000% { + 55.555556%, 66.655556% { opacity: 1; } - 60.000000%, 100% { + 66.666667%, 100% { opacity: 0; } }@keyframes d2Transition-d2-393299205-6 { - 0%, 59.990000% { + 0%, 66.655556% { opacity: 0; } - 60.000000%, 69.990000% { + 66.666667%, 77.766667% { opacity: 1; } - 70.000000%, 100% { + 77.777778%, 100% { opacity: 0; } }@keyframes d2Transition-d2-393299205-7 { - 0%, 69.990000% { + 0%, 77.766667% { opacity: 0; } - 70.000000%, 79.990000% { + 77.777778%, 88.877778% { opacity: 1; } - 80.000000%, 100% { + 88.888889%, 100% { opacity: 0; } }@keyframes d2Transition-d2-393299205-8 { - 0%, 79.990000% { + 0%, 88.877778% { opacity: 0; } - 80.000000%, 89.990000% { + 88.888889%, 100.000000% { opacity: 1; } - 90.000000%, 100% { - opacity: 0; - } -}@keyframes d2Transition-d2-393299205-9 { - 0%, 89.990000% { - opacity: 0; - } - 90.000000%, 100.000000% { - opacity: 1; - } -}]]>windowroofgarage +}]]>windowroofgarage -blindsglass +blindsglass -shinglesstarlinkutility hookup +shinglesstarlinkutility hookup -toolsvehicles +toolsvehicles - - - -find contractorscraigslistfacebook +find contractorscraigslistfacebook -find contractorssolicit quotescraigslistfacebook +find contractorssolicit quotescraigslistfacebook -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook @@ -233,7 +220,7 @@ -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook @@ -242,7 +229,7 @@ -windowroofgaragewaterrainthunder +windowroofgaragewaterrainthunder diff --git a/e2etests/testdata/stable/complex-layers/elk/board.exp.json b/e2etests/testdata/stable/complex-layers/elk/board.exp.json index 277381b1d..cd538c972 100644 --- a/e2etests/testdata/stable/complex-layers/elk/board.exp.json +++ b/e2etests/testdata/stable/complex-layers/elk/board.exp.json @@ -602,7 +602,7 @@ }, { "name": "repair", - "isFolderOnly": false, + "isFolderOnly": true, "fontFamily": "SourceSansPro", "shapes": [], "connections": [], diff --git a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg index ccbc3ffac..712a5936c 100644 --- a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg @@ -100,132 +100,119 @@ 0%, 0.000000% { opacity: 0; } - 0.000000%, 9.990000% { + 0.000000%, 11.100000% { opacity: 1; } - 10.000000%, 100% { + 11.111111%, 100% { opacity: 0; } }@keyframes d2Transition-d2-659664847-1 { - 0%, 9.990000% { + 0%, 11.100000% { opacity: 0; } - 10.000000%, 19.990000% { + 11.111111%, 22.211111% { opacity: 1; } - 20.000000%, 100% { + 22.222222%, 100% { opacity: 0; } }@keyframes d2Transition-d2-659664847-2 { - 0%, 19.990000% { + 0%, 22.211111% { opacity: 0; } - 20.000000%, 29.990000% { + 22.222222%, 33.322222% { opacity: 1; } - 30.000000%, 100% { + 33.333333%, 100% { opacity: 0; } }@keyframes d2Transition-d2-659664847-3 { - 0%, 29.990000% { + 0%, 33.322222% { opacity: 0; } - 30.000000%, 39.990000% { + 33.333333%, 44.433333% { opacity: 1; } - 40.000000%, 100% { + 44.444444%, 100% { opacity: 0; } }@keyframes d2Transition-d2-659664847-4 { - 0%, 39.990000% { + 0%, 44.433333% { opacity: 0; } - 40.000000%, 49.990000% { + 44.444444%, 55.544444% { opacity: 1; } - 50.000000%, 100% { + 55.555556%, 100% { opacity: 0; } }@keyframes d2Transition-d2-659664847-5 { - 0%, 49.990000% { + 0%, 55.544444% { opacity: 0; } - 50.000000%, 59.990000% { + 55.555556%, 66.655556% { opacity: 1; } - 60.000000%, 100% { + 66.666667%, 100% { opacity: 0; } }@keyframes d2Transition-d2-659664847-6 { - 0%, 59.990000% { + 0%, 66.655556% { opacity: 0; } - 60.000000%, 69.990000% { + 66.666667%, 77.766667% { opacity: 1; } - 70.000000%, 100% { + 77.777778%, 100% { opacity: 0; } }@keyframes d2Transition-d2-659664847-7 { - 0%, 69.990000% { + 0%, 77.766667% { opacity: 0; } - 70.000000%, 79.990000% { + 77.777778%, 88.877778% { opacity: 1; } - 80.000000%, 100% { + 88.888889%, 100% { opacity: 0; } }@keyframes d2Transition-d2-659664847-8 { - 0%, 79.990000% { + 0%, 88.877778% { opacity: 0; } - 80.000000%, 89.990000% { + 88.888889%, 100.000000% { opacity: 1; } - 90.000000%, 100% { - opacity: 0; - } -}@keyframes d2Transition-d2-659664847-9 { - 0%, 89.990000% { - opacity: 0; - } - 90.000000%, 100.000000% { - opacity: 1; - } -}]]>windowroofgarage +}]]>windowroofgarage -blindsglass +blindsglass -shinglesstarlinkutility hookup +shinglesstarlinkutility hookup -toolsvehicles +toolsvehicles - - - -find contractorscraigslistfacebook +find contractorscraigslistfacebook -find contractorssolicit quotescraigslistfacebook +find contractorssolicit quotescraigslistfacebook -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook @@ -233,7 +220,7 @@ -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook @@ -242,7 +229,7 @@ -windowroofgaragewaterrainthunder +windowroofgaragewaterrainthunder diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 98ba30eda..a61670cdc 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2compiler/TestCompile/root_direction.d2,0:0:0-0:16:16", "nodes": [ diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 353ce9a61..4fa6ad4a8 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2compiler/TestCompile/root_sequence.d2,0:0:0-1:0:24", "nodes": [ diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json new file mode 100644 index 000000000..3205a49da --- /dev/null +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json @@ -0,0 +1,287 @@ +{ + "graph": { + "name": "", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,0:0:0-8:0:48", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,1:0:1-1:16:17", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,1:0:1-1:9:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,1:0:1-1:9:10", + "value": [ + { + "string": "direction", + "raw_string": "direction" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,1:11:12-1:16:17", + "value": [ + { + "string": "right", + "raw_string": "right" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,3:0:19-7:1:47", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,3:0:19-3:5:24", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,3:0:19-3:5:24", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,3:7:26-7:1:47", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,4:2:30-6:3:45", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,4:2:30-4:3:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,4:2:30-4:3:31", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,4:5:33-6:3:45", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,5:4:39-5:6:41", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,5:4:39-5:6:41", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,5:4:39-5:6:41", + "value": [ + { + "string": "RJ", + "raw_string": "RJ" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "right" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null, + "steps": [ + { + "name": "1", + "isFolderOnly": false, + "ast": { + "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": "direction" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,1:11:12-1:16:17", + "value": [ + { + "string": "right", + "raw_string": "right" + } + ] + } + }, + "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": "RJ" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "right" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "RJ", + "id_val": "RJ", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,5:4:39-5:6:41", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,5:4:39-5:6:41", + "value": [ + { + "string": "RJ", + "raw_string": "RJ" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "RJ" + }, + "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/TestCompile2/nulls/basic/shape.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json index 4f2c2fd5c..ec5030e90 100644 --- a/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/shape.d2,0:0:0-3:0:11", "nodes": [ diff --git a/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json b/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json index 9a3a10c59..821e51b86 100644 --- a/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json @@ -189,7 +189,7 @@ "scenarios": [ { "name": "a", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": ",1:0:0-2:0:0", "nodes": null diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json index c8ad77b4c..7f72e74ba 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,0:0:0-15:0:135", "nodes": [ diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index bda871992..4306c2469 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,0:0:0-10:0:62", "nodes": [ diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index 30b160ed8..6dcdda361 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,0:0:0-23:0:196", "nodes": [ diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index 86ad2c0cb..1ade3446e 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,0:0:0-13:0:109", "nodes": [ diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index 1da21aa14..b529b2127 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,0:0:0-10:0:65", "nodes": [ diff --git a/testdata/d2oracle/TestDelete/class_refs.exp.json b/testdata/d2oracle/TestDelete/class_refs.exp.json index 965ae6c65..600314149 100644 --- a/testdata/d2oracle/TestDelete/class_refs.exp.json +++ b/testdata/d2oracle/TestDelete/class_refs.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2oracle/TestDelete/class_refs.d2,0:0:0-0:0:0", "nodes": null diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index f40d4a886..bf68210d1 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -1,7 +1,7 @@ { "graph": { "name": "", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { "range": "d2/testdata/d2oracle/TestDelete/flat.d2,0:0:0-0:0:0", "nodes": null From 477014d069fa1509e0365d4b2ae40fa24355d39a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 29 Jul 2023 10:07:20 -0700 Subject: [PATCH 102/138] ignore invalid debug flag --- ci/release/changelogs/next.md | 1 + d2cli/main.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index e71dbb04e..1c4a18e21 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -16,6 +16,7 @@ - Tooltip and link icons are now positioned on shape border [#1466](https://github.com/terrastruct/d2/pull/1466) - Tooltip and link icons are always rendered over shapes [#1467](https://github.com/terrastruct/d2/pull/1467) - Boards with no objects are considered folders [#1504](https://github.com/terrastruct/d2/pull/1504) +- `DEBUG` environment variable ignored if set incorrectly [#1505](https://github.com/terrastruct/d2/pull/1505) #### Bugfixes ⛑️ diff --git a/d2cli/main.go b/d2cli/main.go index 0f0e8167b..635a5e440 100644 --- a/d2cli/main.go +++ b/d2cli/main.go @@ -67,7 +67,8 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { } debugFlag, err := ms.Opts.Bool("DEBUG", "debug", "d", false, "print debug logs.") if err != nil { - return err + ms.Log.Warn.Printf("Invalid DEBUG flag value ignored") + debugFlag = go2.Pointer(false) } 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 { From 366696ad05170e568f51ff651a694c12389ae574 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 29 Jul 2023 10:53:39 -0700 Subject: [PATCH 103/138] include diagram config in hash --- d2target/d2target.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/d2target/d2target.go b/d2target/d2target.go index b05641df7..bf2c0277e 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -83,6 +83,14 @@ func (diagram Diagram) Bytes() ([]byte, error) { } base := append(b1, b2...) + if diagram.Config != nil { + b, err := json.Marshal(diagram.Config) + if err != nil { + return nil, err + } + base = append(base, b...) + } + for _, d := range diagram.Layers { slices, err := d.Bytes() if err != nil { From 9122ce1c2bb9733df1550bdb949e2b720a089d20 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 29 Jul 2023 11:31:03 -0700 Subject: [PATCH 104/138] robust hash --- d2exporter/export_test.go | 62 +- d2lib/d2.go | 3 + .../testdata/all_shapes/sketch.exp.svg | 154 ++--- .../testdata/all_shapes_dark/sketch.exp.svg | 154 ++--- .../d2sketch/testdata/animated/sketch.exp.svg | 160 ++--- .../testdata/animated_dark/sketch.exp.svg | 160 ++--- .../testdata/arrowheads/sketch.exp.svg | 160 ++--- .../testdata/arrowheads_dark/sketch.exp.svg | 160 ++--- .../d2sketch/testdata/basic/sketch.exp.svg | 154 ++--- .../testdata/basic_dark/sketch.exp.svg | 154 ++--- .../testdata/child_to_child/sketch.exp.svg | 160 ++--- .../child_to_child_dark/sketch.exp.svg | 160 ++--- .../d2sketch/testdata/class/sketch.exp.svg | 154 ++--- .../sketch.exp.svg | 160 ++--- .../testdata/class_dark/sketch.exp.svg | 154 ++--- .../testdata/connection_label/sketch.exp.svg | 160 ++--- .../connection_label_dark/sketch.exp.svg | 160 ++--- .../testdata/crows_feet/sketch.exp.svg | 154 ++--- .../testdata/crows_feet_dark/sketch.exp.svg | 154 ++--- .../d2sketch/testdata/dots-3d/sketch.exp.svg | 154 ++--- .../d2sketch/testdata/dots-all/sketch.exp.svg | 154 ++--- .../testdata/dots-multiple/sketch.exp.svg | 154 ++--- .../testdata/dots-real/sketch.exp.svg | 166 ++--- .../testdata/double-border/sketch.exp.svg | 160 ++--- .../testdata/elk_corners/sketch.exp.svg | 154 ++--- .../long_arrowhead_label/sketch.exp.svg | 160 ++--- .../d2sketch/testdata/opacity/sketch.exp.svg | 560 ++++++++--------- .../testdata/opacity_dark/sketch.exp.svg | 560 ++++++++--------- .../d2sketch/testdata/overlay/sketch.exp.svg | 154 ++--- .../testdata/paper-real/sketch.exp.svg | 166 ++--- .../testdata/root-fill/sketch.exp.svg | 554 ++++++++--------- .../testdata/sql_tables/sketch.exp.svg | 154 ++--- .../testdata/sql_tables_dark/sketch.exp.svg | 154 ++--- .../d2sketch/testdata/terminal/sketch.exp.svg | 166 ++--- .../d2sketch/testdata/twitter/sketch.exp.svg | 560 ++++++++--------- .../testdata/twitter_dark/sketch.exp.svg | 560 ++++++++--------- .../diagram_wider_than_tooltip/sketch.exp.svg | 158 ++--- .../testdata/internal-links/sketch.exp.svg | 152 ++--- .../appendix/testdata/links/sketch.exp.svg | 152 ++--- .../testdata/links_dark/sketch.exp.svg | 152 ++--- .../testdata/tooltip_fill/sketch.exp.svg | 152 ++--- .../tooltip_wider_than_diagram/sketch.exp.svg | 152 ++--- .../testdata/all_shapes/dark_theme.exp.svg | 152 ++--- .../testdata/animated/dark_theme.exp.svg | 158 ++--- .../testdata/arrowheads/dark_theme.exp.svg | 158 ++--- .../testdata/basic/dark_theme.exp.svg | 152 ++--- .../child_to_child/dark_theme.exp.svg | 158 ++--- .../testdata/class/dark_theme.exp.svg | 152 ++--- .../testdata/code/dark_theme.exp.svg | 566 ++++++++--------- .../connection_label/dark_theme.exp.svg | 158 ++--- .../testdata/opacity/dark_theme.exp.svg | 560 ++++++++--------- .../testdata/overlay/dark_theme.exp.svg | 152 ++--- .../testdata/sql_tables/dark_theme.exp.svg | 152 ++--- .../testdata/twitter/dark_theme.exp.svg | 560 ++++++++--------- d2target/d2target.go | 6 +- docs/examples/lib/3-lowlevel/lowlevel.go | 3 +- .../testdata/TestCLI_E2E/abspath.exp.svg | 152 ++--- .../testdata/TestCLI_E2E/animation.exp.svg | 180 +++--- .../board_import/hello-world-x-y.exp.svg | 152 ++--- .../board_import/hello-world-x.exp.svg | 154 ++--- .../board_import/hello-world.exp.svg | 154 ++--- .../testdata/TestCLI_E2E/center.exp.svg | 152 ++--- .../testdata/TestCLI_E2E/chain_import.exp.svg | 152 ++--- .../testdata/TestCLI_E2E/empty-base.exp.svg | 160 ++--- .../testdata/TestCLI_E2E/import.exp.svg | 152 ++--- .../TestCLI_E2E/import_spread_nested.exp.svg | 152 ++--- .../testdata/TestCLI_E2E/import_vars.exp.svg | 152 ++--- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 80081 -> 80081 bytes .../TestCLI_E2E/layer-link/index.exp.svg | 154 ++--- .../TestCLI_E2E/layer-link/test2.exp.svg | 154 ++--- .../TestCLI_E2E/multiboard/life/index.exp.svg | 152 ++--- .../multiboard/life/layers/broker.exp.svg | 152 ++--- .../multiboard/life/layers/core.exp.svg | 152 ++--- .../multiboard/life/layers/stocks.exp.svg | 152 ++--- .../multiboard/life/scenarios/why.exp.svg | 152 ++--- .../multiboard/life_index_d2/index.exp.svg | 152 ++--- .../life_index_d2/layers/broker.exp.svg | 152 ++--- .../life_index_d2/layers/core.exp.svg | 152 ++--- .../life_index_d2/layers/stocks.exp.svg | 152 ++--- .../life_index_d2/scenarios/why.exp.svg | 152 ++--- .../testdata/TestCLI_E2E/stdin.exp.svg | 152 ++--- .../TestCLI_E2E/vars-animation.exp.svg | 180 +++--- .../testdata/TestCLI_E2E/vars-config.exp.svg | 160 ++--- .../testdata/TestCLI_E2E/with-font.exp.svg | 158 ++--- .../measured/empty-class/dagre/sketch.exp.svg | 146 ++--- .../measured/empty-shape/dagre/sketch.exp.svg | 146 ++--- .../empty-sql_table/dagre/sketch.exp.svg | 146 ++--- .../testdata/patterns/3d/dagre/sketch.exp.svg | 154 ++--- .../patterns/all_shapes/dagre/sketch.exp.svg | 154 ++--- .../patterns/multiple/dagre/sketch.exp.svg | 154 ++--- .../patterns/paper/dagre/sketch.exp.svg | 154 ++--- .../patterns/real-lines/dagre/sketch.exp.svg | 172 +++--- .../patterns/real/dagre/sketch.exp.svg | 166 ++--- .../root-dots-with-fill/dagre/sketch.exp.svg | 154 ++--- .../patterns/root-dots/dagre/sketch.exp.svg | 154 ++--- .../patterns/shape/dagre/sketch.exp.svg | 154 ++--- .../ampersand-escape/dagre/sketch.exp.svg | 154 ++--- .../ampersand-escape/elk/sketch.exp.svg | 154 ++--- .../dagre/sketch.exp.svg | 164 ++--- .../elk/sketch.exp.svg | 164 ++--- .../bold_edge_label/dagre/sketch.exp.svg | 158 ++--- .../bold_edge_label/elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 166 ++--- .../code_leading_newlines/elk/sketch.exp.svg | 166 ++--- .../dagre/sketch.exp.svg | 166 ++--- .../elk/sketch.exp.svg | 166 ++--- .../dagre/sketch.exp.svg | 166 ++--- .../code_trailing_newlines/elk/sketch.exp.svg | 166 ++--- .../cylinder_grid_label/dagre/sketch.exp.svg | 158 ++--- .../cylinder_grid_label/elk/sketch.exp.svg | 158 ++--- .../dagre-disconnect/dagre/sketch.exp.svg | 164 ++--- .../dagre-disconnect/elk/sketch.exp.svg | 164 ++--- .../dagre/sketch.exp.svg | 164 ++--- .../dagre_broken_arrowhead/elk/sketch.exp.svg | 164 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 164 ++--- .../elk/sketch.exp.svg | 164 ++--- .../dagre_special_ids/dagre/sketch.exp.svg | 152 ++--- .../dagre_special_ids/elk/sketch.exp.svg | 152 ++--- .../elk_alignment/dagre/sketch.exp.svg | 164 ++--- .../elk_alignment/elk/sketch.exp.svg | 164 ++--- .../dagre/sketch.exp.svg | 146 ++--- .../elk/sketch.exp.svg | 146 ++--- .../elk_loop_panic/dagre/sketch.exp.svg | 158 ++--- .../elk_loop_panic/elk/sketch.exp.svg | 158 ++--- .../regression/elk_order/dagre/sketch.exp.svg | 554 ++++++++--------- .../regression/elk_order/elk/sketch.exp.svg | 554 ++++++++--------- .../empty_class_height/dagre/sketch.exp.svg | 152 ++--- .../empty_class_height/elk/sketch.exp.svg | 152 ++--- .../empty_sequence/dagre/sketch.exp.svg | 152 ++--- .../empty_sequence/elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../grid_in_constant_near/elk/sketch.exp.svg | 158 ++--- .../regression/grid_oom/dagre/sketch.exp.svg | 152 ++--- .../regression/grid_oom/elk/sketch.exp.svg | 152 ++--- .../grid_panic/dagre/sketch.exp.svg | 158 ++--- .../regression/grid_panic/elk/sketch.exp.svg | 158 ++--- .../grid_with_latex/dagre/sketch.exp.svg | 552 ++++++++--------- .../grid_with_latex/elk/sketch.exp.svg | 552 ++++++++--------- .../regression/hex-fill/dagre/sketch.exp.svg | 152 ++--- .../regression/hex-fill/elk/sketch.exp.svg | 152 ++--- .../icons_on_top/dagre/sketch.exp.svg | 154 ++--- .../icons_on_top/elk/sketch.exp.svg | 154 ++--- .../just-width/dagre/sketch.exp.svg | 152 ++--- .../regression/just-width/elk/sketch.exp.svg | 152 ++--- .../link_with_ampersand/dagre/sketch.exp.svg | 154 ++--- .../link_with_ampersand/elk/sketch.exp.svg | 154 ++--- .../long_arrowhead_label/dagre/sketch.exp.svg | 158 ++--- .../long_arrowhead_label/elk/sketch.exp.svg | 158 ++--- .../md_font_weight/dagre/sketch.exp.svg | 548 ++++++++--------- .../md_font_weight/elk/sketch.exp.svg | 548 ++++++++--------- .../md_h1_li_li/dagre/sketch.exp.svg | 554 ++++++++--------- .../regression/md_h1_li_li/elk/sketch.exp.svg | 554 ++++++++--------- .../nested_steps/dagre/sketch.exp.svg | 158 ++--- .../nested_steps/elk/sketch.exp.svg | 158 ++--- .../regression/no-lexer/dagre/sketch.exp.svg | 152 ++--- .../regression/no-lexer/elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../opacity-on-label/dagre/sketch.exp.svg | 560 ++++++++--------- .../opacity-on-label/elk/sketch.exp.svg | 560 ++++++++--------- .../dagre/sketch.exp.svg | 164 ++--- .../overlapping-edge-label/elk/sketch.exp.svg | 164 ++--- .../query_param_escape/dagre/sketch.exp.svg | 152 ++--- .../query_param_escape/elk/sketch.exp.svg | 152 ++--- .../root-container/dagre/sketch.exp.svg | 158 ++--- .../root-container/elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../regression/slow_grid/dagre/sketch.exp.svg | 152 ++--- .../regression/slow_grid/elk/sketch.exp.svg | 152 ++--- .../sql_table_overflow/dagre/sketch.exp.svg | 152 ++--- .../sql_table_overflow/elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../unconnected/dagre/sketch.exp.svg | 554 ++++++++--------- .../regression/unconnected/elk/sketch.exp.svg | 554 ++++++++--------- .../dagre/sketch.exp.svg | 166 ++--- .../elk/sketch.exp.svg | 166 ++--- .../root/border-radius/dagre/sketch.exp.svg | 152 ++--- .../root/border-radius/elk/sketch.exp.svg | 152 ++--- .../root/double-border/dagre/sketch.exp.svg | 152 ++--- .../root/double-border/elk/sketch.exp.svg | 152 ++--- .../even-stroke-width/dagre/sketch.exp.svg | 152 ++--- .../root/even-stroke-width/elk/sketch.exp.svg | 152 ++--- .../testdata/root/fill/dagre/sketch.exp.svg | 152 ++--- .../testdata/root/fill/elk/sketch.exp.svg | 152 ++--- .../root/stroke-dash/dagre/sketch.exp.svg | 152 ++--- .../root/stroke-dash/elk/sketch.exp.svg | 152 ++--- .../root/stroke-no-width/dagre/sketch.exp.svg | 152 ++--- .../root/stroke-no-width/elk/sketch.exp.svg | 152 ++--- .../root/stroke-width/dagre/sketch.exp.svg | 152 ++--- .../root/stroke-width/elk/sketch.exp.svg | 152 ++--- .../sanity/1_to_2/dagre/sketch.exp.svg | 152 ++--- .../testdata/sanity/1_to_2/elk/sketch.exp.svg | 152 ++--- .../sanity/basic/dagre/sketch.exp.svg | 152 ++--- .../testdata/sanity/basic/elk/sketch.exp.svg | 152 ++--- .../child_to_child/dagre/sketch.exp.svg | 158 ++--- .../sanity/child_to_child/elk/sketch.exp.svg | 158 ++--- .../connection_label/dagre/sketch.exp.svg | 158 ++--- .../connection_label/elk/sketch.exp.svg | 158 ++--- .../sanity/empty/dagre/sketch.exp.svg | 144 ++--- .../testdata/sanity/empty/elk/sketch.exp.svg | 144 ++--- .../3d_fill_and_stroke/dagre/sketch.exp.svg | 154 ++--- .../3d_fill_and_stroke/elk/sketch.exp.svg | 154 ++--- .../stable/all_shapes/dagre/sketch.exp.svg | 152 ++--- .../stable/all_shapes/elk/sketch.exp.svg | 152 ++--- .../all_shapes_link/dagre/sketch.exp.svg | 160 ++--- .../stable/all_shapes_link/elk/sketch.exp.svg | 160 ++--- .../all_shapes_multiple/dagre/sketch.exp.svg | 152 ++--- .../all_shapes_multiple/elk/sketch.exp.svg | 152 ++--- .../all_shapes_shadow/dagre/sketch.exp.svg | 154 ++--- .../all_shapes_shadow/elk/sketch.exp.svg | 154 ++--- .../stable/animated/dagre/sketch.exp.svg | 158 ++--- .../stable/animated/elk/sketch.exp.svg | 158 ++--- .../stable/array-classes/dagre/sketch.exp.svg | 152 ++--- .../stable/array-classes/elk/sketch.exp.svg | 152 ++--- .../arrowhead_adjustment/dagre/sketch.exp.svg | 158 ++--- .../arrowhead_adjustment/elk/sketch.exp.svg | 158 ++--- .../arrowhead_labels/dagre/sketch.exp.svg | 158 ++--- .../arrowhead_labels/elk/sketch.exp.svg | 158 ++--- .../arrowhead_scaling/dagre/sketch.exp.svg | 164 ++--- .../arrowhead_scaling/elk/sketch.exp.svg | 164 ++--- .../basic-tooltips/dagre/sketch.exp.svg | 154 ++--- .../stable/basic-tooltips/elk/sketch.exp.svg | 154 ++--- .../stable/binary_tree/dagre/sketch.exp.svg | 152 ++--- .../stable/binary_tree/elk/sketch.exp.svg | 152 ++--- .../stable/bold-mono/dagre/sketch.exp.svg | 158 ++--- .../stable/bold-mono/elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 154 ++--- .../elk/sketch.exp.svg | 154 ++--- .../stable/border-radius/dagre/sketch.exp.svg | 154 ++--- .../stable/border-radius/elk/sketch.exp.svg | 154 ++--- .../testdata/stable/br/dagre/sketch.exp.svg | 548 ++++++++--------- .../testdata/stable/br/elk/sketch.exp.svg | 548 ++++++++--------- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../stable/chaos2/dagre/sketch.exp.svg | 558 ++++++++--------- .../testdata/stable/chaos2/elk/sketch.exp.svg | 558 ++++++++--------- .../circle_arrowhead/dagre/sketch.exp.svg | 158 ++--- .../circle_arrowhead/elk/sketch.exp.svg | 158 ++--- .../circular_dependency/dagre/sketch.exp.svg | 152 ++--- .../circular_dependency/elk/sketch.exp.svg | 152 ++--- .../stable/class/dagre/sketch.exp.svg | 152 ++--- .../testdata/stable/class/elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../stable/classes/dagre/sketch.exp.svg | 158 ++--- .../stable/classes/elk/sketch.exp.svg | 158 ++--- .../stable/code_snippet/dagre/sketch.exp.svg | 172 +++--- .../stable/code_snippet/elk/sketch.exp.svg | 172 +++--- .../complex-layers/dagre/sketch.exp.svg | 190 +++--- .../stable/complex-layers/elk/sketch.exp.svg | 190 +++--- .../connected_container/dagre/sketch.exp.svg | 158 ++--- .../connected_container/elk/sketch.exp.svg | 158 ++--- .../constant_near_stress/dagre/sketch.exp.svg | 554 ++++++++--------- .../constant_near_stress/elk/sketch.exp.svg | 554 ++++++++--------- .../constant_near_title/dagre/sketch.exp.svg | 554 ++++++++--------- .../constant_near_title/elk/sketch.exp.svg | 554 ++++++++--------- .../container_edges/dagre/sketch.exp.svg | 158 ++--- .../stable/container_edges/elk/sketch.exp.svg | 158 ++--- .../crow_foot_arrowhead/dagre/sketch.exp.svg | 152 ++--- .../crow_foot_arrowhead/elk/sketch.exp.svg | 152 ++--- .../stable/cycle-order/dagre/sketch.exp.svg | 158 ++--- .../stable/cycle-order/elk/sketch.exp.svg | 158 ++--- .../stable/dagger_grid/dagre/sketch.exp.svg | 152 ++--- .../stable/dagger_grid/elk/sketch.exp.svg | 152 ++--- .../dagre-container/dagre/sketch.exp.svg | 158 ++--- .../stable/dagre-container/elk/sketch.exp.svg | 158 ++--- .../stable/dagre_spacing/dagre/sketch.exp.svg | 164 ++--- .../stable/dagre_spacing/elk/sketch.exp.svg | 164 ++--- .../dagre_spacing_right/dagre/sketch.exp.svg | 164 ++--- .../dagre_spacing_right/elk/sketch.exp.svg | 164 ++--- .../stable/dense/dagre/sketch.exp.svg | 152 ++--- .../testdata/stable/dense/elk/sketch.exp.svg | 152 ++--- .../different_subgraphs/dagre/sketch.exp.svg | 158 ++--- .../different_subgraphs/elk/sketch.exp.svg | 158 ++--- .../stable/direction/dagre/sketch.exp.svg | 158 ++--- .../stable/direction/elk/sketch.exp.svg | 158 ++--- .../edge-label-overflow/dagre/sketch.exp.svg | 158 ++--- .../edge-label-overflow/elk/sketch.exp.svg | 158 ++--- .../elk_border_radius/dagre/sketch.exp.svg | 152 ++--- .../elk_border_radius/elk/sketch.exp.svg | 152 ++--- .../elk_container_height/dagre/sketch.exp.svg | 158 ++--- .../elk_container_height/elk/sketch.exp.svg | 158 ++--- .../stable/elk_shim/dagre/sketch.exp.svg | 164 ++--- .../stable/elk_shim/elk/sketch.exp.svg | 164 ++--- .../stable/ent2d2_basic/dagre/sketch.exp.svg | 158 ++--- .../stable/ent2d2_basic/elk/sketch.exp.svg | 158 ++--- .../stable/ent2d2_right/dagre/sketch.exp.svg | 158 ++--- .../stable/ent2d2_right/elk/sketch.exp.svg | 158 ++--- .../executive_grid/dagre/sketch.exp.svg | 152 ++--- .../stable/executive_grid/elk/sketch.exp.svg | 152 ++--- .../stable/font_colors/dagre/sketch.exp.svg | 158 ++--- .../stable/font_colors/elk/sketch.exp.svg | 158 ++--- .../stable/font_sizes/dagre/sketch.exp.svg | 158 ++--- .../stable/font_sizes/elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../giant_markdown_test/dagre/sketch.exp.svg | 566 ++++++++--------- .../giant_markdown_test/elk/sketch.exp.svg | 566 ++++++++--------- .../stable/grid_animated/dagre/sketch.exp.svg | 214 +++---- .../stable/grid_animated/elk/sketch.exp.svg | 214 +++---- .../stable/grid_even/dagre/sketch.exp.svg | 158 ++--- .../stable/grid_even/elk/sketch.exp.svg | 158 ++--- .../stable/grid_gap/dagre/sketch.exp.svg | 158 ++--- .../stable/grid_gap/elk/sketch.exp.svg | 158 ++--- .../stable/grid_icon/dagre/sketch.exp.svg | 158 ++--- .../stable/grid_icon/elk/sketch.exp.svg | 158 ++--- .../grid_large_checkered/dagre/sketch.exp.svg | 146 ++--- .../grid_large_checkered/elk/sketch.exp.svg | 146 ++--- .../stable/grid_nested/dagre/sketch.exp.svg | 158 ++--- .../stable/grid_nested/elk/sketch.exp.svg | 158 ++--- .../grid_nested_gap0/dagre/sketch.exp.svg | 158 ++--- .../grid_nested_gap0/elk/sketch.exp.svg | 158 ++--- .../stable/grid_tests/dagre/sketch.exp.svg | 158 ++--- .../stable/grid_tests/elk/sketch.exp.svg | 158 ++--- .../stable/hexagon_3d/dagre/sketch.exp.svg | 154 ++--- .../stable/hexagon_3d/elk/sketch.exp.svg | 154 ++--- .../testdata/stable/hr/dagre/sketch.exp.svg | 554 ++++++++--------- .../testdata/stable/hr/elk/sketch.exp.svg | 554 ++++++++--------- .../icon-containers/dagre/sketch.exp.svg | 158 ++--- .../stable/icon-containers/elk/sketch.exp.svg | 158 ++--- .../stable/icon-label/dagre/sketch.exp.svg | 152 ++--- .../stable/icon-label/elk/sketch.exp.svg | 152 ++--- .../icon_positions/dagre/sketch.exp.svg | 158 ++--- .../stable/icon_positions/elk/sketch.exp.svg | 158 ++--- .../stable/images/dagre/sketch.exp.svg | 152 ++--- .../testdata/stable/images/elk/sketch.exp.svg | 152 ++--- .../stable/investigate/dagre/sketch.exp.svg | 164 ++--- .../stable/investigate/elk/sketch.exp.svg | 164 ++--- .../stable/label-near/dagre/sketch.exp.svg | 152 ++--- .../stable/label-near/elk/sketch.exp.svg | 152 ++--- .../label_positions/dagre/sketch.exp.svg | 158 ++--- .../stable/label_positions/elk/sketch.exp.svg | 158 ++--- .../stable/large_arch/dagre/sketch.exp.svg | 158 ++--- .../stable/large_arch/elk/sketch.exp.svg | 158 ++--- .../stable/latex/dagre/sketch.exp.svg | 552 ++++++++--------- .../testdata/stable/latex/elk/sketch.exp.svg | 552 ++++++++--------- .../legend_with_near_key/dagre/sketch.exp.svg | 552 ++++++++--------- .../legend_with_near_key/elk/sketch.exp.svg | 552 ++++++++--------- .../testdata/stable/li1/dagre/sketch.exp.svg | 554 ++++++++--------- .../testdata/stable/li1/elk/sketch.exp.svg | 554 ++++++++--------- .../testdata/stable/li2/dagre/sketch.exp.svg | 560 ++++++++--------- .../testdata/stable/li2/elk/sketch.exp.svg | 560 ++++++++--------- .../testdata/stable/li3/dagre/sketch.exp.svg | 554 ++++++++--------- .../testdata/stable/li3/elk/sketch.exp.svg | 554 ++++++++--------- .../testdata/stable/li4/dagre/sketch.exp.svg | 560 ++++++++--------- .../testdata/stable/li4/elk/sketch.exp.svg | 560 ++++++++--------- .../stable/links/dagre/sketch.exp.svg | 154 ++--- .../testdata/stable/links/elk/sketch.exp.svg | 154 ++--- .../stable/lone_h1/dagre/sketch.exp.svg | 554 ++++++++--------- .../stable/lone_h1/elk/sketch.exp.svg | 554 ++++++++--------- .../stable/markdown/dagre/sketch.exp.svg | 560 ++++++++--------- .../stable/markdown/elk/sketch.exp.svg | 560 ++++++++--------- .../markdown_stroke_fill/dagre/sketch.exp.svg | 554 ++++++++--------- .../markdown_stroke_fill/elk/sketch.exp.svg | 554 ++++++++--------- .../md_2space_newline/dagre/sketch.exp.svg | 548 ++++++++--------- .../md_2space_newline/elk/sketch.exp.svg | 548 ++++++++--------- .../md_backslash_newline/dagre/sketch.exp.svg | 548 ++++++++--------- .../md_backslash_newline/elk/sketch.exp.svg | 548 ++++++++--------- .../md_code_block_fenced/dagre/sketch.exp.svg | 560 ++++++++--------- .../md_code_block_fenced/elk/sketch.exp.svg | 560 ++++++++--------- .../dagre/sketch.exp.svg | 560 ++++++++--------- .../md_code_block_indented/elk/sketch.exp.svg | 560 ++++++++--------- .../md_code_inline/dagre/sketch.exp.svg | 560 ++++++++--------- .../stable/md_code_inline/elk/sketch.exp.svg | 560 ++++++++--------- .../md_fontsize_10/dagre/sketch.exp.svg | 560 ++++++++--------- .../stable/md_fontsize_10/elk/sketch.exp.svg | 560 ++++++++--------- .../stable/mono-edge/dagre/sketch.exp.svg | 164 ++--- .../stable/mono-edge/elk/sketch.exp.svg | 164 ++--- .../stable/mono-font/dagre/sketch.exp.svg | 164 ++--- .../stable/mono-font/elk/sketch.exp.svg | 164 ++--- .../multiline_text/dagre/sketch.exp.svg | 152 ++--- .../stable/multiline_text/elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../multiple_box_selection/elk/sketch.exp.svg | 158 ++--- .../multiple_offset/dagre/sketch.exp.svg | 160 ++--- .../stable/multiple_offset/elk/sketch.exp.svg | 160 ++--- .../multiple_offset_left/dagre/sketch.exp.svg | 160 ++--- .../multiple_offset_left/elk/sketch.exp.svg | 160 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../multiple_person_label/elk/sketch.exp.svg | 152 ++--- .../multiple_trees/dagre/sketch.exp.svg | 152 ++--- .../stable/multiple_trees/elk/sketch.exp.svg | 152 ++--- .../stable/n22_e32/dagre/sketch.exp.svg | 152 ++--- .../stable/n22_e32/elk/sketch.exp.svg | 152 ++--- .../stable/near-alone/dagre/sketch.exp.svg | 152 ++--- .../stable/near-alone/elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 548 ++++++++--------- .../elk/sketch.exp.svg | 548 ++++++++--------- .../nested_shape_labels/dagre/sketch.exp.svg | 158 ++--- .../nested_shape_labels/elk/sketch.exp.svg | 158 ++--- .../number_connections/dagre/sketch.exp.svg | 152 ++--- .../number_connections/elk/sketch.exp.svg | 152 ++--- .../one_container_loop/dagre/sketch.exp.svg | 158 ++--- .../one_container_loop/elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../outside_bottom_labels/elk/sketch.exp.svg | 152 ++--- .../stable/ovals/dagre/sketch.exp.svg | 152 ++--- .../testdata/stable/ovals/elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 164 ++--- .../elk/sketch.exp.svg | 164 ++--- .../testdata/stable/p/dagre/sketch.exp.svg | 554 ++++++++--------- e2etests/testdata/stable/p/elk/sketch.exp.svg | 554 ++++++++--------- .../stable/people/dagre/sketch.exp.svg | 152 ++--- .../testdata/stable/people/elk/sketch.exp.svg | 152 ++--- .../testdata/stable/pre/dagre/sketch.exp.svg | 560 ++++++++--------- .../testdata/stable/pre/elk/sketch.exp.svg | 560 ++++++++--------- .../self-referencing/dagre/sketch.exp.svg | 158 ++--- .../self-referencing/elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 172 +++--- .../elk/sketch.exp.svg | 172 +++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../sequence_diagram_note/elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../sequence_diagram_real/elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../sequence_diagram_span/elk/sketch.exp.svg | 158 ++--- .../sequence_diagrams/dagre/sketch.exp.svg | 164 ++--- .../sequence_diagrams/elk/sketch.exp.svg | 164 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 154 ++--- .../elk/sketch.exp.svg | 154 ++--- .../stable/sql_tables/dagre/sketch.exp.svg | 152 ++--- .../stable/sql_tables/elk/sketch.exp.svg | 152 ++--- .../stable/square_3d/dagre/sketch.exp.svg | 154 ++--- .../stable/square_3d/elk/sketch.exp.svg | 154 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../stable/stylish/dagre/sketch.exp.svg | 160 ++--- .../stable/stylish/elk/sketch.exp.svg | 160 ++--- .../stable/teleport_grid/dagre/sketch.exp.svg | 560 ++++++++--------- .../stable/teleport_grid/elk/sketch.exp.svg | 560 ++++++++--------- .../text_font_sizes/dagre/sketch.exp.svg | 558 ++++++++--------- .../stable/text_font_sizes/elk/sketch.exp.svg | 558 ++++++++--------- .../transparent_3d/dagre/sketch.exp.svg | 154 ++--- .../stable/transparent_3d/elk/sketch.exp.svg | 154 ++--- .../unnamed_only_height/dagre/sketch.exp.svg | 166 ++--- .../unnamed_only_height/elk/sketch.exp.svg | 166 ++--- .../unnamed_only_width/dagre/sketch.exp.svg | 166 ++--- .../unnamed_only_width/elk/sketch.exp.svg | 166 ++--- .../stable/us_map/dagre/sketch.exp.svg | 152 ++--- .../testdata/stable/us_map/elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 572 +++++++++--------- .../elk/sketch.exp.svg | 572 +++++++++--------- .../themes/origami/dagre/sketch.exp.svg | 166 ++--- .../themes/origami/elk/sketch.exp.svg | 166 ++--- .../themes/terminal/dagre/sketch.exp.svg | 566 ++++++++--------- .../themes/terminal/elk/sketch.exp.svg | 566 ++++++++--------- .../terminal_grayscale/dagre/sketch.exp.svg | 166 ++--- .../terminal_grayscale/elk/sketch.exp.svg | 166 ++--- .../container_icon_label/dagre/sketch.exp.svg | 158 ++--- .../container_icon_label/elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 164 ++--- .../elk/sketch.exp.svg | 164 ++--- .../dagre/sketch.exp.svg | 554 ++++++++--------- .../elk/sketch.exp.svg | 554 ++++++++--------- .../dagre/sketch.exp.svg | 152 ++--- .../elk/sketch.exp.svg | 152 ++--- .../dagre/sketch.exp.svg | 158 ++--- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 566 ++++++++--------- .../shape_set_width_height/elk/sketch.exp.svg | 566 ++++++++--------- .../unicode/chinese/dagre/sketch.exp.svg | 554 ++++++++--------- .../unicode/chinese/elk/sketch.exp.svg | 554 ++++++++--------- .../unicode/emojis/dagre/sketch.exp.svg | 152 ++--- .../unicode/emojis/elk/sketch.exp.svg | 152 ++--- .../japanese-basic/dagre/sketch.exp.svg | 152 ++--- .../unicode/japanese-basic/elk/sketch.exp.svg | 152 ++--- .../japanese-full/dagre/sketch.exp.svg | 158 ++--- .../unicode/japanese-full/elk/sketch.exp.svg | 158 ++--- .../japanese-mixed/dagre/sketch.exp.svg | 152 ++--- .../unicode/japanese-mixed/elk/sketch.exp.svg | 152 ++--- .../unicode/korean/dagre/sketch.exp.svg | 152 ++--- .../unicode/korean/elk/sketch.exp.svg | 152 ++--- .../mixed-language-2/dagre/sketch.exp.svg | 152 ++--- .../mixed-language-2/elk/sketch.exp.svg | 152 ++--- .../mixed-language/dagre/sketch.exp.svg | 554 ++++++++--------- .../unicode/mixed-language/elk/sketch.exp.svg | 554 ++++++++--------- .../unicode/with-style/dagre/sketch.exp.svg | 152 ++--- .../unicode/with-style/elk/sketch.exp.svg | 152 ++--- 524 files changed, 57540 insertions(+), 57472 deletions(-) diff --git a/d2exporter/export_test.go b/d2exporter/export_test.go index d98b214ac..5b02901ae 100644 --- a/d2exporter/export_test.go +++ b/d2exporter/export_test.go @@ -12,12 +12,15 @@ import ( "oss.terrastruct.com/util-go/assert" "oss.terrastruct.com/util-go/diff" + "oss.terrastruct.com/util-go/go2" "oss.terrastruct.com/d2/d2compiler" "oss.terrastruct.com/d2/d2exporter" + "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" "oss.terrastruct.com/d2/d2layouts/d2grid" "oss.terrastruct.com/d2/d2layouts/d2sequence" + "oss.terrastruct.com/d2/d2lib" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/log" @@ -219,7 +222,7 @@ func run(t *testing.T, tc testCase) { ctx = log.WithTB(ctx, t, nil) ctx = log.Leveled(ctx, slog.LevelDebug) - g, _, err := d2compiler.Compile("", strings.NewReader(tc.dsl), &d2compiler.CompileOptions{ + g, config, err := d2compiler.Compile("", strings.NewReader(tc.dsl), &d2compiler.CompileOptions{ UTF16: true, }) if err != nil { @@ -241,6 +244,9 @@ func run(t *testing.T, tc testCase) { if err != nil { t.Fatal(err) } + if got != nil { + got.Config = config + } if tc.assertions != nil { t.Run("assertions", func(t *testing.T) { @@ -267,3 +273,57 @@ func run(t *testing.T, tc testCase) { err = diff.TestdataJSON(filepath.Join("..", "testdata", "d2exporter", t.Name()), got) assert.Success(t, err) } + +// TestHashID tests that 2 diagrams with different theme configs do not equal each other +func TestHashID(t *testing.T) { + ctx := context.Background() + ctx = log.WithTB(ctx, t, nil) + ctx = log.Leveled(ctx, slog.LevelDebug) + + aString := ` +vars: { + d2-config: { + theme-id: 3 + } +} +a -> b +` + + bString := ` +vars: { + d2-config: { + theme-id: 4 + } +} +a -> b +` + + da, err := compile(ctx, aString) + assert.JSON(t, nil, err) + + db, err := compile(ctx, bString) + assert.JSON(t, nil, err) + + hashA, err := da.HashID() + assert.JSON(t, nil, err) + + hashB, err := db.HashID() + assert.JSON(t, nil, err) + + assert.NotEqual(t, hashA, hashB) +} + +func layoutResolver(engine string) (d2graph.LayoutGraph, error) { + return d2dagrelayout.DefaultLayout, nil +} + +func compile(ctx context.Context, d2 string) (*d2target.Diagram, error) { + ruler, _ := textmeasure.NewRuler() + opts := &d2lib.CompileOptions{ + Ruler: ruler, + LayoutResolver: layoutResolver, + Layout: go2.Pointer("dagre"), + } + d, _, e := d2lib.Compile(ctx, d2, opts, nil) + return d, e +} diff --git a/d2lib/d2.go b/d2lib/d2.go index bf4902d9f..18372ee73 100644 --- a/d2lib/d2.go +++ b/d2lib/d2.go @@ -61,6 +61,9 @@ func Compile(ctx context.Context, input string, compileOpts *CompileOptions, ren applyDefaults(compileOpts, renderOpts) d, err := compile(ctx, g, compileOpts, renderOpts) + if d != nil { + d.Config = config + } return d, g, err } diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index f7afd8a15..57388cdf6 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3902229455 .fill-N1{fill:#0A0F25;} + .d2-3902229455 .fill-N2{fill:#676C7E;} + .d2-3902229455 .fill-N3{fill:#9499AB;} + .d2-3902229455 .fill-N4{fill:#CFD2DD;} + .d2-3902229455 .fill-N5{fill:#DEE1EB;} + .d2-3902229455 .fill-N6{fill:#EEF1F8;} + .d2-3902229455 .fill-N7{fill:#FFFFFF;} + .d2-3902229455 .fill-B1{fill:#0D32B2;} + .d2-3902229455 .fill-B2{fill:#0D32B2;} + .d2-3902229455 .fill-B3{fill:#E3E9FD;} + .d2-3902229455 .fill-B4{fill:#E3E9FD;} + .d2-3902229455 .fill-B5{fill:#EDF0FD;} + .d2-3902229455 .fill-B6{fill:#F7F8FE;} + .d2-3902229455 .fill-AA2{fill:#4A6FF3;} + .d2-3902229455 .fill-AA4{fill:#EDF0FD;} + .d2-3902229455 .fill-AA5{fill:#F7F8FE;} + .d2-3902229455 .fill-AB4{fill:#EDF0FD;} + .d2-3902229455 .fill-AB5{fill:#F7F8FE;} + .d2-3902229455 .stroke-N1{stroke:#0A0F25;} + .d2-3902229455 .stroke-N2{stroke:#676C7E;} + .d2-3902229455 .stroke-N3{stroke:#9499AB;} + .d2-3902229455 .stroke-N4{stroke:#CFD2DD;} + .d2-3902229455 .stroke-N5{stroke:#DEE1EB;} + .d2-3902229455 .stroke-N6{stroke:#EEF1F8;} + .d2-3902229455 .stroke-N7{stroke:#FFFFFF;} + .d2-3902229455 .stroke-B1{stroke:#0D32B2;} + .d2-3902229455 .stroke-B2{stroke:#0D32B2;} + .d2-3902229455 .stroke-B3{stroke:#E3E9FD;} + .d2-3902229455 .stroke-B4{stroke:#E3E9FD;} + .d2-3902229455 .stroke-B5{stroke:#EDF0FD;} + .d2-3902229455 .stroke-B6{stroke:#F7F8FE;} + .d2-3902229455 .stroke-AA2{stroke:#4A6FF3;} + .d2-3902229455 .stroke-AA4{stroke:#EDF0FD;} + .d2-3902229455 .stroke-AA5{stroke:#F7F8FE;} + .d2-3902229455 .stroke-AB4{stroke:#EDF0FD;} + .d2-3902229455 .stroke-AB5{stroke:#F7F8FE;} + .d2-3902229455 .background-color-N1{background-color:#0A0F25;} + .d2-3902229455 .background-color-N2{background-color:#676C7E;} + .d2-3902229455 .background-color-N3{background-color:#9499AB;} + .d2-3902229455 .background-color-N4{background-color:#CFD2DD;} + .d2-3902229455 .background-color-N5{background-color:#DEE1EB;} + .d2-3902229455 .background-color-N6{background-color:#EEF1F8;} + .d2-3902229455 .background-color-N7{background-color:#FFFFFF;} + .d2-3902229455 .background-color-B1{background-color:#0D32B2;} + .d2-3902229455 .background-color-B2{background-color:#0D32B2;} + .d2-3902229455 .background-color-B3{background-color:#E3E9FD;} + .d2-3902229455 .background-color-B4{background-color:#E3E9FD;} + .d2-3902229455 .background-color-B5{background-color:#EDF0FD;} + .d2-3902229455 .background-color-B6{background-color:#F7F8FE;} + .d2-3902229455 .background-color-AA2{background-color:#4A6FF3;} + .d2-3902229455 .background-color-AA4{background-color:#EDF0FD;} + .d2-3902229455 .background-color-AA5{background-color:#F7F8FE;} + .d2-3902229455 .background-color-AB4{background-color:#EDF0FD;} + .d2-3902229455 .background-color-AB5{background-color:#F7F8FE;} + .d2-3902229455 .color-N1{color:#0A0F25;} + .d2-3902229455 .color-N2{color:#676C7E;} + .d2-3902229455 .color-N3{color:#9499AB;} + .d2-3902229455 .color-N4{color:#CFD2DD;} + .d2-3902229455 .color-N5{color:#DEE1EB;} + .d2-3902229455 .color-N6{color:#EEF1F8;} + .d2-3902229455 .color-N7{color:#FFFFFF;} + .d2-3902229455 .color-B1{color:#0D32B2;} + .d2-3902229455 .color-B2{color:#0D32B2;} + .d2-3902229455 .color-B3{color:#E3E9FD;} + .d2-3902229455 .color-B4{color:#E3E9FD;} + .d2-3902229455 .color-B5{color:#EDF0FD;} + .d2-3902229455 .color-B6{color:#F7F8FE;} + .d2-3902229455 .color-AA2{color:#4A6FF3;} + .d2-3902229455 .color-AA4{color:#EDF0FD;} + .d2-3902229455 .color-AA5{color:#F7F8FE;} + .d2-3902229455 .color-AB4{color:#EDF0FD;} + .d2-3902229455 .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 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg index e5c00870e..19c0ac4ed 100644 --- a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3902229455 .fill-N1{fill:#CDD6F4;} + .d2-3902229455 .fill-N2{fill:#BAC2DE;} + .d2-3902229455 .fill-N3{fill:#A6ADC8;} + .d2-3902229455 .fill-N4{fill:#585B70;} + .d2-3902229455 .fill-N5{fill:#45475A;} + .d2-3902229455 .fill-N6{fill:#313244;} + .d2-3902229455 .fill-N7{fill:#1E1E2E;} + .d2-3902229455 .fill-B1{fill:#CBA6f7;} + .d2-3902229455 .fill-B2{fill:#CBA6f7;} + .d2-3902229455 .fill-B3{fill:#6C7086;} + .d2-3902229455 .fill-B4{fill:#585B70;} + .d2-3902229455 .fill-B5{fill:#45475A;} + .d2-3902229455 .fill-B6{fill:#313244;} + .d2-3902229455 .fill-AA2{fill:#f38BA8;} + .d2-3902229455 .fill-AA4{fill:#45475A;} + .d2-3902229455 .fill-AA5{fill:#313244;} + .d2-3902229455 .fill-AB4{fill:#45475A;} + .d2-3902229455 .fill-AB5{fill:#313244;} + .d2-3902229455 .stroke-N1{stroke:#CDD6F4;} + .d2-3902229455 .stroke-N2{stroke:#BAC2DE;} + .d2-3902229455 .stroke-N3{stroke:#A6ADC8;} + .d2-3902229455 .stroke-N4{stroke:#585B70;} + .d2-3902229455 .stroke-N5{stroke:#45475A;} + .d2-3902229455 .stroke-N6{stroke:#313244;} + .d2-3902229455 .stroke-N7{stroke:#1E1E2E;} + .d2-3902229455 .stroke-B1{stroke:#CBA6f7;} + .d2-3902229455 .stroke-B2{stroke:#CBA6f7;} + .d2-3902229455 .stroke-B3{stroke:#6C7086;} + .d2-3902229455 .stroke-B4{stroke:#585B70;} + .d2-3902229455 .stroke-B5{stroke:#45475A;} + .d2-3902229455 .stroke-B6{stroke:#313244;} + .d2-3902229455 .stroke-AA2{stroke:#f38BA8;} + .d2-3902229455 .stroke-AA4{stroke:#45475A;} + .d2-3902229455 .stroke-AA5{stroke:#313244;} + .d2-3902229455 .stroke-AB4{stroke:#45475A;} + .d2-3902229455 .stroke-AB5{stroke:#313244;} + .d2-3902229455 .background-color-N1{background-color:#CDD6F4;} + .d2-3902229455 .background-color-N2{background-color:#BAC2DE;} + .d2-3902229455 .background-color-N3{background-color:#A6ADC8;} + .d2-3902229455 .background-color-N4{background-color:#585B70;} + .d2-3902229455 .background-color-N5{background-color:#45475A;} + .d2-3902229455 .background-color-N6{background-color:#313244;} + .d2-3902229455 .background-color-N7{background-color:#1E1E2E;} + .d2-3902229455 .background-color-B1{background-color:#CBA6f7;} + .d2-3902229455 .background-color-B2{background-color:#CBA6f7;} + .d2-3902229455 .background-color-B3{background-color:#6C7086;} + .d2-3902229455 .background-color-B4{background-color:#585B70;} + .d2-3902229455 .background-color-B5{background-color:#45475A;} + .d2-3902229455 .background-color-B6{background-color:#313244;} + .d2-3902229455 .background-color-AA2{background-color:#f38BA8;} + .d2-3902229455 .background-color-AA4{background-color:#45475A;} + .d2-3902229455 .background-color-AA5{background-color:#313244;} + .d2-3902229455 .background-color-AB4{background-color:#45475A;} + .d2-3902229455 .background-color-AB5{background-color:#313244;} + .d2-3902229455 .color-N1{color:#CDD6F4;} + .d2-3902229455 .color-N2{color:#BAC2DE;} + .d2-3902229455 .color-N3{color:#A6ADC8;} + .d2-3902229455 .color-N4{color:#585B70;} + .d2-3902229455 .color-N5{color:#45475A;} + .d2-3902229455 .color-N6{color:#313244;} + .d2-3902229455 .color-N7{color:#1E1E2E;} + .d2-3902229455 .color-B1{color:#CBA6f7;} + .d2-3902229455 .color-B2{color:#CBA6f7;} + .d2-3902229455 .color-B3{color:#6C7086;} + .d2-3902229455 .color-B4{color:#585B70;} + .d2-3902229455 .color-B5{color:#45475A;} + .d2-3902229455 .color-B6{color:#313244;} + .d2-3902229455 .color-AA2{color:#f38BA8;} + .d2-3902229455 .color-AA4{color:#45475A;} + .d2-3902229455 .color-AA5{color:#313244;} + .d2-3902229455 .color-AB4{color:#45475A;} + .d2-3902229455 .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}]]> -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg index 6ca9ebb2e..6c8b9979d 100644 --- a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2916329547 .fill-N1{fill:#0A0F25;} + .d2-2916329547 .fill-N2{fill:#676C7E;} + .d2-2916329547 .fill-N3{fill:#9499AB;} + .d2-2916329547 .fill-N4{fill:#CFD2DD;} + .d2-2916329547 .fill-N5{fill:#DEE1EB;} + .d2-2916329547 .fill-N6{fill:#EEF1F8;} + .d2-2916329547 .fill-N7{fill:#FFFFFF;} + .d2-2916329547 .fill-B1{fill:#0D32B2;} + .d2-2916329547 .fill-B2{fill:#0D32B2;} + .d2-2916329547 .fill-B3{fill:#E3E9FD;} + .d2-2916329547 .fill-B4{fill:#E3E9FD;} + .d2-2916329547 .fill-B5{fill:#EDF0FD;} + .d2-2916329547 .fill-B6{fill:#F7F8FE;} + .d2-2916329547 .fill-AA2{fill:#4A6FF3;} + .d2-2916329547 .fill-AA4{fill:#EDF0FD;} + .d2-2916329547 .fill-AA5{fill:#F7F8FE;} + .d2-2916329547 .fill-AB4{fill:#EDF0FD;} + .d2-2916329547 .fill-AB5{fill:#F7F8FE;} + .d2-2916329547 .stroke-N1{stroke:#0A0F25;} + .d2-2916329547 .stroke-N2{stroke:#676C7E;} + .d2-2916329547 .stroke-N3{stroke:#9499AB;} + .d2-2916329547 .stroke-N4{stroke:#CFD2DD;} + .d2-2916329547 .stroke-N5{stroke:#DEE1EB;} + .d2-2916329547 .stroke-N6{stroke:#EEF1F8;} + .d2-2916329547 .stroke-N7{stroke:#FFFFFF;} + .d2-2916329547 .stroke-B1{stroke:#0D32B2;} + .d2-2916329547 .stroke-B2{stroke:#0D32B2;} + .d2-2916329547 .stroke-B3{stroke:#E3E9FD;} + .d2-2916329547 .stroke-B4{stroke:#E3E9FD;} + .d2-2916329547 .stroke-B5{stroke:#EDF0FD;} + .d2-2916329547 .stroke-B6{stroke:#F7F8FE;} + .d2-2916329547 .stroke-AA2{stroke:#4A6FF3;} + .d2-2916329547 .stroke-AA4{stroke:#EDF0FD;} + .d2-2916329547 .stroke-AA5{stroke:#F7F8FE;} + .d2-2916329547 .stroke-AB4{stroke:#EDF0FD;} + .d2-2916329547 .stroke-AB5{stroke:#F7F8FE;} + .d2-2916329547 .background-color-N1{background-color:#0A0F25;} + .d2-2916329547 .background-color-N2{background-color:#676C7E;} + .d2-2916329547 .background-color-N3{background-color:#9499AB;} + .d2-2916329547 .background-color-N4{background-color:#CFD2DD;} + .d2-2916329547 .background-color-N5{background-color:#DEE1EB;} + .d2-2916329547 .background-color-N6{background-color:#EEF1F8;} + .d2-2916329547 .background-color-N7{background-color:#FFFFFF;} + .d2-2916329547 .background-color-B1{background-color:#0D32B2;} + .d2-2916329547 .background-color-B2{background-color:#0D32B2;} + .d2-2916329547 .background-color-B3{background-color:#E3E9FD;} + .d2-2916329547 .background-color-B4{background-color:#E3E9FD;} + .d2-2916329547 .background-color-B5{background-color:#EDF0FD;} + .d2-2916329547 .background-color-B6{background-color:#F7F8FE;} + .d2-2916329547 .background-color-AA2{background-color:#4A6FF3;} + .d2-2916329547 .background-color-AA4{background-color:#EDF0FD;} + .d2-2916329547 .background-color-AA5{background-color:#F7F8FE;} + .d2-2916329547 .background-color-AB4{background-color:#EDF0FD;} + .d2-2916329547 .background-color-AB5{background-color:#F7F8FE;} + .d2-2916329547 .color-N1{color:#0A0F25;} + .d2-2916329547 .color-N2{color:#676C7E;} + .d2-2916329547 .color-N3{color:#9499AB;} + .d2-2916329547 .color-N4{color:#CFD2DD;} + .d2-2916329547 .color-N5{color:#DEE1EB;} + .d2-2916329547 .color-N6{color:#EEF1F8;} + .d2-2916329547 .color-N7{color:#FFFFFF;} + .d2-2916329547 .color-B1{color:#0D32B2;} + .d2-2916329547 .color-B2{color:#0D32B2;} + .d2-2916329547 .color-B3{color:#E3E9FD;} + .d2-2916329547 .color-B4{color:#E3E9FD;} + .d2-2916329547 .color-B5{color:#EDF0FD;} + .d2-2916329547 .color-B6{color:#F7F8FE;} + .d2-2916329547 .color-AA2{color:#4A6FF3;} + .d2-2916329547 .color-AA4{color:#EDF0FD;} + .d2-2916329547 .color-AA5{color:#F7F8FE;} + .d2-2916329547 .color-AB4{color:#EDF0FD;} + .d2-2916329547 .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}]]> @@ -110,7 +110,7 @@ -wintersummertreessnowsun +wintersummertreessnowsun diff --git a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg index d28e08e72..aee35874a 100644 --- a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2916329547 .fill-N1{fill:#CDD6F4;} + .d2-2916329547 .fill-N2{fill:#BAC2DE;} + .d2-2916329547 .fill-N3{fill:#A6ADC8;} + .d2-2916329547 .fill-N4{fill:#585B70;} + .d2-2916329547 .fill-N5{fill:#45475A;} + .d2-2916329547 .fill-N6{fill:#313244;} + .d2-2916329547 .fill-N7{fill:#1E1E2E;} + .d2-2916329547 .fill-B1{fill:#CBA6f7;} + .d2-2916329547 .fill-B2{fill:#CBA6f7;} + .d2-2916329547 .fill-B3{fill:#6C7086;} + .d2-2916329547 .fill-B4{fill:#585B70;} + .d2-2916329547 .fill-B5{fill:#45475A;} + .d2-2916329547 .fill-B6{fill:#313244;} + .d2-2916329547 .fill-AA2{fill:#f38BA8;} + .d2-2916329547 .fill-AA4{fill:#45475A;} + .d2-2916329547 .fill-AA5{fill:#313244;} + .d2-2916329547 .fill-AB4{fill:#45475A;} + .d2-2916329547 .fill-AB5{fill:#313244;} + .d2-2916329547 .stroke-N1{stroke:#CDD6F4;} + .d2-2916329547 .stroke-N2{stroke:#BAC2DE;} + .d2-2916329547 .stroke-N3{stroke:#A6ADC8;} + .d2-2916329547 .stroke-N4{stroke:#585B70;} + .d2-2916329547 .stroke-N5{stroke:#45475A;} + .d2-2916329547 .stroke-N6{stroke:#313244;} + .d2-2916329547 .stroke-N7{stroke:#1E1E2E;} + .d2-2916329547 .stroke-B1{stroke:#CBA6f7;} + .d2-2916329547 .stroke-B2{stroke:#CBA6f7;} + .d2-2916329547 .stroke-B3{stroke:#6C7086;} + .d2-2916329547 .stroke-B4{stroke:#585B70;} + .d2-2916329547 .stroke-B5{stroke:#45475A;} + .d2-2916329547 .stroke-B6{stroke:#313244;} + .d2-2916329547 .stroke-AA2{stroke:#f38BA8;} + .d2-2916329547 .stroke-AA4{stroke:#45475A;} + .d2-2916329547 .stroke-AA5{stroke:#313244;} + .d2-2916329547 .stroke-AB4{stroke:#45475A;} + .d2-2916329547 .stroke-AB5{stroke:#313244;} + .d2-2916329547 .background-color-N1{background-color:#CDD6F4;} + .d2-2916329547 .background-color-N2{background-color:#BAC2DE;} + .d2-2916329547 .background-color-N3{background-color:#A6ADC8;} + .d2-2916329547 .background-color-N4{background-color:#585B70;} + .d2-2916329547 .background-color-N5{background-color:#45475A;} + .d2-2916329547 .background-color-N6{background-color:#313244;} + .d2-2916329547 .background-color-N7{background-color:#1E1E2E;} + .d2-2916329547 .background-color-B1{background-color:#CBA6f7;} + .d2-2916329547 .background-color-B2{background-color:#CBA6f7;} + .d2-2916329547 .background-color-B3{background-color:#6C7086;} + .d2-2916329547 .background-color-B4{background-color:#585B70;} + .d2-2916329547 .background-color-B5{background-color:#45475A;} + .d2-2916329547 .background-color-B6{background-color:#313244;} + .d2-2916329547 .background-color-AA2{background-color:#f38BA8;} + .d2-2916329547 .background-color-AA4{background-color:#45475A;} + .d2-2916329547 .background-color-AA5{background-color:#313244;} + .d2-2916329547 .background-color-AB4{background-color:#45475A;} + .d2-2916329547 .background-color-AB5{background-color:#313244;} + .d2-2916329547 .color-N1{color:#CDD6F4;} + .d2-2916329547 .color-N2{color:#BAC2DE;} + .d2-2916329547 .color-N3{color:#A6ADC8;} + .d2-2916329547 .color-N4{color:#585B70;} + .d2-2916329547 .color-N5{color:#45475A;} + .d2-2916329547 .color-N6{color:#313244;} + .d2-2916329547 .color-N7{color:#1E1E2E;} + .d2-2916329547 .color-B1{color:#CBA6f7;} + .d2-2916329547 .color-B2{color:#CBA6f7;} + .d2-2916329547 .color-B3{color:#6C7086;} + .d2-2916329547 .color-B4{color:#585B70;} + .d2-2916329547 .color-B5{color:#45475A;} + .d2-2916329547 .color-B6{color:#313244;} + .d2-2916329547 .color-AA2{color:#f38BA8;} + .d2-2916329547 .color-AA4{color:#45475A;} + .d2-2916329547 .color-AA5{color:#313244;} + .d2-2916329547 .color-AB4{color:#45475A;} + .d2-2916329547 .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}]]> -wintersummertreessnowsun +wintersummertreessnowsun diff --git a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg index 0053b5fff..8e87caf35 100644 --- a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3148583989 .fill-N1{fill:#0A0F25;} + .d2-3148583989 .fill-N2{fill:#676C7E;} + .d2-3148583989 .fill-N3{fill:#9499AB;} + .d2-3148583989 .fill-N4{fill:#CFD2DD;} + .d2-3148583989 .fill-N5{fill:#DEE1EB;} + .d2-3148583989 .fill-N6{fill:#EEF1F8;} + .d2-3148583989 .fill-N7{fill:#FFFFFF;} + .d2-3148583989 .fill-B1{fill:#0D32B2;} + .d2-3148583989 .fill-B2{fill:#0D32B2;} + .d2-3148583989 .fill-B3{fill:#E3E9FD;} + .d2-3148583989 .fill-B4{fill:#E3E9FD;} + .d2-3148583989 .fill-B5{fill:#EDF0FD;} + .d2-3148583989 .fill-B6{fill:#F7F8FE;} + .d2-3148583989 .fill-AA2{fill:#4A6FF3;} + .d2-3148583989 .fill-AA4{fill:#EDF0FD;} + .d2-3148583989 .fill-AA5{fill:#F7F8FE;} + .d2-3148583989 .fill-AB4{fill:#EDF0FD;} + .d2-3148583989 .fill-AB5{fill:#F7F8FE;} + .d2-3148583989 .stroke-N1{stroke:#0A0F25;} + .d2-3148583989 .stroke-N2{stroke:#676C7E;} + .d2-3148583989 .stroke-N3{stroke:#9499AB;} + .d2-3148583989 .stroke-N4{stroke:#CFD2DD;} + .d2-3148583989 .stroke-N5{stroke:#DEE1EB;} + .d2-3148583989 .stroke-N6{stroke:#EEF1F8;} + .d2-3148583989 .stroke-N7{stroke:#FFFFFF;} + .d2-3148583989 .stroke-B1{stroke:#0D32B2;} + .d2-3148583989 .stroke-B2{stroke:#0D32B2;} + .d2-3148583989 .stroke-B3{stroke:#E3E9FD;} + .d2-3148583989 .stroke-B4{stroke:#E3E9FD;} + .d2-3148583989 .stroke-B5{stroke:#EDF0FD;} + .d2-3148583989 .stroke-B6{stroke:#F7F8FE;} + .d2-3148583989 .stroke-AA2{stroke:#4A6FF3;} + .d2-3148583989 .stroke-AA4{stroke:#EDF0FD;} + .d2-3148583989 .stroke-AA5{stroke:#F7F8FE;} + .d2-3148583989 .stroke-AB4{stroke:#EDF0FD;} + .d2-3148583989 .stroke-AB5{stroke:#F7F8FE;} + .d2-3148583989 .background-color-N1{background-color:#0A0F25;} + .d2-3148583989 .background-color-N2{background-color:#676C7E;} + .d2-3148583989 .background-color-N3{background-color:#9499AB;} + .d2-3148583989 .background-color-N4{background-color:#CFD2DD;} + .d2-3148583989 .background-color-N5{background-color:#DEE1EB;} + .d2-3148583989 .background-color-N6{background-color:#EEF1F8;} + .d2-3148583989 .background-color-N7{background-color:#FFFFFF;} + .d2-3148583989 .background-color-B1{background-color:#0D32B2;} + .d2-3148583989 .background-color-B2{background-color:#0D32B2;} + .d2-3148583989 .background-color-B3{background-color:#E3E9FD;} + .d2-3148583989 .background-color-B4{background-color:#E3E9FD;} + .d2-3148583989 .background-color-B5{background-color:#EDF0FD;} + .d2-3148583989 .background-color-B6{background-color:#F7F8FE;} + .d2-3148583989 .background-color-AA2{background-color:#4A6FF3;} + .d2-3148583989 .background-color-AA4{background-color:#EDF0FD;} + .d2-3148583989 .background-color-AA5{background-color:#F7F8FE;} + .d2-3148583989 .background-color-AB4{background-color:#EDF0FD;} + .d2-3148583989 .background-color-AB5{background-color:#F7F8FE;} + .d2-3148583989 .color-N1{color:#0A0F25;} + .d2-3148583989 .color-N2{color:#676C7E;} + .d2-3148583989 .color-N3{color:#9499AB;} + .d2-3148583989 .color-N4{color:#CFD2DD;} + .d2-3148583989 .color-N5{color:#DEE1EB;} + .d2-3148583989 .color-N6{color:#EEF1F8;} + .d2-3148583989 .color-N7{color:#FFFFFF;} + .d2-3148583989 .color-B1{color:#0D32B2;} + .d2-3148583989 .color-B2{color:#0D32B2;} + .d2-3148583989 .color-B3{color:#E3E9FD;} + .d2-3148583989 .color-B4{color:#E3E9FD;} + .d2-3148583989 .color-B5{color:#EDF0FD;} + .d2-3148583989 .color-B6{color:#F7F8FE;} + .d2-3148583989 .color-AA2{color:#4A6FF3;} + .d2-3148583989 .color-AA4{color:#EDF0FD;} + .d2-3148583989 .color-AA5{color:#F7F8FE;} + .d2-3148583989 .color-AB4{color:#EDF0FD;} + .d2-3148583989 .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}]]> @@ -104,7 +104,7 @@ -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required +112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required diff --git a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg index 4a59d66f5..ca5857826 100644 --- a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3148583989 .fill-N1{fill:#CDD6F4;} + .d2-3148583989 .fill-N2{fill:#BAC2DE;} + .d2-3148583989 .fill-N3{fill:#A6ADC8;} + .d2-3148583989 .fill-N4{fill:#585B70;} + .d2-3148583989 .fill-N5{fill:#45475A;} + .d2-3148583989 .fill-N6{fill:#313244;} + .d2-3148583989 .fill-N7{fill:#1E1E2E;} + .d2-3148583989 .fill-B1{fill:#CBA6f7;} + .d2-3148583989 .fill-B2{fill:#CBA6f7;} + .d2-3148583989 .fill-B3{fill:#6C7086;} + .d2-3148583989 .fill-B4{fill:#585B70;} + .d2-3148583989 .fill-B5{fill:#45475A;} + .d2-3148583989 .fill-B6{fill:#313244;} + .d2-3148583989 .fill-AA2{fill:#f38BA8;} + .d2-3148583989 .fill-AA4{fill:#45475A;} + .d2-3148583989 .fill-AA5{fill:#313244;} + .d2-3148583989 .fill-AB4{fill:#45475A;} + .d2-3148583989 .fill-AB5{fill:#313244;} + .d2-3148583989 .stroke-N1{stroke:#CDD6F4;} + .d2-3148583989 .stroke-N2{stroke:#BAC2DE;} + .d2-3148583989 .stroke-N3{stroke:#A6ADC8;} + .d2-3148583989 .stroke-N4{stroke:#585B70;} + .d2-3148583989 .stroke-N5{stroke:#45475A;} + .d2-3148583989 .stroke-N6{stroke:#313244;} + .d2-3148583989 .stroke-N7{stroke:#1E1E2E;} + .d2-3148583989 .stroke-B1{stroke:#CBA6f7;} + .d2-3148583989 .stroke-B2{stroke:#CBA6f7;} + .d2-3148583989 .stroke-B3{stroke:#6C7086;} + .d2-3148583989 .stroke-B4{stroke:#585B70;} + .d2-3148583989 .stroke-B5{stroke:#45475A;} + .d2-3148583989 .stroke-B6{stroke:#313244;} + .d2-3148583989 .stroke-AA2{stroke:#f38BA8;} + .d2-3148583989 .stroke-AA4{stroke:#45475A;} + .d2-3148583989 .stroke-AA5{stroke:#313244;} + .d2-3148583989 .stroke-AB4{stroke:#45475A;} + .d2-3148583989 .stroke-AB5{stroke:#313244;} + .d2-3148583989 .background-color-N1{background-color:#CDD6F4;} + .d2-3148583989 .background-color-N2{background-color:#BAC2DE;} + .d2-3148583989 .background-color-N3{background-color:#A6ADC8;} + .d2-3148583989 .background-color-N4{background-color:#585B70;} + .d2-3148583989 .background-color-N5{background-color:#45475A;} + .d2-3148583989 .background-color-N6{background-color:#313244;} + .d2-3148583989 .background-color-N7{background-color:#1E1E2E;} + .d2-3148583989 .background-color-B1{background-color:#CBA6f7;} + .d2-3148583989 .background-color-B2{background-color:#CBA6f7;} + .d2-3148583989 .background-color-B3{background-color:#6C7086;} + .d2-3148583989 .background-color-B4{background-color:#585B70;} + .d2-3148583989 .background-color-B5{background-color:#45475A;} + .d2-3148583989 .background-color-B6{background-color:#313244;} + .d2-3148583989 .background-color-AA2{background-color:#f38BA8;} + .d2-3148583989 .background-color-AA4{background-color:#45475A;} + .d2-3148583989 .background-color-AA5{background-color:#313244;} + .d2-3148583989 .background-color-AB4{background-color:#45475A;} + .d2-3148583989 .background-color-AB5{background-color:#313244;} + .d2-3148583989 .color-N1{color:#CDD6F4;} + .d2-3148583989 .color-N2{color:#BAC2DE;} + .d2-3148583989 .color-N3{color:#A6ADC8;} + .d2-3148583989 .color-N4{color:#585B70;} + .d2-3148583989 .color-N5{color:#45475A;} + .d2-3148583989 .color-N6{color:#313244;} + .d2-3148583989 .color-N7{color:#1E1E2E;} + .d2-3148583989 .color-B1{color:#CBA6f7;} + .d2-3148583989 .color-B2{color:#CBA6f7;} + .d2-3148583989 .color-B3{color:#6C7086;} + .d2-3148583989 .color-B4{color:#585B70;} + .d2-3148583989 .color-B5{color:#45475A;} + .d2-3148583989 .color-B6{color:#313244;} + .d2-3148583989 .color-AA2{color:#f38BA8;} + .d2-3148583989 .color-AA4{color:#45475A;} + .d2-3148583989 .color-AA5{color:#313244;} + .d2-3148583989 .color-AB4{color:#45475A;} + .d2-3148583989 .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}]]> -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required +112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required diff --git a/d2renderers/d2sketch/testdata/basic/sketch.exp.svg b/d2renderers/d2sketch/testdata/basic/sketch.exp.svg index 180f783df..eea0d4c43 100644 --- a/d2renderers/d2sketch/testdata/basic/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/basic/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-327680947 .fill-N1{fill:#0A0F25;} + .d2-327680947 .fill-N2{fill:#676C7E;} + .d2-327680947 .fill-N3{fill:#9499AB;} + .d2-327680947 .fill-N4{fill:#CFD2DD;} + .d2-327680947 .fill-N5{fill:#DEE1EB;} + .d2-327680947 .fill-N6{fill:#EEF1F8;} + .d2-327680947 .fill-N7{fill:#FFFFFF;} + .d2-327680947 .fill-B1{fill:#0D32B2;} + .d2-327680947 .fill-B2{fill:#0D32B2;} + .d2-327680947 .fill-B3{fill:#E3E9FD;} + .d2-327680947 .fill-B4{fill:#E3E9FD;} + .d2-327680947 .fill-B5{fill:#EDF0FD;} + .d2-327680947 .fill-B6{fill:#F7F8FE;} + .d2-327680947 .fill-AA2{fill:#4A6FF3;} + .d2-327680947 .fill-AA4{fill:#EDF0FD;} + .d2-327680947 .fill-AA5{fill:#F7F8FE;} + .d2-327680947 .fill-AB4{fill:#EDF0FD;} + .d2-327680947 .fill-AB5{fill:#F7F8FE;} + .d2-327680947 .stroke-N1{stroke:#0A0F25;} + .d2-327680947 .stroke-N2{stroke:#676C7E;} + .d2-327680947 .stroke-N3{stroke:#9499AB;} + .d2-327680947 .stroke-N4{stroke:#CFD2DD;} + .d2-327680947 .stroke-N5{stroke:#DEE1EB;} + .d2-327680947 .stroke-N6{stroke:#EEF1F8;} + .d2-327680947 .stroke-N7{stroke:#FFFFFF;} + .d2-327680947 .stroke-B1{stroke:#0D32B2;} + .d2-327680947 .stroke-B2{stroke:#0D32B2;} + .d2-327680947 .stroke-B3{stroke:#E3E9FD;} + .d2-327680947 .stroke-B4{stroke:#E3E9FD;} + .d2-327680947 .stroke-B5{stroke:#EDF0FD;} + .d2-327680947 .stroke-B6{stroke:#F7F8FE;} + .d2-327680947 .stroke-AA2{stroke:#4A6FF3;} + .d2-327680947 .stroke-AA4{stroke:#EDF0FD;} + .d2-327680947 .stroke-AA5{stroke:#F7F8FE;} + .d2-327680947 .stroke-AB4{stroke:#EDF0FD;} + .d2-327680947 .stroke-AB5{stroke:#F7F8FE;} + .d2-327680947 .background-color-N1{background-color:#0A0F25;} + .d2-327680947 .background-color-N2{background-color:#676C7E;} + .d2-327680947 .background-color-N3{background-color:#9499AB;} + .d2-327680947 .background-color-N4{background-color:#CFD2DD;} + .d2-327680947 .background-color-N5{background-color:#DEE1EB;} + .d2-327680947 .background-color-N6{background-color:#EEF1F8;} + .d2-327680947 .background-color-N7{background-color:#FFFFFF;} + .d2-327680947 .background-color-B1{background-color:#0D32B2;} + .d2-327680947 .background-color-B2{background-color:#0D32B2;} + .d2-327680947 .background-color-B3{background-color:#E3E9FD;} + .d2-327680947 .background-color-B4{background-color:#E3E9FD;} + .d2-327680947 .background-color-B5{background-color:#EDF0FD;} + .d2-327680947 .background-color-B6{background-color:#F7F8FE;} + .d2-327680947 .background-color-AA2{background-color:#4A6FF3;} + .d2-327680947 .background-color-AA4{background-color:#EDF0FD;} + .d2-327680947 .background-color-AA5{background-color:#F7F8FE;} + .d2-327680947 .background-color-AB4{background-color:#EDF0FD;} + .d2-327680947 .background-color-AB5{background-color:#F7F8FE;} + .d2-327680947 .color-N1{color:#0A0F25;} + .d2-327680947 .color-N2{color:#676C7E;} + .d2-327680947 .color-N3{color:#9499AB;} + .d2-327680947 .color-N4{color:#CFD2DD;} + .d2-327680947 .color-N5{color:#DEE1EB;} + .d2-327680947 .color-N6{color:#EEF1F8;} + .d2-327680947 .color-N7{color:#FFFFFF;} + .d2-327680947 .color-B1{color:#0D32B2;} + .d2-327680947 .color-B2{color:#0D32B2;} + .d2-327680947 .color-B3{color:#E3E9FD;} + .d2-327680947 .color-B4{color:#E3E9FD;} + .d2-327680947 .color-B5{color:#EDF0FD;} + .d2-327680947 .color-B6{color:#F7F8FE;} + .d2-327680947 .color-AA2{color:#4A6FF3;} + .d2-327680947 .color-AA4{color:#EDF0FD;} + .d2-327680947 .color-AA5{color:#F7F8FE;} + .d2-327680947 .color-AB4{color:#EDF0FD;} + .d2-327680947 .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 @@ -ab +ab diff --git a/d2renderers/d2sketch/testdata/basic_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/basic_dark/sketch.exp.svg index 1da76dfe8..b8f01f58c 100644 --- a/d2renderers/d2sketch/testdata/basic_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/basic_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-327680947 .fill-N1{fill:#CDD6F4;} + .d2-327680947 .fill-N2{fill:#BAC2DE;} + .d2-327680947 .fill-N3{fill:#A6ADC8;} + .d2-327680947 .fill-N4{fill:#585B70;} + .d2-327680947 .fill-N5{fill:#45475A;} + .d2-327680947 .fill-N6{fill:#313244;} + .d2-327680947 .fill-N7{fill:#1E1E2E;} + .d2-327680947 .fill-B1{fill:#CBA6f7;} + .d2-327680947 .fill-B2{fill:#CBA6f7;} + .d2-327680947 .fill-B3{fill:#6C7086;} + .d2-327680947 .fill-B4{fill:#585B70;} + .d2-327680947 .fill-B5{fill:#45475A;} + .d2-327680947 .fill-B6{fill:#313244;} + .d2-327680947 .fill-AA2{fill:#f38BA8;} + .d2-327680947 .fill-AA4{fill:#45475A;} + .d2-327680947 .fill-AA5{fill:#313244;} + .d2-327680947 .fill-AB4{fill:#45475A;} + .d2-327680947 .fill-AB5{fill:#313244;} + .d2-327680947 .stroke-N1{stroke:#CDD6F4;} + .d2-327680947 .stroke-N2{stroke:#BAC2DE;} + .d2-327680947 .stroke-N3{stroke:#A6ADC8;} + .d2-327680947 .stroke-N4{stroke:#585B70;} + .d2-327680947 .stroke-N5{stroke:#45475A;} + .d2-327680947 .stroke-N6{stroke:#313244;} + .d2-327680947 .stroke-N7{stroke:#1E1E2E;} + .d2-327680947 .stroke-B1{stroke:#CBA6f7;} + .d2-327680947 .stroke-B2{stroke:#CBA6f7;} + .d2-327680947 .stroke-B3{stroke:#6C7086;} + .d2-327680947 .stroke-B4{stroke:#585B70;} + .d2-327680947 .stroke-B5{stroke:#45475A;} + .d2-327680947 .stroke-B6{stroke:#313244;} + .d2-327680947 .stroke-AA2{stroke:#f38BA8;} + .d2-327680947 .stroke-AA4{stroke:#45475A;} + .d2-327680947 .stroke-AA5{stroke:#313244;} + .d2-327680947 .stroke-AB4{stroke:#45475A;} + .d2-327680947 .stroke-AB5{stroke:#313244;} + .d2-327680947 .background-color-N1{background-color:#CDD6F4;} + .d2-327680947 .background-color-N2{background-color:#BAC2DE;} + .d2-327680947 .background-color-N3{background-color:#A6ADC8;} + .d2-327680947 .background-color-N4{background-color:#585B70;} + .d2-327680947 .background-color-N5{background-color:#45475A;} + .d2-327680947 .background-color-N6{background-color:#313244;} + .d2-327680947 .background-color-N7{background-color:#1E1E2E;} + .d2-327680947 .background-color-B1{background-color:#CBA6f7;} + .d2-327680947 .background-color-B2{background-color:#CBA6f7;} + .d2-327680947 .background-color-B3{background-color:#6C7086;} + .d2-327680947 .background-color-B4{background-color:#585B70;} + .d2-327680947 .background-color-B5{background-color:#45475A;} + .d2-327680947 .background-color-B6{background-color:#313244;} + .d2-327680947 .background-color-AA2{background-color:#f38BA8;} + .d2-327680947 .background-color-AA4{background-color:#45475A;} + .d2-327680947 .background-color-AA5{background-color:#313244;} + .d2-327680947 .background-color-AB4{background-color:#45475A;} + .d2-327680947 .background-color-AB5{background-color:#313244;} + .d2-327680947 .color-N1{color:#CDD6F4;} + .d2-327680947 .color-N2{color:#BAC2DE;} + .d2-327680947 .color-N3{color:#A6ADC8;} + .d2-327680947 .color-N4{color:#585B70;} + .d2-327680947 .color-N5{color:#45475A;} + .d2-327680947 .color-N6{color:#313244;} + .d2-327680947 .color-N7{color:#1E1E2E;} + .d2-327680947 .color-B1{color:#CBA6f7;} + .d2-327680947 .color-B2{color:#CBA6f7;} + .d2-327680947 .color-B3{color:#6C7086;} + .d2-327680947 .color-B4{color:#585B70;} + .d2-327680947 .color-B5{color:#45475A;} + .d2-327680947 .color-B6{color:#313244;} + .d2-327680947 .color-AA2{color:#f38BA8;} + .d2-327680947 .color-AA4{color:#45475A;} + .d2-327680947 .color-AA5{color:#313244;} + .d2-327680947 .color-AB4{color:#45475A;} + .d2-327680947 .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}]]> -ab +ab diff --git a/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg b/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg index 101f1ef59..9293583f3 100644 --- a/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-914436609 .fill-N1{fill:#0A0F25;} + .d2-914436609 .fill-N2{fill:#676C7E;} + .d2-914436609 .fill-N3{fill:#9499AB;} + .d2-914436609 .fill-N4{fill:#CFD2DD;} + .d2-914436609 .fill-N5{fill:#DEE1EB;} + .d2-914436609 .fill-N6{fill:#EEF1F8;} + .d2-914436609 .fill-N7{fill:#FFFFFF;} + .d2-914436609 .fill-B1{fill:#0D32B2;} + .d2-914436609 .fill-B2{fill:#0D32B2;} + .d2-914436609 .fill-B3{fill:#E3E9FD;} + .d2-914436609 .fill-B4{fill:#E3E9FD;} + .d2-914436609 .fill-B5{fill:#EDF0FD;} + .d2-914436609 .fill-B6{fill:#F7F8FE;} + .d2-914436609 .fill-AA2{fill:#4A6FF3;} + .d2-914436609 .fill-AA4{fill:#EDF0FD;} + .d2-914436609 .fill-AA5{fill:#F7F8FE;} + .d2-914436609 .fill-AB4{fill:#EDF0FD;} + .d2-914436609 .fill-AB5{fill:#F7F8FE;} + .d2-914436609 .stroke-N1{stroke:#0A0F25;} + .d2-914436609 .stroke-N2{stroke:#676C7E;} + .d2-914436609 .stroke-N3{stroke:#9499AB;} + .d2-914436609 .stroke-N4{stroke:#CFD2DD;} + .d2-914436609 .stroke-N5{stroke:#DEE1EB;} + .d2-914436609 .stroke-N6{stroke:#EEF1F8;} + .d2-914436609 .stroke-N7{stroke:#FFFFFF;} + .d2-914436609 .stroke-B1{stroke:#0D32B2;} + .d2-914436609 .stroke-B2{stroke:#0D32B2;} + .d2-914436609 .stroke-B3{stroke:#E3E9FD;} + .d2-914436609 .stroke-B4{stroke:#E3E9FD;} + .d2-914436609 .stroke-B5{stroke:#EDF0FD;} + .d2-914436609 .stroke-B6{stroke:#F7F8FE;} + .d2-914436609 .stroke-AA2{stroke:#4A6FF3;} + .d2-914436609 .stroke-AA4{stroke:#EDF0FD;} + .d2-914436609 .stroke-AA5{stroke:#F7F8FE;} + .d2-914436609 .stroke-AB4{stroke:#EDF0FD;} + .d2-914436609 .stroke-AB5{stroke:#F7F8FE;} + .d2-914436609 .background-color-N1{background-color:#0A0F25;} + .d2-914436609 .background-color-N2{background-color:#676C7E;} + .d2-914436609 .background-color-N3{background-color:#9499AB;} + .d2-914436609 .background-color-N4{background-color:#CFD2DD;} + .d2-914436609 .background-color-N5{background-color:#DEE1EB;} + .d2-914436609 .background-color-N6{background-color:#EEF1F8;} + .d2-914436609 .background-color-N7{background-color:#FFFFFF;} + .d2-914436609 .background-color-B1{background-color:#0D32B2;} + .d2-914436609 .background-color-B2{background-color:#0D32B2;} + .d2-914436609 .background-color-B3{background-color:#E3E9FD;} + .d2-914436609 .background-color-B4{background-color:#E3E9FD;} + .d2-914436609 .background-color-B5{background-color:#EDF0FD;} + .d2-914436609 .background-color-B6{background-color:#F7F8FE;} + .d2-914436609 .background-color-AA2{background-color:#4A6FF3;} + .d2-914436609 .background-color-AA4{background-color:#EDF0FD;} + .d2-914436609 .background-color-AA5{background-color:#F7F8FE;} + .d2-914436609 .background-color-AB4{background-color:#EDF0FD;} + .d2-914436609 .background-color-AB5{background-color:#F7F8FE;} + .d2-914436609 .color-N1{color:#0A0F25;} + .d2-914436609 .color-N2{color:#676C7E;} + .d2-914436609 .color-N3{color:#9499AB;} + .d2-914436609 .color-N4{color:#CFD2DD;} + .d2-914436609 .color-N5{color:#DEE1EB;} + .d2-914436609 .color-N6{color:#EEF1F8;} + .d2-914436609 .color-N7{color:#FFFFFF;} + .d2-914436609 .color-B1{color:#0D32B2;} + .d2-914436609 .color-B2{color:#0D32B2;} + .d2-914436609 .color-B3{color:#E3E9FD;} + .d2-914436609 .color-B4{color:#E3E9FD;} + .d2-914436609 .color-B5{color:#EDF0FD;} + .d2-914436609 .color-B6{color:#F7F8FE;} + .d2-914436609 .color-AA2{color:#4A6FF3;} + .d2-914436609 .color-AA4{color:#EDF0FD;} + .d2-914436609 .color-AA5{color:#F7F8FE;} + .d2-914436609 .color-AB4{color:#EDF0FD;} + .d2-914436609 .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}]]> @@ -104,7 +104,7 @@ -wintersummersnowsun +wintersummersnowsun diff --git a/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg index 9c286bb43..fbc98c0b7 100644 --- a/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-914436609 .fill-N1{fill:#CDD6F4;} + .d2-914436609 .fill-N2{fill:#BAC2DE;} + .d2-914436609 .fill-N3{fill:#A6ADC8;} + .d2-914436609 .fill-N4{fill:#585B70;} + .d2-914436609 .fill-N5{fill:#45475A;} + .d2-914436609 .fill-N6{fill:#313244;} + .d2-914436609 .fill-N7{fill:#1E1E2E;} + .d2-914436609 .fill-B1{fill:#CBA6f7;} + .d2-914436609 .fill-B2{fill:#CBA6f7;} + .d2-914436609 .fill-B3{fill:#6C7086;} + .d2-914436609 .fill-B4{fill:#585B70;} + .d2-914436609 .fill-B5{fill:#45475A;} + .d2-914436609 .fill-B6{fill:#313244;} + .d2-914436609 .fill-AA2{fill:#f38BA8;} + .d2-914436609 .fill-AA4{fill:#45475A;} + .d2-914436609 .fill-AA5{fill:#313244;} + .d2-914436609 .fill-AB4{fill:#45475A;} + .d2-914436609 .fill-AB5{fill:#313244;} + .d2-914436609 .stroke-N1{stroke:#CDD6F4;} + .d2-914436609 .stroke-N2{stroke:#BAC2DE;} + .d2-914436609 .stroke-N3{stroke:#A6ADC8;} + .d2-914436609 .stroke-N4{stroke:#585B70;} + .d2-914436609 .stroke-N5{stroke:#45475A;} + .d2-914436609 .stroke-N6{stroke:#313244;} + .d2-914436609 .stroke-N7{stroke:#1E1E2E;} + .d2-914436609 .stroke-B1{stroke:#CBA6f7;} + .d2-914436609 .stroke-B2{stroke:#CBA6f7;} + .d2-914436609 .stroke-B3{stroke:#6C7086;} + .d2-914436609 .stroke-B4{stroke:#585B70;} + .d2-914436609 .stroke-B5{stroke:#45475A;} + .d2-914436609 .stroke-B6{stroke:#313244;} + .d2-914436609 .stroke-AA2{stroke:#f38BA8;} + .d2-914436609 .stroke-AA4{stroke:#45475A;} + .d2-914436609 .stroke-AA5{stroke:#313244;} + .d2-914436609 .stroke-AB4{stroke:#45475A;} + .d2-914436609 .stroke-AB5{stroke:#313244;} + .d2-914436609 .background-color-N1{background-color:#CDD6F4;} + .d2-914436609 .background-color-N2{background-color:#BAC2DE;} + .d2-914436609 .background-color-N3{background-color:#A6ADC8;} + .d2-914436609 .background-color-N4{background-color:#585B70;} + .d2-914436609 .background-color-N5{background-color:#45475A;} + .d2-914436609 .background-color-N6{background-color:#313244;} + .d2-914436609 .background-color-N7{background-color:#1E1E2E;} + .d2-914436609 .background-color-B1{background-color:#CBA6f7;} + .d2-914436609 .background-color-B2{background-color:#CBA6f7;} + .d2-914436609 .background-color-B3{background-color:#6C7086;} + .d2-914436609 .background-color-B4{background-color:#585B70;} + .d2-914436609 .background-color-B5{background-color:#45475A;} + .d2-914436609 .background-color-B6{background-color:#313244;} + .d2-914436609 .background-color-AA2{background-color:#f38BA8;} + .d2-914436609 .background-color-AA4{background-color:#45475A;} + .d2-914436609 .background-color-AA5{background-color:#313244;} + .d2-914436609 .background-color-AB4{background-color:#45475A;} + .d2-914436609 .background-color-AB5{background-color:#313244;} + .d2-914436609 .color-N1{color:#CDD6F4;} + .d2-914436609 .color-N2{color:#BAC2DE;} + .d2-914436609 .color-N3{color:#A6ADC8;} + .d2-914436609 .color-N4{color:#585B70;} + .d2-914436609 .color-N5{color:#45475A;} + .d2-914436609 .color-N6{color:#313244;} + .d2-914436609 .color-N7{color:#1E1E2E;} + .d2-914436609 .color-B1{color:#CBA6f7;} + .d2-914436609 .color-B2{color:#CBA6f7;} + .d2-914436609 .color-B3{color:#6C7086;} + .d2-914436609 .color-B4{color:#585B70;} + .d2-914436609 .color-B5{color:#45475A;} + .d2-914436609 .color-B6{color:#313244;} + .d2-914436609 .color-AA2{color:#f38BA8;} + .d2-914436609 .color-AA4{color:#45475A;} + .d2-914436609 .color-AA5{color:#313244;} + .d2-914436609 .color-AB4{color:#45475A;} + .d2-914436609 .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}]]> -wintersummersnowsun +wintersummersnowsun diff --git a/d2renderers/d2sketch/testdata/class/sketch.exp.svg b/d2renderers/d2sketch/testdata/class/sketch.exp.svg index 6c2f37c87..b7f902b68 100644 --- a/d2renderers/d2sketch/testdata/class/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2730605657 .fill-N1{fill:#0A0F25;} + .d2-2730605657 .fill-N2{fill:#676C7E;} + .d2-2730605657 .fill-N3{fill:#9499AB;} + .d2-2730605657 .fill-N4{fill:#CFD2DD;} + .d2-2730605657 .fill-N5{fill:#DEE1EB;} + .d2-2730605657 .fill-N6{fill:#EEF1F8;} + .d2-2730605657 .fill-N7{fill:#FFFFFF;} + .d2-2730605657 .fill-B1{fill:#0D32B2;} + .d2-2730605657 .fill-B2{fill:#0D32B2;} + .d2-2730605657 .fill-B3{fill:#E3E9FD;} + .d2-2730605657 .fill-B4{fill:#E3E9FD;} + .d2-2730605657 .fill-B5{fill:#EDF0FD;} + .d2-2730605657 .fill-B6{fill:#F7F8FE;} + .d2-2730605657 .fill-AA2{fill:#4A6FF3;} + .d2-2730605657 .fill-AA4{fill:#EDF0FD;} + .d2-2730605657 .fill-AA5{fill:#F7F8FE;} + .d2-2730605657 .fill-AB4{fill:#EDF0FD;} + .d2-2730605657 .fill-AB5{fill:#F7F8FE;} + .d2-2730605657 .stroke-N1{stroke:#0A0F25;} + .d2-2730605657 .stroke-N2{stroke:#676C7E;} + .d2-2730605657 .stroke-N3{stroke:#9499AB;} + .d2-2730605657 .stroke-N4{stroke:#CFD2DD;} + .d2-2730605657 .stroke-N5{stroke:#DEE1EB;} + .d2-2730605657 .stroke-N6{stroke:#EEF1F8;} + .d2-2730605657 .stroke-N7{stroke:#FFFFFF;} + .d2-2730605657 .stroke-B1{stroke:#0D32B2;} + .d2-2730605657 .stroke-B2{stroke:#0D32B2;} + .d2-2730605657 .stroke-B3{stroke:#E3E9FD;} + .d2-2730605657 .stroke-B4{stroke:#E3E9FD;} + .d2-2730605657 .stroke-B5{stroke:#EDF0FD;} + .d2-2730605657 .stroke-B6{stroke:#F7F8FE;} + .d2-2730605657 .stroke-AA2{stroke:#4A6FF3;} + .d2-2730605657 .stroke-AA4{stroke:#EDF0FD;} + .d2-2730605657 .stroke-AA5{stroke:#F7F8FE;} + .d2-2730605657 .stroke-AB4{stroke:#EDF0FD;} + .d2-2730605657 .stroke-AB5{stroke:#F7F8FE;} + .d2-2730605657 .background-color-N1{background-color:#0A0F25;} + .d2-2730605657 .background-color-N2{background-color:#676C7E;} + .d2-2730605657 .background-color-N3{background-color:#9499AB;} + .d2-2730605657 .background-color-N4{background-color:#CFD2DD;} + .d2-2730605657 .background-color-N5{background-color:#DEE1EB;} + .d2-2730605657 .background-color-N6{background-color:#EEF1F8;} + .d2-2730605657 .background-color-N7{background-color:#FFFFFF;} + .d2-2730605657 .background-color-B1{background-color:#0D32B2;} + .d2-2730605657 .background-color-B2{background-color:#0D32B2;} + .d2-2730605657 .background-color-B3{background-color:#E3E9FD;} + .d2-2730605657 .background-color-B4{background-color:#E3E9FD;} + .d2-2730605657 .background-color-B5{background-color:#EDF0FD;} + .d2-2730605657 .background-color-B6{background-color:#F7F8FE;} + .d2-2730605657 .background-color-AA2{background-color:#4A6FF3;} + .d2-2730605657 .background-color-AA4{background-color:#EDF0FD;} + .d2-2730605657 .background-color-AA5{background-color:#F7F8FE;} + .d2-2730605657 .background-color-AB4{background-color:#EDF0FD;} + .d2-2730605657 .background-color-AB5{background-color:#F7F8FE;} + .d2-2730605657 .color-N1{color:#0A0F25;} + .d2-2730605657 .color-N2{color:#676C7E;} + .d2-2730605657 .color-N3{color:#9499AB;} + .d2-2730605657 .color-N4{color:#CFD2DD;} + .d2-2730605657 .color-N5{color:#DEE1EB;} + .d2-2730605657 .color-N6{color:#EEF1F8;} + .d2-2730605657 .color-N7{color:#FFFFFF;} + .d2-2730605657 .color-B1{color:#0D32B2;} + .d2-2730605657 .color-B2{color:#0D32B2;} + .d2-2730605657 .color-B3{color:#E3E9FD;} + .d2-2730605657 .color-B4{color:#E3E9FD;} + .d2-2730605657 .color-B5{color:#EDF0FD;} + .d2-2730605657 .color-B6{color:#F7F8FE;} + .d2-2730605657 .color-AA2{color:#4A6FF3;} + .d2-2730605657 .color-AA4{color:#EDF0FD;} + .d2-2730605657 .color-AA5{color:#F7F8FE;} + .d2-2730605657 .color-AB4{color:#EDF0FD;} + .d2-2730605657 .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 @@ -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void +BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg index 3f59f8c29..6e3c35caf 100644 --- a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-206057491 .fill-N1{fill:#0A0F25;} + .d2-206057491 .fill-N2{fill:#676C7E;} + .d2-206057491 .fill-N3{fill:#9499AB;} + .d2-206057491 .fill-N4{fill:#CFD2DD;} + .d2-206057491 .fill-N5{fill:#DEE1EB;} + .d2-206057491 .fill-N6{fill:#EEF1F8;} + .d2-206057491 .fill-N7{fill:#FFFFFF;} + .d2-206057491 .fill-B1{fill:#0D32B2;} + .d2-206057491 .fill-B2{fill:#0D32B2;} + .d2-206057491 .fill-B3{fill:#E3E9FD;} + .d2-206057491 .fill-B4{fill:#E3E9FD;} + .d2-206057491 .fill-B5{fill:#EDF0FD;} + .d2-206057491 .fill-B6{fill:#F7F8FE;} + .d2-206057491 .fill-AA2{fill:#4A6FF3;} + .d2-206057491 .fill-AA4{fill:#EDF0FD;} + .d2-206057491 .fill-AA5{fill:#F7F8FE;} + .d2-206057491 .fill-AB4{fill:#EDF0FD;} + .d2-206057491 .fill-AB5{fill:#F7F8FE;} + .d2-206057491 .stroke-N1{stroke:#0A0F25;} + .d2-206057491 .stroke-N2{stroke:#676C7E;} + .d2-206057491 .stroke-N3{stroke:#9499AB;} + .d2-206057491 .stroke-N4{stroke:#CFD2DD;} + .d2-206057491 .stroke-N5{stroke:#DEE1EB;} + .d2-206057491 .stroke-N6{stroke:#EEF1F8;} + .d2-206057491 .stroke-N7{stroke:#FFFFFF;} + .d2-206057491 .stroke-B1{stroke:#0D32B2;} + .d2-206057491 .stroke-B2{stroke:#0D32B2;} + .d2-206057491 .stroke-B3{stroke:#E3E9FD;} + .d2-206057491 .stroke-B4{stroke:#E3E9FD;} + .d2-206057491 .stroke-B5{stroke:#EDF0FD;} + .d2-206057491 .stroke-B6{stroke:#F7F8FE;} + .d2-206057491 .stroke-AA2{stroke:#4A6FF3;} + .d2-206057491 .stroke-AA4{stroke:#EDF0FD;} + .d2-206057491 .stroke-AA5{stroke:#F7F8FE;} + .d2-206057491 .stroke-AB4{stroke:#EDF0FD;} + .d2-206057491 .stroke-AB5{stroke:#F7F8FE;} + .d2-206057491 .background-color-N1{background-color:#0A0F25;} + .d2-206057491 .background-color-N2{background-color:#676C7E;} + .d2-206057491 .background-color-N3{background-color:#9499AB;} + .d2-206057491 .background-color-N4{background-color:#CFD2DD;} + .d2-206057491 .background-color-N5{background-color:#DEE1EB;} + .d2-206057491 .background-color-N6{background-color:#EEF1F8;} + .d2-206057491 .background-color-N7{background-color:#FFFFFF;} + .d2-206057491 .background-color-B1{background-color:#0D32B2;} + .d2-206057491 .background-color-B2{background-color:#0D32B2;} + .d2-206057491 .background-color-B3{background-color:#E3E9FD;} + .d2-206057491 .background-color-B4{background-color:#E3E9FD;} + .d2-206057491 .background-color-B5{background-color:#EDF0FD;} + .d2-206057491 .background-color-B6{background-color:#F7F8FE;} + .d2-206057491 .background-color-AA2{background-color:#4A6FF3;} + .d2-206057491 .background-color-AA4{background-color:#EDF0FD;} + .d2-206057491 .background-color-AA5{background-color:#F7F8FE;} + .d2-206057491 .background-color-AB4{background-color:#EDF0FD;} + .d2-206057491 .background-color-AB5{background-color:#F7F8FE;} + .d2-206057491 .color-N1{color:#0A0F25;} + .d2-206057491 .color-N2{color:#676C7E;} + .d2-206057491 .color-N3{color:#9499AB;} + .d2-206057491 .color-N4{color:#CFD2DD;} + .d2-206057491 .color-N5{color:#DEE1EB;} + .d2-206057491 .color-N6{color:#EEF1F8;} + .d2-206057491 .color-N7{color:#FFFFFF;} + .d2-206057491 .color-B1{color:#0D32B2;} + .d2-206057491 .color-B2{color:#0D32B2;} + .d2-206057491 .color-B3{color:#E3E9FD;} + .d2-206057491 .color-B4{color:#E3E9FD;} + .d2-206057491 .color-B5{color:#EDF0FD;} + .d2-206057491 .color-B6{color:#F7F8FE;} + .d2-206057491 .color-AA2{color:#4A6FF3;} + .d2-206057491 .color-AA4{color:#EDF0FD;} + .d2-206057491 .color-AA5{color:#F7F8FE;} + .d2-206057491 .color-AB4{color:#EDF0FD;} + .d2-206057491 .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 26771940a..3bca7f54c 100644 --- a/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2730605657 .fill-N1{fill:#CDD6F4;} + .d2-2730605657 .fill-N2{fill:#BAC2DE;} + .d2-2730605657 .fill-N3{fill:#A6ADC8;} + .d2-2730605657 .fill-N4{fill:#585B70;} + .d2-2730605657 .fill-N5{fill:#45475A;} + .d2-2730605657 .fill-N6{fill:#313244;} + .d2-2730605657 .fill-N7{fill:#1E1E2E;} + .d2-2730605657 .fill-B1{fill:#CBA6f7;} + .d2-2730605657 .fill-B2{fill:#CBA6f7;} + .d2-2730605657 .fill-B3{fill:#6C7086;} + .d2-2730605657 .fill-B4{fill:#585B70;} + .d2-2730605657 .fill-B5{fill:#45475A;} + .d2-2730605657 .fill-B6{fill:#313244;} + .d2-2730605657 .fill-AA2{fill:#f38BA8;} + .d2-2730605657 .fill-AA4{fill:#45475A;} + .d2-2730605657 .fill-AA5{fill:#313244;} + .d2-2730605657 .fill-AB4{fill:#45475A;} + .d2-2730605657 .fill-AB5{fill:#313244;} + .d2-2730605657 .stroke-N1{stroke:#CDD6F4;} + .d2-2730605657 .stroke-N2{stroke:#BAC2DE;} + .d2-2730605657 .stroke-N3{stroke:#A6ADC8;} + .d2-2730605657 .stroke-N4{stroke:#585B70;} + .d2-2730605657 .stroke-N5{stroke:#45475A;} + .d2-2730605657 .stroke-N6{stroke:#313244;} + .d2-2730605657 .stroke-N7{stroke:#1E1E2E;} + .d2-2730605657 .stroke-B1{stroke:#CBA6f7;} + .d2-2730605657 .stroke-B2{stroke:#CBA6f7;} + .d2-2730605657 .stroke-B3{stroke:#6C7086;} + .d2-2730605657 .stroke-B4{stroke:#585B70;} + .d2-2730605657 .stroke-B5{stroke:#45475A;} + .d2-2730605657 .stroke-B6{stroke:#313244;} + .d2-2730605657 .stroke-AA2{stroke:#f38BA8;} + .d2-2730605657 .stroke-AA4{stroke:#45475A;} + .d2-2730605657 .stroke-AA5{stroke:#313244;} + .d2-2730605657 .stroke-AB4{stroke:#45475A;} + .d2-2730605657 .stroke-AB5{stroke:#313244;} + .d2-2730605657 .background-color-N1{background-color:#CDD6F4;} + .d2-2730605657 .background-color-N2{background-color:#BAC2DE;} + .d2-2730605657 .background-color-N3{background-color:#A6ADC8;} + .d2-2730605657 .background-color-N4{background-color:#585B70;} + .d2-2730605657 .background-color-N5{background-color:#45475A;} + .d2-2730605657 .background-color-N6{background-color:#313244;} + .d2-2730605657 .background-color-N7{background-color:#1E1E2E;} + .d2-2730605657 .background-color-B1{background-color:#CBA6f7;} + .d2-2730605657 .background-color-B2{background-color:#CBA6f7;} + .d2-2730605657 .background-color-B3{background-color:#6C7086;} + .d2-2730605657 .background-color-B4{background-color:#585B70;} + .d2-2730605657 .background-color-B5{background-color:#45475A;} + .d2-2730605657 .background-color-B6{background-color:#313244;} + .d2-2730605657 .background-color-AA2{background-color:#f38BA8;} + .d2-2730605657 .background-color-AA4{background-color:#45475A;} + .d2-2730605657 .background-color-AA5{background-color:#313244;} + .d2-2730605657 .background-color-AB4{background-color:#45475A;} + .d2-2730605657 .background-color-AB5{background-color:#313244;} + .d2-2730605657 .color-N1{color:#CDD6F4;} + .d2-2730605657 .color-N2{color:#BAC2DE;} + .d2-2730605657 .color-N3{color:#A6ADC8;} + .d2-2730605657 .color-N4{color:#585B70;} + .d2-2730605657 .color-N5{color:#45475A;} + .d2-2730605657 .color-N6{color:#313244;} + .d2-2730605657 .color-N7{color:#1E1E2E;} + .d2-2730605657 .color-B1{color:#CBA6f7;} + .d2-2730605657 .color-B2{color:#CBA6f7;} + .d2-2730605657 .color-B3{color:#6C7086;} + .d2-2730605657 .color-B4{color:#585B70;} + .d2-2730605657 .color-B5{color:#45475A;} + .d2-2730605657 .color-B6{color:#313244;} + .d2-2730605657 .color-AA2{color:#f38BA8;} + .d2-2730605657 .color-AA4{color:#45475A;} + .d2-2730605657 .color-AA5{color:#313244;} + .d2-2730605657 .color-AB4{color:#45475A;} + .d2-2730605657 .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}]]> -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void +BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg index 331b87067..21929fdb7 100644 --- a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2029734873 .fill-N1{fill:#0A0F25;} + .d2-2029734873 .fill-N2{fill:#676C7E;} + .d2-2029734873 .fill-N3{fill:#9499AB;} + .d2-2029734873 .fill-N4{fill:#CFD2DD;} + .d2-2029734873 .fill-N5{fill:#DEE1EB;} + .d2-2029734873 .fill-N6{fill:#EEF1F8;} + .d2-2029734873 .fill-N7{fill:#FFFFFF;} + .d2-2029734873 .fill-B1{fill:#0D32B2;} + .d2-2029734873 .fill-B2{fill:#0D32B2;} + .d2-2029734873 .fill-B3{fill:#E3E9FD;} + .d2-2029734873 .fill-B4{fill:#E3E9FD;} + .d2-2029734873 .fill-B5{fill:#EDF0FD;} + .d2-2029734873 .fill-B6{fill:#F7F8FE;} + .d2-2029734873 .fill-AA2{fill:#4A6FF3;} + .d2-2029734873 .fill-AA4{fill:#EDF0FD;} + .d2-2029734873 .fill-AA5{fill:#F7F8FE;} + .d2-2029734873 .fill-AB4{fill:#EDF0FD;} + .d2-2029734873 .fill-AB5{fill:#F7F8FE;} + .d2-2029734873 .stroke-N1{stroke:#0A0F25;} + .d2-2029734873 .stroke-N2{stroke:#676C7E;} + .d2-2029734873 .stroke-N3{stroke:#9499AB;} + .d2-2029734873 .stroke-N4{stroke:#CFD2DD;} + .d2-2029734873 .stroke-N5{stroke:#DEE1EB;} + .d2-2029734873 .stroke-N6{stroke:#EEF1F8;} + .d2-2029734873 .stroke-N7{stroke:#FFFFFF;} + .d2-2029734873 .stroke-B1{stroke:#0D32B2;} + .d2-2029734873 .stroke-B2{stroke:#0D32B2;} + .d2-2029734873 .stroke-B3{stroke:#E3E9FD;} + .d2-2029734873 .stroke-B4{stroke:#E3E9FD;} + .d2-2029734873 .stroke-B5{stroke:#EDF0FD;} + .d2-2029734873 .stroke-B6{stroke:#F7F8FE;} + .d2-2029734873 .stroke-AA2{stroke:#4A6FF3;} + .d2-2029734873 .stroke-AA4{stroke:#EDF0FD;} + .d2-2029734873 .stroke-AA5{stroke:#F7F8FE;} + .d2-2029734873 .stroke-AB4{stroke:#EDF0FD;} + .d2-2029734873 .stroke-AB5{stroke:#F7F8FE;} + .d2-2029734873 .background-color-N1{background-color:#0A0F25;} + .d2-2029734873 .background-color-N2{background-color:#676C7E;} + .d2-2029734873 .background-color-N3{background-color:#9499AB;} + .d2-2029734873 .background-color-N4{background-color:#CFD2DD;} + .d2-2029734873 .background-color-N5{background-color:#DEE1EB;} + .d2-2029734873 .background-color-N6{background-color:#EEF1F8;} + .d2-2029734873 .background-color-N7{background-color:#FFFFFF;} + .d2-2029734873 .background-color-B1{background-color:#0D32B2;} + .d2-2029734873 .background-color-B2{background-color:#0D32B2;} + .d2-2029734873 .background-color-B3{background-color:#E3E9FD;} + .d2-2029734873 .background-color-B4{background-color:#E3E9FD;} + .d2-2029734873 .background-color-B5{background-color:#EDF0FD;} + .d2-2029734873 .background-color-B6{background-color:#F7F8FE;} + .d2-2029734873 .background-color-AA2{background-color:#4A6FF3;} + .d2-2029734873 .background-color-AA4{background-color:#EDF0FD;} + .d2-2029734873 .background-color-AA5{background-color:#F7F8FE;} + .d2-2029734873 .background-color-AB4{background-color:#EDF0FD;} + .d2-2029734873 .background-color-AB5{background-color:#F7F8FE;} + .d2-2029734873 .color-N1{color:#0A0F25;} + .d2-2029734873 .color-N2{color:#676C7E;} + .d2-2029734873 .color-N3{color:#9499AB;} + .d2-2029734873 .color-N4{color:#CFD2DD;} + .d2-2029734873 .color-N5{color:#DEE1EB;} + .d2-2029734873 .color-N6{color:#EEF1F8;} + .d2-2029734873 .color-N7{color:#FFFFFF;} + .d2-2029734873 .color-B1{color:#0D32B2;} + .d2-2029734873 .color-B2{color:#0D32B2;} + .d2-2029734873 .color-B3{color:#E3E9FD;} + .d2-2029734873 .color-B4{color:#E3E9FD;} + .d2-2029734873 .color-B5{color:#EDF0FD;} + .d2-2029734873 .color-B6{color:#F7F8FE;} + .d2-2029734873 .color-AA2{color:#4A6FF3;} + .d2-2029734873 .color-AA4{color:#EDF0FD;} + .d2-2029734873 .color-AA5{color:#F7F8FE;} + .d2-2029734873 .color-AB4{color:#EDF0FD;} + .d2-2029734873 .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}]]> @@ -104,7 +104,7 @@ -ab hello +ab hello diff --git a/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg index 6f2fd911d..e9be8fd7f 100644 --- a/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2029734873 .fill-N1{fill:#CDD6F4;} + .d2-2029734873 .fill-N2{fill:#BAC2DE;} + .d2-2029734873 .fill-N3{fill:#A6ADC8;} + .d2-2029734873 .fill-N4{fill:#585B70;} + .d2-2029734873 .fill-N5{fill:#45475A;} + .d2-2029734873 .fill-N6{fill:#313244;} + .d2-2029734873 .fill-N7{fill:#1E1E2E;} + .d2-2029734873 .fill-B1{fill:#CBA6f7;} + .d2-2029734873 .fill-B2{fill:#CBA6f7;} + .d2-2029734873 .fill-B3{fill:#6C7086;} + .d2-2029734873 .fill-B4{fill:#585B70;} + .d2-2029734873 .fill-B5{fill:#45475A;} + .d2-2029734873 .fill-B6{fill:#313244;} + .d2-2029734873 .fill-AA2{fill:#f38BA8;} + .d2-2029734873 .fill-AA4{fill:#45475A;} + .d2-2029734873 .fill-AA5{fill:#313244;} + .d2-2029734873 .fill-AB4{fill:#45475A;} + .d2-2029734873 .fill-AB5{fill:#313244;} + .d2-2029734873 .stroke-N1{stroke:#CDD6F4;} + .d2-2029734873 .stroke-N2{stroke:#BAC2DE;} + .d2-2029734873 .stroke-N3{stroke:#A6ADC8;} + .d2-2029734873 .stroke-N4{stroke:#585B70;} + .d2-2029734873 .stroke-N5{stroke:#45475A;} + .d2-2029734873 .stroke-N6{stroke:#313244;} + .d2-2029734873 .stroke-N7{stroke:#1E1E2E;} + .d2-2029734873 .stroke-B1{stroke:#CBA6f7;} + .d2-2029734873 .stroke-B2{stroke:#CBA6f7;} + .d2-2029734873 .stroke-B3{stroke:#6C7086;} + .d2-2029734873 .stroke-B4{stroke:#585B70;} + .d2-2029734873 .stroke-B5{stroke:#45475A;} + .d2-2029734873 .stroke-B6{stroke:#313244;} + .d2-2029734873 .stroke-AA2{stroke:#f38BA8;} + .d2-2029734873 .stroke-AA4{stroke:#45475A;} + .d2-2029734873 .stroke-AA5{stroke:#313244;} + .d2-2029734873 .stroke-AB4{stroke:#45475A;} + .d2-2029734873 .stroke-AB5{stroke:#313244;} + .d2-2029734873 .background-color-N1{background-color:#CDD6F4;} + .d2-2029734873 .background-color-N2{background-color:#BAC2DE;} + .d2-2029734873 .background-color-N3{background-color:#A6ADC8;} + .d2-2029734873 .background-color-N4{background-color:#585B70;} + .d2-2029734873 .background-color-N5{background-color:#45475A;} + .d2-2029734873 .background-color-N6{background-color:#313244;} + .d2-2029734873 .background-color-N7{background-color:#1E1E2E;} + .d2-2029734873 .background-color-B1{background-color:#CBA6f7;} + .d2-2029734873 .background-color-B2{background-color:#CBA6f7;} + .d2-2029734873 .background-color-B3{background-color:#6C7086;} + .d2-2029734873 .background-color-B4{background-color:#585B70;} + .d2-2029734873 .background-color-B5{background-color:#45475A;} + .d2-2029734873 .background-color-B6{background-color:#313244;} + .d2-2029734873 .background-color-AA2{background-color:#f38BA8;} + .d2-2029734873 .background-color-AA4{background-color:#45475A;} + .d2-2029734873 .background-color-AA5{background-color:#313244;} + .d2-2029734873 .background-color-AB4{background-color:#45475A;} + .d2-2029734873 .background-color-AB5{background-color:#313244;} + .d2-2029734873 .color-N1{color:#CDD6F4;} + .d2-2029734873 .color-N2{color:#BAC2DE;} + .d2-2029734873 .color-N3{color:#A6ADC8;} + .d2-2029734873 .color-N4{color:#585B70;} + .d2-2029734873 .color-N5{color:#45475A;} + .d2-2029734873 .color-N6{color:#313244;} + .d2-2029734873 .color-N7{color:#1E1E2E;} + .d2-2029734873 .color-B1{color:#CBA6f7;} + .d2-2029734873 .color-B2{color:#CBA6f7;} + .d2-2029734873 .color-B3{color:#6C7086;} + .d2-2029734873 .color-B4{color:#585B70;} + .d2-2029734873 .color-B5{color:#45475A;} + .d2-2029734873 .color-B6{color:#313244;} + .d2-2029734873 .color-AA2{color:#f38BA8;} + .d2-2029734873 .color-AA4{color:#45475A;} + .d2-2029734873 .color-AA5{color:#313244;} + .d2-2029734873 .color-AB4{color:#45475A;} + .d2-2029734873 .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}]]> -ab hello +ab hello diff --git a/d2renderers/d2sketch/testdata/crows_feet/sketch.exp.svg b/d2renderers/d2sketch/testdata/crows_feet/sketch.exp.svg index 8b1e0e09f..852149fd2 100644 --- a/d2renderers/d2sketch/testdata/crows_feet/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/crows_feet/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-341527886 .fill-N1{fill:#0A0F25;} + .d2-341527886 .fill-N2{fill:#676C7E;} + .d2-341527886 .fill-N3{fill:#9499AB;} + .d2-341527886 .fill-N4{fill:#CFD2DD;} + .d2-341527886 .fill-N5{fill:#DEE1EB;} + .d2-341527886 .fill-N6{fill:#EEF1F8;} + .d2-341527886 .fill-N7{fill:#FFFFFF;} + .d2-341527886 .fill-B1{fill:#0D32B2;} + .d2-341527886 .fill-B2{fill:#0D32B2;} + .d2-341527886 .fill-B3{fill:#E3E9FD;} + .d2-341527886 .fill-B4{fill:#E3E9FD;} + .d2-341527886 .fill-B5{fill:#EDF0FD;} + .d2-341527886 .fill-B6{fill:#F7F8FE;} + .d2-341527886 .fill-AA2{fill:#4A6FF3;} + .d2-341527886 .fill-AA4{fill:#EDF0FD;} + .d2-341527886 .fill-AA5{fill:#F7F8FE;} + .d2-341527886 .fill-AB4{fill:#EDF0FD;} + .d2-341527886 .fill-AB5{fill:#F7F8FE;} + .d2-341527886 .stroke-N1{stroke:#0A0F25;} + .d2-341527886 .stroke-N2{stroke:#676C7E;} + .d2-341527886 .stroke-N3{stroke:#9499AB;} + .d2-341527886 .stroke-N4{stroke:#CFD2DD;} + .d2-341527886 .stroke-N5{stroke:#DEE1EB;} + .d2-341527886 .stroke-N6{stroke:#EEF1F8;} + .d2-341527886 .stroke-N7{stroke:#FFFFFF;} + .d2-341527886 .stroke-B1{stroke:#0D32B2;} + .d2-341527886 .stroke-B2{stroke:#0D32B2;} + .d2-341527886 .stroke-B3{stroke:#E3E9FD;} + .d2-341527886 .stroke-B4{stroke:#E3E9FD;} + .d2-341527886 .stroke-B5{stroke:#EDF0FD;} + .d2-341527886 .stroke-B6{stroke:#F7F8FE;} + .d2-341527886 .stroke-AA2{stroke:#4A6FF3;} + .d2-341527886 .stroke-AA4{stroke:#EDF0FD;} + .d2-341527886 .stroke-AA5{stroke:#F7F8FE;} + .d2-341527886 .stroke-AB4{stroke:#EDF0FD;} + .d2-341527886 .stroke-AB5{stroke:#F7F8FE;} + .d2-341527886 .background-color-N1{background-color:#0A0F25;} + .d2-341527886 .background-color-N2{background-color:#676C7E;} + .d2-341527886 .background-color-N3{background-color:#9499AB;} + .d2-341527886 .background-color-N4{background-color:#CFD2DD;} + .d2-341527886 .background-color-N5{background-color:#DEE1EB;} + .d2-341527886 .background-color-N6{background-color:#EEF1F8;} + .d2-341527886 .background-color-N7{background-color:#FFFFFF;} + .d2-341527886 .background-color-B1{background-color:#0D32B2;} + .d2-341527886 .background-color-B2{background-color:#0D32B2;} + .d2-341527886 .background-color-B3{background-color:#E3E9FD;} + .d2-341527886 .background-color-B4{background-color:#E3E9FD;} + .d2-341527886 .background-color-B5{background-color:#EDF0FD;} + .d2-341527886 .background-color-B6{background-color:#F7F8FE;} + .d2-341527886 .background-color-AA2{background-color:#4A6FF3;} + .d2-341527886 .background-color-AA4{background-color:#EDF0FD;} + .d2-341527886 .background-color-AA5{background-color:#F7F8FE;} + .d2-341527886 .background-color-AB4{background-color:#EDF0FD;} + .d2-341527886 .background-color-AB5{background-color:#F7F8FE;} + .d2-341527886 .color-N1{color:#0A0F25;} + .d2-341527886 .color-N2{color:#676C7E;} + .d2-341527886 .color-N3{color:#9499AB;} + .d2-341527886 .color-N4{color:#CFD2DD;} + .d2-341527886 .color-N5{color:#DEE1EB;} + .d2-341527886 .color-N6{color:#EEF1F8;} + .d2-341527886 .color-N7{color:#FFFFFF;} + .d2-341527886 .color-B1{color:#0D32B2;} + .d2-341527886 .color-B2{color:#0D32B2;} + .d2-341527886 .color-B3{color:#E3E9FD;} + .d2-341527886 .color-B4{color:#E3E9FD;} + .d2-341527886 .color-B5{color:#EDF0FD;} + .d2-341527886 .color-B6{color:#F7F8FE;} + .d2-341527886 .color-AA2{color:#4A6FF3;} + .d2-341527886 .color-AA4{color:#EDF0FD;} + .d2-341527886 .color-AA5{color:#F7F8FE;} + .d2-341527886 .color-AB4{color:#EDF0FD;} + .d2-341527886 .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 @@ -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf +a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf diff --git a/d2renderers/d2sketch/testdata/crows_feet_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/crows_feet_dark/sketch.exp.svg index 6e0d860f2..f285cbe30 100644 --- a/d2renderers/d2sketch/testdata/crows_feet_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/crows_feet_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-341527886 .fill-N1{fill:#CDD6F4;} + .d2-341527886 .fill-N2{fill:#BAC2DE;} + .d2-341527886 .fill-N3{fill:#A6ADC8;} + .d2-341527886 .fill-N4{fill:#585B70;} + .d2-341527886 .fill-N5{fill:#45475A;} + .d2-341527886 .fill-N6{fill:#313244;} + .d2-341527886 .fill-N7{fill:#1E1E2E;} + .d2-341527886 .fill-B1{fill:#CBA6f7;} + .d2-341527886 .fill-B2{fill:#CBA6f7;} + .d2-341527886 .fill-B3{fill:#6C7086;} + .d2-341527886 .fill-B4{fill:#585B70;} + .d2-341527886 .fill-B5{fill:#45475A;} + .d2-341527886 .fill-B6{fill:#313244;} + .d2-341527886 .fill-AA2{fill:#f38BA8;} + .d2-341527886 .fill-AA4{fill:#45475A;} + .d2-341527886 .fill-AA5{fill:#313244;} + .d2-341527886 .fill-AB4{fill:#45475A;} + .d2-341527886 .fill-AB5{fill:#313244;} + .d2-341527886 .stroke-N1{stroke:#CDD6F4;} + .d2-341527886 .stroke-N2{stroke:#BAC2DE;} + .d2-341527886 .stroke-N3{stroke:#A6ADC8;} + .d2-341527886 .stroke-N4{stroke:#585B70;} + .d2-341527886 .stroke-N5{stroke:#45475A;} + .d2-341527886 .stroke-N6{stroke:#313244;} + .d2-341527886 .stroke-N7{stroke:#1E1E2E;} + .d2-341527886 .stroke-B1{stroke:#CBA6f7;} + .d2-341527886 .stroke-B2{stroke:#CBA6f7;} + .d2-341527886 .stroke-B3{stroke:#6C7086;} + .d2-341527886 .stroke-B4{stroke:#585B70;} + .d2-341527886 .stroke-B5{stroke:#45475A;} + .d2-341527886 .stroke-B6{stroke:#313244;} + .d2-341527886 .stroke-AA2{stroke:#f38BA8;} + .d2-341527886 .stroke-AA4{stroke:#45475A;} + .d2-341527886 .stroke-AA5{stroke:#313244;} + .d2-341527886 .stroke-AB4{stroke:#45475A;} + .d2-341527886 .stroke-AB5{stroke:#313244;} + .d2-341527886 .background-color-N1{background-color:#CDD6F4;} + .d2-341527886 .background-color-N2{background-color:#BAC2DE;} + .d2-341527886 .background-color-N3{background-color:#A6ADC8;} + .d2-341527886 .background-color-N4{background-color:#585B70;} + .d2-341527886 .background-color-N5{background-color:#45475A;} + .d2-341527886 .background-color-N6{background-color:#313244;} + .d2-341527886 .background-color-N7{background-color:#1E1E2E;} + .d2-341527886 .background-color-B1{background-color:#CBA6f7;} + .d2-341527886 .background-color-B2{background-color:#CBA6f7;} + .d2-341527886 .background-color-B3{background-color:#6C7086;} + .d2-341527886 .background-color-B4{background-color:#585B70;} + .d2-341527886 .background-color-B5{background-color:#45475A;} + .d2-341527886 .background-color-B6{background-color:#313244;} + .d2-341527886 .background-color-AA2{background-color:#f38BA8;} + .d2-341527886 .background-color-AA4{background-color:#45475A;} + .d2-341527886 .background-color-AA5{background-color:#313244;} + .d2-341527886 .background-color-AB4{background-color:#45475A;} + .d2-341527886 .background-color-AB5{background-color:#313244;} + .d2-341527886 .color-N1{color:#CDD6F4;} + .d2-341527886 .color-N2{color:#BAC2DE;} + .d2-341527886 .color-N3{color:#A6ADC8;} + .d2-341527886 .color-N4{color:#585B70;} + .d2-341527886 .color-N5{color:#45475A;} + .d2-341527886 .color-N6{color:#313244;} + .d2-341527886 .color-N7{color:#1E1E2E;} + .d2-341527886 .color-B1{color:#CBA6f7;} + .d2-341527886 .color-B2{color:#CBA6f7;} + .d2-341527886 .color-B3{color:#6C7086;} + .d2-341527886 .color-B4{color:#585B70;} + .d2-341527886 .color-B5{color:#45475A;} + .d2-341527886 .color-B6{color:#313244;} + .d2-341527886 .color-AA2{color:#f38BA8;} + .d2-341527886 .color-AA4{color:#45475A;} + .d2-341527886 .color-AA5{color:#313244;} + .d2-341527886 .color-AB4{color:#45475A;} + .d2-341527886 .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}]]> -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf +a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf diff --git a/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg index 6a9aa35a7..389cded02 100644 --- a/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1379818723 .fill-N1{fill:#0A0F25;} + .d2-1379818723 .fill-N2{fill:#676C7E;} + .d2-1379818723 .fill-N3{fill:#9499AB;} + .d2-1379818723 .fill-N4{fill:#CFD2DD;} + .d2-1379818723 .fill-N5{fill:#DEE1EB;} + .d2-1379818723 .fill-N6{fill:#EEF1F8;} + .d2-1379818723 .fill-N7{fill:#FFFFFF;} + .d2-1379818723 .fill-B1{fill:#0D32B2;} + .d2-1379818723 .fill-B2{fill:#0D32B2;} + .d2-1379818723 .fill-B3{fill:#E3E9FD;} + .d2-1379818723 .fill-B4{fill:#E3E9FD;} + .d2-1379818723 .fill-B5{fill:#EDF0FD;} + .d2-1379818723 .fill-B6{fill:#F7F8FE;} + .d2-1379818723 .fill-AA2{fill:#4A6FF3;} + .d2-1379818723 .fill-AA4{fill:#EDF0FD;} + .d2-1379818723 .fill-AA5{fill:#F7F8FE;} + .d2-1379818723 .fill-AB4{fill:#EDF0FD;} + .d2-1379818723 .fill-AB5{fill:#F7F8FE;} + .d2-1379818723 .stroke-N1{stroke:#0A0F25;} + .d2-1379818723 .stroke-N2{stroke:#676C7E;} + .d2-1379818723 .stroke-N3{stroke:#9499AB;} + .d2-1379818723 .stroke-N4{stroke:#CFD2DD;} + .d2-1379818723 .stroke-N5{stroke:#DEE1EB;} + .d2-1379818723 .stroke-N6{stroke:#EEF1F8;} + .d2-1379818723 .stroke-N7{stroke:#FFFFFF;} + .d2-1379818723 .stroke-B1{stroke:#0D32B2;} + .d2-1379818723 .stroke-B2{stroke:#0D32B2;} + .d2-1379818723 .stroke-B3{stroke:#E3E9FD;} + .d2-1379818723 .stroke-B4{stroke:#E3E9FD;} + .d2-1379818723 .stroke-B5{stroke:#EDF0FD;} + .d2-1379818723 .stroke-B6{stroke:#F7F8FE;} + .d2-1379818723 .stroke-AA2{stroke:#4A6FF3;} + .d2-1379818723 .stroke-AA4{stroke:#EDF0FD;} + .d2-1379818723 .stroke-AA5{stroke:#F7F8FE;} + .d2-1379818723 .stroke-AB4{stroke:#EDF0FD;} + .d2-1379818723 .stroke-AB5{stroke:#F7F8FE;} + .d2-1379818723 .background-color-N1{background-color:#0A0F25;} + .d2-1379818723 .background-color-N2{background-color:#676C7E;} + .d2-1379818723 .background-color-N3{background-color:#9499AB;} + .d2-1379818723 .background-color-N4{background-color:#CFD2DD;} + .d2-1379818723 .background-color-N5{background-color:#DEE1EB;} + .d2-1379818723 .background-color-N6{background-color:#EEF1F8;} + .d2-1379818723 .background-color-N7{background-color:#FFFFFF;} + .d2-1379818723 .background-color-B1{background-color:#0D32B2;} + .d2-1379818723 .background-color-B2{background-color:#0D32B2;} + .d2-1379818723 .background-color-B3{background-color:#E3E9FD;} + .d2-1379818723 .background-color-B4{background-color:#E3E9FD;} + .d2-1379818723 .background-color-B5{background-color:#EDF0FD;} + .d2-1379818723 .background-color-B6{background-color:#F7F8FE;} + .d2-1379818723 .background-color-AA2{background-color:#4A6FF3;} + .d2-1379818723 .background-color-AA4{background-color:#EDF0FD;} + .d2-1379818723 .background-color-AA5{background-color:#F7F8FE;} + .d2-1379818723 .background-color-AB4{background-color:#EDF0FD;} + .d2-1379818723 .background-color-AB5{background-color:#F7F8FE;} + .d2-1379818723 .color-N1{color:#0A0F25;} + .d2-1379818723 .color-N2{color:#676C7E;} + .d2-1379818723 .color-N3{color:#9499AB;} + .d2-1379818723 .color-N4{color:#CFD2DD;} + .d2-1379818723 .color-N5{color:#DEE1EB;} + .d2-1379818723 .color-N6{color:#EEF1F8;} + .d2-1379818723 .color-N7{color:#FFFFFF;} + .d2-1379818723 .color-B1{color:#0D32B2;} + .d2-1379818723 .color-B2{color:#0D32B2;} + .d2-1379818723 .color-B3{color:#E3E9FD;} + .d2-1379818723 .color-B4{color:#E3E9FD;} + .d2-1379818723 .color-B5{color:#EDF0FD;} + .d2-1379818723 .color-B6{color:#F7F8FE;} + .d2-1379818723 .color-AA2{color:#4A6FF3;} + .d2-1379818723 .color-AA4{color:#EDF0FD;} + .d2-1379818723 .color-AA5{color:#F7F8FE;} + .d2-1379818723 .color-AB4{color:#EDF0FD;} + .d2-1379818723 .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}]]> @@ -134,7 +134,7 @@ x -y +y diff --git a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg index 5448e8ebb..584294329 100644 --- a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1207082110 .fill-N1{fill:#0A0F25;} + .d2-1207082110 .fill-N2{fill:#676C7E;} + .d2-1207082110 .fill-N3{fill:#9499AB;} + .d2-1207082110 .fill-N4{fill:#CFD2DD;} + .d2-1207082110 .fill-N5{fill:#DEE1EB;} + .d2-1207082110 .fill-N6{fill:#EEF1F8;} + .d2-1207082110 .fill-N7{fill:#FFFFFF;} + .d2-1207082110 .fill-B1{fill:#0D32B2;} + .d2-1207082110 .fill-B2{fill:#0D32B2;} + .d2-1207082110 .fill-B3{fill:#E3E9FD;} + .d2-1207082110 .fill-B4{fill:#E3E9FD;} + .d2-1207082110 .fill-B5{fill:#EDF0FD;} + .d2-1207082110 .fill-B6{fill:#F7F8FE;} + .d2-1207082110 .fill-AA2{fill:#4A6FF3;} + .d2-1207082110 .fill-AA4{fill:#EDF0FD;} + .d2-1207082110 .fill-AA5{fill:#F7F8FE;} + .d2-1207082110 .fill-AB4{fill:#EDF0FD;} + .d2-1207082110 .fill-AB5{fill:#F7F8FE;} + .d2-1207082110 .stroke-N1{stroke:#0A0F25;} + .d2-1207082110 .stroke-N2{stroke:#676C7E;} + .d2-1207082110 .stroke-N3{stroke:#9499AB;} + .d2-1207082110 .stroke-N4{stroke:#CFD2DD;} + .d2-1207082110 .stroke-N5{stroke:#DEE1EB;} + .d2-1207082110 .stroke-N6{stroke:#EEF1F8;} + .d2-1207082110 .stroke-N7{stroke:#FFFFFF;} + .d2-1207082110 .stroke-B1{stroke:#0D32B2;} + .d2-1207082110 .stroke-B2{stroke:#0D32B2;} + .d2-1207082110 .stroke-B3{stroke:#E3E9FD;} + .d2-1207082110 .stroke-B4{stroke:#E3E9FD;} + .d2-1207082110 .stroke-B5{stroke:#EDF0FD;} + .d2-1207082110 .stroke-B6{stroke:#F7F8FE;} + .d2-1207082110 .stroke-AA2{stroke:#4A6FF3;} + .d2-1207082110 .stroke-AA4{stroke:#EDF0FD;} + .d2-1207082110 .stroke-AA5{stroke:#F7F8FE;} + .d2-1207082110 .stroke-AB4{stroke:#EDF0FD;} + .d2-1207082110 .stroke-AB5{stroke:#F7F8FE;} + .d2-1207082110 .background-color-N1{background-color:#0A0F25;} + .d2-1207082110 .background-color-N2{background-color:#676C7E;} + .d2-1207082110 .background-color-N3{background-color:#9499AB;} + .d2-1207082110 .background-color-N4{background-color:#CFD2DD;} + .d2-1207082110 .background-color-N5{background-color:#DEE1EB;} + .d2-1207082110 .background-color-N6{background-color:#EEF1F8;} + .d2-1207082110 .background-color-N7{background-color:#FFFFFF;} + .d2-1207082110 .background-color-B1{background-color:#0D32B2;} + .d2-1207082110 .background-color-B2{background-color:#0D32B2;} + .d2-1207082110 .background-color-B3{background-color:#E3E9FD;} + .d2-1207082110 .background-color-B4{background-color:#E3E9FD;} + .d2-1207082110 .background-color-B5{background-color:#EDF0FD;} + .d2-1207082110 .background-color-B6{background-color:#F7F8FE;} + .d2-1207082110 .background-color-AA2{background-color:#4A6FF3;} + .d2-1207082110 .background-color-AA4{background-color:#EDF0FD;} + .d2-1207082110 .background-color-AA5{background-color:#F7F8FE;} + .d2-1207082110 .background-color-AB4{background-color:#EDF0FD;} + .d2-1207082110 .background-color-AB5{background-color:#F7F8FE;} + .d2-1207082110 .color-N1{color:#0A0F25;} + .d2-1207082110 .color-N2{color:#676C7E;} + .d2-1207082110 .color-N3{color:#9499AB;} + .d2-1207082110 .color-N4{color:#CFD2DD;} + .d2-1207082110 .color-N5{color:#DEE1EB;} + .d2-1207082110 .color-N6{color:#EEF1F8;} + .d2-1207082110 .color-N7{color:#FFFFFF;} + .d2-1207082110 .color-B1{color:#0D32B2;} + .d2-1207082110 .color-B2{color:#0D32B2;} + .d2-1207082110 .color-B3{color:#E3E9FD;} + .d2-1207082110 .color-B4{color:#E3E9FD;} + .d2-1207082110 .color-B5{color:#EDF0FD;} + .d2-1207082110 .color-B6{color:#F7F8FE;} + .d2-1207082110 .color-AA2{color:#4A6FF3;} + .d2-1207082110 .color-AA4{color:#EDF0FD;} + .d2-1207082110 .color-AA5{color:#F7F8FE;} + .d2-1207082110 .color-AB4{color:#EDF0FD;} + .d2-1207082110 .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}]]> @@ -130,7 +130,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg index 4cf60a0ff..af8dc158a 100644 --- a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1360573900 .fill-N1{fill:#0A0F25;} + .d2-1360573900 .fill-N2{fill:#676C7E;} + .d2-1360573900 .fill-N3{fill:#9499AB;} + .d2-1360573900 .fill-N4{fill:#CFD2DD;} + .d2-1360573900 .fill-N5{fill:#DEE1EB;} + .d2-1360573900 .fill-N6{fill:#EEF1F8;} + .d2-1360573900 .fill-N7{fill:#FFFFFF;} + .d2-1360573900 .fill-B1{fill:#0D32B2;} + .d2-1360573900 .fill-B2{fill:#0D32B2;} + .d2-1360573900 .fill-B3{fill:#E3E9FD;} + .d2-1360573900 .fill-B4{fill:#E3E9FD;} + .d2-1360573900 .fill-B5{fill:#EDF0FD;} + .d2-1360573900 .fill-B6{fill:#F7F8FE;} + .d2-1360573900 .fill-AA2{fill:#4A6FF3;} + .d2-1360573900 .fill-AA4{fill:#EDF0FD;} + .d2-1360573900 .fill-AA5{fill:#F7F8FE;} + .d2-1360573900 .fill-AB4{fill:#EDF0FD;} + .d2-1360573900 .fill-AB5{fill:#F7F8FE;} + .d2-1360573900 .stroke-N1{stroke:#0A0F25;} + .d2-1360573900 .stroke-N2{stroke:#676C7E;} + .d2-1360573900 .stroke-N3{stroke:#9499AB;} + .d2-1360573900 .stroke-N4{stroke:#CFD2DD;} + .d2-1360573900 .stroke-N5{stroke:#DEE1EB;} + .d2-1360573900 .stroke-N6{stroke:#EEF1F8;} + .d2-1360573900 .stroke-N7{stroke:#FFFFFF;} + .d2-1360573900 .stroke-B1{stroke:#0D32B2;} + .d2-1360573900 .stroke-B2{stroke:#0D32B2;} + .d2-1360573900 .stroke-B3{stroke:#E3E9FD;} + .d2-1360573900 .stroke-B4{stroke:#E3E9FD;} + .d2-1360573900 .stroke-B5{stroke:#EDF0FD;} + .d2-1360573900 .stroke-B6{stroke:#F7F8FE;} + .d2-1360573900 .stroke-AA2{stroke:#4A6FF3;} + .d2-1360573900 .stroke-AA4{stroke:#EDF0FD;} + .d2-1360573900 .stroke-AA5{stroke:#F7F8FE;} + .d2-1360573900 .stroke-AB4{stroke:#EDF0FD;} + .d2-1360573900 .stroke-AB5{stroke:#F7F8FE;} + .d2-1360573900 .background-color-N1{background-color:#0A0F25;} + .d2-1360573900 .background-color-N2{background-color:#676C7E;} + .d2-1360573900 .background-color-N3{background-color:#9499AB;} + .d2-1360573900 .background-color-N4{background-color:#CFD2DD;} + .d2-1360573900 .background-color-N5{background-color:#DEE1EB;} + .d2-1360573900 .background-color-N6{background-color:#EEF1F8;} + .d2-1360573900 .background-color-N7{background-color:#FFFFFF;} + .d2-1360573900 .background-color-B1{background-color:#0D32B2;} + .d2-1360573900 .background-color-B2{background-color:#0D32B2;} + .d2-1360573900 .background-color-B3{background-color:#E3E9FD;} + .d2-1360573900 .background-color-B4{background-color:#E3E9FD;} + .d2-1360573900 .background-color-B5{background-color:#EDF0FD;} + .d2-1360573900 .background-color-B6{background-color:#F7F8FE;} + .d2-1360573900 .background-color-AA2{background-color:#4A6FF3;} + .d2-1360573900 .background-color-AA4{background-color:#EDF0FD;} + .d2-1360573900 .background-color-AA5{background-color:#F7F8FE;} + .d2-1360573900 .background-color-AB4{background-color:#EDF0FD;} + .d2-1360573900 .background-color-AB5{background-color:#F7F8FE;} + .d2-1360573900 .color-N1{color:#0A0F25;} + .d2-1360573900 .color-N2{color:#676C7E;} + .d2-1360573900 .color-N3{color:#9499AB;} + .d2-1360573900 .color-N4{color:#CFD2DD;} + .d2-1360573900 .color-N5{color:#DEE1EB;} + .d2-1360573900 .color-N6{color:#EEF1F8;} + .d2-1360573900 .color-N7{color:#FFFFFF;} + .d2-1360573900 .color-B1{color:#0D32B2;} + .d2-1360573900 .color-B2{color:#0D32B2;} + .d2-1360573900 .color-B3{color:#E3E9FD;} + .d2-1360573900 .color-B4{color:#E3E9FD;} + .d2-1360573900 .color-B5{color:#EDF0FD;} + .d2-1360573900 .color-B6{color:#F7F8FE;} + .d2-1360573900 .color-AA2{color:#4A6FF3;} + .d2-1360573900 .color-AA4{color:#EDF0FD;} + .d2-1360573900 .color-AA5{color:#F7F8FE;} + .d2-1360573900 .color-AB4{color:#EDF0FD;} + .d2-1360573900 .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}]]> @@ -130,7 +130,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg index 027f36be8..069943695 100644 --- a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-611371411 .fill-N1{fill:#0A0F25;} + .d2-611371411 .fill-N2{fill:#676C7E;} + .d2-611371411 .fill-N3{fill:#9499AB;} + .d2-611371411 .fill-N4{fill:#CFD2DD;} + .d2-611371411 .fill-N5{fill:#DEE1EB;} + .d2-611371411 .fill-N6{fill:#EEF1F8;} + .d2-611371411 .fill-N7{fill:#FFFFFF;} + .d2-611371411 .fill-B1{fill:#0D32B2;} + .d2-611371411 .fill-B2{fill:#0D32B2;} + .d2-611371411 .fill-B3{fill:#E3E9FD;} + .d2-611371411 .fill-B4{fill:#E3E9FD;} + .d2-611371411 .fill-B5{fill:#EDF0FD;} + .d2-611371411 .fill-B6{fill:#F7F8FE;} + .d2-611371411 .fill-AA2{fill:#4A6FF3;} + .d2-611371411 .fill-AA4{fill:#EDF0FD;} + .d2-611371411 .fill-AA5{fill:#F7F8FE;} + .d2-611371411 .fill-AB4{fill:#EDF0FD;} + .d2-611371411 .fill-AB5{fill:#F7F8FE;} + .d2-611371411 .stroke-N1{stroke:#0A0F25;} + .d2-611371411 .stroke-N2{stroke:#676C7E;} + .d2-611371411 .stroke-N3{stroke:#9499AB;} + .d2-611371411 .stroke-N4{stroke:#CFD2DD;} + .d2-611371411 .stroke-N5{stroke:#DEE1EB;} + .d2-611371411 .stroke-N6{stroke:#EEF1F8;} + .d2-611371411 .stroke-N7{stroke:#FFFFFF;} + .d2-611371411 .stroke-B1{stroke:#0D32B2;} + .d2-611371411 .stroke-B2{stroke:#0D32B2;} + .d2-611371411 .stroke-B3{stroke:#E3E9FD;} + .d2-611371411 .stroke-B4{stroke:#E3E9FD;} + .d2-611371411 .stroke-B5{stroke:#EDF0FD;} + .d2-611371411 .stroke-B6{stroke:#F7F8FE;} + .d2-611371411 .stroke-AA2{stroke:#4A6FF3;} + .d2-611371411 .stroke-AA4{stroke:#EDF0FD;} + .d2-611371411 .stroke-AA5{stroke:#F7F8FE;} + .d2-611371411 .stroke-AB4{stroke:#EDF0FD;} + .d2-611371411 .stroke-AB5{stroke:#F7F8FE;} + .d2-611371411 .background-color-N1{background-color:#0A0F25;} + .d2-611371411 .background-color-N2{background-color:#676C7E;} + .d2-611371411 .background-color-N3{background-color:#9499AB;} + .d2-611371411 .background-color-N4{background-color:#CFD2DD;} + .d2-611371411 .background-color-N5{background-color:#DEE1EB;} + .d2-611371411 .background-color-N6{background-color:#EEF1F8;} + .d2-611371411 .background-color-N7{background-color:#FFFFFF;} + .d2-611371411 .background-color-B1{background-color:#0D32B2;} + .d2-611371411 .background-color-B2{background-color:#0D32B2;} + .d2-611371411 .background-color-B3{background-color:#E3E9FD;} + .d2-611371411 .background-color-B4{background-color:#E3E9FD;} + .d2-611371411 .background-color-B5{background-color:#EDF0FD;} + .d2-611371411 .background-color-B6{background-color:#F7F8FE;} + .d2-611371411 .background-color-AA2{background-color:#4A6FF3;} + .d2-611371411 .background-color-AA4{background-color:#EDF0FD;} + .d2-611371411 .background-color-AA5{background-color:#F7F8FE;} + .d2-611371411 .background-color-AB4{background-color:#EDF0FD;} + .d2-611371411 .background-color-AB5{background-color:#F7F8FE;} + .d2-611371411 .color-N1{color:#0A0F25;} + .d2-611371411 .color-N2{color:#676C7E;} + .d2-611371411 .color-N3{color:#9499AB;} + .d2-611371411 .color-N4{color:#CFD2DD;} + .d2-611371411 .color-N5{color:#DEE1EB;} + .d2-611371411 .color-N6{color:#EEF1F8;} + .d2-611371411 .color-N7{color:#FFFFFF;} + .d2-611371411 .color-B1{color:#0D32B2;} + .d2-611371411 .color-B2{color:#0D32B2;} + .d2-611371411 .color-B3{color:#E3E9FD;} + .d2-611371411 .color-B4{color:#E3E9FD;} + .d2-611371411 .color-B5{color:#EDF0FD;} + .d2-611371411 .color-B6{color:#F7F8FE;} + .d2-611371411 .color-AA2{color:#4A6FF3;} + .d2-611371411 .color-AA4{color:#EDF0FD;} + .d2-611371411 .color-AA5{color:#F7F8FE;} + .d2-611371411 .color-AB4{color:#EDF0FD;} + .d2-611371411 .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}]]> @@ -166,7 +166,7 @@ -NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND +NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND diff --git a/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg b/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg index fc8d4c564..3c715831f 100644 --- a/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2864094478 .fill-N1{fill:#0A0F25;} + .d2-2864094478 .fill-N2{fill:#676C7E;} + .d2-2864094478 .fill-N3{fill:#9499AB;} + .d2-2864094478 .fill-N4{fill:#CFD2DD;} + .d2-2864094478 .fill-N5{fill:#DEE1EB;} + .d2-2864094478 .fill-N6{fill:#EEF1F8;} + .d2-2864094478 .fill-N7{fill:#FFFFFF;} + .d2-2864094478 .fill-B1{fill:#0D32B2;} + .d2-2864094478 .fill-B2{fill:#0D32B2;} + .d2-2864094478 .fill-B3{fill:#E3E9FD;} + .d2-2864094478 .fill-B4{fill:#E3E9FD;} + .d2-2864094478 .fill-B5{fill:#EDF0FD;} + .d2-2864094478 .fill-B6{fill:#F7F8FE;} + .d2-2864094478 .fill-AA2{fill:#4A6FF3;} + .d2-2864094478 .fill-AA4{fill:#EDF0FD;} + .d2-2864094478 .fill-AA5{fill:#F7F8FE;} + .d2-2864094478 .fill-AB4{fill:#EDF0FD;} + .d2-2864094478 .fill-AB5{fill:#F7F8FE;} + .d2-2864094478 .stroke-N1{stroke:#0A0F25;} + .d2-2864094478 .stroke-N2{stroke:#676C7E;} + .d2-2864094478 .stroke-N3{stroke:#9499AB;} + .d2-2864094478 .stroke-N4{stroke:#CFD2DD;} + .d2-2864094478 .stroke-N5{stroke:#DEE1EB;} + .d2-2864094478 .stroke-N6{stroke:#EEF1F8;} + .d2-2864094478 .stroke-N7{stroke:#FFFFFF;} + .d2-2864094478 .stroke-B1{stroke:#0D32B2;} + .d2-2864094478 .stroke-B2{stroke:#0D32B2;} + .d2-2864094478 .stroke-B3{stroke:#E3E9FD;} + .d2-2864094478 .stroke-B4{stroke:#E3E9FD;} + .d2-2864094478 .stroke-B5{stroke:#EDF0FD;} + .d2-2864094478 .stroke-B6{stroke:#F7F8FE;} + .d2-2864094478 .stroke-AA2{stroke:#4A6FF3;} + .d2-2864094478 .stroke-AA4{stroke:#EDF0FD;} + .d2-2864094478 .stroke-AA5{stroke:#F7F8FE;} + .d2-2864094478 .stroke-AB4{stroke:#EDF0FD;} + .d2-2864094478 .stroke-AB5{stroke:#F7F8FE;} + .d2-2864094478 .background-color-N1{background-color:#0A0F25;} + .d2-2864094478 .background-color-N2{background-color:#676C7E;} + .d2-2864094478 .background-color-N3{background-color:#9499AB;} + .d2-2864094478 .background-color-N4{background-color:#CFD2DD;} + .d2-2864094478 .background-color-N5{background-color:#DEE1EB;} + .d2-2864094478 .background-color-N6{background-color:#EEF1F8;} + .d2-2864094478 .background-color-N7{background-color:#FFFFFF;} + .d2-2864094478 .background-color-B1{background-color:#0D32B2;} + .d2-2864094478 .background-color-B2{background-color:#0D32B2;} + .d2-2864094478 .background-color-B3{background-color:#E3E9FD;} + .d2-2864094478 .background-color-B4{background-color:#E3E9FD;} + .d2-2864094478 .background-color-B5{background-color:#EDF0FD;} + .d2-2864094478 .background-color-B6{background-color:#F7F8FE;} + .d2-2864094478 .background-color-AA2{background-color:#4A6FF3;} + .d2-2864094478 .background-color-AA4{background-color:#EDF0FD;} + .d2-2864094478 .background-color-AA5{background-color:#F7F8FE;} + .d2-2864094478 .background-color-AB4{background-color:#EDF0FD;} + .d2-2864094478 .background-color-AB5{background-color:#F7F8FE;} + .d2-2864094478 .color-N1{color:#0A0F25;} + .d2-2864094478 .color-N2{color:#676C7E;} + .d2-2864094478 .color-N3{color:#9499AB;} + .d2-2864094478 .color-N4{color:#CFD2DD;} + .d2-2864094478 .color-N5{color:#DEE1EB;} + .d2-2864094478 .color-N6{color:#EEF1F8;} + .d2-2864094478 .color-N7{color:#FFFFFF;} + .d2-2864094478 .color-B1{color:#0D32B2;} + .d2-2864094478 .color-B2{color:#0D32B2;} + .d2-2864094478 .color-B3{color:#E3E9FD;} + .d2-2864094478 .color-B4{color:#E3E9FD;} + .d2-2864094478 .color-B5{color:#EDF0FD;} + .d2-2864094478 .color-B6{color:#F7F8FE;} + .d2-2864094478 .color-AA2{color:#4A6FF3;} + .d2-2864094478 .color-AA4{color:#EDF0FD;} + .d2-2864094478 .color-AA5{color:#F7F8FE;} + .d2-2864094478 .color-AB4{color:#EDF0FD;} + .d2-2864094478 .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}]]> @@ -104,7 +104,7 @@ -acnormalsomethingbdnested normal +acnormalsomethingbdnested normal diff --git a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg index 78dd49392..e4c092b98 100644 --- a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2874225056 .fill-N1{fill:#0A0F25;} + .d2-2874225056 .fill-N2{fill:#676C7E;} + .d2-2874225056 .fill-N3{fill:#9499AB;} + .d2-2874225056 .fill-N4{fill:#CFD2DD;} + .d2-2874225056 .fill-N5{fill:#DEE1EB;} + .d2-2874225056 .fill-N6{fill:#EEF1F8;} + .d2-2874225056 .fill-N7{fill:#FFFFFF;} + .d2-2874225056 .fill-B1{fill:#0D32B2;} + .d2-2874225056 .fill-B2{fill:#0D32B2;} + .d2-2874225056 .fill-B3{fill:#E3E9FD;} + .d2-2874225056 .fill-B4{fill:#E3E9FD;} + .d2-2874225056 .fill-B5{fill:#EDF0FD;} + .d2-2874225056 .fill-B6{fill:#F7F8FE;} + .d2-2874225056 .fill-AA2{fill:#4A6FF3;} + .d2-2874225056 .fill-AA4{fill:#EDF0FD;} + .d2-2874225056 .fill-AA5{fill:#F7F8FE;} + .d2-2874225056 .fill-AB4{fill:#EDF0FD;} + .d2-2874225056 .fill-AB5{fill:#F7F8FE;} + .d2-2874225056 .stroke-N1{stroke:#0A0F25;} + .d2-2874225056 .stroke-N2{stroke:#676C7E;} + .d2-2874225056 .stroke-N3{stroke:#9499AB;} + .d2-2874225056 .stroke-N4{stroke:#CFD2DD;} + .d2-2874225056 .stroke-N5{stroke:#DEE1EB;} + .d2-2874225056 .stroke-N6{stroke:#EEF1F8;} + .d2-2874225056 .stroke-N7{stroke:#FFFFFF;} + .d2-2874225056 .stroke-B1{stroke:#0D32B2;} + .d2-2874225056 .stroke-B2{stroke:#0D32B2;} + .d2-2874225056 .stroke-B3{stroke:#E3E9FD;} + .d2-2874225056 .stroke-B4{stroke:#E3E9FD;} + .d2-2874225056 .stroke-B5{stroke:#EDF0FD;} + .d2-2874225056 .stroke-B6{stroke:#F7F8FE;} + .d2-2874225056 .stroke-AA2{stroke:#4A6FF3;} + .d2-2874225056 .stroke-AA4{stroke:#EDF0FD;} + .d2-2874225056 .stroke-AA5{stroke:#F7F8FE;} + .d2-2874225056 .stroke-AB4{stroke:#EDF0FD;} + .d2-2874225056 .stroke-AB5{stroke:#F7F8FE;} + .d2-2874225056 .background-color-N1{background-color:#0A0F25;} + .d2-2874225056 .background-color-N2{background-color:#676C7E;} + .d2-2874225056 .background-color-N3{background-color:#9499AB;} + .d2-2874225056 .background-color-N4{background-color:#CFD2DD;} + .d2-2874225056 .background-color-N5{background-color:#DEE1EB;} + .d2-2874225056 .background-color-N6{background-color:#EEF1F8;} + .d2-2874225056 .background-color-N7{background-color:#FFFFFF;} + .d2-2874225056 .background-color-B1{background-color:#0D32B2;} + .d2-2874225056 .background-color-B2{background-color:#0D32B2;} + .d2-2874225056 .background-color-B3{background-color:#E3E9FD;} + .d2-2874225056 .background-color-B4{background-color:#E3E9FD;} + .d2-2874225056 .background-color-B5{background-color:#EDF0FD;} + .d2-2874225056 .background-color-B6{background-color:#F7F8FE;} + .d2-2874225056 .background-color-AA2{background-color:#4A6FF3;} + .d2-2874225056 .background-color-AA4{background-color:#EDF0FD;} + .d2-2874225056 .background-color-AA5{background-color:#F7F8FE;} + .d2-2874225056 .background-color-AB4{background-color:#EDF0FD;} + .d2-2874225056 .background-color-AB5{background-color:#F7F8FE;} + .d2-2874225056 .color-N1{color:#0A0F25;} + .d2-2874225056 .color-N2{color:#676C7E;} + .d2-2874225056 .color-N3{color:#9499AB;} + .d2-2874225056 .color-N4{color:#CFD2DD;} + .d2-2874225056 .color-N5{color:#DEE1EB;} + .d2-2874225056 .color-N6{color:#EEF1F8;} + .d2-2874225056 .color-N7{color:#FFFFFF;} + .d2-2874225056 .color-B1{color:#0D32B2;} + .d2-2874225056 .color-B2{color:#0D32B2;} + .d2-2874225056 .color-B3{color:#E3E9FD;} + .d2-2874225056 .color-B4{color:#E3E9FD;} + .d2-2874225056 .color-B5{color:#EDF0FD;} + .d2-2874225056 .color-B6{color:#F7F8FE;} + .d2-2874225056 .color-AA2{color:#4A6FF3;} + .d2-2874225056 .color-AA4{color:#EDF0FD;} + .d2-2874225056 .color-AA5{color:#F7F8FE;} + .d2-2874225056 .color-AB4{color:#EDF0FD;} + .d2-2874225056 .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 @@ -abc +abc diff --git a/d2renderers/d2sketch/testdata/long_arrowhead_label/sketch.exp.svg b/d2renderers/d2sketch/testdata/long_arrowhead_label/sketch.exp.svg index 9eb1e1b07..f6c3aafba 100644 --- a/d2renderers/d2sketch/testdata/long_arrowhead_label/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/long_arrowhead_label/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2558489054 .fill-N1{fill:#0A0F25;} + .d2-2558489054 .fill-N2{fill:#676C7E;} + .d2-2558489054 .fill-N3{fill:#9499AB;} + .d2-2558489054 .fill-N4{fill:#CFD2DD;} + .d2-2558489054 .fill-N5{fill:#DEE1EB;} + .d2-2558489054 .fill-N6{fill:#EEF1F8;} + .d2-2558489054 .fill-N7{fill:#FFFFFF;} + .d2-2558489054 .fill-B1{fill:#0D32B2;} + .d2-2558489054 .fill-B2{fill:#0D32B2;} + .d2-2558489054 .fill-B3{fill:#E3E9FD;} + .d2-2558489054 .fill-B4{fill:#E3E9FD;} + .d2-2558489054 .fill-B5{fill:#EDF0FD;} + .d2-2558489054 .fill-B6{fill:#F7F8FE;} + .d2-2558489054 .fill-AA2{fill:#4A6FF3;} + .d2-2558489054 .fill-AA4{fill:#EDF0FD;} + .d2-2558489054 .fill-AA5{fill:#F7F8FE;} + .d2-2558489054 .fill-AB4{fill:#EDF0FD;} + .d2-2558489054 .fill-AB5{fill:#F7F8FE;} + .d2-2558489054 .stroke-N1{stroke:#0A0F25;} + .d2-2558489054 .stroke-N2{stroke:#676C7E;} + .d2-2558489054 .stroke-N3{stroke:#9499AB;} + .d2-2558489054 .stroke-N4{stroke:#CFD2DD;} + .d2-2558489054 .stroke-N5{stroke:#DEE1EB;} + .d2-2558489054 .stroke-N6{stroke:#EEF1F8;} + .d2-2558489054 .stroke-N7{stroke:#FFFFFF;} + .d2-2558489054 .stroke-B1{stroke:#0D32B2;} + .d2-2558489054 .stroke-B2{stroke:#0D32B2;} + .d2-2558489054 .stroke-B3{stroke:#E3E9FD;} + .d2-2558489054 .stroke-B4{stroke:#E3E9FD;} + .d2-2558489054 .stroke-B5{stroke:#EDF0FD;} + .d2-2558489054 .stroke-B6{stroke:#F7F8FE;} + .d2-2558489054 .stroke-AA2{stroke:#4A6FF3;} + .d2-2558489054 .stroke-AA4{stroke:#EDF0FD;} + .d2-2558489054 .stroke-AA5{stroke:#F7F8FE;} + .d2-2558489054 .stroke-AB4{stroke:#EDF0FD;} + .d2-2558489054 .stroke-AB5{stroke:#F7F8FE;} + .d2-2558489054 .background-color-N1{background-color:#0A0F25;} + .d2-2558489054 .background-color-N2{background-color:#676C7E;} + .d2-2558489054 .background-color-N3{background-color:#9499AB;} + .d2-2558489054 .background-color-N4{background-color:#CFD2DD;} + .d2-2558489054 .background-color-N5{background-color:#DEE1EB;} + .d2-2558489054 .background-color-N6{background-color:#EEF1F8;} + .d2-2558489054 .background-color-N7{background-color:#FFFFFF;} + .d2-2558489054 .background-color-B1{background-color:#0D32B2;} + .d2-2558489054 .background-color-B2{background-color:#0D32B2;} + .d2-2558489054 .background-color-B3{background-color:#E3E9FD;} + .d2-2558489054 .background-color-B4{background-color:#E3E9FD;} + .d2-2558489054 .background-color-B5{background-color:#EDF0FD;} + .d2-2558489054 .background-color-B6{background-color:#F7F8FE;} + .d2-2558489054 .background-color-AA2{background-color:#4A6FF3;} + .d2-2558489054 .background-color-AA4{background-color:#EDF0FD;} + .d2-2558489054 .background-color-AA5{background-color:#F7F8FE;} + .d2-2558489054 .background-color-AB4{background-color:#EDF0FD;} + .d2-2558489054 .background-color-AB5{background-color:#F7F8FE;} + .d2-2558489054 .color-N1{color:#0A0F25;} + .d2-2558489054 .color-N2{color:#676C7E;} + .d2-2558489054 .color-N3{color:#9499AB;} + .d2-2558489054 .color-N4{color:#CFD2DD;} + .d2-2558489054 .color-N5{color:#DEE1EB;} + .d2-2558489054 .color-N6{color:#EEF1F8;} + .d2-2558489054 .color-N7{color:#FFFFFF;} + .d2-2558489054 .color-B1{color:#0D32B2;} + .d2-2558489054 .color-B2{color:#0D32B2;} + .d2-2558489054 .color-B3{color:#E3E9FD;} + .d2-2558489054 .color-B4{color:#E3E9FD;} + .d2-2558489054 .color-B5{color:#EDF0FD;} + .d2-2558489054 .color-B6{color:#F7F8FE;} + .d2-2558489054 .color-AA2{color:#4A6FF3;} + .d2-2558489054 .color-AA4{color:#EDF0FD;} + .d2-2558489054 .color-AA5{color:#F7F8FE;} + .d2-2558489054 .color-AB4{color:#EDF0FD;} + .d2-2558489054 .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}]]> @@ -104,7 +104,7 @@ -ab a to b with unexpectedly long target arrowhead label +ab a to b with unexpectedly long target arrowhead label diff --git a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg index 1dc869f92..17ff6dfaa 100644 --- a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -852,7 +852,7 @@ x

          linux: because a PC is a terrible thing to waste

          -
          auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +
        auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. diff --git a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg index fe00812f9..fb2771aec 100644 --- a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -850,7 +850,7 @@ x

        linux: because a PC is a terrible thing to waste

        -
        auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +
        auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. diff --git a/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg b/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg index 4a7ac8f4e..ae9e794c2 100644 --- a/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-4290168978 .fill-N1{fill:#0A0F25;} + .d2-4290168978 .fill-N2{fill:#676C7E;} + .d2-4290168978 .fill-N3{fill:#9499AB;} + .d2-4290168978 .fill-N4{fill:#CFD2DD;} + .d2-4290168978 .fill-N5{fill:#DEE1EB;} + .d2-4290168978 .fill-N6{fill:#EEF1F8;} + .d2-4290168978 .fill-N7{fill:#FFFFFF;} + .d2-4290168978 .fill-B1{fill:#0D32B2;} + .d2-4290168978 .fill-B2{fill:#0D32B2;} + .d2-4290168978 .fill-B3{fill:#E3E9FD;} + .d2-4290168978 .fill-B4{fill:#E3E9FD;} + .d2-4290168978 .fill-B5{fill:#EDF0FD;} + .d2-4290168978 .fill-B6{fill:#F7F8FE;} + .d2-4290168978 .fill-AA2{fill:#4A6FF3;} + .d2-4290168978 .fill-AA4{fill:#EDF0FD;} + .d2-4290168978 .fill-AA5{fill:#F7F8FE;} + .d2-4290168978 .fill-AB4{fill:#EDF0FD;} + .d2-4290168978 .fill-AB5{fill:#F7F8FE;} + .d2-4290168978 .stroke-N1{stroke:#0A0F25;} + .d2-4290168978 .stroke-N2{stroke:#676C7E;} + .d2-4290168978 .stroke-N3{stroke:#9499AB;} + .d2-4290168978 .stroke-N4{stroke:#CFD2DD;} + .d2-4290168978 .stroke-N5{stroke:#DEE1EB;} + .d2-4290168978 .stroke-N6{stroke:#EEF1F8;} + .d2-4290168978 .stroke-N7{stroke:#FFFFFF;} + .d2-4290168978 .stroke-B1{stroke:#0D32B2;} + .d2-4290168978 .stroke-B2{stroke:#0D32B2;} + .d2-4290168978 .stroke-B3{stroke:#E3E9FD;} + .d2-4290168978 .stroke-B4{stroke:#E3E9FD;} + .d2-4290168978 .stroke-B5{stroke:#EDF0FD;} + .d2-4290168978 .stroke-B6{stroke:#F7F8FE;} + .d2-4290168978 .stroke-AA2{stroke:#4A6FF3;} + .d2-4290168978 .stroke-AA4{stroke:#EDF0FD;} + .d2-4290168978 .stroke-AA5{stroke:#F7F8FE;} + .d2-4290168978 .stroke-AB4{stroke:#EDF0FD;} + .d2-4290168978 .stroke-AB5{stroke:#F7F8FE;} + .d2-4290168978 .background-color-N1{background-color:#0A0F25;} + .d2-4290168978 .background-color-N2{background-color:#676C7E;} + .d2-4290168978 .background-color-N3{background-color:#9499AB;} + .d2-4290168978 .background-color-N4{background-color:#CFD2DD;} + .d2-4290168978 .background-color-N5{background-color:#DEE1EB;} + .d2-4290168978 .background-color-N6{background-color:#EEF1F8;} + .d2-4290168978 .background-color-N7{background-color:#FFFFFF;} + .d2-4290168978 .background-color-B1{background-color:#0D32B2;} + .d2-4290168978 .background-color-B2{background-color:#0D32B2;} + .d2-4290168978 .background-color-B3{background-color:#E3E9FD;} + .d2-4290168978 .background-color-B4{background-color:#E3E9FD;} + .d2-4290168978 .background-color-B5{background-color:#EDF0FD;} + .d2-4290168978 .background-color-B6{background-color:#F7F8FE;} + .d2-4290168978 .background-color-AA2{background-color:#4A6FF3;} + .d2-4290168978 .background-color-AA4{background-color:#EDF0FD;} + .d2-4290168978 .background-color-AA5{background-color:#F7F8FE;} + .d2-4290168978 .background-color-AB4{background-color:#EDF0FD;} + .d2-4290168978 .background-color-AB5{background-color:#F7F8FE;} + .d2-4290168978 .color-N1{color:#0A0F25;} + .d2-4290168978 .color-N2{color:#676C7E;} + .d2-4290168978 .color-N3{color:#9499AB;} + .d2-4290168978 .color-N4{color:#CFD2DD;} + .d2-4290168978 .color-N5{color:#DEE1EB;} + .d2-4290168978 .color-N6{color:#EEF1F8;} + .d2-4290168978 .color-N7{color:#FFFFFF;} + .d2-4290168978 .color-B1{color:#0D32B2;} + .d2-4290168978 .color-B2{color:#0D32B2;} + .d2-4290168978 .color-B3{color:#E3E9FD;} + .d2-4290168978 .color-B4{color:#E3E9FD;} + .d2-4290168978 .color-B5{color:#EDF0FD;} + .d2-4290168978 .color-B6{color:#F7F8FE;} + .d2-4290168978 .color-AA2{color:#4A6FF3;} + .d2-4290168978 .color-AA4{color:#EDF0FD;} + .d2-4290168978 .color-AA5{color:#F7F8FE;} + .d2-4290168978 .color-AB4{color:#EDF0FD;} + .d2-4290168978 .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}]]> @@ -113,7 +113,7 @@ -brightnormaldarkdarker +brightnormaldarkdarker diff --git a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg index 85fe7230c..95627abce 100644 --- a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-3736831304 .fill-N1{fill:#0A0F25;} + .d2-3736831304 .fill-N2{fill:#676C7E;} + .d2-3736831304 .fill-N3{fill:#9499AB;} + .d2-3736831304 .fill-N4{fill:#CFD2DD;} + .d2-3736831304 .fill-N5{fill:#DEE1EB;} + .d2-3736831304 .fill-N6{fill:#EEF1F8;} + .d2-3736831304 .fill-N7{fill:#FFFFFF;} + .d2-3736831304 .fill-B1{fill:#0D32B2;} + .d2-3736831304 .fill-B2{fill:#0D32B2;} + .d2-3736831304 .fill-B3{fill:#E3E9FD;} + .d2-3736831304 .fill-B4{fill:#E3E9FD;} + .d2-3736831304 .fill-B5{fill:#EDF0FD;} + .d2-3736831304 .fill-B6{fill:#F7F8FE;} + .d2-3736831304 .fill-AA2{fill:#4A6FF3;} + .d2-3736831304 .fill-AA4{fill:#EDF0FD;} + .d2-3736831304 .fill-AA5{fill:#F7F8FE;} + .d2-3736831304 .fill-AB4{fill:#EDF0FD;} + .d2-3736831304 .fill-AB5{fill:#F7F8FE;} + .d2-3736831304 .stroke-N1{stroke:#0A0F25;} + .d2-3736831304 .stroke-N2{stroke:#676C7E;} + .d2-3736831304 .stroke-N3{stroke:#9499AB;} + .d2-3736831304 .stroke-N4{stroke:#CFD2DD;} + .d2-3736831304 .stroke-N5{stroke:#DEE1EB;} + .d2-3736831304 .stroke-N6{stroke:#EEF1F8;} + .d2-3736831304 .stroke-N7{stroke:#FFFFFF;} + .d2-3736831304 .stroke-B1{stroke:#0D32B2;} + .d2-3736831304 .stroke-B2{stroke:#0D32B2;} + .d2-3736831304 .stroke-B3{stroke:#E3E9FD;} + .d2-3736831304 .stroke-B4{stroke:#E3E9FD;} + .d2-3736831304 .stroke-B5{stroke:#EDF0FD;} + .d2-3736831304 .stroke-B6{stroke:#F7F8FE;} + .d2-3736831304 .stroke-AA2{stroke:#4A6FF3;} + .d2-3736831304 .stroke-AA4{stroke:#EDF0FD;} + .d2-3736831304 .stroke-AA5{stroke:#F7F8FE;} + .d2-3736831304 .stroke-AB4{stroke:#EDF0FD;} + .d2-3736831304 .stroke-AB5{stroke:#F7F8FE;} + .d2-3736831304 .background-color-N1{background-color:#0A0F25;} + .d2-3736831304 .background-color-N2{background-color:#676C7E;} + .d2-3736831304 .background-color-N3{background-color:#9499AB;} + .d2-3736831304 .background-color-N4{background-color:#CFD2DD;} + .d2-3736831304 .background-color-N5{background-color:#DEE1EB;} + .d2-3736831304 .background-color-N6{background-color:#EEF1F8;} + .d2-3736831304 .background-color-N7{background-color:#FFFFFF;} + .d2-3736831304 .background-color-B1{background-color:#0D32B2;} + .d2-3736831304 .background-color-B2{background-color:#0D32B2;} + .d2-3736831304 .background-color-B3{background-color:#E3E9FD;} + .d2-3736831304 .background-color-B4{background-color:#E3E9FD;} + .d2-3736831304 .background-color-B5{background-color:#EDF0FD;} + .d2-3736831304 .background-color-B6{background-color:#F7F8FE;} + .d2-3736831304 .background-color-AA2{background-color:#4A6FF3;} + .d2-3736831304 .background-color-AA4{background-color:#EDF0FD;} + .d2-3736831304 .background-color-AA5{background-color:#F7F8FE;} + .d2-3736831304 .background-color-AB4{background-color:#EDF0FD;} + .d2-3736831304 .background-color-AB5{background-color:#F7F8FE;} + .d2-3736831304 .color-N1{color:#0A0F25;} + .d2-3736831304 .color-N2{color:#676C7E;} + .d2-3736831304 .color-N3{color:#9499AB;} + .d2-3736831304 .color-N4{color:#CFD2DD;} + .d2-3736831304 .color-N5{color:#DEE1EB;} + .d2-3736831304 .color-N6{color:#EEF1F8;} + .d2-3736831304 .color-N7{color:#FFFFFF;} + .d2-3736831304 .color-B1{color:#0D32B2;} + .d2-3736831304 .color-B2{color:#0D32B2;} + .d2-3736831304 .color-B3{color:#E3E9FD;} + .d2-3736831304 .color-B4{color:#E3E9FD;} + .d2-3736831304 .color-B5{color:#EDF0FD;} + .d2-3736831304 .color-B6{color:#F7F8FE;} + .d2-3736831304 .color-AA2{color:#4A6FF3;} + .d2-3736831304 .color-AA4{color:#EDF0FD;} + .d2-3736831304 .color-AA5{color:#F7F8FE;} + .d2-3736831304 .color-AB4{color:#EDF0FD;} + .d2-3736831304 .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}]]> @@ -1212,7 +1212,7 @@ -NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND +NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND diff --git a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg index 4a4c93049..477f27ce8 100644 --- a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg @@ -1,20 +1,20 @@ - @@ -851,7 +851,7 @@
      • Staging
      • Dispatch to Site
      -
       +
       diff --git a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg index c1e808c13..e7873d6f6 100644 --- a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2504113906 .fill-N1{fill:#0A0F25;} + .d2-2504113906 .fill-N2{fill:#676C7E;} + .d2-2504113906 .fill-N3{fill:#9499AB;} + .d2-2504113906 .fill-N4{fill:#CFD2DD;} + .d2-2504113906 .fill-N5{fill:#DEE1EB;} + .d2-2504113906 .fill-N6{fill:#EEF1F8;} + .d2-2504113906 .fill-N7{fill:#FFFFFF;} + .d2-2504113906 .fill-B1{fill:#0D32B2;} + .d2-2504113906 .fill-B2{fill:#0D32B2;} + .d2-2504113906 .fill-B3{fill:#E3E9FD;} + .d2-2504113906 .fill-B4{fill:#E3E9FD;} + .d2-2504113906 .fill-B5{fill:#EDF0FD;} + .d2-2504113906 .fill-B6{fill:#F7F8FE;} + .d2-2504113906 .fill-AA2{fill:#4A6FF3;} + .d2-2504113906 .fill-AA4{fill:#EDF0FD;} + .d2-2504113906 .fill-AA5{fill:#F7F8FE;} + .d2-2504113906 .fill-AB4{fill:#EDF0FD;} + .d2-2504113906 .fill-AB5{fill:#F7F8FE;} + .d2-2504113906 .stroke-N1{stroke:#0A0F25;} + .d2-2504113906 .stroke-N2{stroke:#676C7E;} + .d2-2504113906 .stroke-N3{stroke:#9499AB;} + .d2-2504113906 .stroke-N4{stroke:#CFD2DD;} + .d2-2504113906 .stroke-N5{stroke:#DEE1EB;} + .d2-2504113906 .stroke-N6{stroke:#EEF1F8;} + .d2-2504113906 .stroke-N7{stroke:#FFFFFF;} + .d2-2504113906 .stroke-B1{stroke:#0D32B2;} + .d2-2504113906 .stroke-B2{stroke:#0D32B2;} + .d2-2504113906 .stroke-B3{stroke:#E3E9FD;} + .d2-2504113906 .stroke-B4{stroke:#E3E9FD;} + .d2-2504113906 .stroke-B5{stroke:#EDF0FD;} + .d2-2504113906 .stroke-B6{stroke:#F7F8FE;} + .d2-2504113906 .stroke-AA2{stroke:#4A6FF3;} + .d2-2504113906 .stroke-AA4{stroke:#EDF0FD;} + .d2-2504113906 .stroke-AA5{stroke:#F7F8FE;} + .d2-2504113906 .stroke-AB4{stroke:#EDF0FD;} + .d2-2504113906 .stroke-AB5{stroke:#F7F8FE;} + .d2-2504113906 .background-color-N1{background-color:#0A0F25;} + .d2-2504113906 .background-color-N2{background-color:#676C7E;} + .d2-2504113906 .background-color-N3{background-color:#9499AB;} + .d2-2504113906 .background-color-N4{background-color:#CFD2DD;} + .d2-2504113906 .background-color-N5{background-color:#DEE1EB;} + .d2-2504113906 .background-color-N6{background-color:#EEF1F8;} + .d2-2504113906 .background-color-N7{background-color:#FFFFFF;} + .d2-2504113906 .background-color-B1{background-color:#0D32B2;} + .d2-2504113906 .background-color-B2{background-color:#0D32B2;} + .d2-2504113906 .background-color-B3{background-color:#E3E9FD;} + .d2-2504113906 .background-color-B4{background-color:#E3E9FD;} + .d2-2504113906 .background-color-B5{background-color:#EDF0FD;} + .d2-2504113906 .background-color-B6{background-color:#F7F8FE;} + .d2-2504113906 .background-color-AA2{background-color:#4A6FF3;} + .d2-2504113906 .background-color-AA4{background-color:#EDF0FD;} + .d2-2504113906 .background-color-AA5{background-color:#F7F8FE;} + .d2-2504113906 .background-color-AB4{background-color:#EDF0FD;} + .d2-2504113906 .background-color-AB5{background-color:#F7F8FE;} + .d2-2504113906 .color-N1{color:#0A0F25;} + .d2-2504113906 .color-N2{color:#676C7E;} + .d2-2504113906 .color-N3{color:#9499AB;} + .d2-2504113906 .color-N4{color:#CFD2DD;} + .d2-2504113906 .color-N5{color:#DEE1EB;} + .d2-2504113906 .color-N6{color:#EEF1F8;} + .d2-2504113906 .color-N7{color:#FFFFFF;} + .d2-2504113906 .color-B1{color:#0D32B2;} + .d2-2504113906 .color-B2{color:#0D32B2;} + .d2-2504113906 .color-B3{color:#E3E9FD;} + .d2-2504113906 .color-B4{color:#E3E9FD;} + .d2-2504113906 .color-B5{color:#EDF0FD;} + .d2-2504113906 .color-B6{color:#F7F8FE;} + .d2-2504113906 .color-AA2{color:#4A6FF3;} + .d2-2504113906 .color-AA4{color:#EDF0FD;} + .d2-2504113906 .color-AA5{color:#F7F8FE;} + .d2-2504113906 .color-AB4{color:#EDF0FD;} + .d2-2504113906 .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 11091b6ff..fb794851a 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-2504113906 .fill-N1{fill:#CDD6F4;} + .d2-2504113906 .fill-N2{fill:#BAC2DE;} + .d2-2504113906 .fill-N3{fill:#A6ADC8;} + .d2-2504113906 .fill-N4{fill:#585B70;} + .d2-2504113906 .fill-N5{fill:#45475A;} + .d2-2504113906 .fill-N6{fill:#313244;} + .d2-2504113906 .fill-N7{fill:#1E1E2E;} + .d2-2504113906 .fill-B1{fill:#CBA6f7;} + .d2-2504113906 .fill-B2{fill:#CBA6f7;} + .d2-2504113906 .fill-B3{fill:#6C7086;} + .d2-2504113906 .fill-B4{fill:#585B70;} + .d2-2504113906 .fill-B5{fill:#45475A;} + .d2-2504113906 .fill-B6{fill:#313244;} + .d2-2504113906 .fill-AA2{fill:#f38BA8;} + .d2-2504113906 .fill-AA4{fill:#45475A;} + .d2-2504113906 .fill-AA5{fill:#313244;} + .d2-2504113906 .fill-AB4{fill:#45475A;} + .d2-2504113906 .fill-AB5{fill:#313244;} + .d2-2504113906 .stroke-N1{stroke:#CDD6F4;} + .d2-2504113906 .stroke-N2{stroke:#BAC2DE;} + .d2-2504113906 .stroke-N3{stroke:#A6ADC8;} + .d2-2504113906 .stroke-N4{stroke:#585B70;} + .d2-2504113906 .stroke-N5{stroke:#45475A;} + .d2-2504113906 .stroke-N6{stroke:#313244;} + .d2-2504113906 .stroke-N7{stroke:#1E1E2E;} + .d2-2504113906 .stroke-B1{stroke:#CBA6f7;} + .d2-2504113906 .stroke-B2{stroke:#CBA6f7;} + .d2-2504113906 .stroke-B3{stroke:#6C7086;} + .d2-2504113906 .stroke-B4{stroke:#585B70;} + .d2-2504113906 .stroke-B5{stroke:#45475A;} + .d2-2504113906 .stroke-B6{stroke:#313244;} + .d2-2504113906 .stroke-AA2{stroke:#f38BA8;} + .d2-2504113906 .stroke-AA4{stroke:#45475A;} + .d2-2504113906 .stroke-AA5{stroke:#313244;} + .d2-2504113906 .stroke-AB4{stroke:#45475A;} + .d2-2504113906 .stroke-AB5{stroke:#313244;} + .d2-2504113906 .background-color-N1{background-color:#CDD6F4;} + .d2-2504113906 .background-color-N2{background-color:#BAC2DE;} + .d2-2504113906 .background-color-N3{background-color:#A6ADC8;} + .d2-2504113906 .background-color-N4{background-color:#585B70;} + .d2-2504113906 .background-color-N5{background-color:#45475A;} + .d2-2504113906 .background-color-N6{background-color:#313244;} + .d2-2504113906 .background-color-N7{background-color:#1E1E2E;} + .d2-2504113906 .background-color-B1{background-color:#CBA6f7;} + .d2-2504113906 .background-color-B2{background-color:#CBA6f7;} + .d2-2504113906 .background-color-B3{background-color:#6C7086;} + .d2-2504113906 .background-color-B4{background-color:#585B70;} + .d2-2504113906 .background-color-B5{background-color:#45475A;} + .d2-2504113906 .background-color-B6{background-color:#313244;} + .d2-2504113906 .background-color-AA2{background-color:#f38BA8;} + .d2-2504113906 .background-color-AA4{background-color:#45475A;} + .d2-2504113906 .background-color-AA5{background-color:#313244;} + .d2-2504113906 .background-color-AB4{background-color:#45475A;} + .d2-2504113906 .background-color-AB5{background-color:#313244;} + .d2-2504113906 .color-N1{color:#CDD6F4;} + .d2-2504113906 .color-N2{color:#BAC2DE;} + .d2-2504113906 .color-N3{color:#A6ADC8;} + .d2-2504113906 .color-N4{color:#585B70;} + .d2-2504113906 .color-N5{color:#45475A;} + .d2-2504113906 .color-N6{color:#313244;} + .d2-2504113906 .color-N7{color:#1E1E2E;} + .d2-2504113906 .color-B1{color:#CBA6f7;} + .d2-2504113906 .color-B2{color:#CBA6f7;} + .d2-2504113906 .color-B3{color:#6C7086;} + .d2-2504113906 .color-B4{color:#585B70;} + .d2-2504113906 .color-B5{color:#45475A;} + .d2-2504113906 .color-B6{color:#313244;} + .d2-2504113906 .color-AA2{color:#f38BA8;} + .d2-2504113906 .color-AA4{color:#45475A;} + .d2-2504113906 .color-AA5{color:#313244;} + .d2-2504113906 .color-AB4{color:#45475A;} + .d2-2504113906 .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 a5901d112..581af4a28 100644 --- a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-790545213 .fill-N1{fill:#000410;} + .d2-790545213 .fill-N2{fill:#0000B8;} + .d2-790545213 .fill-N3{fill:#9499AB;} + .d2-790545213 .fill-N4{fill:#CFD2DD;} + .d2-790545213 .fill-N5{fill:#C3DEF3;} + .d2-790545213 .fill-N6{fill:#EEF1F8;} + .d2-790545213 .fill-N7{fill:#FFFFFF;} + .d2-790545213 .fill-B1{fill:#000410;} + .d2-790545213 .fill-B2{fill:#0000E4;} + .d2-790545213 .fill-B3{fill:#5AA4DC;} + .d2-790545213 .fill-B4{fill:#E7E9EE;} + .d2-790545213 .fill-B5{fill:#F5F6F9;} + .d2-790545213 .fill-B6{fill:#FFFFFF;} + .d2-790545213 .fill-AA2{fill:#008566;} + .d2-790545213 .fill-AA4{fill:#45BBA5;} + .d2-790545213 .fill-AA5{fill:#7ACCBD;} + .d2-790545213 .fill-AB4{fill:#F1C759;} + .d2-790545213 .fill-AB5{fill:#F9E088;} + .d2-790545213 .stroke-N1{stroke:#000410;} + .d2-790545213 .stroke-N2{stroke:#0000B8;} + .d2-790545213 .stroke-N3{stroke:#9499AB;} + .d2-790545213 .stroke-N4{stroke:#CFD2DD;} + .d2-790545213 .stroke-N5{stroke:#C3DEF3;} + .d2-790545213 .stroke-N6{stroke:#EEF1F8;} + .d2-790545213 .stroke-N7{stroke:#FFFFFF;} + .d2-790545213 .stroke-B1{stroke:#000410;} + .d2-790545213 .stroke-B2{stroke:#0000E4;} + .d2-790545213 .stroke-B3{stroke:#5AA4DC;} + .d2-790545213 .stroke-B4{stroke:#E7E9EE;} + .d2-790545213 .stroke-B5{stroke:#F5F6F9;} + .d2-790545213 .stroke-B6{stroke:#FFFFFF;} + .d2-790545213 .stroke-AA2{stroke:#008566;} + .d2-790545213 .stroke-AA4{stroke:#45BBA5;} + .d2-790545213 .stroke-AA5{stroke:#7ACCBD;} + .d2-790545213 .stroke-AB4{stroke:#F1C759;} + .d2-790545213 .stroke-AB5{stroke:#F9E088;} + .d2-790545213 .background-color-N1{background-color:#000410;} + .d2-790545213 .background-color-N2{background-color:#0000B8;} + .d2-790545213 .background-color-N3{background-color:#9499AB;} + .d2-790545213 .background-color-N4{background-color:#CFD2DD;} + .d2-790545213 .background-color-N5{background-color:#C3DEF3;} + .d2-790545213 .background-color-N6{background-color:#EEF1F8;} + .d2-790545213 .background-color-N7{background-color:#FFFFFF;} + .d2-790545213 .background-color-B1{background-color:#000410;} + .d2-790545213 .background-color-B2{background-color:#0000E4;} + .d2-790545213 .background-color-B3{background-color:#5AA4DC;} + .d2-790545213 .background-color-B4{background-color:#E7E9EE;} + .d2-790545213 .background-color-B5{background-color:#F5F6F9;} + .d2-790545213 .background-color-B6{background-color:#FFFFFF;} + .d2-790545213 .background-color-AA2{background-color:#008566;} + .d2-790545213 .background-color-AA4{background-color:#45BBA5;} + .d2-790545213 .background-color-AA5{background-color:#7ACCBD;} + .d2-790545213 .background-color-AB4{background-color:#F1C759;} + .d2-790545213 .background-color-AB5{background-color:#F9E088;} + .d2-790545213 .color-N1{color:#000410;} + .d2-790545213 .color-N2{color:#0000B8;} + .d2-790545213 .color-N3{color:#9499AB;} + .d2-790545213 .color-N4{color:#CFD2DD;} + .d2-790545213 .color-N5{color:#C3DEF3;} + .d2-790545213 .color-N6{color:#EEF1F8;} + .d2-790545213 .color-N7{color:#FFFFFF;} + .d2-790545213 .color-B1{color:#000410;} + .d2-790545213 .color-B2{color:#0000E4;} + .d2-790545213 .color-B3{color:#5AA4DC;} + .d2-790545213 .color-B4{color:#E7E9EE;} + .d2-790545213 .color-B5{color:#F5F6F9;} + .d2-790545213 .color-B6{color:#FFFFFF;} + .d2-790545213 .color-AA2{color:#008566;} + .d2-790545213 .color-AA4{color:#45BBA5;} + .d2-790545213 .color-AA5{color:#7ACCBD;} + .d2-790545213 .color-AB4{color:#F1C759;} + .d2-790545213 .color-AB5{color:#F9E088;}.appendix text.text{fill:#000410}.md{--color-fg-default:#000410;--color-fg-muted:#0000B8;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#000410;--color-border-muted:#0000E4;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0000E4;--color-accent-emphasis:#0000E4;--color-attention-subtle:#0000B8;--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-normal);mix-blend-mode:color-burn}.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-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.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-normal);mix-blend-mode:color-burn}.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}]]> @@ -144,7 +144,7 @@ -NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST +NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST diff --git a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg index 724dcf869..9252a1e94 100644 --- a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -868,7 +868,7 @@
    • Served data logging
    GraphQLFederated Strato Column

    Tweet/user content hydration, visibility filtering

    -
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources +
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources diff --git a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg index 89aab0048..701c4d132 100644 --- a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -868,7 +868,7 @@
  • Served data logging
    • GraphQLFederated Strato Column

    Tweet/user content hydration, visibility filtering

    -
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources +TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources diff --git a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg index 655ecc782..532542084 100644 --- a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg @@ -1,19 +1,19 @@ -customerissuerstoreLike starbucks or somethingacquirerI'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 occurLike starbucks or something1I'm not sure what this is2 + .d2-4070036272 .fill-N1{fill:#0A0F25;} + .d2-4070036272 .fill-N2{fill:#676C7E;} + .d2-4070036272 .fill-N3{fill:#9499AB;} + .d2-4070036272 .fill-N4{fill:#CFD2DD;} + .d2-4070036272 .fill-N5{fill:#DEE1EB;} + .d2-4070036272 .fill-N6{fill:#EEF1F8;} + .d2-4070036272 .fill-N7{fill:#FFFFFF;} + .d2-4070036272 .fill-B1{fill:#0D32B2;} + .d2-4070036272 .fill-B2{fill:#0D32B2;} + .d2-4070036272 .fill-B3{fill:#E3E9FD;} + .d2-4070036272 .fill-B4{fill:#E3E9FD;} + .d2-4070036272 .fill-B5{fill:#EDF0FD;} + .d2-4070036272 .fill-B6{fill:#F7F8FE;} + .d2-4070036272 .fill-AA2{fill:#4A6FF3;} + .d2-4070036272 .fill-AA4{fill:#EDF0FD;} + .d2-4070036272 .fill-AA5{fill:#F7F8FE;} + .d2-4070036272 .fill-AB4{fill:#EDF0FD;} + .d2-4070036272 .fill-AB5{fill:#F7F8FE;} + .d2-4070036272 .stroke-N1{stroke:#0A0F25;} + .d2-4070036272 .stroke-N2{stroke:#676C7E;} + .d2-4070036272 .stroke-N3{stroke:#9499AB;} + .d2-4070036272 .stroke-N4{stroke:#CFD2DD;} + .d2-4070036272 .stroke-N5{stroke:#DEE1EB;} + .d2-4070036272 .stroke-N6{stroke:#EEF1F8;} + .d2-4070036272 .stroke-N7{stroke:#FFFFFF;} + .d2-4070036272 .stroke-B1{stroke:#0D32B2;} + .d2-4070036272 .stroke-B2{stroke:#0D32B2;} + .d2-4070036272 .stroke-B3{stroke:#E3E9FD;} + .d2-4070036272 .stroke-B4{stroke:#E3E9FD;} + .d2-4070036272 .stroke-B5{stroke:#EDF0FD;} + .d2-4070036272 .stroke-B6{stroke:#F7F8FE;} + .d2-4070036272 .stroke-AA2{stroke:#4A6FF3;} + .d2-4070036272 .stroke-AA4{stroke:#EDF0FD;} + .d2-4070036272 .stroke-AA5{stroke:#F7F8FE;} + .d2-4070036272 .stroke-AB4{stroke:#EDF0FD;} + .d2-4070036272 .stroke-AB5{stroke:#F7F8FE;} + .d2-4070036272 .background-color-N1{background-color:#0A0F25;} + .d2-4070036272 .background-color-N2{background-color:#676C7E;} + .d2-4070036272 .background-color-N3{background-color:#9499AB;} + .d2-4070036272 .background-color-N4{background-color:#CFD2DD;} + .d2-4070036272 .background-color-N5{background-color:#DEE1EB;} + .d2-4070036272 .background-color-N6{background-color:#EEF1F8;} + .d2-4070036272 .background-color-N7{background-color:#FFFFFF;} + .d2-4070036272 .background-color-B1{background-color:#0D32B2;} + .d2-4070036272 .background-color-B2{background-color:#0D32B2;} + .d2-4070036272 .background-color-B3{background-color:#E3E9FD;} + .d2-4070036272 .background-color-B4{background-color:#E3E9FD;} + .d2-4070036272 .background-color-B5{background-color:#EDF0FD;} + .d2-4070036272 .background-color-B6{background-color:#F7F8FE;} + .d2-4070036272 .background-color-AA2{background-color:#4A6FF3;} + .d2-4070036272 .background-color-AA4{background-color:#EDF0FD;} + .d2-4070036272 .background-color-AA5{background-color:#F7F8FE;} + .d2-4070036272 .background-color-AB4{background-color:#EDF0FD;} + .d2-4070036272 .background-color-AB5{background-color:#F7F8FE;} + .d2-4070036272 .color-N1{color:#0A0F25;} + .d2-4070036272 .color-N2{color:#676C7E;} + .d2-4070036272 .color-N3{color:#9499AB;} + .d2-4070036272 .color-N4{color:#CFD2DD;} + .d2-4070036272 .color-N5{color:#DEE1EB;} + .d2-4070036272 .color-N6{color:#EEF1F8;} + .d2-4070036272 .color-N7{color:#FFFFFF;} + .d2-4070036272 .color-B1{color:#0D32B2;} + .d2-4070036272 .color-B2{color:#0D32B2;} + .d2-4070036272 .color-B3{color:#E3E9FD;} + .d2-4070036272 .color-B4{color:#E3E9FD;} + .d2-4070036272 .color-B5{color:#EDF0FD;} + .d2-4070036272 .color-B6{color:#F7F8FE;} + .d2-4070036272 .color-AA2{color:#4A6FF3;} + .d2-4070036272 .color-AA4{color:#EDF0FD;} + .d2-4070036272 .color-AA5{color:#F7F8FE;} + .d2-4070036272 .color-AB4{color:#EDF0FD;} + .d2-4070036272 .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}]]>customerissuerstoreLike starbucks or somethingacquirerI'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 occurLike starbucks or something1I'm not sure what this is2 diff --git a/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg index fde98a3c1..6f89082b8 100644 --- a/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg @@ -1,12 +1,12 @@ -x1 + .d2-3057089836 .fill-N1{fill:#0A0F25;} + .d2-3057089836 .fill-N2{fill:#676C7E;} + .d2-3057089836 .fill-N3{fill:#9499AB;} + .d2-3057089836 .fill-N4{fill:#CFD2DD;} + .d2-3057089836 .fill-N5{fill:#DEE1EB;} + .d2-3057089836 .fill-N6{fill:#EEF1F8;} + .d2-3057089836 .fill-N7{fill:#FFFFFF;} + .d2-3057089836 .fill-B1{fill:#0D32B2;} + .d2-3057089836 .fill-B2{fill:#0D32B2;} + .d2-3057089836 .fill-B3{fill:#E3E9FD;} + .d2-3057089836 .fill-B4{fill:#E3E9FD;} + .d2-3057089836 .fill-B5{fill:#EDF0FD;} + .d2-3057089836 .fill-B6{fill:#F7F8FE;} + .d2-3057089836 .fill-AA2{fill:#4A6FF3;} + .d2-3057089836 .fill-AA4{fill:#EDF0FD;} + .d2-3057089836 .fill-AA5{fill:#F7F8FE;} + .d2-3057089836 .fill-AB4{fill:#EDF0FD;} + .d2-3057089836 .fill-AB5{fill:#F7F8FE;} + .d2-3057089836 .stroke-N1{stroke:#0A0F25;} + .d2-3057089836 .stroke-N2{stroke:#676C7E;} + .d2-3057089836 .stroke-N3{stroke:#9499AB;} + .d2-3057089836 .stroke-N4{stroke:#CFD2DD;} + .d2-3057089836 .stroke-N5{stroke:#DEE1EB;} + .d2-3057089836 .stroke-N6{stroke:#EEF1F8;} + .d2-3057089836 .stroke-N7{stroke:#FFFFFF;} + .d2-3057089836 .stroke-B1{stroke:#0D32B2;} + .d2-3057089836 .stroke-B2{stroke:#0D32B2;} + .d2-3057089836 .stroke-B3{stroke:#E3E9FD;} + .d2-3057089836 .stroke-B4{stroke:#E3E9FD;} + .d2-3057089836 .stroke-B5{stroke:#EDF0FD;} + .d2-3057089836 .stroke-B6{stroke:#F7F8FE;} + .d2-3057089836 .stroke-AA2{stroke:#4A6FF3;} + .d2-3057089836 .stroke-AA4{stroke:#EDF0FD;} + .d2-3057089836 .stroke-AA5{stroke:#F7F8FE;} + .d2-3057089836 .stroke-AB4{stroke:#EDF0FD;} + .d2-3057089836 .stroke-AB5{stroke:#F7F8FE;} + .d2-3057089836 .background-color-N1{background-color:#0A0F25;} + .d2-3057089836 .background-color-N2{background-color:#676C7E;} + .d2-3057089836 .background-color-N3{background-color:#9499AB;} + .d2-3057089836 .background-color-N4{background-color:#CFD2DD;} + .d2-3057089836 .background-color-N5{background-color:#DEE1EB;} + .d2-3057089836 .background-color-N6{background-color:#EEF1F8;} + .d2-3057089836 .background-color-N7{background-color:#FFFFFF;} + .d2-3057089836 .background-color-B1{background-color:#0D32B2;} + .d2-3057089836 .background-color-B2{background-color:#0D32B2;} + .d2-3057089836 .background-color-B3{background-color:#E3E9FD;} + .d2-3057089836 .background-color-B4{background-color:#E3E9FD;} + .d2-3057089836 .background-color-B5{background-color:#EDF0FD;} + .d2-3057089836 .background-color-B6{background-color:#F7F8FE;} + .d2-3057089836 .background-color-AA2{background-color:#4A6FF3;} + .d2-3057089836 .background-color-AA4{background-color:#EDF0FD;} + .d2-3057089836 .background-color-AA5{background-color:#F7F8FE;} + .d2-3057089836 .background-color-AB4{background-color:#EDF0FD;} + .d2-3057089836 .background-color-AB5{background-color:#F7F8FE;} + .d2-3057089836 .color-N1{color:#0A0F25;} + .d2-3057089836 .color-N2{color:#676C7E;} + .d2-3057089836 .color-N3{color:#9499AB;} + .d2-3057089836 .color-N4{color:#CFD2DD;} + .d2-3057089836 .color-N5{color:#DEE1EB;} + .d2-3057089836 .color-N6{color:#EEF1F8;} + .d2-3057089836 .color-N7{color:#FFFFFF;} + .d2-3057089836 .color-B1{color:#0D32B2;} + .d2-3057089836 .color-B2{color:#0D32B2;} + .d2-3057089836 .color-B3{color:#E3E9FD;} + .d2-3057089836 .color-B4{color:#E3E9FD;} + .d2-3057089836 .color-B5{color:#EDF0FD;} + .d2-3057089836 .color-B6{color:#F7F8FE;} + .d2-3057089836 .color-AA2{color:#4A6FF3;} + .d2-3057089836 .color-AA4{color:#EDF0FD;} + .d2-3057089836 .color-AA5{color:#F7F8FE;} + .d2-3057089836 .color-AB4{color:#EDF0FD;} + .d2-3057089836 .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}]]>x1 1root > x diff --git a/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg index f7ada866c..1eb948d4d 100644 --- a/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 + .d2-3606605273 .fill-N1{fill:#0A0F25;} + .d2-3606605273 .fill-N2{fill:#676C7E;} + .d2-3606605273 .fill-N3{fill:#9499AB;} + .d2-3606605273 .fill-N4{fill:#CFD2DD;} + .d2-3606605273 .fill-N5{fill:#DEE1EB;} + .d2-3606605273 .fill-N6{fill:#EEF1F8;} + .d2-3606605273 .fill-N7{fill:#FFFFFF;} + .d2-3606605273 .fill-B1{fill:#0D32B2;} + .d2-3606605273 .fill-B2{fill:#0D32B2;} + .d2-3606605273 .fill-B3{fill:#E3E9FD;} + .d2-3606605273 .fill-B4{fill:#E3E9FD;} + .d2-3606605273 .fill-B5{fill:#EDF0FD;} + .d2-3606605273 .fill-B6{fill:#F7F8FE;} + .d2-3606605273 .fill-AA2{fill:#4A6FF3;} + .d2-3606605273 .fill-AA4{fill:#EDF0FD;} + .d2-3606605273 .fill-AA5{fill:#F7F8FE;} + .d2-3606605273 .fill-AB4{fill:#EDF0FD;} + .d2-3606605273 .fill-AB5{fill:#F7F8FE;} + .d2-3606605273 .stroke-N1{stroke:#0A0F25;} + .d2-3606605273 .stroke-N2{stroke:#676C7E;} + .d2-3606605273 .stroke-N3{stroke:#9499AB;} + .d2-3606605273 .stroke-N4{stroke:#CFD2DD;} + .d2-3606605273 .stroke-N5{stroke:#DEE1EB;} + .d2-3606605273 .stroke-N6{stroke:#EEF1F8;} + .d2-3606605273 .stroke-N7{stroke:#FFFFFF;} + .d2-3606605273 .stroke-B1{stroke:#0D32B2;} + .d2-3606605273 .stroke-B2{stroke:#0D32B2;} + .d2-3606605273 .stroke-B3{stroke:#E3E9FD;} + .d2-3606605273 .stroke-B4{stroke:#E3E9FD;} + .d2-3606605273 .stroke-B5{stroke:#EDF0FD;} + .d2-3606605273 .stroke-B6{stroke:#F7F8FE;} + .d2-3606605273 .stroke-AA2{stroke:#4A6FF3;} + .d2-3606605273 .stroke-AA4{stroke:#EDF0FD;} + .d2-3606605273 .stroke-AA5{stroke:#F7F8FE;} + .d2-3606605273 .stroke-AB4{stroke:#EDF0FD;} + .d2-3606605273 .stroke-AB5{stroke:#F7F8FE;} + .d2-3606605273 .background-color-N1{background-color:#0A0F25;} + .d2-3606605273 .background-color-N2{background-color:#676C7E;} + .d2-3606605273 .background-color-N3{background-color:#9499AB;} + .d2-3606605273 .background-color-N4{background-color:#CFD2DD;} + .d2-3606605273 .background-color-N5{background-color:#DEE1EB;} + .d2-3606605273 .background-color-N6{background-color:#EEF1F8;} + .d2-3606605273 .background-color-N7{background-color:#FFFFFF;} + .d2-3606605273 .background-color-B1{background-color:#0D32B2;} + .d2-3606605273 .background-color-B2{background-color:#0D32B2;} + .d2-3606605273 .background-color-B3{background-color:#E3E9FD;} + .d2-3606605273 .background-color-B4{background-color:#E3E9FD;} + .d2-3606605273 .background-color-B5{background-color:#EDF0FD;} + .d2-3606605273 .background-color-B6{background-color:#F7F8FE;} + .d2-3606605273 .background-color-AA2{background-color:#4A6FF3;} + .d2-3606605273 .background-color-AA4{background-color:#EDF0FD;} + .d2-3606605273 .background-color-AA5{background-color:#F7F8FE;} + .d2-3606605273 .background-color-AB4{background-color:#EDF0FD;} + .d2-3606605273 .background-color-AB5{background-color:#F7F8FE;} + .d2-3606605273 .color-N1{color:#0A0F25;} + .d2-3606605273 .color-N2{color:#676C7E;} + .d2-3606605273 .color-N3{color:#9499AB;} + .d2-3606605273 .color-N4{color:#CFD2DD;} + .d2-3606605273 .color-N5{color:#DEE1EB;} + .d2-3606605273 .color-N6{color:#EEF1F8;} + .d2-3606605273 .color-N7{color:#FFFFFF;} + .d2-3606605273 .color-B1{color:#0D32B2;} + .d2-3606605273 .color-B2{color:#0D32B2;} + .d2-3606605273 .color-B3{color:#E3E9FD;} + .d2-3606605273 .color-B4{color:#E3E9FD;} + .d2-3606605273 .color-B5{color:#EDF0FD;} + .d2-3606605273 .color-B6{color:#F7F8FE;} + .d2-3606605273 .color-AA2{color:#4A6FF3;} + .d2-3606605273 .color-AA4{color:#EDF0FD;} + .d2-3606605273 .color-AA5{color:#F7F8FE;} + .d2-3606605273 .color-AB4{color:#EDF0FD;} + .d2-3606605273 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 diff --git a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg index 415909ae4..28348d924 100644 --- a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 + .d2-4098508292 .fill-N1{fill:#CDD6F4;} + .d2-4098508292 .fill-N2{fill:#BAC2DE;} + .d2-4098508292 .fill-N3{fill:#A6ADC8;} + .d2-4098508292 .fill-N4{fill:#585B70;} + .d2-4098508292 .fill-N5{fill:#45475A;} + .d2-4098508292 .fill-N6{fill:#313244;} + .d2-4098508292 .fill-N7{fill:#1E1E2E;} + .d2-4098508292 .fill-B1{fill:#CBA6f7;} + .d2-4098508292 .fill-B2{fill:#CBA6f7;} + .d2-4098508292 .fill-B3{fill:#6C7086;} + .d2-4098508292 .fill-B4{fill:#585B70;} + .d2-4098508292 .fill-B5{fill:#45475A;} + .d2-4098508292 .fill-B6{fill:#313244;} + .d2-4098508292 .fill-AA2{fill:#f38BA8;} + .d2-4098508292 .fill-AA4{fill:#45475A;} + .d2-4098508292 .fill-AA5{fill:#313244;} + .d2-4098508292 .fill-AB4{fill:#45475A;} + .d2-4098508292 .fill-AB5{fill:#313244;} + .d2-4098508292 .stroke-N1{stroke:#CDD6F4;} + .d2-4098508292 .stroke-N2{stroke:#BAC2DE;} + .d2-4098508292 .stroke-N3{stroke:#A6ADC8;} + .d2-4098508292 .stroke-N4{stroke:#585B70;} + .d2-4098508292 .stroke-N5{stroke:#45475A;} + .d2-4098508292 .stroke-N6{stroke:#313244;} + .d2-4098508292 .stroke-N7{stroke:#1E1E2E;} + .d2-4098508292 .stroke-B1{stroke:#CBA6f7;} + .d2-4098508292 .stroke-B2{stroke:#CBA6f7;} + .d2-4098508292 .stroke-B3{stroke:#6C7086;} + .d2-4098508292 .stroke-B4{stroke:#585B70;} + .d2-4098508292 .stroke-B5{stroke:#45475A;} + .d2-4098508292 .stroke-B6{stroke:#313244;} + .d2-4098508292 .stroke-AA2{stroke:#f38BA8;} + .d2-4098508292 .stroke-AA4{stroke:#45475A;} + .d2-4098508292 .stroke-AA5{stroke:#313244;} + .d2-4098508292 .stroke-AB4{stroke:#45475A;} + .d2-4098508292 .stroke-AB5{stroke:#313244;} + .d2-4098508292 .background-color-N1{background-color:#CDD6F4;} + .d2-4098508292 .background-color-N2{background-color:#BAC2DE;} + .d2-4098508292 .background-color-N3{background-color:#A6ADC8;} + .d2-4098508292 .background-color-N4{background-color:#585B70;} + .d2-4098508292 .background-color-N5{background-color:#45475A;} + .d2-4098508292 .background-color-N6{background-color:#313244;} + .d2-4098508292 .background-color-N7{background-color:#1E1E2E;} + .d2-4098508292 .background-color-B1{background-color:#CBA6f7;} + .d2-4098508292 .background-color-B2{background-color:#CBA6f7;} + .d2-4098508292 .background-color-B3{background-color:#6C7086;} + .d2-4098508292 .background-color-B4{background-color:#585B70;} + .d2-4098508292 .background-color-B5{background-color:#45475A;} + .d2-4098508292 .background-color-B6{background-color:#313244;} + .d2-4098508292 .background-color-AA2{background-color:#f38BA8;} + .d2-4098508292 .background-color-AA4{background-color:#45475A;} + .d2-4098508292 .background-color-AA5{background-color:#313244;} + .d2-4098508292 .background-color-AB4{background-color:#45475A;} + .d2-4098508292 .background-color-AB5{background-color:#313244;} + .d2-4098508292 .color-N1{color:#CDD6F4;} + .d2-4098508292 .color-N2{color:#BAC2DE;} + .d2-4098508292 .color-N3{color:#A6ADC8;} + .d2-4098508292 .color-N4{color:#585B70;} + .d2-4098508292 .color-N5{color:#45475A;} + .d2-4098508292 .color-N6{color:#313244;} + .d2-4098508292 .color-N7{color:#1E1E2E;} + .d2-4098508292 .color-B1{color:#CBA6f7;} + .d2-4098508292 .color-B2{color:#CBA6f7;} + .d2-4098508292 .color-B3{color:#6C7086;} + .d2-4098508292 .color-B4{color:#585B70;} + .d2-4098508292 .color-B5{color:#45475A;} + .d2-4098508292 .color-B6{color:#313244;} + .d2-4098508292 .color-AA2{color:#f38BA8;} + .d2-4098508292 .color-AA4{color:#45475A;} + .d2-4098508292 .color-AA5{color:#313244;} + .d2-4098508292 .color-AB4{color:#45475A;} + .d2-4098508292 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg index 1a8fa696b..7c5db1680 100644 --- a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg @@ -1,12 +1,12 @@ -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 + .d2-3026443247 .fill-N1{fill:#0A0F25;} + .d2-3026443247 .fill-N2{fill:#676C7E;} + .d2-3026443247 .fill-N3{fill:#9499AB;} + .d2-3026443247 .fill-N4{fill:#CFD2DD;} + .d2-3026443247 .fill-N5{fill:#DEE1EB;} + .d2-3026443247 .fill-N6{fill:#EEF1F8;} + .d2-3026443247 .fill-N7{fill:#FFFFFF;} + .d2-3026443247 .fill-B1{fill:#0D32B2;} + .d2-3026443247 .fill-B2{fill:#0D32B2;} + .d2-3026443247 .fill-B3{fill:#E3E9FD;} + .d2-3026443247 .fill-B4{fill:#E3E9FD;} + .d2-3026443247 .fill-B5{fill:#EDF0FD;} + .d2-3026443247 .fill-B6{fill:#F7F8FE;} + .d2-3026443247 .fill-AA2{fill:#4A6FF3;} + .d2-3026443247 .fill-AA4{fill:#EDF0FD;} + .d2-3026443247 .fill-AA5{fill:#F7F8FE;} + .d2-3026443247 .fill-AB4{fill:#EDF0FD;} + .d2-3026443247 .fill-AB5{fill:#F7F8FE;} + .d2-3026443247 .stroke-N1{stroke:#0A0F25;} + .d2-3026443247 .stroke-N2{stroke:#676C7E;} + .d2-3026443247 .stroke-N3{stroke:#9499AB;} + .d2-3026443247 .stroke-N4{stroke:#CFD2DD;} + .d2-3026443247 .stroke-N5{stroke:#DEE1EB;} + .d2-3026443247 .stroke-N6{stroke:#EEF1F8;} + .d2-3026443247 .stroke-N7{stroke:#FFFFFF;} + .d2-3026443247 .stroke-B1{stroke:#0D32B2;} + .d2-3026443247 .stroke-B2{stroke:#0D32B2;} + .d2-3026443247 .stroke-B3{stroke:#E3E9FD;} + .d2-3026443247 .stroke-B4{stroke:#E3E9FD;} + .d2-3026443247 .stroke-B5{stroke:#EDF0FD;} + .d2-3026443247 .stroke-B6{stroke:#F7F8FE;} + .d2-3026443247 .stroke-AA2{stroke:#4A6FF3;} + .d2-3026443247 .stroke-AA4{stroke:#EDF0FD;} + .d2-3026443247 .stroke-AA5{stroke:#F7F8FE;} + .d2-3026443247 .stroke-AB4{stroke:#EDF0FD;} + .d2-3026443247 .stroke-AB5{stroke:#F7F8FE;} + .d2-3026443247 .background-color-N1{background-color:#0A0F25;} + .d2-3026443247 .background-color-N2{background-color:#676C7E;} + .d2-3026443247 .background-color-N3{background-color:#9499AB;} + .d2-3026443247 .background-color-N4{background-color:#CFD2DD;} + .d2-3026443247 .background-color-N5{background-color:#DEE1EB;} + .d2-3026443247 .background-color-N6{background-color:#EEF1F8;} + .d2-3026443247 .background-color-N7{background-color:#FFFFFF;} + .d2-3026443247 .background-color-B1{background-color:#0D32B2;} + .d2-3026443247 .background-color-B2{background-color:#0D32B2;} + .d2-3026443247 .background-color-B3{background-color:#E3E9FD;} + .d2-3026443247 .background-color-B4{background-color:#E3E9FD;} + .d2-3026443247 .background-color-B5{background-color:#EDF0FD;} + .d2-3026443247 .background-color-B6{background-color:#F7F8FE;} + .d2-3026443247 .background-color-AA2{background-color:#4A6FF3;} + .d2-3026443247 .background-color-AA4{background-color:#EDF0FD;} + .d2-3026443247 .background-color-AA5{background-color:#F7F8FE;} + .d2-3026443247 .background-color-AB4{background-color:#EDF0FD;} + .d2-3026443247 .background-color-AB5{background-color:#F7F8FE;} + .d2-3026443247 .color-N1{color:#0A0F25;} + .d2-3026443247 .color-N2{color:#676C7E;} + .d2-3026443247 .color-N3{color:#9499AB;} + .d2-3026443247 .color-N4{color:#CFD2DD;} + .d2-3026443247 .color-N5{color:#DEE1EB;} + .d2-3026443247 .color-N6{color:#EEF1F8;} + .d2-3026443247 .color-N7{color:#FFFFFF;} + .d2-3026443247 .color-B1{color:#0D32B2;} + .d2-3026443247 .color-B2{color:#0D32B2;} + .d2-3026443247 .color-B3{color:#E3E9FD;} + .d2-3026443247 .color-B4{color:#E3E9FD;} + .d2-3026443247 .color-B5{color:#EDF0FD;} + .d2-3026443247 .color-B6{color:#F7F8FE;} + .d2-3026443247 .color-AA2{color:#4A6FF3;} + .d2-3026443247 .color-AA4{color:#EDF0FD;} + .d2-3026443247 .color-AA5{color:#F7F8FE;} + .d2-3026443247 .color-AB4{color:#EDF0FD;} + .d2-3026443247 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg index f59319bfb..7ff1e92b2 100644 --- a/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg @@ -1,12 +1,12 @@ -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 + .d2-2257413360 .fill-N1{fill:#0A0F25;} + .d2-2257413360 .fill-N2{fill:#676C7E;} + .d2-2257413360 .fill-N3{fill:#9499AB;} + .d2-2257413360 .fill-N4{fill:#CFD2DD;} + .d2-2257413360 .fill-N5{fill:#DEE1EB;} + .d2-2257413360 .fill-N6{fill:#EEF1F8;} + .d2-2257413360 .fill-N7{fill:#FFFFFF;} + .d2-2257413360 .fill-B1{fill:#0D32B2;} + .d2-2257413360 .fill-B2{fill:#0D32B2;} + .d2-2257413360 .fill-B3{fill:#E3E9FD;} + .d2-2257413360 .fill-B4{fill:#E3E9FD;} + .d2-2257413360 .fill-B5{fill:#EDF0FD;} + .d2-2257413360 .fill-B6{fill:#F7F8FE;} + .d2-2257413360 .fill-AA2{fill:#4A6FF3;} + .d2-2257413360 .fill-AA4{fill:#EDF0FD;} + .d2-2257413360 .fill-AA5{fill:#F7F8FE;} + .d2-2257413360 .fill-AB4{fill:#EDF0FD;} + .d2-2257413360 .fill-AB5{fill:#F7F8FE;} + .d2-2257413360 .stroke-N1{stroke:#0A0F25;} + .d2-2257413360 .stroke-N2{stroke:#676C7E;} + .d2-2257413360 .stroke-N3{stroke:#9499AB;} + .d2-2257413360 .stroke-N4{stroke:#CFD2DD;} + .d2-2257413360 .stroke-N5{stroke:#DEE1EB;} + .d2-2257413360 .stroke-N6{stroke:#EEF1F8;} + .d2-2257413360 .stroke-N7{stroke:#FFFFFF;} + .d2-2257413360 .stroke-B1{stroke:#0D32B2;} + .d2-2257413360 .stroke-B2{stroke:#0D32B2;} + .d2-2257413360 .stroke-B3{stroke:#E3E9FD;} + .d2-2257413360 .stroke-B4{stroke:#E3E9FD;} + .d2-2257413360 .stroke-B5{stroke:#EDF0FD;} + .d2-2257413360 .stroke-B6{stroke:#F7F8FE;} + .d2-2257413360 .stroke-AA2{stroke:#4A6FF3;} + .d2-2257413360 .stroke-AA4{stroke:#EDF0FD;} + .d2-2257413360 .stroke-AA5{stroke:#F7F8FE;} + .d2-2257413360 .stroke-AB4{stroke:#EDF0FD;} + .d2-2257413360 .stroke-AB5{stroke:#F7F8FE;} + .d2-2257413360 .background-color-N1{background-color:#0A0F25;} + .d2-2257413360 .background-color-N2{background-color:#676C7E;} + .d2-2257413360 .background-color-N3{background-color:#9499AB;} + .d2-2257413360 .background-color-N4{background-color:#CFD2DD;} + .d2-2257413360 .background-color-N5{background-color:#DEE1EB;} + .d2-2257413360 .background-color-N6{background-color:#EEF1F8;} + .d2-2257413360 .background-color-N7{background-color:#FFFFFF;} + .d2-2257413360 .background-color-B1{background-color:#0D32B2;} + .d2-2257413360 .background-color-B2{background-color:#0D32B2;} + .d2-2257413360 .background-color-B3{background-color:#E3E9FD;} + .d2-2257413360 .background-color-B4{background-color:#E3E9FD;} + .d2-2257413360 .background-color-B5{background-color:#EDF0FD;} + .d2-2257413360 .background-color-B6{background-color:#F7F8FE;} + .d2-2257413360 .background-color-AA2{background-color:#4A6FF3;} + .d2-2257413360 .background-color-AA4{background-color:#EDF0FD;} + .d2-2257413360 .background-color-AA5{background-color:#F7F8FE;} + .d2-2257413360 .background-color-AB4{background-color:#EDF0FD;} + .d2-2257413360 .background-color-AB5{background-color:#F7F8FE;} + .d2-2257413360 .color-N1{color:#0A0F25;} + .d2-2257413360 .color-N2{color:#676C7E;} + .d2-2257413360 .color-N3{color:#9499AB;} + .d2-2257413360 .color-N4{color:#CFD2DD;} + .d2-2257413360 .color-N5{color:#DEE1EB;} + .d2-2257413360 .color-N6{color:#EEF1F8;} + .d2-2257413360 .color-N7{color:#FFFFFF;} + .d2-2257413360 .color-B1{color:#0D32B2;} + .d2-2257413360 .color-B2{color:#0D32B2;} + .d2-2257413360 .color-B3{color:#E3E9FD;} + .d2-2257413360 .color-B4{color:#E3E9FD;} + .d2-2257413360 .color-B5{color:#EDF0FD;} + .d2-2257413360 .color-B6{color:#F7F8FE;} + .d2-2257413360 .color-AA2{color:#4A6FF3;} + .d2-2257413360 .color-AA4{color:#EDF0FD;} + .d2-2257413360 .color-AA5{color:#F7F8FE;} + .d2-2257413360 .color-AB4{color:#EDF0FD;} + .d2-2257413360 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 diff --git a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg index 08372ed53..32a850a0d 100644 --- a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3902229455 .fill-N1{fill:#CDD6F4;} + .d2-3902229455 .fill-N2{fill:#BAC2DE;} + .d2-3902229455 .fill-N3{fill:#A6ADC8;} + .d2-3902229455 .fill-N4{fill:#585B70;} + .d2-3902229455 .fill-N5{fill:#45475A;} + .d2-3902229455 .fill-N6{fill:#313244;} + .d2-3902229455 .fill-N7{fill:#1E1E2E;} + .d2-3902229455 .fill-B1{fill:#CBA6f7;} + .d2-3902229455 .fill-B2{fill:#CBA6f7;} + .d2-3902229455 .fill-B3{fill:#6C7086;} + .d2-3902229455 .fill-B4{fill:#585B70;} + .d2-3902229455 .fill-B5{fill:#45475A;} + .d2-3902229455 .fill-B6{fill:#313244;} + .d2-3902229455 .fill-AA2{fill:#f38BA8;} + .d2-3902229455 .fill-AA4{fill:#45475A;} + .d2-3902229455 .fill-AA5{fill:#313244;} + .d2-3902229455 .fill-AB4{fill:#45475A;} + .d2-3902229455 .fill-AB5{fill:#313244;} + .d2-3902229455 .stroke-N1{stroke:#CDD6F4;} + .d2-3902229455 .stroke-N2{stroke:#BAC2DE;} + .d2-3902229455 .stroke-N3{stroke:#A6ADC8;} + .d2-3902229455 .stroke-N4{stroke:#585B70;} + .d2-3902229455 .stroke-N5{stroke:#45475A;} + .d2-3902229455 .stroke-N6{stroke:#313244;} + .d2-3902229455 .stroke-N7{stroke:#1E1E2E;} + .d2-3902229455 .stroke-B1{stroke:#CBA6f7;} + .d2-3902229455 .stroke-B2{stroke:#CBA6f7;} + .d2-3902229455 .stroke-B3{stroke:#6C7086;} + .d2-3902229455 .stroke-B4{stroke:#585B70;} + .d2-3902229455 .stroke-B5{stroke:#45475A;} + .d2-3902229455 .stroke-B6{stroke:#313244;} + .d2-3902229455 .stroke-AA2{stroke:#f38BA8;} + .d2-3902229455 .stroke-AA4{stroke:#45475A;} + .d2-3902229455 .stroke-AA5{stroke:#313244;} + .d2-3902229455 .stroke-AB4{stroke:#45475A;} + .d2-3902229455 .stroke-AB5{stroke:#313244;} + .d2-3902229455 .background-color-N1{background-color:#CDD6F4;} + .d2-3902229455 .background-color-N2{background-color:#BAC2DE;} + .d2-3902229455 .background-color-N3{background-color:#A6ADC8;} + .d2-3902229455 .background-color-N4{background-color:#585B70;} + .d2-3902229455 .background-color-N5{background-color:#45475A;} + .d2-3902229455 .background-color-N6{background-color:#313244;} + .d2-3902229455 .background-color-N7{background-color:#1E1E2E;} + .d2-3902229455 .background-color-B1{background-color:#CBA6f7;} + .d2-3902229455 .background-color-B2{background-color:#CBA6f7;} + .d2-3902229455 .background-color-B3{background-color:#6C7086;} + .d2-3902229455 .background-color-B4{background-color:#585B70;} + .d2-3902229455 .background-color-B5{background-color:#45475A;} + .d2-3902229455 .background-color-B6{background-color:#313244;} + .d2-3902229455 .background-color-AA2{background-color:#f38BA8;} + .d2-3902229455 .background-color-AA4{background-color:#45475A;} + .d2-3902229455 .background-color-AA5{background-color:#313244;} + .d2-3902229455 .background-color-AB4{background-color:#45475A;} + .d2-3902229455 .background-color-AB5{background-color:#313244;} + .d2-3902229455 .color-N1{color:#CDD6F4;} + .d2-3902229455 .color-N2{color:#BAC2DE;} + .d2-3902229455 .color-N3{color:#A6ADC8;} + .d2-3902229455 .color-N4{color:#585B70;} + .d2-3902229455 .color-N5{color:#45475A;} + .d2-3902229455 .color-N6{color:#313244;} + .d2-3902229455 .color-N7{color:#1E1E2E;} + .d2-3902229455 .color-B1{color:#CBA6f7;} + .d2-3902229455 .color-B2{color:#CBA6f7;} + .d2-3902229455 .color-B3{color:#6C7086;} + .d2-3902229455 .color-B4{color:#585B70;} + .d2-3902229455 .color-B5{color:#45475A;} + .d2-3902229455 .color-B6{color:#313244;} + .d2-3902229455 .color-AA2{color:#f38BA8;} + .d2-3902229455 .color-AA4{color:#45475A;} + .d2-3902229455 .color-AA5{color:#313244;} + .d2-3902229455 .color-AB4{color:#45475A;} + .d2-3902229455 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud 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 40e557f10..fb7757168 100644 --- a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg @@ -1,9 +1,9 @@ -wintersummertreessnowsun + .d2-2916329547 .fill-N1{fill:#CDD6F4;} + .d2-2916329547 .fill-N2{fill:#BAC2DE;} + .d2-2916329547 .fill-N3{fill:#A6ADC8;} + .d2-2916329547 .fill-N4{fill:#585B70;} + .d2-2916329547 .fill-N5{fill:#45475A;} + .d2-2916329547 .fill-N6{fill:#313244;} + .d2-2916329547 .fill-N7{fill:#1E1E2E;} + .d2-2916329547 .fill-B1{fill:#CBA6f7;} + .d2-2916329547 .fill-B2{fill:#CBA6f7;} + .d2-2916329547 .fill-B3{fill:#6C7086;} + .d2-2916329547 .fill-B4{fill:#585B70;} + .d2-2916329547 .fill-B5{fill:#45475A;} + .d2-2916329547 .fill-B6{fill:#313244;} + .d2-2916329547 .fill-AA2{fill:#f38BA8;} + .d2-2916329547 .fill-AA4{fill:#45475A;} + .d2-2916329547 .fill-AA5{fill:#313244;} + .d2-2916329547 .fill-AB4{fill:#45475A;} + .d2-2916329547 .fill-AB5{fill:#313244;} + .d2-2916329547 .stroke-N1{stroke:#CDD6F4;} + .d2-2916329547 .stroke-N2{stroke:#BAC2DE;} + .d2-2916329547 .stroke-N3{stroke:#A6ADC8;} + .d2-2916329547 .stroke-N4{stroke:#585B70;} + .d2-2916329547 .stroke-N5{stroke:#45475A;} + .d2-2916329547 .stroke-N6{stroke:#313244;} + .d2-2916329547 .stroke-N7{stroke:#1E1E2E;} + .d2-2916329547 .stroke-B1{stroke:#CBA6f7;} + .d2-2916329547 .stroke-B2{stroke:#CBA6f7;} + .d2-2916329547 .stroke-B3{stroke:#6C7086;} + .d2-2916329547 .stroke-B4{stroke:#585B70;} + .d2-2916329547 .stroke-B5{stroke:#45475A;} + .d2-2916329547 .stroke-B6{stroke:#313244;} + .d2-2916329547 .stroke-AA2{stroke:#f38BA8;} + .d2-2916329547 .stroke-AA4{stroke:#45475A;} + .d2-2916329547 .stroke-AA5{stroke:#313244;} + .d2-2916329547 .stroke-AB4{stroke:#45475A;} + .d2-2916329547 .stroke-AB5{stroke:#313244;} + .d2-2916329547 .background-color-N1{background-color:#CDD6F4;} + .d2-2916329547 .background-color-N2{background-color:#BAC2DE;} + .d2-2916329547 .background-color-N3{background-color:#A6ADC8;} + .d2-2916329547 .background-color-N4{background-color:#585B70;} + .d2-2916329547 .background-color-N5{background-color:#45475A;} + .d2-2916329547 .background-color-N6{background-color:#313244;} + .d2-2916329547 .background-color-N7{background-color:#1E1E2E;} + .d2-2916329547 .background-color-B1{background-color:#CBA6f7;} + .d2-2916329547 .background-color-B2{background-color:#CBA6f7;} + .d2-2916329547 .background-color-B3{background-color:#6C7086;} + .d2-2916329547 .background-color-B4{background-color:#585B70;} + .d2-2916329547 .background-color-B5{background-color:#45475A;} + .d2-2916329547 .background-color-B6{background-color:#313244;} + .d2-2916329547 .background-color-AA2{background-color:#f38BA8;} + .d2-2916329547 .background-color-AA4{background-color:#45475A;} + .d2-2916329547 .background-color-AA5{background-color:#313244;} + .d2-2916329547 .background-color-AB4{background-color:#45475A;} + .d2-2916329547 .background-color-AB5{background-color:#313244;} + .d2-2916329547 .color-N1{color:#CDD6F4;} + .d2-2916329547 .color-N2{color:#BAC2DE;} + .d2-2916329547 .color-N3{color:#A6ADC8;} + .d2-2916329547 .color-N4{color:#585B70;} + .d2-2916329547 .color-N5{color:#45475A;} + .d2-2916329547 .color-N6{color:#313244;} + .d2-2916329547 .color-N7{color:#1E1E2E;} + .d2-2916329547 .color-B1{color:#CBA6f7;} + .d2-2916329547 .color-B2{color:#CBA6f7;} + .d2-2916329547 .color-B3{color:#6C7086;} + .d2-2916329547 .color-B4{color:#585B70;} + .d2-2916329547 .color-B5{color:#45475A;} + .d2-2916329547 .color-B6{color:#313244;} + .d2-2916329547 .color-AA2{color:#f38BA8;} + .d2-2916329547 .color-AA4{color:#45475A;} + .d2-2916329547 .color-AA5{color:#313244;} + .d2-2916329547 .color-AB4{color:#45475A;} + .d2-2916329547 .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}]]>wintersummertreessnowsun 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 3ac7cfe85..b87b7c15c 100644 --- a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg @@ -1,16 +1,16 @@ -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + .d2-3148583989 .fill-N1{fill:#CDD6F4;} + .d2-3148583989 .fill-N2{fill:#BAC2DE;} + .d2-3148583989 .fill-N3{fill:#A6ADC8;} + .d2-3148583989 .fill-N4{fill:#585B70;} + .d2-3148583989 .fill-N5{fill:#45475A;} + .d2-3148583989 .fill-N6{fill:#313244;} + .d2-3148583989 .fill-N7{fill:#1E1E2E;} + .d2-3148583989 .fill-B1{fill:#CBA6f7;} + .d2-3148583989 .fill-B2{fill:#CBA6f7;} + .d2-3148583989 .fill-B3{fill:#6C7086;} + .d2-3148583989 .fill-B4{fill:#585B70;} + .d2-3148583989 .fill-B5{fill:#45475A;} + .d2-3148583989 .fill-B6{fill:#313244;} + .d2-3148583989 .fill-AA2{fill:#f38BA8;} + .d2-3148583989 .fill-AA4{fill:#45475A;} + .d2-3148583989 .fill-AA5{fill:#313244;} + .d2-3148583989 .fill-AB4{fill:#45475A;} + .d2-3148583989 .fill-AB5{fill:#313244;} + .d2-3148583989 .stroke-N1{stroke:#CDD6F4;} + .d2-3148583989 .stroke-N2{stroke:#BAC2DE;} + .d2-3148583989 .stroke-N3{stroke:#A6ADC8;} + .d2-3148583989 .stroke-N4{stroke:#585B70;} + .d2-3148583989 .stroke-N5{stroke:#45475A;} + .d2-3148583989 .stroke-N6{stroke:#313244;} + .d2-3148583989 .stroke-N7{stroke:#1E1E2E;} + .d2-3148583989 .stroke-B1{stroke:#CBA6f7;} + .d2-3148583989 .stroke-B2{stroke:#CBA6f7;} + .d2-3148583989 .stroke-B3{stroke:#6C7086;} + .d2-3148583989 .stroke-B4{stroke:#585B70;} + .d2-3148583989 .stroke-B5{stroke:#45475A;} + .d2-3148583989 .stroke-B6{stroke:#313244;} + .d2-3148583989 .stroke-AA2{stroke:#f38BA8;} + .d2-3148583989 .stroke-AA4{stroke:#45475A;} + .d2-3148583989 .stroke-AA5{stroke:#313244;} + .d2-3148583989 .stroke-AB4{stroke:#45475A;} + .d2-3148583989 .stroke-AB5{stroke:#313244;} + .d2-3148583989 .background-color-N1{background-color:#CDD6F4;} + .d2-3148583989 .background-color-N2{background-color:#BAC2DE;} + .d2-3148583989 .background-color-N3{background-color:#A6ADC8;} + .d2-3148583989 .background-color-N4{background-color:#585B70;} + .d2-3148583989 .background-color-N5{background-color:#45475A;} + .d2-3148583989 .background-color-N6{background-color:#313244;} + .d2-3148583989 .background-color-N7{background-color:#1E1E2E;} + .d2-3148583989 .background-color-B1{background-color:#CBA6f7;} + .d2-3148583989 .background-color-B2{background-color:#CBA6f7;} + .d2-3148583989 .background-color-B3{background-color:#6C7086;} + .d2-3148583989 .background-color-B4{background-color:#585B70;} + .d2-3148583989 .background-color-B5{background-color:#45475A;} + .d2-3148583989 .background-color-B6{background-color:#313244;} + .d2-3148583989 .background-color-AA2{background-color:#f38BA8;} + .d2-3148583989 .background-color-AA4{background-color:#45475A;} + .d2-3148583989 .background-color-AA5{background-color:#313244;} + .d2-3148583989 .background-color-AB4{background-color:#45475A;} + .d2-3148583989 .background-color-AB5{background-color:#313244;} + .d2-3148583989 .color-N1{color:#CDD6F4;} + .d2-3148583989 .color-N2{color:#BAC2DE;} + .d2-3148583989 .color-N3{color:#A6ADC8;} + .d2-3148583989 .color-N4{color:#585B70;} + .d2-3148583989 .color-N5{color:#45475A;} + .d2-3148583989 .color-N6{color:#313244;} + .d2-3148583989 .color-N7{color:#1E1E2E;} + .d2-3148583989 .color-B1{color:#CBA6f7;} + .d2-3148583989 .color-B2{color:#CBA6f7;} + .d2-3148583989 .color-B3{color:#6C7086;} + .d2-3148583989 .color-B4{color:#585B70;} + .d2-3148583989 .color-B5{color:#45475A;} + .d2-3148583989 .color-B6{color:#313244;} + .d2-3148583989 .color-AA2{color:#f38BA8;} + .d2-3148583989 .color-AA4{color:#45475A;} + .d2-3148583989 .color-AA5{color:#313244;} + .d2-3148583989 .color-AB4{color:#45475A;} + .d2-3148583989 .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}]]>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 df2e381b6..289ef8cb9 100644 --- a/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-327680947 .fill-N1{fill:#CDD6F4;} + .d2-327680947 .fill-N2{fill:#BAC2DE;} + .d2-327680947 .fill-N3{fill:#A6ADC8;} + .d2-327680947 .fill-N4{fill:#585B70;} + .d2-327680947 .fill-N5{fill:#45475A;} + .d2-327680947 .fill-N6{fill:#313244;} + .d2-327680947 .fill-N7{fill:#1E1E2E;} + .d2-327680947 .fill-B1{fill:#CBA6f7;} + .d2-327680947 .fill-B2{fill:#CBA6f7;} + .d2-327680947 .fill-B3{fill:#6C7086;} + .d2-327680947 .fill-B4{fill:#585B70;} + .d2-327680947 .fill-B5{fill:#45475A;} + .d2-327680947 .fill-B6{fill:#313244;} + .d2-327680947 .fill-AA2{fill:#f38BA8;} + .d2-327680947 .fill-AA4{fill:#45475A;} + .d2-327680947 .fill-AA5{fill:#313244;} + .d2-327680947 .fill-AB4{fill:#45475A;} + .d2-327680947 .fill-AB5{fill:#313244;} + .d2-327680947 .stroke-N1{stroke:#CDD6F4;} + .d2-327680947 .stroke-N2{stroke:#BAC2DE;} + .d2-327680947 .stroke-N3{stroke:#A6ADC8;} + .d2-327680947 .stroke-N4{stroke:#585B70;} + .d2-327680947 .stroke-N5{stroke:#45475A;} + .d2-327680947 .stroke-N6{stroke:#313244;} + .d2-327680947 .stroke-N7{stroke:#1E1E2E;} + .d2-327680947 .stroke-B1{stroke:#CBA6f7;} + .d2-327680947 .stroke-B2{stroke:#CBA6f7;} + .d2-327680947 .stroke-B3{stroke:#6C7086;} + .d2-327680947 .stroke-B4{stroke:#585B70;} + .d2-327680947 .stroke-B5{stroke:#45475A;} + .d2-327680947 .stroke-B6{stroke:#313244;} + .d2-327680947 .stroke-AA2{stroke:#f38BA8;} + .d2-327680947 .stroke-AA4{stroke:#45475A;} + .d2-327680947 .stroke-AA5{stroke:#313244;} + .d2-327680947 .stroke-AB4{stroke:#45475A;} + .d2-327680947 .stroke-AB5{stroke:#313244;} + .d2-327680947 .background-color-N1{background-color:#CDD6F4;} + .d2-327680947 .background-color-N2{background-color:#BAC2DE;} + .d2-327680947 .background-color-N3{background-color:#A6ADC8;} + .d2-327680947 .background-color-N4{background-color:#585B70;} + .d2-327680947 .background-color-N5{background-color:#45475A;} + .d2-327680947 .background-color-N6{background-color:#313244;} + .d2-327680947 .background-color-N7{background-color:#1E1E2E;} + .d2-327680947 .background-color-B1{background-color:#CBA6f7;} + .d2-327680947 .background-color-B2{background-color:#CBA6f7;} + .d2-327680947 .background-color-B3{background-color:#6C7086;} + .d2-327680947 .background-color-B4{background-color:#585B70;} + .d2-327680947 .background-color-B5{background-color:#45475A;} + .d2-327680947 .background-color-B6{background-color:#313244;} + .d2-327680947 .background-color-AA2{background-color:#f38BA8;} + .d2-327680947 .background-color-AA4{background-color:#45475A;} + .d2-327680947 .background-color-AA5{background-color:#313244;} + .d2-327680947 .background-color-AB4{background-color:#45475A;} + .d2-327680947 .background-color-AB5{background-color:#313244;} + .d2-327680947 .color-N1{color:#CDD6F4;} + .d2-327680947 .color-N2{color:#BAC2DE;} + .d2-327680947 .color-N3{color:#A6ADC8;} + .d2-327680947 .color-N4{color:#585B70;} + .d2-327680947 .color-N5{color:#45475A;} + .d2-327680947 .color-N6{color:#313244;} + .d2-327680947 .color-N7{color:#1E1E2E;} + .d2-327680947 .color-B1{color:#CBA6f7;} + .d2-327680947 .color-B2{color:#CBA6f7;} + .d2-327680947 .color-B3{color:#6C7086;} + .d2-327680947 .color-B4{color:#585B70;} + .d2-327680947 .color-B5{color:#45475A;} + .d2-327680947 .color-B6{color:#313244;} + .d2-327680947 .color-AA2{color:#f38BA8;} + .d2-327680947 .color-AA4{color:#45475A;} + .d2-327680947 .color-AA5{color:#313244;} + .d2-327680947 .color-AB4{color:#45475A;} + .d2-327680947 .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}]]>ab 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 975adb22d..916508812 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,16 +1,16 @@ -wintersummersnowsun + .d2-914436609 .fill-N1{fill:#CDD6F4;} + .d2-914436609 .fill-N2{fill:#BAC2DE;} + .d2-914436609 .fill-N3{fill:#A6ADC8;} + .d2-914436609 .fill-N4{fill:#585B70;} + .d2-914436609 .fill-N5{fill:#45475A;} + .d2-914436609 .fill-N6{fill:#313244;} + .d2-914436609 .fill-N7{fill:#1E1E2E;} + .d2-914436609 .fill-B1{fill:#CBA6f7;} + .d2-914436609 .fill-B2{fill:#CBA6f7;} + .d2-914436609 .fill-B3{fill:#6C7086;} + .d2-914436609 .fill-B4{fill:#585B70;} + .d2-914436609 .fill-B5{fill:#45475A;} + .d2-914436609 .fill-B6{fill:#313244;} + .d2-914436609 .fill-AA2{fill:#f38BA8;} + .d2-914436609 .fill-AA4{fill:#45475A;} + .d2-914436609 .fill-AA5{fill:#313244;} + .d2-914436609 .fill-AB4{fill:#45475A;} + .d2-914436609 .fill-AB5{fill:#313244;} + .d2-914436609 .stroke-N1{stroke:#CDD6F4;} + .d2-914436609 .stroke-N2{stroke:#BAC2DE;} + .d2-914436609 .stroke-N3{stroke:#A6ADC8;} + .d2-914436609 .stroke-N4{stroke:#585B70;} + .d2-914436609 .stroke-N5{stroke:#45475A;} + .d2-914436609 .stroke-N6{stroke:#313244;} + .d2-914436609 .stroke-N7{stroke:#1E1E2E;} + .d2-914436609 .stroke-B1{stroke:#CBA6f7;} + .d2-914436609 .stroke-B2{stroke:#CBA6f7;} + .d2-914436609 .stroke-B3{stroke:#6C7086;} + .d2-914436609 .stroke-B4{stroke:#585B70;} + .d2-914436609 .stroke-B5{stroke:#45475A;} + .d2-914436609 .stroke-B6{stroke:#313244;} + .d2-914436609 .stroke-AA2{stroke:#f38BA8;} + .d2-914436609 .stroke-AA4{stroke:#45475A;} + .d2-914436609 .stroke-AA5{stroke:#313244;} + .d2-914436609 .stroke-AB4{stroke:#45475A;} + .d2-914436609 .stroke-AB5{stroke:#313244;} + .d2-914436609 .background-color-N1{background-color:#CDD6F4;} + .d2-914436609 .background-color-N2{background-color:#BAC2DE;} + .d2-914436609 .background-color-N3{background-color:#A6ADC8;} + .d2-914436609 .background-color-N4{background-color:#585B70;} + .d2-914436609 .background-color-N5{background-color:#45475A;} + .d2-914436609 .background-color-N6{background-color:#313244;} + .d2-914436609 .background-color-N7{background-color:#1E1E2E;} + .d2-914436609 .background-color-B1{background-color:#CBA6f7;} + .d2-914436609 .background-color-B2{background-color:#CBA6f7;} + .d2-914436609 .background-color-B3{background-color:#6C7086;} + .d2-914436609 .background-color-B4{background-color:#585B70;} + .d2-914436609 .background-color-B5{background-color:#45475A;} + .d2-914436609 .background-color-B6{background-color:#313244;} + .d2-914436609 .background-color-AA2{background-color:#f38BA8;} + .d2-914436609 .background-color-AA4{background-color:#45475A;} + .d2-914436609 .background-color-AA5{background-color:#313244;} + .d2-914436609 .background-color-AB4{background-color:#45475A;} + .d2-914436609 .background-color-AB5{background-color:#313244;} + .d2-914436609 .color-N1{color:#CDD6F4;} + .d2-914436609 .color-N2{color:#BAC2DE;} + .d2-914436609 .color-N3{color:#A6ADC8;} + .d2-914436609 .color-N4{color:#585B70;} + .d2-914436609 .color-N5{color:#45475A;} + .d2-914436609 .color-N6{color:#313244;} + .d2-914436609 .color-N7{color:#1E1E2E;} + .d2-914436609 .color-B1{color:#CBA6f7;} + .d2-914436609 .color-B2{color:#CBA6f7;} + .d2-914436609 .color-B3{color:#6C7086;} + .d2-914436609 .color-B4{color:#585B70;} + .d2-914436609 .color-B5{color:#45475A;} + .d2-914436609 .color-B6{color:#313244;} + .d2-914436609 .color-AA2{color:#f38BA8;} + .d2-914436609 .color-AA4{color:#45475A;} + .d2-914436609 .color-AA5{color:#313244;} + .d2-914436609 .color-AB4{color:#45475A;} + .d2-914436609 .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}]]>wintersummersnowsun 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 850b0b77d..45f0be5b1 100644 --- a/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg @@ -1,9 +1,9 @@ -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2730605657 .fill-N1{fill:#CDD6F4;} + .d2-2730605657 .fill-N2{fill:#BAC2DE;} + .d2-2730605657 .fill-N3{fill:#A6ADC8;} + .d2-2730605657 .fill-N4{fill:#585B70;} + .d2-2730605657 .fill-N5{fill:#45475A;} + .d2-2730605657 .fill-N6{fill:#313244;} + .d2-2730605657 .fill-N7{fill:#1E1E2E;} + .d2-2730605657 .fill-B1{fill:#CBA6f7;} + .d2-2730605657 .fill-B2{fill:#CBA6f7;} + .d2-2730605657 .fill-B3{fill:#6C7086;} + .d2-2730605657 .fill-B4{fill:#585B70;} + .d2-2730605657 .fill-B5{fill:#45475A;} + .d2-2730605657 .fill-B6{fill:#313244;} + .d2-2730605657 .fill-AA2{fill:#f38BA8;} + .d2-2730605657 .fill-AA4{fill:#45475A;} + .d2-2730605657 .fill-AA5{fill:#313244;} + .d2-2730605657 .fill-AB4{fill:#45475A;} + .d2-2730605657 .fill-AB5{fill:#313244;} + .d2-2730605657 .stroke-N1{stroke:#CDD6F4;} + .d2-2730605657 .stroke-N2{stroke:#BAC2DE;} + .d2-2730605657 .stroke-N3{stroke:#A6ADC8;} + .d2-2730605657 .stroke-N4{stroke:#585B70;} + .d2-2730605657 .stroke-N5{stroke:#45475A;} + .d2-2730605657 .stroke-N6{stroke:#313244;} + .d2-2730605657 .stroke-N7{stroke:#1E1E2E;} + .d2-2730605657 .stroke-B1{stroke:#CBA6f7;} + .d2-2730605657 .stroke-B2{stroke:#CBA6f7;} + .d2-2730605657 .stroke-B3{stroke:#6C7086;} + .d2-2730605657 .stroke-B4{stroke:#585B70;} + .d2-2730605657 .stroke-B5{stroke:#45475A;} + .d2-2730605657 .stroke-B6{stroke:#313244;} + .d2-2730605657 .stroke-AA2{stroke:#f38BA8;} + .d2-2730605657 .stroke-AA4{stroke:#45475A;} + .d2-2730605657 .stroke-AA5{stroke:#313244;} + .d2-2730605657 .stroke-AB4{stroke:#45475A;} + .d2-2730605657 .stroke-AB5{stroke:#313244;} + .d2-2730605657 .background-color-N1{background-color:#CDD6F4;} + .d2-2730605657 .background-color-N2{background-color:#BAC2DE;} + .d2-2730605657 .background-color-N3{background-color:#A6ADC8;} + .d2-2730605657 .background-color-N4{background-color:#585B70;} + .d2-2730605657 .background-color-N5{background-color:#45475A;} + .d2-2730605657 .background-color-N6{background-color:#313244;} + .d2-2730605657 .background-color-N7{background-color:#1E1E2E;} + .d2-2730605657 .background-color-B1{background-color:#CBA6f7;} + .d2-2730605657 .background-color-B2{background-color:#CBA6f7;} + .d2-2730605657 .background-color-B3{background-color:#6C7086;} + .d2-2730605657 .background-color-B4{background-color:#585B70;} + .d2-2730605657 .background-color-B5{background-color:#45475A;} + .d2-2730605657 .background-color-B6{background-color:#313244;} + .d2-2730605657 .background-color-AA2{background-color:#f38BA8;} + .d2-2730605657 .background-color-AA4{background-color:#45475A;} + .d2-2730605657 .background-color-AA5{background-color:#313244;} + .d2-2730605657 .background-color-AB4{background-color:#45475A;} + .d2-2730605657 .background-color-AB5{background-color:#313244;} + .d2-2730605657 .color-N1{color:#CDD6F4;} + .d2-2730605657 .color-N2{color:#BAC2DE;} + .d2-2730605657 .color-N3{color:#A6ADC8;} + .d2-2730605657 .color-N4{color:#585B70;} + .d2-2730605657 .color-N5{color:#45475A;} + .d2-2730605657 .color-N6{color:#313244;} + .d2-2730605657 .color-N7{color:#1E1E2E;} + .d2-2730605657 .color-B1{color:#CBA6f7;} + .d2-2730605657 .color-B2{color:#CBA6f7;} + .d2-2730605657 .color-B3{color:#6C7086;} + .d2-2730605657 .color-B4{color:#585B70;} + .d2-2730605657 .color-B5{color:#45475A;} + .d2-2730605657 .color-B6{color:#313244;} + .d2-2730605657 .color-AA2{color:#f38BA8;} + .d2-2730605657 .color-AA4{color:#45475A;} + .d2-2730605657 .color-AA5{color:#313244;} + .d2-2730605657 .color-AB4{color:#45475A;} + .d2-2730605657 .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}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg index 67f8df77b..342e9d114 100644 --- a/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg @@ -1,34 +1,34 @@ -func main() { @@ -855,7 +855,7 @@ }func main() {   panic("TODO") }

    Five is a sufficiently close approximation to infinity.

    -
    Don't hit me!!  I'm in the Twilight Zone!!!Don't hit me!!  I'm in the Twilight Zone!!! +Don't hit me!!  I'm in the Twilight Zone!!!Don't hit me!!  I'm in the Twilight Zone!!! diff --git a/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg index c84e674ed..dad58a300 100644 --- a/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-2029734873 .fill-N1{fill:#CDD6F4;} + .d2-2029734873 .fill-N2{fill:#BAC2DE;} + .d2-2029734873 .fill-N3{fill:#A6ADC8;} + .d2-2029734873 .fill-N4{fill:#585B70;} + .d2-2029734873 .fill-N5{fill:#45475A;} + .d2-2029734873 .fill-N6{fill:#313244;} + .d2-2029734873 .fill-N7{fill:#1E1E2E;} + .d2-2029734873 .fill-B1{fill:#CBA6f7;} + .d2-2029734873 .fill-B2{fill:#CBA6f7;} + .d2-2029734873 .fill-B3{fill:#6C7086;} + .d2-2029734873 .fill-B4{fill:#585B70;} + .d2-2029734873 .fill-B5{fill:#45475A;} + .d2-2029734873 .fill-B6{fill:#313244;} + .d2-2029734873 .fill-AA2{fill:#f38BA8;} + .d2-2029734873 .fill-AA4{fill:#45475A;} + .d2-2029734873 .fill-AA5{fill:#313244;} + .d2-2029734873 .fill-AB4{fill:#45475A;} + .d2-2029734873 .fill-AB5{fill:#313244;} + .d2-2029734873 .stroke-N1{stroke:#CDD6F4;} + .d2-2029734873 .stroke-N2{stroke:#BAC2DE;} + .d2-2029734873 .stroke-N3{stroke:#A6ADC8;} + .d2-2029734873 .stroke-N4{stroke:#585B70;} + .d2-2029734873 .stroke-N5{stroke:#45475A;} + .d2-2029734873 .stroke-N6{stroke:#313244;} + .d2-2029734873 .stroke-N7{stroke:#1E1E2E;} + .d2-2029734873 .stroke-B1{stroke:#CBA6f7;} + .d2-2029734873 .stroke-B2{stroke:#CBA6f7;} + .d2-2029734873 .stroke-B3{stroke:#6C7086;} + .d2-2029734873 .stroke-B4{stroke:#585B70;} + .d2-2029734873 .stroke-B5{stroke:#45475A;} + .d2-2029734873 .stroke-B6{stroke:#313244;} + .d2-2029734873 .stroke-AA2{stroke:#f38BA8;} + .d2-2029734873 .stroke-AA4{stroke:#45475A;} + .d2-2029734873 .stroke-AA5{stroke:#313244;} + .d2-2029734873 .stroke-AB4{stroke:#45475A;} + .d2-2029734873 .stroke-AB5{stroke:#313244;} + .d2-2029734873 .background-color-N1{background-color:#CDD6F4;} + .d2-2029734873 .background-color-N2{background-color:#BAC2DE;} + .d2-2029734873 .background-color-N3{background-color:#A6ADC8;} + .d2-2029734873 .background-color-N4{background-color:#585B70;} + .d2-2029734873 .background-color-N5{background-color:#45475A;} + .d2-2029734873 .background-color-N6{background-color:#313244;} + .d2-2029734873 .background-color-N7{background-color:#1E1E2E;} + .d2-2029734873 .background-color-B1{background-color:#CBA6f7;} + .d2-2029734873 .background-color-B2{background-color:#CBA6f7;} + .d2-2029734873 .background-color-B3{background-color:#6C7086;} + .d2-2029734873 .background-color-B4{background-color:#585B70;} + .d2-2029734873 .background-color-B5{background-color:#45475A;} + .d2-2029734873 .background-color-B6{background-color:#313244;} + .d2-2029734873 .background-color-AA2{background-color:#f38BA8;} + .d2-2029734873 .background-color-AA4{background-color:#45475A;} + .d2-2029734873 .background-color-AA5{background-color:#313244;} + .d2-2029734873 .background-color-AB4{background-color:#45475A;} + .d2-2029734873 .background-color-AB5{background-color:#313244;} + .d2-2029734873 .color-N1{color:#CDD6F4;} + .d2-2029734873 .color-N2{color:#BAC2DE;} + .d2-2029734873 .color-N3{color:#A6ADC8;} + .d2-2029734873 .color-N4{color:#585B70;} + .d2-2029734873 .color-N5{color:#45475A;} + .d2-2029734873 .color-N6{color:#313244;} + .d2-2029734873 .color-N7{color:#1E1E2E;} + .d2-2029734873 .color-B1{color:#CBA6f7;} + .d2-2029734873 .color-B2{color:#CBA6f7;} + .d2-2029734873 .color-B3{color:#6C7086;} + .d2-2029734873 .color-B4{color:#585B70;} + .d2-2029734873 .color-B5{color:#45475A;} + .d2-2029734873 .color-B6{color:#313244;} + .d2-2029734873 .color-AA2{color:#f38BA8;} + .d2-2029734873 .color-AA4{color:#45475A;} + .d2-2029734873 .color-AA5{color:#313244;} + .d2-2029734873 .color-AB4{color:#45475A;} + .d2-2029734873 .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}]]>ab hello 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 52d6159c5..d70408a22 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. 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 16f94a0a5..bf8863431 100644 --- a/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg @@ -1,9 +1,9 @@ -brightnormaldarkdarker + .d2-4290168978 .fill-N1{fill:#CDD6F4;} + .d2-4290168978 .fill-N2{fill:#BAC2DE;} + .d2-4290168978 .fill-N3{fill:#A6ADC8;} + .d2-4290168978 .fill-N4{fill:#585B70;} + .d2-4290168978 .fill-N5{fill:#45475A;} + .d2-4290168978 .fill-N6{fill:#313244;} + .d2-4290168978 .fill-N7{fill:#1E1E2E;} + .d2-4290168978 .fill-B1{fill:#CBA6f7;} + .d2-4290168978 .fill-B2{fill:#CBA6f7;} + .d2-4290168978 .fill-B3{fill:#6C7086;} + .d2-4290168978 .fill-B4{fill:#585B70;} + .d2-4290168978 .fill-B5{fill:#45475A;} + .d2-4290168978 .fill-B6{fill:#313244;} + .d2-4290168978 .fill-AA2{fill:#f38BA8;} + .d2-4290168978 .fill-AA4{fill:#45475A;} + .d2-4290168978 .fill-AA5{fill:#313244;} + .d2-4290168978 .fill-AB4{fill:#45475A;} + .d2-4290168978 .fill-AB5{fill:#313244;} + .d2-4290168978 .stroke-N1{stroke:#CDD6F4;} + .d2-4290168978 .stroke-N2{stroke:#BAC2DE;} + .d2-4290168978 .stroke-N3{stroke:#A6ADC8;} + .d2-4290168978 .stroke-N4{stroke:#585B70;} + .d2-4290168978 .stroke-N5{stroke:#45475A;} + .d2-4290168978 .stroke-N6{stroke:#313244;} + .d2-4290168978 .stroke-N7{stroke:#1E1E2E;} + .d2-4290168978 .stroke-B1{stroke:#CBA6f7;} + .d2-4290168978 .stroke-B2{stroke:#CBA6f7;} + .d2-4290168978 .stroke-B3{stroke:#6C7086;} + .d2-4290168978 .stroke-B4{stroke:#585B70;} + .d2-4290168978 .stroke-B5{stroke:#45475A;} + .d2-4290168978 .stroke-B6{stroke:#313244;} + .d2-4290168978 .stroke-AA2{stroke:#f38BA8;} + .d2-4290168978 .stroke-AA4{stroke:#45475A;} + .d2-4290168978 .stroke-AA5{stroke:#313244;} + .d2-4290168978 .stroke-AB4{stroke:#45475A;} + .d2-4290168978 .stroke-AB5{stroke:#313244;} + .d2-4290168978 .background-color-N1{background-color:#CDD6F4;} + .d2-4290168978 .background-color-N2{background-color:#BAC2DE;} + .d2-4290168978 .background-color-N3{background-color:#A6ADC8;} + .d2-4290168978 .background-color-N4{background-color:#585B70;} + .d2-4290168978 .background-color-N5{background-color:#45475A;} + .d2-4290168978 .background-color-N6{background-color:#313244;} + .d2-4290168978 .background-color-N7{background-color:#1E1E2E;} + .d2-4290168978 .background-color-B1{background-color:#CBA6f7;} + .d2-4290168978 .background-color-B2{background-color:#CBA6f7;} + .d2-4290168978 .background-color-B3{background-color:#6C7086;} + .d2-4290168978 .background-color-B4{background-color:#585B70;} + .d2-4290168978 .background-color-B5{background-color:#45475A;} + .d2-4290168978 .background-color-B6{background-color:#313244;} + .d2-4290168978 .background-color-AA2{background-color:#f38BA8;} + .d2-4290168978 .background-color-AA4{background-color:#45475A;} + .d2-4290168978 .background-color-AA5{background-color:#313244;} + .d2-4290168978 .background-color-AB4{background-color:#45475A;} + .d2-4290168978 .background-color-AB5{background-color:#313244;} + .d2-4290168978 .color-N1{color:#CDD6F4;} + .d2-4290168978 .color-N2{color:#BAC2DE;} + .d2-4290168978 .color-N3{color:#A6ADC8;} + .d2-4290168978 .color-N4{color:#585B70;} + .d2-4290168978 .color-N5{color:#45475A;} + .d2-4290168978 .color-N6{color:#313244;} + .d2-4290168978 .color-N7{color:#1E1E2E;} + .d2-4290168978 .color-B1{color:#CBA6f7;} + .d2-4290168978 .color-B2{color:#CBA6f7;} + .d2-4290168978 .color-B3{color:#6C7086;} + .d2-4290168978 .color-B4{color:#585B70;} + .d2-4290168978 .color-B5{color:#45475A;} + .d2-4290168978 .color-B6{color:#313244;} + .d2-4290168978 .color-AA2{color:#f38BA8;} + .d2-4290168978 .color-AA4{color:#45475A;} + .d2-4290168978 .color-AA5{color:#313244;} + .d2-4290168978 .color-AB4{color:#45475A;} + .d2-4290168978 .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}]]>brightnormaldarkdarker 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 8f6be3a83..d18d83ac5 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-2504113906 .fill-N1{fill:#CDD6F4;} + .d2-2504113906 .fill-N2{fill:#BAC2DE;} + .d2-2504113906 .fill-N3{fill:#A6ADC8;} + .d2-2504113906 .fill-N4{fill:#585B70;} + .d2-2504113906 .fill-N5{fill:#45475A;} + .d2-2504113906 .fill-N6{fill:#313244;} + .d2-2504113906 .fill-N7{fill:#1E1E2E;} + .d2-2504113906 .fill-B1{fill:#CBA6f7;} + .d2-2504113906 .fill-B2{fill:#CBA6f7;} + .d2-2504113906 .fill-B3{fill:#6C7086;} + .d2-2504113906 .fill-B4{fill:#585B70;} + .d2-2504113906 .fill-B5{fill:#45475A;} + .d2-2504113906 .fill-B6{fill:#313244;} + .d2-2504113906 .fill-AA2{fill:#f38BA8;} + .d2-2504113906 .fill-AA4{fill:#45475A;} + .d2-2504113906 .fill-AA5{fill:#313244;} + .d2-2504113906 .fill-AB4{fill:#45475A;} + .d2-2504113906 .fill-AB5{fill:#313244;} + .d2-2504113906 .stroke-N1{stroke:#CDD6F4;} + .d2-2504113906 .stroke-N2{stroke:#BAC2DE;} + .d2-2504113906 .stroke-N3{stroke:#A6ADC8;} + .d2-2504113906 .stroke-N4{stroke:#585B70;} + .d2-2504113906 .stroke-N5{stroke:#45475A;} + .d2-2504113906 .stroke-N6{stroke:#313244;} + .d2-2504113906 .stroke-N7{stroke:#1E1E2E;} + .d2-2504113906 .stroke-B1{stroke:#CBA6f7;} + .d2-2504113906 .stroke-B2{stroke:#CBA6f7;} + .d2-2504113906 .stroke-B3{stroke:#6C7086;} + .d2-2504113906 .stroke-B4{stroke:#585B70;} + .d2-2504113906 .stroke-B5{stroke:#45475A;} + .d2-2504113906 .stroke-B6{stroke:#313244;} + .d2-2504113906 .stroke-AA2{stroke:#f38BA8;} + .d2-2504113906 .stroke-AA4{stroke:#45475A;} + .d2-2504113906 .stroke-AA5{stroke:#313244;} + .d2-2504113906 .stroke-AB4{stroke:#45475A;} + .d2-2504113906 .stroke-AB5{stroke:#313244;} + .d2-2504113906 .background-color-N1{background-color:#CDD6F4;} + .d2-2504113906 .background-color-N2{background-color:#BAC2DE;} + .d2-2504113906 .background-color-N3{background-color:#A6ADC8;} + .d2-2504113906 .background-color-N4{background-color:#585B70;} + .d2-2504113906 .background-color-N5{background-color:#45475A;} + .d2-2504113906 .background-color-N6{background-color:#313244;} + .d2-2504113906 .background-color-N7{background-color:#1E1E2E;} + .d2-2504113906 .background-color-B1{background-color:#CBA6f7;} + .d2-2504113906 .background-color-B2{background-color:#CBA6f7;} + .d2-2504113906 .background-color-B3{background-color:#6C7086;} + .d2-2504113906 .background-color-B4{background-color:#585B70;} + .d2-2504113906 .background-color-B5{background-color:#45475A;} + .d2-2504113906 .background-color-B6{background-color:#313244;} + .d2-2504113906 .background-color-AA2{background-color:#f38BA8;} + .d2-2504113906 .background-color-AA4{background-color:#45475A;} + .d2-2504113906 .background-color-AA5{background-color:#313244;} + .d2-2504113906 .background-color-AB4{background-color:#45475A;} + .d2-2504113906 .background-color-AB5{background-color:#313244;} + .d2-2504113906 .color-N1{color:#CDD6F4;} + .d2-2504113906 .color-N2{color:#BAC2DE;} + .d2-2504113906 .color-N3{color:#A6ADC8;} + .d2-2504113906 .color-N4{color:#585B70;} + .d2-2504113906 .color-N5{color:#45475A;} + .d2-2504113906 .color-N6{color:#313244;} + .d2-2504113906 .color-N7{color:#1E1E2E;} + .d2-2504113906 .color-B1{color:#CBA6f7;} + .d2-2504113906 .color-B2{color:#CBA6f7;} + .d2-2504113906 .color-B3{color:#6C7086;} + .d2-2504113906 .color-B4{color:#585B70;} + .d2-2504113906 .color-B5{color:#45475A;} + .d2-2504113906 .color-B6{color:#313244;} + .d2-2504113906 .color-AA2{color:#f38BA8;} + .d2-2504113906 .color-AA4{color:#45475A;} + .d2-2504113906 .color-AA5{color:#313244;} + .d2-2504113906 .color-AB4{color:#45475A;} + .d2-2504113906 .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 82a1f025c..78c8ed5d8 100644 --- a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg @@ -1,27 +1,27 @@ -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

    Timeline mixer

    @@ -852,7 +852,7 @@
  • Served data logging
    • GraphQLFederated Strato Column

    Tweet/user content hydration, visibility filtering

    -
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone webHTTP AndroidThrift RPC Candidate FetchFeature HydrationCandidate sources +TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone webHTTP AndroidThrift RPC Candidate FetchFeature HydrationCandidate sources diff --git a/d2target/d2target.go b/d2target/d2target.go index bf2c0277e..368e4c1a7 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -81,7 +81,11 @@ func (diagram Diagram) Bytes() ([]byte, error) { if err != nil { return nil, err } - base := append(b1, b2...) + b3, err := json.Marshal(diagram.Root) + if err != nil { + return nil, err + } + base := append(append(b1, b2...), b3...) if diagram.Config != nil { b, err := json.Marshal(diagram.Config) diff --git a/docs/examples/lib/3-lowlevel/lowlevel.go b/docs/examples/lib/3-lowlevel/lowlevel.go index f120df278..53f0468e7 100644 --- a/docs/examples/lib/3-lowlevel/lowlevel.go +++ b/docs/examples/lib/3-lowlevel/lowlevel.go @@ -16,12 +16,13 @@ import ( // Remember to add if err != nil checks in production. func main() { - graph, _, _ := d2compiler.Compile("", strings.NewReader("x -> y"), nil) + graph, config, _ := d2compiler.Compile("", strings.NewReader("x -> y"), nil) graph.ApplyTheme(d2themescatalog.NeutralDefault.ID) ruler, _ := textmeasure.NewRuler() _ = graph.SetDimensions(nil, ruler, nil) _ = d2dagrelayout.Layout(context.Background(), graph, nil) diagram, _ := d2exporter.Export(context.Background(), graph, nil) + diagram.Config = config out, _ := d2svg.Render(diagram, &d2svg.RenderOpts{ ThemeID: &d2themescatalog.NeutralDefault.ID, }) diff --git a/e2etests-cli/testdata/TestCLI_E2E/abspath.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/abspath.exp.svg index 84e5e922b..63f8b5d26 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/abspath.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/abspath.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-1843626214 .fill-N1{fill:#0A0F25;} + .d2-1843626214 .fill-N2{fill:#676C7E;} + .d2-1843626214 .fill-N3{fill:#9499AB;} + .d2-1843626214 .fill-N4{fill:#CFD2DD;} + .d2-1843626214 .fill-N5{fill:#DEE1EB;} + .d2-1843626214 .fill-N6{fill:#EEF1F8;} + .d2-1843626214 .fill-N7{fill:#FFFFFF;} + .d2-1843626214 .fill-B1{fill:#0D32B2;} + .d2-1843626214 .fill-B2{fill:#0D32B2;} + .d2-1843626214 .fill-B3{fill:#E3E9FD;} + .d2-1843626214 .fill-B4{fill:#E3E9FD;} + .d2-1843626214 .fill-B5{fill:#EDF0FD;} + .d2-1843626214 .fill-B6{fill:#F7F8FE;} + .d2-1843626214 .fill-AA2{fill:#4A6FF3;} + .d2-1843626214 .fill-AA4{fill:#EDF0FD;} + .d2-1843626214 .fill-AA5{fill:#F7F8FE;} + .d2-1843626214 .fill-AB4{fill:#EDF0FD;} + .d2-1843626214 .fill-AB5{fill:#F7F8FE;} + .d2-1843626214 .stroke-N1{stroke:#0A0F25;} + .d2-1843626214 .stroke-N2{stroke:#676C7E;} + .d2-1843626214 .stroke-N3{stroke:#9499AB;} + .d2-1843626214 .stroke-N4{stroke:#CFD2DD;} + .d2-1843626214 .stroke-N5{stroke:#DEE1EB;} + .d2-1843626214 .stroke-N6{stroke:#EEF1F8;} + .d2-1843626214 .stroke-N7{stroke:#FFFFFF;} + .d2-1843626214 .stroke-B1{stroke:#0D32B2;} + .d2-1843626214 .stroke-B2{stroke:#0D32B2;} + .d2-1843626214 .stroke-B3{stroke:#E3E9FD;} + .d2-1843626214 .stroke-B4{stroke:#E3E9FD;} + .d2-1843626214 .stroke-B5{stroke:#EDF0FD;} + .d2-1843626214 .stroke-B6{stroke:#F7F8FE;} + .d2-1843626214 .stroke-AA2{stroke:#4A6FF3;} + .d2-1843626214 .stroke-AA4{stroke:#EDF0FD;} + .d2-1843626214 .stroke-AA5{stroke:#F7F8FE;} + .d2-1843626214 .stroke-AB4{stroke:#EDF0FD;} + .d2-1843626214 .stroke-AB5{stroke:#F7F8FE;} + .d2-1843626214 .background-color-N1{background-color:#0A0F25;} + .d2-1843626214 .background-color-N2{background-color:#676C7E;} + .d2-1843626214 .background-color-N3{background-color:#9499AB;} + .d2-1843626214 .background-color-N4{background-color:#CFD2DD;} + .d2-1843626214 .background-color-N5{background-color:#DEE1EB;} + .d2-1843626214 .background-color-N6{background-color:#EEF1F8;} + .d2-1843626214 .background-color-N7{background-color:#FFFFFF;} + .d2-1843626214 .background-color-B1{background-color:#0D32B2;} + .d2-1843626214 .background-color-B2{background-color:#0D32B2;} + .d2-1843626214 .background-color-B3{background-color:#E3E9FD;} + .d2-1843626214 .background-color-B4{background-color:#E3E9FD;} + .d2-1843626214 .background-color-B5{background-color:#EDF0FD;} + .d2-1843626214 .background-color-B6{background-color:#F7F8FE;} + .d2-1843626214 .background-color-AA2{background-color:#4A6FF3;} + .d2-1843626214 .background-color-AA4{background-color:#EDF0FD;} + .d2-1843626214 .background-color-AA5{background-color:#F7F8FE;} + .d2-1843626214 .background-color-AB4{background-color:#EDF0FD;} + .d2-1843626214 .background-color-AB5{background-color:#F7F8FE;} + .d2-1843626214 .color-N1{color:#0A0F25;} + .d2-1843626214 .color-N2{color:#676C7E;} + .d2-1843626214 .color-N3{color:#9499AB;} + .d2-1843626214 .color-N4{color:#CFD2DD;} + .d2-1843626214 .color-N5{color:#DEE1EB;} + .d2-1843626214 .color-N6{color:#EEF1F8;} + .d2-1843626214 .color-N7{color:#FFFFFF;} + .d2-1843626214 .color-B1{color:#0D32B2;} + .d2-1843626214 .color-B2{color:#0D32B2;} + .d2-1843626214 .color-B3{color:#E3E9FD;} + .d2-1843626214 .color-B4{color:#E3E9FD;} + .d2-1843626214 .color-B5{color:#EDF0FD;} + .d2-1843626214 .color-B6{color:#F7F8FE;} + .d2-1843626214 .color-AA2{color:#4A6FF3;} + .d2-1843626214 .color-AA4{color:#EDF0FD;} + .d2-1843626214 .color-AA5{color:#F7F8FE;} + .d2-1843626214 .color-AB4{color:#EDF0FD;} + .d2-1843626214 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg index 630668e50..f6216f287 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg @@ -1,16 +1,16 @@ Chicken's plan +}]]>Chicken's plan -Approach roadChicken's plan +Approach roadChicken's plan -Approach roadCross roadChicken's plan +Approach roadCross roadChicken's plan -Approach roadCross roadMake you wonder whyChicken's plan +Approach roadCross roadMake you wonder whyChicken's plan 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 index e0eadfb85..5d443cab8 100644 --- 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 @@ -1,9 +1,9 @@ -meow + .d2-3054270525 .fill-N1{fill:#0A0F25;} + .d2-3054270525 .fill-N2{fill:#676C7E;} + .d2-3054270525 .fill-N3{fill:#9499AB;} + .d2-3054270525 .fill-N4{fill:#CFD2DD;} + .d2-3054270525 .fill-N5{fill:#DEE1EB;} + .d2-3054270525 .fill-N6{fill:#EEF1F8;} + .d2-3054270525 .fill-N7{fill:#FFFFFF;} + .d2-3054270525 .fill-B1{fill:#0D32B2;} + .d2-3054270525 .fill-B2{fill:#0D32B2;} + .d2-3054270525 .fill-B3{fill:#E3E9FD;} + .d2-3054270525 .fill-B4{fill:#E3E9FD;} + .d2-3054270525 .fill-B5{fill:#EDF0FD;} + .d2-3054270525 .fill-B6{fill:#F7F8FE;} + .d2-3054270525 .fill-AA2{fill:#4A6FF3;} + .d2-3054270525 .fill-AA4{fill:#EDF0FD;} + .d2-3054270525 .fill-AA5{fill:#F7F8FE;} + .d2-3054270525 .fill-AB4{fill:#EDF0FD;} + .d2-3054270525 .fill-AB5{fill:#F7F8FE;} + .d2-3054270525 .stroke-N1{stroke:#0A0F25;} + .d2-3054270525 .stroke-N2{stroke:#676C7E;} + .d2-3054270525 .stroke-N3{stroke:#9499AB;} + .d2-3054270525 .stroke-N4{stroke:#CFD2DD;} + .d2-3054270525 .stroke-N5{stroke:#DEE1EB;} + .d2-3054270525 .stroke-N6{stroke:#EEF1F8;} + .d2-3054270525 .stroke-N7{stroke:#FFFFFF;} + .d2-3054270525 .stroke-B1{stroke:#0D32B2;} + .d2-3054270525 .stroke-B2{stroke:#0D32B2;} + .d2-3054270525 .stroke-B3{stroke:#E3E9FD;} + .d2-3054270525 .stroke-B4{stroke:#E3E9FD;} + .d2-3054270525 .stroke-B5{stroke:#EDF0FD;} + .d2-3054270525 .stroke-B6{stroke:#F7F8FE;} + .d2-3054270525 .stroke-AA2{stroke:#4A6FF3;} + .d2-3054270525 .stroke-AA4{stroke:#EDF0FD;} + .d2-3054270525 .stroke-AA5{stroke:#F7F8FE;} + .d2-3054270525 .stroke-AB4{stroke:#EDF0FD;} + .d2-3054270525 .stroke-AB5{stroke:#F7F8FE;} + .d2-3054270525 .background-color-N1{background-color:#0A0F25;} + .d2-3054270525 .background-color-N2{background-color:#676C7E;} + .d2-3054270525 .background-color-N3{background-color:#9499AB;} + .d2-3054270525 .background-color-N4{background-color:#CFD2DD;} + .d2-3054270525 .background-color-N5{background-color:#DEE1EB;} + .d2-3054270525 .background-color-N6{background-color:#EEF1F8;} + .d2-3054270525 .background-color-N7{background-color:#FFFFFF;} + .d2-3054270525 .background-color-B1{background-color:#0D32B2;} + .d2-3054270525 .background-color-B2{background-color:#0D32B2;} + .d2-3054270525 .background-color-B3{background-color:#E3E9FD;} + .d2-3054270525 .background-color-B4{background-color:#E3E9FD;} + .d2-3054270525 .background-color-B5{background-color:#EDF0FD;} + .d2-3054270525 .background-color-B6{background-color:#F7F8FE;} + .d2-3054270525 .background-color-AA2{background-color:#4A6FF3;} + .d2-3054270525 .background-color-AA4{background-color:#EDF0FD;} + .d2-3054270525 .background-color-AA5{background-color:#F7F8FE;} + .d2-3054270525 .background-color-AB4{background-color:#EDF0FD;} + .d2-3054270525 .background-color-AB5{background-color:#F7F8FE;} + .d2-3054270525 .color-N1{color:#0A0F25;} + .d2-3054270525 .color-N2{color:#676C7E;} + .d2-3054270525 .color-N3{color:#9499AB;} + .d2-3054270525 .color-N4{color:#CFD2DD;} + .d2-3054270525 .color-N5{color:#DEE1EB;} + .d2-3054270525 .color-N6{color:#EEF1F8;} + .d2-3054270525 .color-N7{color:#FFFFFF;} + .d2-3054270525 .color-B1{color:#0D32B2;} + .d2-3054270525 .color-B2{color:#0D32B2;} + .d2-3054270525 .color-B3{color:#E3E9FD;} + .d2-3054270525 .color-B4{color:#E3E9FD;} + .d2-3054270525 .color-B5{color:#EDF0FD;} + .d2-3054270525 .color-B6{color:#F7F8FE;} + .d2-3054270525 .color-AA2{color:#4A6FF3;} + .d2-3054270525 .color-AA4{color:#EDF0FD;} + .d2-3054270525 .color-AA5{color:#F7F8FE;} + .d2-3054270525 .color-AB4{color:#EDF0FD;} + .d2-3054270525 .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}]]>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 index 5deef206e..2445c80cd 100644 --- 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 @@ -1,12 +1,12 @@ -y + .d2-1655546234 .fill-N1{fill:#0A0F25;} + .d2-1655546234 .fill-N2{fill:#676C7E;} + .d2-1655546234 .fill-N3{fill:#9499AB;} + .d2-1655546234 .fill-N4{fill:#CFD2DD;} + .d2-1655546234 .fill-N5{fill:#DEE1EB;} + .d2-1655546234 .fill-N6{fill:#EEF1F8;} + .d2-1655546234 .fill-N7{fill:#FFFFFF;} + .d2-1655546234 .fill-B1{fill:#0D32B2;} + .d2-1655546234 .fill-B2{fill:#0D32B2;} + .d2-1655546234 .fill-B3{fill:#E3E9FD;} + .d2-1655546234 .fill-B4{fill:#E3E9FD;} + .d2-1655546234 .fill-B5{fill:#EDF0FD;} + .d2-1655546234 .fill-B6{fill:#F7F8FE;} + .d2-1655546234 .fill-AA2{fill:#4A6FF3;} + .d2-1655546234 .fill-AA4{fill:#EDF0FD;} + .d2-1655546234 .fill-AA5{fill:#F7F8FE;} + .d2-1655546234 .fill-AB4{fill:#EDF0FD;} + .d2-1655546234 .fill-AB5{fill:#F7F8FE;} + .d2-1655546234 .stroke-N1{stroke:#0A0F25;} + .d2-1655546234 .stroke-N2{stroke:#676C7E;} + .d2-1655546234 .stroke-N3{stroke:#9499AB;} + .d2-1655546234 .stroke-N4{stroke:#CFD2DD;} + .d2-1655546234 .stroke-N5{stroke:#DEE1EB;} + .d2-1655546234 .stroke-N6{stroke:#EEF1F8;} + .d2-1655546234 .stroke-N7{stroke:#FFFFFF;} + .d2-1655546234 .stroke-B1{stroke:#0D32B2;} + .d2-1655546234 .stroke-B2{stroke:#0D32B2;} + .d2-1655546234 .stroke-B3{stroke:#E3E9FD;} + .d2-1655546234 .stroke-B4{stroke:#E3E9FD;} + .d2-1655546234 .stroke-B5{stroke:#EDF0FD;} + .d2-1655546234 .stroke-B6{stroke:#F7F8FE;} + .d2-1655546234 .stroke-AA2{stroke:#4A6FF3;} + .d2-1655546234 .stroke-AA4{stroke:#EDF0FD;} + .d2-1655546234 .stroke-AA5{stroke:#F7F8FE;} + .d2-1655546234 .stroke-AB4{stroke:#EDF0FD;} + .d2-1655546234 .stroke-AB5{stroke:#F7F8FE;} + .d2-1655546234 .background-color-N1{background-color:#0A0F25;} + .d2-1655546234 .background-color-N2{background-color:#676C7E;} + .d2-1655546234 .background-color-N3{background-color:#9499AB;} + .d2-1655546234 .background-color-N4{background-color:#CFD2DD;} + .d2-1655546234 .background-color-N5{background-color:#DEE1EB;} + .d2-1655546234 .background-color-N6{background-color:#EEF1F8;} + .d2-1655546234 .background-color-N7{background-color:#FFFFFF;} + .d2-1655546234 .background-color-B1{background-color:#0D32B2;} + .d2-1655546234 .background-color-B2{background-color:#0D32B2;} + .d2-1655546234 .background-color-B3{background-color:#E3E9FD;} + .d2-1655546234 .background-color-B4{background-color:#E3E9FD;} + .d2-1655546234 .background-color-B5{background-color:#EDF0FD;} + .d2-1655546234 .background-color-B6{background-color:#F7F8FE;} + .d2-1655546234 .background-color-AA2{background-color:#4A6FF3;} + .d2-1655546234 .background-color-AA4{background-color:#EDF0FD;} + .d2-1655546234 .background-color-AA5{background-color:#F7F8FE;} + .d2-1655546234 .background-color-AB4{background-color:#EDF0FD;} + .d2-1655546234 .background-color-AB5{background-color:#F7F8FE;} + .d2-1655546234 .color-N1{color:#0A0F25;} + .d2-1655546234 .color-N2{color:#676C7E;} + .d2-1655546234 .color-N3{color:#9499AB;} + .d2-1655546234 .color-N4{color:#CFD2DD;} + .d2-1655546234 .color-N5{color:#DEE1EB;} + .d2-1655546234 .color-N6{color:#EEF1F8;} + .d2-1655546234 .color-N7{color:#FFFFFF;} + .d2-1655546234 .color-B1{color:#0D32B2;} + .d2-1655546234 .color-B2{color:#0D32B2;} + .d2-1655546234 .color-B3{color:#E3E9FD;} + .d2-1655546234 .color-B4{color:#E3E9FD;} + .d2-1655546234 .color-B5{color:#EDF0FD;} + .d2-1655546234 .color-B6{color:#F7F8FE;} + .d2-1655546234 .color-AA2{color:#4A6FF3;} + .d2-1655546234 .color-AA4{color:#EDF0FD;} + .d2-1655546234 .color-AA5{color:#F7F8FE;} + .d2-1655546234 .color-AB4{color:#EDF0FD;} + .d2-1655546234 .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}]]>y @@ -104,7 +104,7 @@ - + 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 index 2087192bb..bd0906e66 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg @@ -1,12 +1,12 @@ -x + .d2-3111330921 .fill-N1{fill:#0A0F25;} + .d2-3111330921 .fill-N2{fill:#676C7E;} + .d2-3111330921 .fill-N3{fill:#9499AB;} + .d2-3111330921 .fill-N4{fill:#CFD2DD;} + .d2-3111330921 .fill-N5{fill:#DEE1EB;} + .d2-3111330921 .fill-N6{fill:#EEF1F8;} + .d2-3111330921 .fill-N7{fill:#FFFFFF;} + .d2-3111330921 .fill-B1{fill:#0D32B2;} + .d2-3111330921 .fill-B2{fill:#0D32B2;} + .d2-3111330921 .fill-B3{fill:#E3E9FD;} + .d2-3111330921 .fill-B4{fill:#E3E9FD;} + .d2-3111330921 .fill-B5{fill:#EDF0FD;} + .d2-3111330921 .fill-B6{fill:#F7F8FE;} + .d2-3111330921 .fill-AA2{fill:#4A6FF3;} + .d2-3111330921 .fill-AA4{fill:#EDF0FD;} + .d2-3111330921 .fill-AA5{fill:#F7F8FE;} + .d2-3111330921 .fill-AB4{fill:#EDF0FD;} + .d2-3111330921 .fill-AB5{fill:#F7F8FE;} + .d2-3111330921 .stroke-N1{stroke:#0A0F25;} + .d2-3111330921 .stroke-N2{stroke:#676C7E;} + .d2-3111330921 .stroke-N3{stroke:#9499AB;} + .d2-3111330921 .stroke-N4{stroke:#CFD2DD;} + .d2-3111330921 .stroke-N5{stroke:#DEE1EB;} + .d2-3111330921 .stroke-N6{stroke:#EEF1F8;} + .d2-3111330921 .stroke-N7{stroke:#FFFFFF;} + .d2-3111330921 .stroke-B1{stroke:#0D32B2;} + .d2-3111330921 .stroke-B2{stroke:#0D32B2;} + .d2-3111330921 .stroke-B3{stroke:#E3E9FD;} + .d2-3111330921 .stroke-B4{stroke:#E3E9FD;} + .d2-3111330921 .stroke-B5{stroke:#EDF0FD;} + .d2-3111330921 .stroke-B6{stroke:#F7F8FE;} + .d2-3111330921 .stroke-AA2{stroke:#4A6FF3;} + .d2-3111330921 .stroke-AA4{stroke:#EDF0FD;} + .d2-3111330921 .stroke-AA5{stroke:#F7F8FE;} + .d2-3111330921 .stroke-AB4{stroke:#EDF0FD;} + .d2-3111330921 .stroke-AB5{stroke:#F7F8FE;} + .d2-3111330921 .background-color-N1{background-color:#0A0F25;} + .d2-3111330921 .background-color-N2{background-color:#676C7E;} + .d2-3111330921 .background-color-N3{background-color:#9499AB;} + .d2-3111330921 .background-color-N4{background-color:#CFD2DD;} + .d2-3111330921 .background-color-N5{background-color:#DEE1EB;} + .d2-3111330921 .background-color-N6{background-color:#EEF1F8;} + .d2-3111330921 .background-color-N7{background-color:#FFFFFF;} + .d2-3111330921 .background-color-B1{background-color:#0D32B2;} + .d2-3111330921 .background-color-B2{background-color:#0D32B2;} + .d2-3111330921 .background-color-B3{background-color:#E3E9FD;} + .d2-3111330921 .background-color-B4{background-color:#E3E9FD;} + .d2-3111330921 .background-color-B5{background-color:#EDF0FD;} + .d2-3111330921 .background-color-B6{background-color:#F7F8FE;} + .d2-3111330921 .background-color-AA2{background-color:#4A6FF3;} + .d2-3111330921 .background-color-AA4{background-color:#EDF0FD;} + .d2-3111330921 .background-color-AA5{background-color:#F7F8FE;} + .d2-3111330921 .background-color-AB4{background-color:#EDF0FD;} + .d2-3111330921 .background-color-AB5{background-color:#F7F8FE;} + .d2-3111330921 .color-N1{color:#0A0F25;} + .d2-3111330921 .color-N2{color:#676C7E;} + .d2-3111330921 .color-N3{color:#9499AB;} + .d2-3111330921 .color-N4{color:#CFD2DD;} + .d2-3111330921 .color-N5{color:#DEE1EB;} + .d2-3111330921 .color-N6{color:#EEF1F8;} + .d2-3111330921 .color-N7{color:#FFFFFF;} + .d2-3111330921 .color-B1{color:#0D32B2;} + .d2-3111330921 .color-B2{color:#0D32B2;} + .d2-3111330921 .color-B3{color:#E3E9FD;} + .d2-3111330921 .color-B4{color:#E3E9FD;} + .d2-3111330921 .color-B5{color:#EDF0FD;} + .d2-3111330921 .color-B6{color:#F7F8FE;} + .d2-3111330921 .color-AA2{color:#4A6FF3;} + .d2-3111330921 .color-AA4{color:#EDF0FD;} + .d2-3111330921 .color-AA5{color:#F7F8FE;} + .d2-3111330921 .color-AB4{color:#EDF0FD;} + .d2-3111330921 .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}]]>x @@ -104,7 +104,7 @@ - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg index 1a4a0fe48..f8c7e3b6a 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-1843626214 .fill-N1{fill:#0A0F25;} + .d2-1843626214 .fill-N2{fill:#676C7E;} + .d2-1843626214 .fill-N3{fill:#9499AB;} + .d2-1843626214 .fill-N4{fill:#CFD2DD;} + .d2-1843626214 .fill-N5{fill:#DEE1EB;} + .d2-1843626214 .fill-N6{fill:#EEF1F8;} + .d2-1843626214 .fill-N7{fill:#FFFFFF;} + .d2-1843626214 .fill-B1{fill:#0D32B2;} + .d2-1843626214 .fill-B2{fill:#0D32B2;} + .d2-1843626214 .fill-B3{fill:#E3E9FD;} + .d2-1843626214 .fill-B4{fill:#E3E9FD;} + .d2-1843626214 .fill-B5{fill:#EDF0FD;} + .d2-1843626214 .fill-B6{fill:#F7F8FE;} + .d2-1843626214 .fill-AA2{fill:#4A6FF3;} + .d2-1843626214 .fill-AA4{fill:#EDF0FD;} + .d2-1843626214 .fill-AA5{fill:#F7F8FE;} + .d2-1843626214 .fill-AB4{fill:#EDF0FD;} + .d2-1843626214 .fill-AB5{fill:#F7F8FE;} + .d2-1843626214 .stroke-N1{stroke:#0A0F25;} + .d2-1843626214 .stroke-N2{stroke:#676C7E;} + .d2-1843626214 .stroke-N3{stroke:#9499AB;} + .d2-1843626214 .stroke-N4{stroke:#CFD2DD;} + .d2-1843626214 .stroke-N5{stroke:#DEE1EB;} + .d2-1843626214 .stroke-N6{stroke:#EEF1F8;} + .d2-1843626214 .stroke-N7{stroke:#FFFFFF;} + .d2-1843626214 .stroke-B1{stroke:#0D32B2;} + .d2-1843626214 .stroke-B2{stroke:#0D32B2;} + .d2-1843626214 .stroke-B3{stroke:#E3E9FD;} + .d2-1843626214 .stroke-B4{stroke:#E3E9FD;} + .d2-1843626214 .stroke-B5{stroke:#EDF0FD;} + .d2-1843626214 .stroke-B6{stroke:#F7F8FE;} + .d2-1843626214 .stroke-AA2{stroke:#4A6FF3;} + .d2-1843626214 .stroke-AA4{stroke:#EDF0FD;} + .d2-1843626214 .stroke-AA5{stroke:#F7F8FE;} + .d2-1843626214 .stroke-AB4{stroke:#EDF0FD;} + .d2-1843626214 .stroke-AB5{stroke:#F7F8FE;} + .d2-1843626214 .background-color-N1{background-color:#0A0F25;} + .d2-1843626214 .background-color-N2{background-color:#676C7E;} + .d2-1843626214 .background-color-N3{background-color:#9499AB;} + .d2-1843626214 .background-color-N4{background-color:#CFD2DD;} + .d2-1843626214 .background-color-N5{background-color:#DEE1EB;} + .d2-1843626214 .background-color-N6{background-color:#EEF1F8;} + .d2-1843626214 .background-color-N7{background-color:#FFFFFF;} + .d2-1843626214 .background-color-B1{background-color:#0D32B2;} + .d2-1843626214 .background-color-B2{background-color:#0D32B2;} + .d2-1843626214 .background-color-B3{background-color:#E3E9FD;} + .d2-1843626214 .background-color-B4{background-color:#E3E9FD;} + .d2-1843626214 .background-color-B5{background-color:#EDF0FD;} + .d2-1843626214 .background-color-B6{background-color:#F7F8FE;} + .d2-1843626214 .background-color-AA2{background-color:#4A6FF3;} + .d2-1843626214 .background-color-AA4{background-color:#EDF0FD;} + .d2-1843626214 .background-color-AA5{background-color:#F7F8FE;} + .d2-1843626214 .background-color-AB4{background-color:#EDF0FD;} + .d2-1843626214 .background-color-AB5{background-color:#F7F8FE;} + .d2-1843626214 .color-N1{color:#0A0F25;} + .d2-1843626214 .color-N2{color:#676C7E;} + .d2-1843626214 .color-N3{color:#9499AB;} + .d2-1843626214 .color-N4{color:#CFD2DD;} + .d2-1843626214 .color-N5{color:#DEE1EB;} + .d2-1843626214 .color-N6{color:#EEF1F8;} + .d2-1843626214 .color-N7{color:#FFFFFF;} + .d2-1843626214 .color-B1{color:#0D32B2;} + .d2-1843626214 .color-B2{color:#0D32B2;} + .d2-1843626214 .color-B3{color:#E3E9FD;} + .d2-1843626214 .color-B4{color:#E3E9FD;} + .d2-1843626214 .color-B5{color:#EDF0FD;} + .d2-1843626214 .color-B6{color:#F7F8FE;} + .d2-1843626214 .color-AA2{color:#4A6FF3;} + .d2-1843626214 .color-AA4{color:#EDF0FD;} + .d2-1843626214 .color-AA5{color:#F7F8FE;} + .d2-1843626214 .color-AB4{color:#EDF0FD;} + .d2-1843626214 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg index e0eadfb85..5d443cab8 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg @@ -1,9 +1,9 @@ -meow + .d2-3054270525 .fill-N1{fill:#0A0F25;} + .d2-3054270525 .fill-N2{fill:#676C7E;} + .d2-3054270525 .fill-N3{fill:#9499AB;} + .d2-3054270525 .fill-N4{fill:#CFD2DD;} + .d2-3054270525 .fill-N5{fill:#DEE1EB;} + .d2-3054270525 .fill-N6{fill:#EEF1F8;} + .d2-3054270525 .fill-N7{fill:#FFFFFF;} + .d2-3054270525 .fill-B1{fill:#0D32B2;} + .d2-3054270525 .fill-B2{fill:#0D32B2;} + .d2-3054270525 .fill-B3{fill:#E3E9FD;} + .d2-3054270525 .fill-B4{fill:#E3E9FD;} + .d2-3054270525 .fill-B5{fill:#EDF0FD;} + .d2-3054270525 .fill-B6{fill:#F7F8FE;} + .d2-3054270525 .fill-AA2{fill:#4A6FF3;} + .d2-3054270525 .fill-AA4{fill:#EDF0FD;} + .d2-3054270525 .fill-AA5{fill:#F7F8FE;} + .d2-3054270525 .fill-AB4{fill:#EDF0FD;} + .d2-3054270525 .fill-AB5{fill:#F7F8FE;} + .d2-3054270525 .stroke-N1{stroke:#0A0F25;} + .d2-3054270525 .stroke-N2{stroke:#676C7E;} + .d2-3054270525 .stroke-N3{stroke:#9499AB;} + .d2-3054270525 .stroke-N4{stroke:#CFD2DD;} + .d2-3054270525 .stroke-N5{stroke:#DEE1EB;} + .d2-3054270525 .stroke-N6{stroke:#EEF1F8;} + .d2-3054270525 .stroke-N7{stroke:#FFFFFF;} + .d2-3054270525 .stroke-B1{stroke:#0D32B2;} + .d2-3054270525 .stroke-B2{stroke:#0D32B2;} + .d2-3054270525 .stroke-B3{stroke:#E3E9FD;} + .d2-3054270525 .stroke-B4{stroke:#E3E9FD;} + .d2-3054270525 .stroke-B5{stroke:#EDF0FD;} + .d2-3054270525 .stroke-B6{stroke:#F7F8FE;} + .d2-3054270525 .stroke-AA2{stroke:#4A6FF3;} + .d2-3054270525 .stroke-AA4{stroke:#EDF0FD;} + .d2-3054270525 .stroke-AA5{stroke:#F7F8FE;} + .d2-3054270525 .stroke-AB4{stroke:#EDF0FD;} + .d2-3054270525 .stroke-AB5{stroke:#F7F8FE;} + .d2-3054270525 .background-color-N1{background-color:#0A0F25;} + .d2-3054270525 .background-color-N2{background-color:#676C7E;} + .d2-3054270525 .background-color-N3{background-color:#9499AB;} + .d2-3054270525 .background-color-N4{background-color:#CFD2DD;} + .d2-3054270525 .background-color-N5{background-color:#DEE1EB;} + .d2-3054270525 .background-color-N6{background-color:#EEF1F8;} + .d2-3054270525 .background-color-N7{background-color:#FFFFFF;} + .d2-3054270525 .background-color-B1{background-color:#0D32B2;} + .d2-3054270525 .background-color-B2{background-color:#0D32B2;} + .d2-3054270525 .background-color-B3{background-color:#E3E9FD;} + .d2-3054270525 .background-color-B4{background-color:#E3E9FD;} + .d2-3054270525 .background-color-B5{background-color:#EDF0FD;} + .d2-3054270525 .background-color-B6{background-color:#F7F8FE;} + .d2-3054270525 .background-color-AA2{background-color:#4A6FF3;} + .d2-3054270525 .background-color-AA4{background-color:#EDF0FD;} + .d2-3054270525 .background-color-AA5{background-color:#F7F8FE;} + .d2-3054270525 .background-color-AB4{background-color:#EDF0FD;} + .d2-3054270525 .background-color-AB5{background-color:#F7F8FE;} + .d2-3054270525 .color-N1{color:#0A0F25;} + .d2-3054270525 .color-N2{color:#676C7E;} + .d2-3054270525 .color-N3{color:#9499AB;} + .d2-3054270525 .color-N4{color:#CFD2DD;} + .d2-3054270525 .color-N5{color:#DEE1EB;} + .d2-3054270525 .color-N6{color:#EEF1F8;} + .d2-3054270525 .color-N7{color:#FFFFFF;} + .d2-3054270525 .color-B1{color:#0D32B2;} + .d2-3054270525 .color-B2{color:#0D32B2;} + .d2-3054270525 .color-B3{color:#E3E9FD;} + .d2-3054270525 .color-B4{color:#E3E9FD;} + .d2-3054270525 .color-B5{color:#EDF0FD;} + .d2-3054270525 .color-B6{color:#F7F8FE;} + .d2-3054270525 .color-AA2{color:#4A6FF3;} + .d2-3054270525 .color-AA4{color:#EDF0FD;} + .d2-3054270525 .color-AA5{color:#F7F8FE;} + .d2-3054270525 .color-AB4{color:#EDF0FD;} + .d2-3054270525 .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}]]>meow diff --git a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg index 38b67dbfd..ba64e310b 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg @@ -1,9 +1,9 @@ ab +}]]>ab -abdc +abdc -abdce +abdce diff --git a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg index 9c7b9ec08..f4570ef39 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-2922829426 .fill-N1{fill:#0A0F25;} + .d2-2922829426 .fill-N2{fill:#676C7E;} + .d2-2922829426 .fill-N3{fill:#9499AB;} + .d2-2922829426 .fill-N4{fill:#CFD2DD;} + .d2-2922829426 .fill-N5{fill:#DEE1EB;} + .d2-2922829426 .fill-N6{fill:#EEF1F8;} + .d2-2922829426 .fill-N7{fill:#FFFFFF;} + .d2-2922829426 .fill-B1{fill:#0D32B2;} + .d2-2922829426 .fill-B2{fill:#0D32B2;} + .d2-2922829426 .fill-B3{fill:#E3E9FD;} + .d2-2922829426 .fill-B4{fill:#E3E9FD;} + .d2-2922829426 .fill-B5{fill:#EDF0FD;} + .d2-2922829426 .fill-B6{fill:#F7F8FE;} + .d2-2922829426 .fill-AA2{fill:#4A6FF3;} + .d2-2922829426 .fill-AA4{fill:#EDF0FD;} + .d2-2922829426 .fill-AA5{fill:#F7F8FE;} + .d2-2922829426 .fill-AB4{fill:#EDF0FD;} + .d2-2922829426 .fill-AB5{fill:#F7F8FE;} + .d2-2922829426 .stroke-N1{stroke:#0A0F25;} + .d2-2922829426 .stroke-N2{stroke:#676C7E;} + .d2-2922829426 .stroke-N3{stroke:#9499AB;} + .d2-2922829426 .stroke-N4{stroke:#CFD2DD;} + .d2-2922829426 .stroke-N5{stroke:#DEE1EB;} + .d2-2922829426 .stroke-N6{stroke:#EEF1F8;} + .d2-2922829426 .stroke-N7{stroke:#FFFFFF;} + .d2-2922829426 .stroke-B1{stroke:#0D32B2;} + .d2-2922829426 .stroke-B2{stroke:#0D32B2;} + .d2-2922829426 .stroke-B3{stroke:#E3E9FD;} + .d2-2922829426 .stroke-B4{stroke:#E3E9FD;} + .d2-2922829426 .stroke-B5{stroke:#EDF0FD;} + .d2-2922829426 .stroke-B6{stroke:#F7F8FE;} + .d2-2922829426 .stroke-AA2{stroke:#4A6FF3;} + .d2-2922829426 .stroke-AA4{stroke:#EDF0FD;} + .d2-2922829426 .stroke-AA5{stroke:#F7F8FE;} + .d2-2922829426 .stroke-AB4{stroke:#EDF0FD;} + .d2-2922829426 .stroke-AB5{stroke:#F7F8FE;} + .d2-2922829426 .background-color-N1{background-color:#0A0F25;} + .d2-2922829426 .background-color-N2{background-color:#676C7E;} + .d2-2922829426 .background-color-N3{background-color:#9499AB;} + .d2-2922829426 .background-color-N4{background-color:#CFD2DD;} + .d2-2922829426 .background-color-N5{background-color:#DEE1EB;} + .d2-2922829426 .background-color-N6{background-color:#EEF1F8;} + .d2-2922829426 .background-color-N7{background-color:#FFFFFF;} + .d2-2922829426 .background-color-B1{background-color:#0D32B2;} + .d2-2922829426 .background-color-B2{background-color:#0D32B2;} + .d2-2922829426 .background-color-B3{background-color:#E3E9FD;} + .d2-2922829426 .background-color-B4{background-color:#E3E9FD;} + .d2-2922829426 .background-color-B5{background-color:#EDF0FD;} + .d2-2922829426 .background-color-B6{background-color:#F7F8FE;} + .d2-2922829426 .background-color-AA2{background-color:#4A6FF3;} + .d2-2922829426 .background-color-AA4{background-color:#EDF0FD;} + .d2-2922829426 .background-color-AA5{background-color:#F7F8FE;} + .d2-2922829426 .background-color-AB4{background-color:#EDF0FD;} + .d2-2922829426 .background-color-AB5{background-color:#F7F8FE;} + .d2-2922829426 .color-N1{color:#0A0F25;} + .d2-2922829426 .color-N2{color:#676C7E;} + .d2-2922829426 .color-N3{color:#9499AB;} + .d2-2922829426 .color-N4{color:#CFD2DD;} + .d2-2922829426 .color-N5{color:#DEE1EB;} + .d2-2922829426 .color-N6{color:#EEF1F8;} + .d2-2922829426 .color-N7{color:#FFFFFF;} + .d2-2922829426 .color-B1{color:#0D32B2;} + .d2-2922829426 .color-B2{color:#0D32B2;} + .d2-2922829426 .color-B3{color:#E3E9FD;} + .d2-2922829426 .color-B4{color:#E3E9FD;} + .d2-2922829426 .color-B5{color:#EDF0FD;} + .d2-2922829426 .color-B6{color:#F7F8FE;} + .d2-2922829426 .color-AA2{color:#4A6FF3;} + .d2-2922829426 .color-AA4{color:#EDF0FD;} + .d2-2922829426 .color-AA5{color:#F7F8FE;} + .d2-2922829426 .color-AB4{color:#EDF0FD;} + .d2-2922829426 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg index db25a6f69..8e0f6cfd3 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg @@ -1,9 +1,9 @@ -jonjan + .d2-2494158097 .fill-N1{fill:#0A0F25;} + .d2-2494158097 .fill-N2{fill:#676C7E;} + .d2-2494158097 .fill-N3{fill:#9499AB;} + .d2-2494158097 .fill-N4{fill:#CFD2DD;} + .d2-2494158097 .fill-N5{fill:#DEE1EB;} + .d2-2494158097 .fill-N6{fill:#EEF1F8;} + .d2-2494158097 .fill-N7{fill:#FFFFFF;} + .d2-2494158097 .fill-B1{fill:#0D32B2;} + .d2-2494158097 .fill-B2{fill:#0D32B2;} + .d2-2494158097 .fill-B3{fill:#E3E9FD;} + .d2-2494158097 .fill-B4{fill:#E3E9FD;} + .d2-2494158097 .fill-B5{fill:#EDF0FD;} + .d2-2494158097 .fill-B6{fill:#F7F8FE;} + .d2-2494158097 .fill-AA2{fill:#4A6FF3;} + .d2-2494158097 .fill-AA4{fill:#EDF0FD;} + .d2-2494158097 .fill-AA5{fill:#F7F8FE;} + .d2-2494158097 .fill-AB4{fill:#EDF0FD;} + .d2-2494158097 .fill-AB5{fill:#F7F8FE;} + .d2-2494158097 .stroke-N1{stroke:#0A0F25;} + .d2-2494158097 .stroke-N2{stroke:#676C7E;} + .d2-2494158097 .stroke-N3{stroke:#9499AB;} + .d2-2494158097 .stroke-N4{stroke:#CFD2DD;} + .d2-2494158097 .stroke-N5{stroke:#DEE1EB;} + .d2-2494158097 .stroke-N6{stroke:#EEF1F8;} + .d2-2494158097 .stroke-N7{stroke:#FFFFFF;} + .d2-2494158097 .stroke-B1{stroke:#0D32B2;} + .d2-2494158097 .stroke-B2{stroke:#0D32B2;} + .d2-2494158097 .stroke-B3{stroke:#E3E9FD;} + .d2-2494158097 .stroke-B4{stroke:#E3E9FD;} + .d2-2494158097 .stroke-B5{stroke:#EDF0FD;} + .d2-2494158097 .stroke-B6{stroke:#F7F8FE;} + .d2-2494158097 .stroke-AA2{stroke:#4A6FF3;} + .d2-2494158097 .stroke-AA4{stroke:#EDF0FD;} + .d2-2494158097 .stroke-AA5{stroke:#F7F8FE;} + .d2-2494158097 .stroke-AB4{stroke:#EDF0FD;} + .d2-2494158097 .stroke-AB5{stroke:#F7F8FE;} + .d2-2494158097 .background-color-N1{background-color:#0A0F25;} + .d2-2494158097 .background-color-N2{background-color:#676C7E;} + .d2-2494158097 .background-color-N3{background-color:#9499AB;} + .d2-2494158097 .background-color-N4{background-color:#CFD2DD;} + .d2-2494158097 .background-color-N5{background-color:#DEE1EB;} + .d2-2494158097 .background-color-N6{background-color:#EEF1F8;} + .d2-2494158097 .background-color-N7{background-color:#FFFFFF;} + .d2-2494158097 .background-color-B1{background-color:#0D32B2;} + .d2-2494158097 .background-color-B2{background-color:#0D32B2;} + .d2-2494158097 .background-color-B3{background-color:#E3E9FD;} + .d2-2494158097 .background-color-B4{background-color:#E3E9FD;} + .d2-2494158097 .background-color-B5{background-color:#EDF0FD;} + .d2-2494158097 .background-color-B6{background-color:#F7F8FE;} + .d2-2494158097 .background-color-AA2{background-color:#4A6FF3;} + .d2-2494158097 .background-color-AA4{background-color:#EDF0FD;} + .d2-2494158097 .background-color-AA5{background-color:#F7F8FE;} + .d2-2494158097 .background-color-AB4{background-color:#EDF0FD;} + .d2-2494158097 .background-color-AB5{background-color:#F7F8FE;} + .d2-2494158097 .color-N1{color:#0A0F25;} + .d2-2494158097 .color-N2{color:#676C7E;} + .d2-2494158097 .color-N3{color:#9499AB;} + .d2-2494158097 .color-N4{color:#CFD2DD;} + .d2-2494158097 .color-N5{color:#DEE1EB;} + .d2-2494158097 .color-N6{color:#EEF1F8;} + .d2-2494158097 .color-N7{color:#FFFFFF;} + .d2-2494158097 .color-B1{color:#0D32B2;} + .d2-2494158097 .color-B2{color:#0D32B2;} + .d2-2494158097 .color-B3{color:#E3E9FD;} + .d2-2494158097 .color-B4{color:#E3E9FD;} + .d2-2494158097 .color-B5{color:#EDF0FD;} + .d2-2494158097 .color-B6{color:#F7F8FE;} + .d2-2494158097 .color-AA2{color:#4A6FF3;} + .d2-2494158097 .color-AA4{color:#EDF0FD;} + .d2-2494158097 .color-AA5{color:#F7F8FE;} + .d2-2494158097 .color-AB4{color:#EDF0FD;} + .d2-2494158097 .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}]]>jonjan diff --git a/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg index 890f11c42..78cc87a17 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3600758884 .fill-N1{fill:#CDD6F4;} + .d2-3600758884 .fill-N2{fill:#BAC2DE;} + .d2-3600758884 .fill-N3{fill:#A6ADC8;} + .d2-3600758884 .fill-N4{fill:#585B70;} + .d2-3600758884 .fill-N5{fill:#45475A;} + .d2-3600758884 .fill-N6{fill:#313244;} + .d2-3600758884 .fill-N7{fill:#1E1E2E;} + .d2-3600758884 .fill-B1{fill:#CBA6f7;} + .d2-3600758884 .fill-B2{fill:#CBA6f7;} + .d2-3600758884 .fill-B3{fill:#6C7086;} + .d2-3600758884 .fill-B4{fill:#585B70;} + .d2-3600758884 .fill-B5{fill:#45475A;} + .d2-3600758884 .fill-B6{fill:#313244;} + .d2-3600758884 .fill-AA2{fill:#f38BA8;} + .d2-3600758884 .fill-AA4{fill:#45475A;} + .d2-3600758884 .fill-AA5{fill:#313244;} + .d2-3600758884 .fill-AB4{fill:#45475A;} + .d2-3600758884 .fill-AB5{fill:#313244;} + .d2-3600758884 .stroke-N1{stroke:#CDD6F4;} + .d2-3600758884 .stroke-N2{stroke:#BAC2DE;} + .d2-3600758884 .stroke-N3{stroke:#A6ADC8;} + .d2-3600758884 .stroke-N4{stroke:#585B70;} + .d2-3600758884 .stroke-N5{stroke:#45475A;} + .d2-3600758884 .stroke-N6{stroke:#313244;} + .d2-3600758884 .stroke-N7{stroke:#1E1E2E;} + .d2-3600758884 .stroke-B1{stroke:#CBA6f7;} + .d2-3600758884 .stroke-B2{stroke:#CBA6f7;} + .d2-3600758884 .stroke-B3{stroke:#6C7086;} + .d2-3600758884 .stroke-B4{stroke:#585B70;} + .d2-3600758884 .stroke-B5{stroke:#45475A;} + .d2-3600758884 .stroke-B6{stroke:#313244;} + .d2-3600758884 .stroke-AA2{stroke:#f38BA8;} + .d2-3600758884 .stroke-AA4{stroke:#45475A;} + .d2-3600758884 .stroke-AA5{stroke:#313244;} + .d2-3600758884 .stroke-AB4{stroke:#45475A;} + .d2-3600758884 .stroke-AB5{stroke:#313244;} + .d2-3600758884 .background-color-N1{background-color:#CDD6F4;} + .d2-3600758884 .background-color-N2{background-color:#BAC2DE;} + .d2-3600758884 .background-color-N3{background-color:#A6ADC8;} + .d2-3600758884 .background-color-N4{background-color:#585B70;} + .d2-3600758884 .background-color-N5{background-color:#45475A;} + .d2-3600758884 .background-color-N6{background-color:#313244;} + .d2-3600758884 .background-color-N7{background-color:#1E1E2E;} + .d2-3600758884 .background-color-B1{background-color:#CBA6f7;} + .d2-3600758884 .background-color-B2{background-color:#CBA6f7;} + .d2-3600758884 .background-color-B3{background-color:#6C7086;} + .d2-3600758884 .background-color-B4{background-color:#585B70;} + .d2-3600758884 .background-color-B5{background-color:#45475A;} + .d2-3600758884 .background-color-B6{background-color:#313244;} + .d2-3600758884 .background-color-AA2{background-color:#f38BA8;} + .d2-3600758884 .background-color-AA4{background-color:#45475A;} + .d2-3600758884 .background-color-AA5{background-color:#313244;} + .d2-3600758884 .background-color-AB4{background-color:#45475A;} + .d2-3600758884 .background-color-AB5{background-color:#313244;} + .d2-3600758884 .color-N1{color:#CDD6F4;} + .d2-3600758884 .color-N2{color:#BAC2DE;} + .d2-3600758884 .color-N3{color:#A6ADC8;} + .d2-3600758884 .color-N4{color:#585B70;} + .d2-3600758884 .color-N5{color:#45475A;} + .d2-3600758884 .color-N6{color:#313244;} + .d2-3600758884 .color-N7{color:#1E1E2E;} + .d2-3600758884 .color-B1{color:#CBA6f7;} + .d2-3600758884 .color-B2{color:#CBA6f7;} + .d2-3600758884 .color-B3{color:#6C7086;} + .d2-3600758884 .color-B4{color:#585B70;} + .d2-3600758884 .color-B5{color:#45475A;} + .d2-3600758884 .color-B6{color:#313244;} + .d2-3600758884 .color-AA2{color:#f38BA8;} + .d2-3600758884 .color-AA4{color:#45475A;} + .d2-3600758884 .color-AA5{color:#313244;} + .d2-3600758884 .color-AB4{color:#45475A;} + .d2-3600758884 .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}]]>xy 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 507153980513cf55e08dac3a92aa89fce57bf0d6..a98721b302bdf0b132a4d7d1d4214547af228b28 100644 GIT binary patch delta 68 zcmcckk>%n?mWC~ib4{k7H(}JDKHG%RX!<`B#;eMfhK5F#MwXgf`o8%oE{P?n3K}j} UMg~U42IfXkx$WOf8E-QI0A$V%n?mWC~ib4{k7GhsBCKHG%RaQZ(J#;eL^Mn)#4MkbnE`o8%oE{P?n3K}j} UMg~U42IfXkx$WOf8E-QI0An>4ZvX%Q diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg index e069c408c..c884c8410 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg @@ -1,12 +1,12 @@ -doh + .d2-3597588678 .fill-N1{fill:#0A0F25;} + .d2-3597588678 .fill-N2{fill:#676C7E;} + .d2-3597588678 .fill-N3{fill:#9499AB;} + .d2-3597588678 .fill-N4{fill:#CFD2DD;} + .d2-3597588678 .fill-N5{fill:#DEE1EB;} + .d2-3597588678 .fill-N6{fill:#EEF1F8;} + .d2-3597588678 .fill-N7{fill:#FFFFFF;} + .d2-3597588678 .fill-B1{fill:#0D32B2;} + .d2-3597588678 .fill-B2{fill:#0D32B2;} + .d2-3597588678 .fill-B3{fill:#E3E9FD;} + .d2-3597588678 .fill-B4{fill:#E3E9FD;} + .d2-3597588678 .fill-B5{fill:#EDF0FD;} + .d2-3597588678 .fill-B6{fill:#F7F8FE;} + .d2-3597588678 .fill-AA2{fill:#4A6FF3;} + .d2-3597588678 .fill-AA4{fill:#EDF0FD;} + .d2-3597588678 .fill-AA5{fill:#F7F8FE;} + .d2-3597588678 .fill-AB4{fill:#EDF0FD;} + .d2-3597588678 .fill-AB5{fill:#F7F8FE;} + .d2-3597588678 .stroke-N1{stroke:#0A0F25;} + .d2-3597588678 .stroke-N2{stroke:#676C7E;} + .d2-3597588678 .stroke-N3{stroke:#9499AB;} + .d2-3597588678 .stroke-N4{stroke:#CFD2DD;} + .d2-3597588678 .stroke-N5{stroke:#DEE1EB;} + .d2-3597588678 .stroke-N6{stroke:#EEF1F8;} + .d2-3597588678 .stroke-N7{stroke:#FFFFFF;} + .d2-3597588678 .stroke-B1{stroke:#0D32B2;} + .d2-3597588678 .stroke-B2{stroke:#0D32B2;} + .d2-3597588678 .stroke-B3{stroke:#E3E9FD;} + .d2-3597588678 .stroke-B4{stroke:#E3E9FD;} + .d2-3597588678 .stroke-B5{stroke:#EDF0FD;} + .d2-3597588678 .stroke-B6{stroke:#F7F8FE;} + .d2-3597588678 .stroke-AA2{stroke:#4A6FF3;} + .d2-3597588678 .stroke-AA4{stroke:#EDF0FD;} + .d2-3597588678 .stroke-AA5{stroke:#F7F8FE;} + .d2-3597588678 .stroke-AB4{stroke:#EDF0FD;} + .d2-3597588678 .stroke-AB5{stroke:#F7F8FE;} + .d2-3597588678 .background-color-N1{background-color:#0A0F25;} + .d2-3597588678 .background-color-N2{background-color:#676C7E;} + .d2-3597588678 .background-color-N3{background-color:#9499AB;} + .d2-3597588678 .background-color-N4{background-color:#CFD2DD;} + .d2-3597588678 .background-color-N5{background-color:#DEE1EB;} + .d2-3597588678 .background-color-N6{background-color:#EEF1F8;} + .d2-3597588678 .background-color-N7{background-color:#FFFFFF;} + .d2-3597588678 .background-color-B1{background-color:#0D32B2;} + .d2-3597588678 .background-color-B2{background-color:#0D32B2;} + .d2-3597588678 .background-color-B3{background-color:#E3E9FD;} + .d2-3597588678 .background-color-B4{background-color:#E3E9FD;} + .d2-3597588678 .background-color-B5{background-color:#EDF0FD;} + .d2-3597588678 .background-color-B6{background-color:#F7F8FE;} + .d2-3597588678 .background-color-AA2{background-color:#4A6FF3;} + .d2-3597588678 .background-color-AA4{background-color:#EDF0FD;} + .d2-3597588678 .background-color-AA5{background-color:#F7F8FE;} + .d2-3597588678 .background-color-AB4{background-color:#EDF0FD;} + .d2-3597588678 .background-color-AB5{background-color:#F7F8FE;} + .d2-3597588678 .color-N1{color:#0A0F25;} + .d2-3597588678 .color-N2{color:#676C7E;} + .d2-3597588678 .color-N3{color:#9499AB;} + .d2-3597588678 .color-N4{color:#CFD2DD;} + .d2-3597588678 .color-N5{color:#DEE1EB;} + .d2-3597588678 .color-N6{color:#EEF1F8;} + .d2-3597588678 .color-N7{color:#FFFFFF;} + .d2-3597588678 .color-B1{color:#0D32B2;} + .d2-3597588678 .color-B2{color:#0D32B2;} + .d2-3597588678 .color-B3{color:#E3E9FD;} + .d2-3597588678 .color-B4{color:#E3E9FD;} + .d2-3597588678 .color-B5{color:#EDF0FD;} + .d2-3597588678 .color-B6{color:#F7F8FE;} + .d2-3597588678 .color-AA2{color:#4A6FF3;} + .d2-3597588678 .color-AA4{color:#EDF0FD;} + .d2-3597588678 .color-AA5{color:#F7F8FE;} + .d2-3597588678 .color-AB4{color:#EDF0FD;} + .d2-3597588678 .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}]]>doh @@ -104,7 +104,7 @@ - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg index ec958858e..1eba24ede 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg @@ -1,12 +1,12 @@ -I'm a Mac + .d2-975237027 .fill-N1{fill:#0A0F25;} + .d2-975237027 .fill-N2{fill:#676C7E;} + .d2-975237027 .fill-N3{fill:#9499AB;} + .d2-975237027 .fill-N4{fill:#CFD2DD;} + .d2-975237027 .fill-N5{fill:#DEE1EB;} + .d2-975237027 .fill-N6{fill:#EEF1F8;} + .d2-975237027 .fill-N7{fill:#FFFFFF;} + .d2-975237027 .fill-B1{fill:#0D32B2;} + .d2-975237027 .fill-B2{fill:#0D32B2;} + .d2-975237027 .fill-B3{fill:#E3E9FD;} + .d2-975237027 .fill-B4{fill:#E3E9FD;} + .d2-975237027 .fill-B5{fill:#EDF0FD;} + .d2-975237027 .fill-B6{fill:#F7F8FE;} + .d2-975237027 .fill-AA2{fill:#4A6FF3;} + .d2-975237027 .fill-AA4{fill:#EDF0FD;} + .d2-975237027 .fill-AA5{fill:#F7F8FE;} + .d2-975237027 .fill-AB4{fill:#EDF0FD;} + .d2-975237027 .fill-AB5{fill:#F7F8FE;} + .d2-975237027 .stroke-N1{stroke:#0A0F25;} + .d2-975237027 .stroke-N2{stroke:#676C7E;} + .d2-975237027 .stroke-N3{stroke:#9499AB;} + .d2-975237027 .stroke-N4{stroke:#CFD2DD;} + .d2-975237027 .stroke-N5{stroke:#DEE1EB;} + .d2-975237027 .stroke-N6{stroke:#EEF1F8;} + .d2-975237027 .stroke-N7{stroke:#FFFFFF;} + .d2-975237027 .stroke-B1{stroke:#0D32B2;} + .d2-975237027 .stroke-B2{stroke:#0D32B2;} + .d2-975237027 .stroke-B3{stroke:#E3E9FD;} + .d2-975237027 .stroke-B4{stroke:#E3E9FD;} + .d2-975237027 .stroke-B5{stroke:#EDF0FD;} + .d2-975237027 .stroke-B6{stroke:#F7F8FE;} + .d2-975237027 .stroke-AA2{stroke:#4A6FF3;} + .d2-975237027 .stroke-AA4{stroke:#EDF0FD;} + .d2-975237027 .stroke-AA5{stroke:#F7F8FE;} + .d2-975237027 .stroke-AB4{stroke:#EDF0FD;} + .d2-975237027 .stroke-AB5{stroke:#F7F8FE;} + .d2-975237027 .background-color-N1{background-color:#0A0F25;} + .d2-975237027 .background-color-N2{background-color:#676C7E;} + .d2-975237027 .background-color-N3{background-color:#9499AB;} + .d2-975237027 .background-color-N4{background-color:#CFD2DD;} + .d2-975237027 .background-color-N5{background-color:#DEE1EB;} + .d2-975237027 .background-color-N6{background-color:#EEF1F8;} + .d2-975237027 .background-color-N7{background-color:#FFFFFF;} + .d2-975237027 .background-color-B1{background-color:#0D32B2;} + .d2-975237027 .background-color-B2{background-color:#0D32B2;} + .d2-975237027 .background-color-B3{background-color:#E3E9FD;} + .d2-975237027 .background-color-B4{background-color:#E3E9FD;} + .d2-975237027 .background-color-B5{background-color:#EDF0FD;} + .d2-975237027 .background-color-B6{background-color:#F7F8FE;} + .d2-975237027 .background-color-AA2{background-color:#4A6FF3;} + .d2-975237027 .background-color-AA4{background-color:#EDF0FD;} + .d2-975237027 .background-color-AA5{background-color:#F7F8FE;} + .d2-975237027 .background-color-AB4{background-color:#EDF0FD;} + .d2-975237027 .background-color-AB5{background-color:#F7F8FE;} + .d2-975237027 .color-N1{color:#0A0F25;} + .d2-975237027 .color-N2{color:#676C7E;} + .d2-975237027 .color-N3{color:#9499AB;} + .d2-975237027 .color-N4{color:#CFD2DD;} + .d2-975237027 .color-N5{color:#DEE1EB;} + .d2-975237027 .color-N6{color:#EEF1F8;} + .d2-975237027 .color-N7{color:#FFFFFF;} + .d2-975237027 .color-B1{color:#0D32B2;} + .d2-975237027 .color-B2{color:#0D32B2;} + .d2-975237027 .color-B3{color:#E3E9FD;} + .d2-975237027 .color-B4{color:#E3E9FD;} + .d2-975237027 .color-B5{color:#EDF0FD;} + .d2-975237027 .color-B6{color:#F7F8FE;} + .d2-975237027 .color-AA2{color:#4A6FF3;} + .d2-975237027 .color-AA4{color:#EDF0FD;} + .d2-975237027 .color-AA5{color:#F7F8FE;} + .d2-975237027 .color-AB4{color:#EDF0FD;} + .d2-975237027 .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}]]>I'm a Mac @@ -104,7 +104,7 @@ - + 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 7ac7d8c8c..08de52c0a 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-66779799 .fill-N1{fill:#0A0F25;} + .d2-66779799 .fill-N2{fill:#676C7E;} + .d2-66779799 .fill-N3{fill:#9499AB;} + .d2-66779799 .fill-N4{fill:#CFD2DD;} + .d2-66779799 .fill-N5{fill:#DEE1EB;} + .d2-66779799 .fill-N6{fill:#EEF1F8;} + .d2-66779799 .fill-N7{fill:#FFFFFF;} + .d2-66779799 .fill-B1{fill:#0D32B2;} + .d2-66779799 .fill-B2{fill:#0D32B2;} + .d2-66779799 .fill-B3{fill:#E3E9FD;} + .d2-66779799 .fill-B4{fill:#E3E9FD;} + .d2-66779799 .fill-B5{fill:#EDF0FD;} + .d2-66779799 .fill-B6{fill:#F7F8FE;} + .d2-66779799 .fill-AA2{fill:#4A6FF3;} + .d2-66779799 .fill-AA4{fill:#EDF0FD;} + .d2-66779799 .fill-AA5{fill:#F7F8FE;} + .d2-66779799 .fill-AB4{fill:#EDF0FD;} + .d2-66779799 .fill-AB5{fill:#F7F8FE;} + .d2-66779799 .stroke-N1{stroke:#0A0F25;} + .d2-66779799 .stroke-N2{stroke:#676C7E;} + .d2-66779799 .stroke-N3{stroke:#9499AB;} + .d2-66779799 .stroke-N4{stroke:#CFD2DD;} + .d2-66779799 .stroke-N5{stroke:#DEE1EB;} + .d2-66779799 .stroke-N6{stroke:#EEF1F8;} + .d2-66779799 .stroke-N7{stroke:#FFFFFF;} + .d2-66779799 .stroke-B1{stroke:#0D32B2;} + .d2-66779799 .stroke-B2{stroke:#0D32B2;} + .d2-66779799 .stroke-B3{stroke:#E3E9FD;} + .d2-66779799 .stroke-B4{stroke:#E3E9FD;} + .d2-66779799 .stroke-B5{stroke:#EDF0FD;} + .d2-66779799 .stroke-B6{stroke:#F7F8FE;} + .d2-66779799 .stroke-AA2{stroke:#4A6FF3;} + .d2-66779799 .stroke-AA4{stroke:#EDF0FD;} + .d2-66779799 .stroke-AA5{stroke:#F7F8FE;} + .d2-66779799 .stroke-AB4{stroke:#EDF0FD;} + .d2-66779799 .stroke-AB5{stroke:#F7F8FE;} + .d2-66779799 .background-color-N1{background-color:#0A0F25;} + .d2-66779799 .background-color-N2{background-color:#676C7E;} + .d2-66779799 .background-color-N3{background-color:#9499AB;} + .d2-66779799 .background-color-N4{background-color:#CFD2DD;} + .d2-66779799 .background-color-N5{background-color:#DEE1EB;} + .d2-66779799 .background-color-N6{background-color:#EEF1F8;} + .d2-66779799 .background-color-N7{background-color:#FFFFFF;} + .d2-66779799 .background-color-B1{background-color:#0D32B2;} + .d2-66779799 .background-color-B2{background-color:#0D32B2;} + .d2-66779799 .background-color-B3{background-color:#E3E9FD;} + .d2-66779799 .background-color-B4{background-color:#E3E9FD;} + .d2-66779799 .background-color-B5{background-color:#EDF0FD;} + .d2-66779799 .background-color-B6{background-color:#F7F8FE;} + .d2-66779799 .background-color-AA2{background-color:#4A6FF3;} + .d2-66779799 .background-color-AA4{background-color:#EDF0FD;} + .d2-66779799 .background-color-AA5{background-color:#F7F8FE;} + .d2-66779799 .background-color-AB4{background-color:#EDF0FD;} + .d2-66779799 .background-color-AB5{background-color:#F7F8FE;} + .d2-66779799 .color-N1{color:#0A0F25;} + .d2-66779799 .color-N2{color:#676C7E;} + .d2-66779799 .color-N3{color:#9499AB;} + .d2-66779799 .color-N4{color:#CFD2DD;} + .d2-66779799 .color-N5{color:#DEE1EB;} + .d2-66779799 .color-N6{color:#EEF1F8;} + .d2-66779799 .color-N7{color:#FFFFFF;} + .d2-66779799 .color-B1{color:#0D32B2;} + .d2-66779799 .color-B2{color:#0D32B2;} + .d2-66779799 .color-B3{color:#E3E9FD;} + .d2-66779799 .color-B4{color:#E3E9FD;} + .d2-66779799 .color-B5{color:#EDF0FD;} + .d2-66779799 .color-B6{color:#F7F8FE;} + .d2-66779799 .color-AA2{color:#4A6FF3;} + .d2-66779799 .color-AA4{color:#EDF0FD;} + .d2-66779799 .color-AA5{color:#F7F8FE;} + .d2-66779799 .color-AB4{color:#EDF0FD;} + .d2-66779799 .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 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 5ae05e336..fe76b61fd 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,9 +1,9 @@ -mortgagerealtor + .d2-1726870641 .fill-N1{fill:#0A0F25;} + .d2-1726870641 .fill-N2{fill:#676C7E;} + .d2-1726870641 .fill-N3{fill:#9499AB;} + .d2-1726870641 .fill-N4{fill:#CFD2DD;} + .d2-1726870641 .fill-N5{fill:#DEE1EB;} + .d2-1726870641 .fill-N6{fill:#EEF1F8;} + .d2-1726870641 .fill-N7{fill:#FFFFFF;} + .d2-1726870641 .fill-B1{fill:#0D32B2;} + .d2-1726870641 .fill-B2{fill:#0D32B2;} + .d2-1726870641 .fill-B3{fill:#E3E9FD;} + .d2-1726870641 .fill-B4{fill:#E3E9FD;} + .d2-1726870641 .fill-B5{fill:#EDF0FD;} + .d2-1726870641 .fill-B6{fill:#F7F8FE;} + .d2-1726870641 .fill-AA2{fill:#4A6FF3;} + .d2-1726870641 .fill-AA4{fill:#EDF0FD;} + .d2-1726870641 .fill-AA5{fill:#F7F8FE;} + .d2-1726870641 .fill-AB4{fill:#EDF0FD;} + .d2-1726870641 .fill-AB5{fill:#F7F8FE;} + .d2-1726870641 .stroke-N1{stroke:#0A0F25;} + .d2-1726870641 .stroke-N2{stroke:#676C7E;} + .d2-1726870641 .stroke-N3{stroke:#9499AB;} + .d2-1726870641 .stroke-N4{stroke:#CFD2DD;} + .d2-1726870641 .stroke-N5{stroke:#DEE1EB;} + .d2-1726870641 .stroke-N6{stroke:#EEF1F8;} + .d2-1726870641 .stroke-N7{stroke:#FFFFFF;} + .d2-1726870641 .stroke-B1{stroke:#0D32B2;} + .d2-1726870641 .stroke-B2{stroke:#0D32B2;} + .d2-1726870641 .stroke-B3{stroke:#E3E9FD;} + .d2-1726870641 .stroke-B4{stroke:#E3E9FD;} + .d2-1726870641 .stroke-B5{stroke:#EDF0FD;} + .d2-1726870641 .stroke-B6{stroke:#F7F8FE;} + .d2-1726870641 .stroke-AA2{stroke:#4A6FF3;} + .d2-1726870641 .stroke-AA4{stroke:#EDF0FD;} + .d2-1726870641 .stroke-AA5{stroke:#F7F8FE;} + .d2-1726870641 .stroke-AB4{stroke:#EDF0FD;} + .d2-1726870641 .stroke-AB5{stroke:#F7F8FE;} + .d2-1726870641 .background-color-N1{background-color:#0A0F25;} + .d2-1726870641 .background-color-N2{background-color:#676C7E;} + .d2-1726870641 .background-color-N3{background-color:#9499AB;} + .d2-1726870641 .background-color-N4{background-color:#CFD2DD;} + .d2-1726870641 .background-color-N5{background-color:#DEE1EB;} + .d2-1726870641 .background-color-N6{background-color:#EEF1F8;} + .d2-1726870641 .background-color-N7{background-color:#FFFFFF;} + .d2-1726870641 .background-color-B1{background-color:#0D32B2;} + .d2-1726870641 .background-color-B2{background-color:#0D32B2;} + .d2-1726870641 .background-color-B3{background-color:#E3E9FD;} + .d2-1726870641 .background-color-B4{background-color:#E3E9FD;} + .d2-1726870641 .background-color-B5{background-color:#EDF0FD;} + .d2-1726870641 .background-color-B6{background-color:#F7F8FE;} + .d2-1726870641 .background-color-AA2{background-color:#4A6FF3;} + .d2-1726870641 .background-color-AA4{background-color:#EDF0FD;} + .d2-1726870641 .background-color-AA5{background-color:#F7F8FE;} + .d2-1726870641 .background-color-AB4{background-color:#EDF0FD;} + .d2-1726870641 .background-color-AB5{background-color:#F7F8FE;} + .d2-1726870641 .color-N1{color:#0A0F25;} + .d2-1726870641 .color-N2{color:#676C7E;} + .d2-1726870641 .color-N3{color:#9499AB;} + .d2-1726870641 .color-N4{color:#CFD2DD;} + .d2-1726870641 .color-N5{color:#DEE1EB;} + .d2-1726870641 .color-N6{color:#EEF1F8;} + .d2-1726870641 .color-N7{color:#FFFFFF;} + .d2-1726870641 .color-B1{color:#0D32B2;} + .d2-1726870641 .color-B2{color:#0D32B2;} + .d2-1726870641 .color-B3{color:#E3E9FD;} + .d2-1726870641 .color-B4{color:#E3E9FD;} + .d2-1726870641 .color-B5{color:#EDF0FD;} + .d2-1726870641 .color-B6{color:#F7F8FE;} + .d2-1726870641 .color-AA2{color:#4A6FF3;} + .d2-1726870641 .color-AA4{color:#EDF0FD;} + .d2-1726870641 .color-AA5{color:#F7F8FE;} + .d2-1726870641 .color-AB4{color:#EDF0FD;} + .d2-1726870641 .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}]]>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 c59bcfe84..08e4916f8 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,9 +1,9 @@ -belieffooddiet + .d2-2725802959 .fill-N1{fill:#0A0F25;} + .d2-2725802959 .fill-N2{fill:#676C7E;} + .d2-2725802959 .fill-N3{fill:#9499AB;} + .d2-2725802959 .fill-N4{fill:#CFD2DD;} + .d2-2725802959 .fill-N5{fill:#DEE1EB;} + .d2-2725802959 .fill-N6{fill:#EEF1F8;} + .d2-2725802959 .fill-N7{fill:#FFFFFF;} + .d2-2725802959 .fill-B1{fill:#0D32B2;} + .d2-2725802959 .fill-B2{fill:#0D32B2;} + .d2-2725802959 .fill-B3{fill:#E3E9FD;} + .d2-2725802959 .fill-B4{fill:#E3E9FD;} + .d2-2725802959 .fill-B5{fill:#EDF0FD;} + .d2-2725802959 .fill-B6{fill:#F7F8FE;} + .d2-2725802959 .fill-AA2{fill:#4A6FF3;} + .d2-2725802959 .fill-AA4{fill:#EDF0FD;} + .d2-2725802959 .fill-AA5{fill:#F7F8FE;} + .d2-2725802959 .fill-AB4{fill:#EDF0FD;} + .d2-2725802959 .fill-AB5{fill:#F7F8FE;} + .d2-2725802959 .stroke-N1{stroke:#0A0F25;} + .d2-2725802959 .stroke-N2{stroke:#676C7E;} + .d2-2725802959 .stroke-N3{stroke:#9499AB;} + .d2-2725802959 .stroke-N4{stroke:#CFD2DD;} + .d2-2725802959 .stroke-N5{stroke:#DEE1EB;} + .d2-2725802959 .stroke-N6{stroke:#EEF1F8;} + .d2-2725802959 .stroke-N7{stroke:#FFFFFF;} + .d2-2725802959 .stroke-B1{stroke:#0D32B2;} + .d2-2725802959 .stroke-B2{stroke:#0D32B2;} + .d2-2725802959 .stroke-B3{stroke:#E3E9FD;} + .d2-2725802959 .stroke-B4{stroke:#E3E9FD;} + .d2-2725802959 .stroke-B5{stroke:#EDF0FD;} + .d2-2725802959 .stroke-B6{stroke:#F7F8FE;} + .d2-2725802959 .stroke-AA2{stroke:#4A6FF3;} + .d2-2725802959 .stroke-AA4{stroke:#EDF0FD;} + .d2-2725802959 .stroke-AA5{stroke:#F7F8FE;} + .d2-2725802959 .stroke-AB4{stroke:#EDF0FD;} + .d2-2725802959 .stroke-AB5{stroke:#F7F8FE;} + .d2-2725802959 .background-color-N1{background-color:#0A0F25;} + .d2-2725802959 .background-color-N2{background-color:#676C7E;} + .d2-2725802959 .background-color-N3{background-color:#9499AB;} + .d2-2725802959 .background-color-N4{background-color:#CFD2DD;} + .d2-2725802959 .background-color-N5{background-color:#DEE1EB;} + .d2-2725802959 .background-color-N6{background-color:#EEF1F8;} + .d2-2725802959 .background-color-N7{background-color:#FFFFFF;} + .d2-2725802959 .background-color-B1{background-color:#0D32B2;} + .d2-2725802959 .background-color-B2{background-color:#0D32B2;} + .d2-2725802959 .background-color-B3{background-color:#E3E9FD;} + .d2-2725802959 .background-color-B4{background-color:#E3E9FD;} + .d2-2725802959 .background-color-B5{background-color:#EDF0FD;} + .d2-2725802959 .background-color-B6{background-color:#F7F8FE;} + .d2-2725802959 .background-color-AA2{background-color:#4A6FF3;} + .d2-2725802959 .background-color-AA4{background-color:#EDF0FD;} + .d2-2725802959 .background-color-AA5{background-color:#F7F8FE;} + .d2-2725802959 .background-color-AB4{background-color:#EDF0FD;} + .d2-2725802959 .background-color-AB5{background-color:#F7F8FE;} + .d2-2725802959 .color-N1{color:#0A0F25;} + .d2-2725802959 .color-N2{color:#676C7E;} + .d2-2725802959 .color-N3{color:#9499AB;} + .d2-2725802959 .color-N4{color:#CFD2DD;} + .d2-2725802959 .color-N5{color:#DEE1EB;} + .d2-2725802959 .color-N6{color:#EEF1F8;} + .d2-2725802959 .color-N7{color:#FFFFFF;} + .d2-2725802959 .color-B1{color:#0D32B2;} + .d2-2725802959 .color-B2{color:#0D32B2;} + .d2-2725802959 .color-B3{color:#E3E9FD;} + .d2-2725802959 .color-B4{color:#E3E9FD;} + .d2-2725802959 .color-B5{color:#EDF0FD;} + .d2-2725802959 .color-B6{color:#F7F8FE;} + .d2-2725802959 .color-AA2{color:#4A6FF3;} + .d2-2725802959 .color-AA4{color:#EDF0FD;} + .d2-2725802959 .color-AA5{color:#F7F8FE;} + .d2-2725802959 .color-AB4{color:#EDF0FD;} + .d2-2725802959 .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}]]>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 3970623ee..d92baa3b7 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,9 +1,9 @@ -TSXNYSENASDAQ + .d2-3935287890 .fill-N1{fill:#0A0F25;} + .d2-3935287890 .fill-N2{fill:#676C7E;} + .d2-3935287890 .fill-N3{fill:#9499AB;} + .d2-3935287890 .fill-N4{fill:#CFD2DD;} + .d2-3935287890 .fill-N5{fill:#DEE1EB;} + .d2-3935287890 .fill-N6{fill:#EEF1F8;} + .d2-3935287890 .fill-N7{fill:#FFFFFF;} + .d2-3935287890 .fill-B1{fill:#0D32B2;} + .d2-3935287890 .fill-B2{fill:#0D32B2;} + .d2-3935287890 .fill-B3{fill:#E3E9FD;} + .d2-3935287890 .fill-B4{fill:#E3E9FD;} + .d2-3935287890 .fill-B5{fill:#EDF0FD;} + .d2-3935287890 .fill-B6{fill:#F7F8FE;} + .d2-3935287890 .fill-AA2{fill:#4A6FF3;} + .d2-3935287890 .fill-AA4{fill:#EDF0FD;} + .d2-3935287890 .fill-AA5{fill:#F7F8FE;} + .d2-3935287890 .fill-AB4{fill:#EDF0FD;} + .d2-3935287890 .fill-AB5{fill:#F7F8FE;} + .d2-3935287890 .stroke-N1{stroke:#0A0F25;} + .d2-3935287890 .stroke-N2{stroke:#676C7E;} + .d2-3935287890 .stroke-N3{stroke:#9499AB;} + .d2-3935287890 .stroke-N4{stroke:#CFD2DD;} + .d2-3935287890 .stroke-N5{stroke:#DEE1EB;} + .d2-3935287890 .stroke-N6{stroke:#EEF1F8;} + .d2-3935287890 .stroke-N7{stroke:#FFFFFF;} + .d2-3935287890 .stroke-B1{stroke:#0D32B2;} + .d2-3935287890 .stroke-B2{stroke:#0D32B2;} + .d2-3935287890 .stroke-B3{stroke:#E3E9FD;} + .d2-3935287890 .stroke-B4{stroke:#E3E9FD;} + .d2-3935287890 .stroke-B5{stroke:#EDF0FD;} + .d2-3935287890 .stroke-B6{stroke:#F7F8FE;} + .d2-3935287890 .stroke-AA2{stroke:#4A6FF3;} + .d2-3935287890 .stroke-AA4{stroke:#EDF0FD;} + .d2-3935287890 .stroke-AA5{stroke:#F7F8FE;} + .d2-3935287890 .stroke-AB4{stroke:#EDF0FD;} + .d2-3935287890 .stroke-AB5{stroke:#F7F8FE;} + .d2-3935287890 .background-color-N1{background-color:#0A0F25;} + .d2-3935287890 .background-color-N2{background-color:#676C7E;} + .d2-3935287890 .background-color-N3{background-color:#9499AB;} + .d2-3935287890 .background-color-N4{background-color:#CFD2DD;} + .d2-3935287890 .background-color-N5{background-color:#DEE1EB;} + .d2-3935287890 .background-color-N6{background-color:#EEF1F8;} + .d2-3935287890 .background-color-N7{background-color:#FFFFFF;} + .d2-3935287890 .background-color-B1{background-color:#0D32B2;} + .d2-3935287890 .background-color-B2{background-color:#0D32B2;} + .d2-3935287890 .background-color-B3{background-color:#E3E9FD;} + .d2-3935287890 .background-color-B4{background-color:#E3E9FD;} + .d2-3935287890 .background-color-B5{background-color:#EDF0FD;} + .d2-3935287890 .background-color-B6{background-color:#F7F8FE;} + .d2-3935287890 .background-color-AA2{background-color:#4A6FF3;} + .d2-3935287890 .background-color-AA4{background-color:#EDF0FD;} + .d2-3935287890 .background-color-AA5{background-color:#F7F8FE;} + .d2-3935287890 .background-color-AB4{background-color:#EDF0FD;} + .d2-3935287890 .background-color-AB5{background-color:#F7F8FE;} + .d2-3935287890 .color-N1{color:#0A0F25;} + .d2-3935287890 .color-N2{color:#676C7E;} + .d2-3935287890 .color-N3{color:#9499AB;} + .d2-3935287890 .color-N4{color:#CFD2DD;} + .d2-3935287890 .color-N5{color:#DEE1EB;} + .d2-3935287890 .color-N6{color:#EEF1F8;} + .d2-3935287890 .color-N7{color:#FFFFFF;} + .d2-3935287890 .color-B1{color:#0D32B2;} + .d2-3935287890 .color-B2{color:#0D32B2;} + .d2-3935287890 .color-B3{color:#E3E9FD;} + .d2-3935287890 .color-B4{color:#E3E9FD;} + .d2-3935287890 .color-B5{color:#EDF0FD;} + .d2-3935287890 .color-B6{color:#F7F8FE;} + .d2-3935287890 .color-AA2{color:#4A6FF3;} + .d2-3935287890 .color-AA4{color:#EDF0FD;} + .d2-3935287890 .color-AA5{color:#F7F8FE;} + .d2-3935287890 .color-AB4{color:#EDF0FD;} + .d2-3935287890 .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}]]>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 5d1bb91cf..cb74951e9 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,9 +1,9 @@ -xy + .d2-1325376569 .fill-N1{fill:#0A0F25;} + .d2-1325376569 .fill-N2{fill:#676C7E;} + .d2-1325376569 .fill-N3{fill:#9499AB;} + .d2-1325376569 .fill-N4{fill:#CFD2DD;} + .d2-1325376569 .fill-N5{fill:#DEE1EB;} + .d2-1325376569 .fill-N6{fill:#EEF1F8;} + .d2-1325376569 .fill-N7{fill:#FFFFFF;} + .d2-1325376569 .fill-B1{fill:#0D32B2;} + .d2-1325376569 .fill-B2{fill:#0D32B2;} + .d2-1325376569 .fill-B3{fill:#E3E9FD;} + .d2-1325376569 .fill-B4{fill:#E3E9FD;} + .d2-1325376569 .fill-B5{fill:#EDF0FD;} + .d2-1325376569 .fill-B6{fill:#F7F8FE;} + .d2-1325376569 .fill-AA2{fill:#4A6FF3;} + .d2-1325376569 .fill-AA4{fill:#EDF0FD;} + .d2-1325376569 .fill-AA5{fill:#F7F8FE;} + .d2-1325376569 .fill-AB4{fill:#EDF0FD;} + .d2-1325376569 .fill-AB5{fill:#F7F8FE;} + .d2-1325376569 .stroke-N1{stroke:#0A0F25;} + .d2-1325376569 .stroke-N2{stroke:#676C7E;} + .d2-1325376569 .stroke-N3{stroke:#9499AB;} + .d2-1325376569 .stroke-N4{stroke:#CFD2DD;} + .d2-1325376569 .stroke-N5{stroke:#DEE1EB;} + .d2-1325376569 .stroke-N6{stroke:#EEF1F8;} + .d2-1325376569 .stroke-N7{stroke:#FFFFFF;} + .d2-1325376569 .stroke-B1{stroke:#0D32B2;} + .d2-1325376569 .stroke-B2{stroke:#0D32B2;} + .d2-1325376569 .stroke-B3{stroke:#E3E9FD;} + .d2-1325376569 .stroke-B4{stroke:#E3E9FD;} + .d2-1325376569 .stroke-B5{stroke:#EDF0FD;} + .d2-1325376569 .stroke-B6{stroke:#F7F8FE;} + .d2-1325376569 .stroke-AA2{stroke:#4A6FF3;} + .d2-1325376569 .stroke-AA4{stroke:#EDF0FD;} + .d2-1325376569 .stroke-AA5{stroke:#F7F8FE;} + .d2-1325376569 .stroke-AB4{stroke:#EDF0FD;} + .d2-1325376569 .stroke-AB5{stroke:#F7F8FE;} + .d2-1325376569 .background-color-N1{background-color:#0A0F25;} + .d2-1325376569 .background-color-N2{background-color:#676C7E;} + .d2-1325376569 .background-color-N3{background-color:#9499AB;} + .d2-1325376569 .background-color-N4{background-color:#CFD2DD;} + .d2-1325376569 .background-color-N5{background-color:#DEE1EB;} + .d2-1325376569 .background-color-N6{background-color:#EEF1F8;} + .d2-1325376569 .background-color-N7{background-color:#FFFFFF;} + .d2-1325376569 .background-color-B1{background-color:#0D32B2;} + .d2-1325376569 .background-color-B2{background-color:#0D32B2;} + .d2-1325376569 .background-color-B3{background-color:#E3E9FD;} + .d2-1325376569 .background-color-B4{background-color:#E3E9FD;} + .d2-1325376569 .background-color-B5{background-color:#EDF0FD;} + .d2-1325376569 .background-color-B6{background-color:#F7F8FE;} + .d2-1325376569 .background-color-AA2{background-color:#4A6FF3;} + .d2-1325376569 .background-color-AA4{background-color:#EDF0FD;} + .d2-1325376569 .background-color-AA5{background-color:#F7F8FE;} + .d2-1325376569 .background-color-AB4{background-color:#EDF0FD;} + .d2-1325376569 .background-color-AB5{background-color:#F7F8FE;} + .d2-1325376569 .color-N1{color:#0A0F25;} + .d2-1325376569 .color-N2{color:#676C7E;} + .d2-1325376569 .color-N3{color:#9499AB;} + .d2-1325376569 .color-N4{color:#CFD2DD;} + .d2-1325376569 .color-N5{color:#DEE1EB;} + .d2-1325376569 .color-N6{color:#EEF1F8;} + .d2-1325376569 .color-N7{color:#FFFFFF;} + .d2-1325376569 .color-B1{color:#0D32B2;} + .d2-1325376569 .color-B2{color:#0D32B2;} + .d2-1325376569 .color-B3{color:#E3E9FD;} + .d2-1325376569 .color-B4{color:#E3E9FD;} + .d2-1325376569 .color-B5{color:#EDF0FD;} + .d2-1325376569 .color-B6{color:#F7F8FE;} + .d2-1325376569 .color-AA2{color:#4A6FF3;} + .d2-1325376569 .color-AA4{color:#EDF0FD;} + .d2-1325376569 .color-AA5{color:#F7F8FE;} + .d2-1325376569 .color-AB4{color:#EDF0FD;} + .d2-1325376569 .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 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 7ac7d8c8c..08de52c0a 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,9 +1,9 @@ -xy + .d2-66779799 .fill-N1{fill:#0A0F25;} + .d2-66779799 .fill-N2{fill:#676C7E;} + .d2-66779799 .fill-N3{fill:#9499AB;} + .d2-66779799 .fill-N4{fill:#CFD2DD;} + .d2-66779799 .fill-N5{fill:#DEE1EB;} + .d2-66779799 .fill-N6{fill:#EEF1F8;} + .d2-66779799 .fill-N7{fill:#FFFFFF;} + .d2-66779799 .fill-B1{fill:#0D32B2;} + .d2-66779799 .fill-B2{fill:#0D32B2;} + .d2-66779799 .fill-B3{fill:#E3E9FD;} + .d2-66779799 .fill-B4{fill:#E3E9FD;} + .d2-66779799 .fill-B5{fill:#EDF0FD;} + .d2-66779799 .fill-B6{fill:#F7F8FE;} + .d2-66779799 .fill-AA2{fill:#4A6FF3;} + .d2-66779799 .fill-AA4{fill:#EDF0FD;} + .d2-66779799 .fill-AA5{fill:#F7F8FE;} + .d2-66779799 .fill-AB4{fill:#EDF0FD;} + .d2-66779799 .fill-AB5{fill:#F7F8FE;} + .d2-66779799 .stroke-N1{stroke:#0A0F25;} + .d2-66779799 .stroke-N2{stroke:#676C7E;} + .d2-66779799 .stroke-N3{stroke:#9499AB;} + .d2-66779799 .stroke-N4{stroke:#CFD2DD;} + .d2-66779799 .stroke-N5{stroke:#DEE1EB;} + .d2-66779799 .stroke-N6{stroke:#EEF1F8;} + .d2-66779799 .stroke-N7{stroke:#FFFFFF;} + .d2-66779799 .stroke-B1{stroke:#0D32B2;} + .d2-66779799 .stroke-B2{stroke:#0D32B2;} + .d2-66779799 .stroke-B3{stroke:#E3E9FD;} + .d2-66779799 .stroke-B4{stroke:#E3E9FD;} + .d2-66779799 .stroke-B5{stroke:#EDF0FD;} + .d2-66779799 .stroke-B6{stroke:#F7F8FE;} + .d2-66779799 .stroke-AA2{stroke:#4A6FF3;} + .d2-66779799 .stroke-AA4{stroke:#EDF0FD;} + .d2-66779799 .stroke-AA5{stroke:#F7F8FE;} + .d2-66779799 .stroke-AB4{stroke:#EDF0FD;} + .d2-66779799 .stroke-AB5{stroke:#F7F8FE;} + .d2-66779799 .background-color-N1{background-color:#0A0F25;} + .d2-66779799 .background-color-N2{background-color:#676C7E;} + .d2-66779799 .background-color-N3{background-color:#9499AB;} + .d2-66779799 .background-color-N4{background-color:#CFD2DD;} + .d2-66779799 .background-color-N5{background-color:#DEE1EB;} + .d2-66779799 .background-color-N6{background-color:#EEF1F8;} + .d2-66779799 .background-color-N7{background-color:#FFFFFF;} + .d2-66779799 .background-color-B1{background-color:#0D32B2;} + .d2-66779799 .background-color-B2{background-color:#0D32B2;} + .d2-66779799 .background-color-B3{background-color:#E3E9FD;} + .d2-66779799 .background-color-B4{background-color:#E3E9FD;} + .d2-66779799 .background-color-B5{background-color:#EDF0FD;} + .d2-66779799 .background-color-B6{background-color:#F7F8FE;} + .d2-66779799 .background-color-AA2{background-color:#4A6FF3;} + .d2-66779799 .background-color-AA4{background-color:#EDF0FD;} + .d2-66779799 .background-color-AA5{background-color:#F7F8FE;} + .d2-66779799 .background-color-AB4{background-color:#EDF0FD;} + .d2-66779799 .background-color-AB5{background-color:#F7F8FE;} + .d2-66779799 .color-N1{color:#0A0F25;} + .d2-66779799 .color-N2{color:#676C7E;} + .d2-66779799 .color-N3{color:#9499AB;} + .d2-66779799 .color-N4{color:#CFD2DD;} + .d2-66779799 .color-N5{color:#DEE1EB;} + .d2-66779799 .color-N6{color:#EEF1F8;} + .d2-66779799 .color-N7{color:#FFFFFF;} + .d2-66779799 .color-B1{color:#0D32B2;} + .d2-66779799 .color-B2{color:#0D32B2;} + .d2-66779799 .color-B3{color:#E3E9FD;} + .d2-66779799 .color-B4{color:#E3E9FD;} + .d2-66779799 .color-B5{color:#EDF0FD;} + .d2-66779799 .color-B6{color:#F7F8FE;} + .d2-66779799 .color-AA2{color:#4A6FF3;} + .d2-66779799 .color-AA4{color:#EDF0FD;} + .d2-66779799 .color-AA5{color:#F7F8FE;} + .d2-66779799 .color-AB4{color:#EDF0FD;} + .d2-66779799 .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 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 5ae05e336..fe76b61fd 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,9 +1,9 @@ -mortgagerealtor + .d2-1726870641 .fill-N1{fill:#0A0F25;} + .d2-1726870641 .fill-N2{fill:#676C7E;} + .d2-1726870641 .fill-N3{fill:#9499AB;} + .d2-1726870641 .fill-N4{fill:#CFD2DD;} + .d2-1726870641 .fill-N5{fill:#DEE1EB;} + .d2-1726870641 .fill-N6{fill:#EEF1F8;} + .d2-1726870641 .fill-N7{fill:#FFFFFF;} + .d2-1726870641 .fill-B1{fill:#0D32B2;} + .d2-1726870641 .fill-B2{fill:#0D32B2;} + .d2-1726870641 .fill-B3{fill:#E3E9FD;} + .d2-1726870641 .fill-B4{fill:#E3E9FD;} + .d2-1726870641 .fill-B5{fill:#EDF0FD;} + .d2-1726870641 .fill-B6{fill:#F7F8FE;} + .d2-1726870641 .fill-AA2{fill:#4A6FF3;} + .d2-1726870641 .fill-AA4{fill:#EDF0FD;} + .d2-1726870641 .fill-AA5{fill:#F7F8FE;} + .d2-1726870641 .fill-AB4{fill:#EDF0FD;} + .d2-1726870641 .fill-AB5{fill:#F7F8FE;} + .d2-1726870641 .stroke-N1{stroke:#0A0F25;} + .d2-1726870641 .stroke-N2{stroke:#676C7E;} + .d2-1726870641 .stroke-N3{stroke:#9499AB;} + .d2-1726870641 .stroke-N4{stroke:#CFD2DD;} + .d2-1726870641 .stroke-N5{stroke:#DEE1EB;} + .d2-1726870641 .stroke-N6{stroke:#EEF1F8;} + .d2-1726870641 .stroke-N7{stroke:#FFFFFF;} + .d2-1726870641 .stroke-B1{stroke:#0D32B2;} + .d2-1726870641 .stroke-B2{stroke:#0D32B2;} + .d2-1726870641 .stroke-B3{stroke:#E3E9FD;} + .d2-1726870641 .stroke-B4{stroke:#E3E9FD;} + .d2-1726870641 .stroke-B5{stroke:#EDF0FD;} + .d2-1726870641 .stroke-B6{stroke:#F7F8FE;} + .d2-1726870641 .stroke-AA2{stroke:#4A6FF3;} + .d2-1726870641 .stroke-AA4{stroke:#EDF0FD;} + .d2-1726870641 .stroke-AA5{stroke:#F7F8FE;} + .d2-1726870641 .stroke-AB4{stroke:#EDF0FD;} + .d2-1726870641 .stroke-AB5{stroke:#F7F8FE;} + .d2-1726870641 .background-color-N1{background-color:#0A0F25;} + .d2-1726870641 .background-color-N2{background-color:#676C7E;} + .d2-1726870641 .background-color-N3{background-color:#9499AB;} + .d2-1726870641 .background-color-N4{background-color:#CFD2DD;} + .d2-1726870641 .background-color-N5{background-color:#DEE1EB;} + .d2-1726870641 .background-color-N6{background-color:#EEF1F8;} + .d2-1726870641 .background-color-N7{background-color:#FFFFFF;} + .d2-1726870641 .background-color-B1{background-color:#0D32B2;} + .d2-1726870641 .background-color-B2{background-color:#0D32B2;} + .d2-1726870641 .background-color-B3{background-color:#E3E9FD;} + .d2-1726870641 .background-color-B4{background-color:#E3E9FD;} + .d2-1726870641 .background-color-B5{background-color:#EDF0FD;} + .d2-1726870641 .background-color-B6{background-color:#F7F8FE;} + .d2-1726870641 .background-color-AA2{background-color:#4A6FF3;} + .d2-1726870641 .background-color-AA4{background-color:#EDF0FD;} + .d2-1726870641 .background-color-AA5{background-color:#F7F8FE;} + .d2-1726870641 .background-color-AB4{background-color:#EDF0FD;} + .d2-1726870641 .background-color-AB5{background-color:#F7F8FE;} + .d2-1726870641 .color-N1{color:#0A0F25;} + .d2-1726870641 .color-N2{color:#676C7E;} + .d2-1726870641 .color-N3{color:#9499AB;} + .d2-1726870641 .color-N4{color:#CFD2DD;} + .d2-1726870641 .color-N5{color:#DEE1EB;} + .d2-1726870641 .color-N6{color:#EEF1F8;} + .d2-1726870641 .color-N7{color:#FFFFFF;} + .d2-1726870641 .color-B1{color:#0D32B2;} + .d2-1726870641 .color-B2{color:#0D32B2;} + .d2-1726870641 .color-B3{color:#E3E9FD;} + .d2-1726870641 .color-B4{color:#E3E9FD;} + .d2-1726870641 .color-B5{color:#EDF0FD;} + .d2-1726870641 .color-B6{color:#F7F8FE;} + .d2-1726870641 .color-AA2{color:#4A6FF3;} + .d2-1726870641 .color-AA4{color:#EDF0FD;} + .d2-1726870641 .color-AA5{color:#F7F8FE;} + .d2-1726870641 .color-AB4{color:#EDF0FD;} + .d2-1726870641 .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}]]>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 c59bcfe84..08e4916f8 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,9 +1,9 @@ -belieffooddiet + .d2-2725802959 .fill-N1{fill:#0A0F25;} + .d2-2725802959 .fill-N2{fill:#676C7E;} + .d2-2725802959 .fill-N3{fill:#9499AB;} + .d2-2725802959 .fill-N4{fill:#CFD2DD;} + .d2-2725802959 .fill-N5{fill:#DEE1EB;} + .d2-2725802959 .fill-N6{fill:#EEF1F8;} + .d2-2725802959 .fill-N7{fill:#FFFFFF;} + .d2-2725802959 .fill-B1{fill:#0D32B2;} + .d2-2725802959 .fill-B2{fill:#0D32B2;} + .d2-2725802959 .fill-B3{fill:#E3E9FD;} + .d2-2725802959 .fill-B4{fill:#E3E9FD;} + .d2-2725802959 .fill-B5{fill:#EDF0FD;} + .d2-2725802959 .fill-B6{fill:#F7F8FE;} + .d2-2725802959 .fill-AA2{fill:#4A6FF3;} + .d2-2725802959 .fill-AA4{fill:#EDF0FD;} + .d2-2725802959 .fill-AA5{fill:#F7F8FE;} + .d2-2725802959 .fill-AB4{fill:#EDF0FD;} + .d2-2725802959 .fill-AB5{fill:#F7F8FE;} + .d2-2725802959 .stroke-N1{stroke:#0A0F25;} + .d2-2725802959 .stroke-N2{stroke:#676C7E;} + .d2-2725802959 .stroke-N3{stroke:#9499AB;} + .d2-2725802959 .stroke-N4{stroke:#CFD2DD;} + .d2-2725802959 .stroke-N5{stroke:#DEE1EB;} + .d2-2725802959 .stroke-N6{stroke:#EEF1F8;} + .d2-2725802959 .stroke-N7{stroke:#FFFFFF;} + .d2-2725802959 .stroke-B1{stroke:#0D32B2;} + .d2-2725802959 .stroke-B2{stroke:#0D32B2;} + .d2-2725802959 .stroke-B3{stroke:#E3E9FD;} + .d2-2725802959 .stroke-B4{stroke:#E3E9FD;} + .d2-2725802959 .stroke-B5{stroke:#EDF0FD;} + .d2-2725802959 .stroke-B6{stroke:#F7F8FE;} + .d2-2725802959 .stroke-AA2{stroke:#4A6FF3;} + .d2-2725802959 .stroke-AA4{stroke:#EDF0FD;} + .d2-2725802959 .stroke-AA5{stroke:#F7F8FE;} + .d2-2725802959 .stroke-AB4{stroke:#EDF0FD;} + .d2-2725802959 .stroke-AB5{stroke:#F7F8FE;} + .d2-2725802959 .background-color-N1{background-color:#0A0F25;} + .d2-2725802959 .background-color-N2{background-color:#676C7E;} + .d2-2725802959 .background-color-N3{background-color:#9499AB;} + .d2-2725802959 .background-color-N4{background-color:#CFD2DD;} + .d2-2725802959 .background-color-N5{background-color:#DEE1EB;} + .d2-2725802959 .background-color-N6{background-color:#EEF1F8;} + .d2-2725802959 .background-color-N7{background-color:#FFFFFF;} + .d2-2725802959 .background-color-B1{background-color:#0D32B2;} + .d2-2725802959 .background-color-B2{background-color:#0D32B2;} + .d2-2725802959 .background-color-B3{background-color:#E3E9FD;} + .d2-2725802959 .background-color-B4{background-color:#E3E9FD;} + .d2-2725802959 .background-color-B5{background-color:#EDF0FD;} + .d2-2725802959 .background-color-B6{background-color:#F7F8FE;} + .d2-2725802959 .background-color-AA2{background-color:#4A6FF3;} + .d2-2725802959 .background-color-AA4{background-color:#EDF0FD;} + .d2-2725802959 .background-color-AA5{background-color:#F7F8FE;} + .d2-2725802959 .background-color-AB4{background-color:#EDF0FD;} + .d2-2725802959 .background-color-AB5{background-color:#F7F8FE;} + .d2-2725802959 .color-N1{color:#0A0F25;} + .d2-2725802959 .color-N2{color:#676C7E;} + .d2-2725802959 .color-N3{color:#9499AB;} + .d2-2725802959 .color-N4{color:#CFD2DD;} + .d2-2725802959 .color-N5{color:#DEE1EB;} + .d2-2725802959 .color-N6{color:#EEF1F8;} + .d2-2725802959 .color-N7{color:#FFFFFF;} + .d2-2725802959 .color-B1{color:#0D32B2;} + .d2-2725802959 .color-B2{color:#0D32B2;} + .d2-2725802959 .color-B3{color:#E3E9FD;} + .d2-2725802959 .color-B4{color:#E3E9FD;} + .d2-2725802959 .color-B5{color:#EDF0FD;} + .d2-2725802959 .color-B6{color:#F7F8FE;} + .d2-2725802959 .color-AA2{color:#4A6FF3;} + .d2-2725802959 .color-AA4{color:#EDF0FD;} + .d2-2725802959 .color-AA5{color:#F7F8FE;} + .d2-2725802959 .color-AB4{color:#EDF0FD;} + .d2-2725802959 .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}]]>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 3970623ee..d92baa3b7 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,9 +1,9 @@ -TSXNYSENASDAQ + .d2-3935287890 .fill-N1{fill:#0A0F25;} + .d2-3935287890 .fill-N2{fill:#676C7E;} + .d2-3935287890 .fill-N3{fill:#9499AB;} + .d2-3935287890 .fill-N4{fill:#CFD2DD;} + .d2-3935287890 .fill-N5{fill:#DEE1EB;} + .d2-3935287890 .fill-N6{fill:#EEF1F8;} + .d2-3935287890 .fill-N7{fill:#FFFFFF;} + .d2-3935287890 .fill-B1{fill:#0D32B2;} + .d2-3935287890 .fill-B2{fill:#0D32B2;} + .d2-3935287890 .fill-B3{fill:#E3E9FD;} + .d2-3935287890 .fill-B4{fill:#E3E9FD;} + .d2-3935287890 .fill-B5{fill:#EDF0FD;} + .d2-3935287890 .fill-B6{fill:#F7F8FE;} + .d2-3935287890 .fill-AA2{fill:#4A6FF3;} + .d2-3935287890 .fill-AA4{fill:#EDF0FD;} + .d2-3935287890 .fill-AA5{fill:#F7F8FE;} + .d2-3935287890 .fill-AB4{fill:#EDF0FD;} + .d2-3935287890 .fill-AB5{fill:#F7F8FE;} + .d2-3935287890 .stroke-N1{stroke:#0A0F25;} + .d2-3935287890 .stroke-N2{stroke:#676C7E;} + .d2-3935287890 .stroke-N3{stroke:#9499AB;} + .d2-3935287890 .stroke-N4{stroke:#CFD2DD;} + .d2-3935287890 .stroke-N5{stroke:#DEE1EB;} + .d2-3935287890 .stroke-N6{stroke:#EEF1F8;} + .d2-3935287890 .stroke-N7{stroke:#FFFFFF;} + .d2-3935287890 .stroke-B1{stroke:#0D32B2;} + .d2-3935287890 .stroke-B2{stroke:#0D32B2;} + .d2-3935287890 .stroke-B3{stroke:#E3E9FD;} + .d2-3935287890 .stroke-B4{stroke:#E3E9FD;} + .d2-3935287890 .stroke-B5{stroke:#EDF0FD;} + .d2-3935287890 .stroke-B6{stroke:#F7F8FE;} + .d2-3935287890 .stroke-AA2{stroke:#4A6FF3;} + .d2-3935287890 .stroke-AA4{stroke:#EDF0FD;} + .d2-3935287890 .stroke-AA5{stroke:#F7F8FE;} + .d2-3935287890 .stroke-AB4{stroke:#EDF0FD;} + .d2-3935287890 .stroke-AB5{stroke:#F7F8FE;} + .d2-3935287890 .background-color-N1{background-color:#0A0F25;} + .d2-3935287890 .background-color-N2{background-color:#676C7E;} + .d2-3935287890 .background-color-N3{background-color:#9499AB;} + .d2-3935287890 .background-color-N4{background-color:#CFD2DD;} + .d2-3935287890 .background-color-N5{background-color:#DEE1EB;} + .d2-3935287890 .background-color-N6{background-color:#EEF1F8;} + .d2-3935287890 .background-color-N7{background-color:#FFFFFF;} + .d2-3935287890 .background-color-B1{background-color:#0D32B2;} + .d2-3935287890 .background-color-B2{background-color:#0D32B2;} + .d2-3935287890 .background-color-B3{background-color:#E3E9FD;} + .d2-3935287890 .background-color-B4{background-color:#E3E9FD;} + .d2-3935287890 .background-color-B5{background-color:#EDF0FD;} + .d2-3935287890 .background-color-B6{background-color:#F7F8FE;} + .d2-3935287890 .background-color-AA2{background-color:#4A6FF3;} + .d2-3935287890 .background-color-AA4{background-color:#EDF0FD;} + .d2-3935287890 .background-color-AA5{background-color:#F7F8FE;} + .d2-3935287890 .background-color-AB4{background-color:#EDF0FD;} + .d2-3935287890 .background-color-AB5{background-color:#F7F8FE;} + .d2-3935287890 .color-N1{color:#0A0F25;} + .d2-3935287890 .color-N2{color:#676C7E;} + .d2-3935287890 .color-N3{color:#9499AB;} + .d2-3935287890 .color-N4{color:#CFD2DD;} + .d2-3935287890 .color-N5{color:#DEE1EB;} + .d2-3935287890 .color-N6{color:#EEF1F8;} + .d2-3935287890 .color-N7{color:#FFFFFF;} + .d2-3935287890 .color-B1{color:#0D32B2;} + .d2-3935287890 .color-B2{color:#0D32B2;} + .d2-3935287890 .color-B3{color:#E3E9FD;} + .d2-3935287890 .color-B4{color:#E3E9FD;} + .d2-3935287890 .color-B5{color:#EDF0FD;} + .d2-3935287890 .color-B6{color:#F7F8FE;} + .d2-3935287890 .color-AA2{color:#4A6FF3;} + .d2-3935287890 .color-AA4{color:#EDF0FD;} + .d2-3935287890 .color-AA5{color:#F7F8FE;} + .d2-3935287890 .color-AB4{color:#EDF0FD;} + .d2-3935287890 .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}]]>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 5d1bb91cf..cb74951e9 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,9 +1,9 @@ -xy + .d2-1325376569 .fill-N1{fill:#0A0F25;} + .d2-1325376569 .fill-N2{fill:#676C7E;} + .d2-1325376569 .fill-N3{fill:#9499AB;} + .d2-1325376569 .fill-N4{fill:#CFD2DD;} + .d2-1325376569 .fill-N5{fill:#DEE1EB;} + .d2-1325376569 .fill-N6{fill:#EEF1F8;} + .d2-1325376569 .fill-N7{fill:#FFFFFF;} + .d2-1325376569 .fill-B1{fill:#0D32B2;} + .d2-1325376569 .fill-B2{fill:#0D32B2;} + .d2-1325376569 .fill-B3{fill:#E3E9FD;} + .d2-1325376569 .fill-B4{fill:#E3E9FD;} + .d2-1325376569 .fill-B5{fill:#EDF0FD;} + .d2-1325376569 .fill-B6{fill:#F7F8FE;} + .d2-1325376569 .fill-AA2{fill:#4A6FF3;} + .d2-1325376569 .fill-AA4{fill:#EDF0FD;} + .d2-1325376569 .fill-AA5{fill:#F7F8FE;} + .d2-1325376569 .fill-AB4{fill:#EDF0FD;} + .d2-1325376569 .fill-AB5{fill:#F7F8FE;} + .d2-1325376569 .stroke-N1{stroke:#0A0F25;} + .d2-1325376569 .stroke-N2{stroke:#676C7E;} + .d2-1325376569 .stroke-N3{stroke:#9499AB;} + .d2-1325376569 .stroke-N4{stroke:#CFD2DD;} + .d2-1325376569 .stroke-N5{stroke:#DEE1EB;} + .d2-1325376569 .stroke-N6{stroke:#EEF1F8;} + .d2-1325376569 .stroke-N7{stroke:#FFFFFF;} + .d2-1325376569 .stroke-B1{stroke:#0D32B2;} + .d2-1325376569 .stroke-B2{stroke:#0D32B2;} + .d2-1325376569 .stroke-B3{stroke:#E3E9FD;} + .d2-1325376569 .stroke-B4{stroke:#E3E9FD;} + .d2-1325376569 .stroke-B5{stroke:#EDF0FD;} + .d2-1325376569 .stroke-B6{stroke:#F7F8FE;} + .d2-1325376569 .stroke-AA2{stroke:#4A6FF3;} + .d2-1325376569 .stroke-AA4{stroke:#EDF0FD;} + .d2-1325376569 .stroke-AA5{stroke:#F7F8FE;} + .d2-1325376569 .stroke-AB4{stroke:#EDF0FD;} + .d2-1325376569 .stroke-AB5{stroke:#F7F8FE;} + .d2-1325376569 .background-color-N1{background-color:#0A0F25;} + .d2-1325376569 .background-color-N2{background-color:#676C7E;} + .d2-1325376569 .background-color-N3{background-color:#9499AB;} + .d2-1325376569 .background-color-N4{background-color:#CFD2DD;} + .d2-1325376569 .background-color-N5{background-color:#DEE1EB;} + .d2-1325376569 .background-color-N6{background-color:#EEF1F8;} + .d2-1325376569 .background-color-N7{background-color:#FFFFFF;} + .d2-1325376569 .background-color-B1{background-color:#0D32B2;} + .d2-1325376569 .background-color-B2{background-color:#0D32B2;} + .d2-1325376569 .background-color-B3{background-color:#E3E9FD;} + .d2-1325376569 .background-color-B4{background-color:#E3E9FD;} + .d2-1325376569 .background-color-B5{background-color:#EDF0FD;} + .d2-1325376569 .background-color-B6{background-color:#F7F8FE;} + .d2-1325376569 .background-color-AA2{background-color:#4A6FF3;} + .d2-1325376569 .background-color-AA4{background-color:#EDF0FD;} + .d2-1325376569 .background-color-AA5{background-color:#F7F8FE;} + .d2-1325376569 .background-color-AB4{background-color:#EDF0FD;} + .d2-1325376569 .background-color-AB5{background-color:#F7F8FE;} + .d2-1325376569 .color-N1{color:#0A0F25;} + .d2-1325376569 .color-N2{color:#676C7E;} + .d2-1325376569 .color-N3{color:#9499AB;} + .d2-1325376569 .color-N4{color:#CFD2DD;} + .d2-1325376569 .color-N5{color:#DEE1EB;} + .d2-1325376569 .color-N6{color:#EEF1F8;} + .d2-1325376569 .color-N7{color:#FFFFFF;} + .d2-1325376569 .color-B1{color:#0D32B2;} + .d2-1325376569 .color-B2{color:#0D32B2;} + .d2-1325376569 .color-B3{color:#E3E9FD;} + .d2-1325376569 .color-B4{color:#E3E9FD;} + .d2-1325376569 .color-B5{color:#EDF0FD;} + .d2-1325376569 .color-B6{color:#F7F8FE;} + .d2-1325376569 .color-AA2{color:#4A6FF3;} + .d2-1325376569 .color-AA4{color:#EDF0FD;} + .d2-1325376569 .color-AA5{color:#F7F8FE;} + .d2-1325376569 .color-AB4{color:#EDF0FD;} + .d2-1325376569 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg index 84e5e922b..63f8b5d26 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-1843626214 .fill-N1{fill:#0A0F25;} + .d2-1843626214 .fill-N2{fill:#676C7E;} + .d2-1843626214 .fill-N3{fill:#9499AB;} + .d2-1843626214 .fill-N4{fill:#CFD2DD;} + .d2-1843626214 .fill-N5{fill:#DEE1EB;} + .d2-1843626214 .fill-N6{fill:#EEF1F8;} + .d2-1843626214 .fill-N7{fill:#FFFFFF;} + .d2-1843626214 .fill-B1{fill:#0D32B2;} + .d2-1843626214 .fill-B2{fill:#0D32B2;} + .d2-1843626214 .fill-B3{fill:#E3E9FD;} + .d2-1843626214 .fill-B4{fill:#E3E9FD;} + .d2-1843626214 .fill-B5{fill:#EDF0FD;} + .d2-1843626214 .fill-B6{fill:#F7F8FE;} + .d2-1843626214 .fill-AA2{fill:#4A6FF3;} + .d2-1843626214 .fill-AA4{fill:#EDF0FD;} + .d2-1843626214 .fill-AA5{fill:#F7F8FE;} + .d2-1843626214 .fill-AB4{fill:#EDF0FD;} + .d2-1843626214 .fill-AB5{fill:#F7F8FE;} + .d2-1843626214 .stroke-N1{stroke:#0A0F25;} + .d2-1843626214 .stroke-N2{stroke:#676C7E;} + .d2-1843626214 .stroke-N3{stroke:#9499AB;} + .d2-1843626214 .stroke-N4{stroke:#CFD2DD;} + .d2-1843626214 .stroke-N5{stroke:#DEE1EB;} + .d2-1843626214 .stroke-N6{stroke:#EEF1F8;} + .d2-1843626214 .stroke-N7{stroke:#FFFFFF;} + .d2-1843626214 .stroke-B1{stroke:#0D32B2;} + .d2-1843626214 .stroke-B2{stroke:#0D32B2;} + .d2-1843626214 .stroke-B3{stroke:#E3E9FD;} + .d2-1843626214 .stroke-B4{stroke:#E3E9FD;} + .d2-1843626214 .stroke-B5{stroke:#EDF0FD;} + .d2-1843626214 .stroke-B6{stroke:#F7F8FE;} + .d2-1843626214 .stroke-AA2{stroke:#4A6FF3;} + .d2-1843626214 .stroke-AA4{stroke:#EDF0FD;} + .d2-1843626214 .stroke-AA5{stroke:#F7F8FE;} + .d2-1843626214 .stroke-AB4{stroke:#EDF0FD;} + .d2-1843626214 .stroke-AB5{stroke:#F7F8FE;} + .d2-1843626214 .background-color-N1{background-color:#0A0F25;} + .d2-1843626214 .background-color-N2{background-color:#676C7E;} + .d2-1843626214 .background-color-N3{background-color:#9499AB;} + .d2-1843626214 .background-color-N4{background-color:#CFD2DD;} + .d2-1843626214 .background-color-N5{background-color:#DEE1EB;} + .d2-1843626214 .background-color-N6{background-color:#EEF1F8;} + .d2-1843626214 .background-color-N7{background-color:#FFFFFF;} + .d2-1843626214 .background-color-B1{background-color:#0D32B2;} + .d2-1843626214 .background-color-B2{background-color:#0D32B2;} + .d2-1843626214 .background-color-B3{background-color:#E3E9FD;} + .d2-1843626214 .background-color-B4{background-color:#E3E9FD;} + .d2-1843626214 .background-color-B5{background-color:#EDF0FD;} + .d2-1843626214 .background-color-B6{background-color:#F7F8FE;} + .d2-1843626214 .background-color-AA2{background-color:#4A6FF3;} + .d2-1843626214 .background-color-AA4{background-color:#EDF0FD;} + .d2-1843626214 .background-color-AA5{background-color:#F7F8FE;} + .d2-1843626214 .background-color-AB4{background-color:#EDF0FD;} + .d2-1843626214 .background-color-AB5{background-color:#F7F8FE;} + .d2-1843626214 .color-N1{color:#0A0F25;} + .d2-1843626214 .color-N2{color:#676C7E;} + .d2-1843626214 .color-N3{color:#9499AB;} + .d2-1843626214 .color-N4{color:#CFD2DD;} + .d2-1843626214 .color-N5{color:#DEE1EB;} + .d2-1843626214 .color-N6{color:#EEF1F8;} + .d2-1843626214 .color-N7{color:#FFFFFF;} + .d2-1843626214 .color-B1{color:#0D32B2;} + .d2-1843626214 .color-B2{color:#0D32B2;} + .d2-1843626214 .color-B3{color:#E3E9FD;} + .d2-1843626214 .color-B4{color:#E3E9FD;} + .d2-1843626214 .color-B5{color:#EDF0FD;} + .d2-1843626214 .color-B6{color:#F7F8FE;} + .d2-1843626214 .color-AA2{color:#4A6FF3;} + .d2-1843626214 .color-AA4{color:#EDF0FD;} + .d2-1843626214 .color-AA5{color:#F7F8FE;} + .d2-1843626214 .color-AB4{color:#EDF0FD;} + .d2-1843626214 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg index 7209041b2..8ec9e5a88 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg @@ -1,16 +1,16 @@ CHICKEN'S PLAN +}]]>CHICKEN'S PLAN -APPROACH ROADCHICKEN'S PLAN +APPROACH ROADCHICKEN'S PLAN -APPROACH ROADCROSS ROADCHICKEN'S PLAN +APPROACH ROADCROSS ROADCHICKEN'S PLAN -APPROACH ROADCROSS ROADMAKE YOU WONDER WHYCHICKEN'S PLAN +APPROACH ROADCROSS ROADMAKE YOU WONDER WHYCHICKEN'S PLAN diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg index 69b22fe93..2bd8a30f4 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg @@ -1,16 +1,16 @@ - + .d2-2856230419 .fill-N1{fill:#0A0F25;} + .d2-2856230419 .fill-N2{fill:#676C7E;} + .d2-2856230419 .fill-N3{fill:#9499AB;} + .d2-2856230419 .fill-N4{fill:#CFD2DD;} + .d2-2856230419 .fill-N5{fill:#DEE1EB;} + .d2-2856230419 .fill-N6{fill:#EEF1F8;} + .d2-2856230419 .fill-N7{fill:#FFFFFF;} + .d2-2856230419 .fill-B1{fill:#0A0F25;} + .d2-2856230419 .fill-B2{fill:#676C7E;} + .d2-2856230419 .fill-B3{fill:#9499AB;} + .d2-2856230419 .fill-B4{fill:#CFD2DD;} + .d2-2856230419 .fill-B5{fill:#DEE1EB;} + .d2-2856230419 .fill-B6{fill:#EEF1F8;} + .d2-2856230419 .fill-AA2{fill:#676C7E;} + .d2-2856230419 .fill-AA4{fill:#CFD2DD;} + .d2-2856230419 .fill-AA5{fill:#DEE1EB;} + .d2-2856230419 .fill-AB4{fill:#CFD2DD;} + .d2-2856230419 .fill-AB5{fill:#DEE1EB;} + .d2-2856230419 .stroke-N1{stroke:#0A0F25;} + .d2-2856230419 .stroke-N2{stroke:#676C7E;} + .d2-2856230419 .stroke-N3{stroke:#9499AB;} + .d2-2856230419 .stroke-N4{stroke:#CFD2DD;} + .d2-2856230419 .stroke-N5{stroke:#DEE1EB;} + .d2-2856230419 .stroke-N6{stroke:#EEF1F8;} + .d2-2856230419 .stroke-N7{stroke:#FFFFFF;} + .d2-2856230419 .stroke-B1{stroke:#0A0F25;} + .d2-2856230419 .stroke-B2{stroke:#676C7E;} + .d2-2856230419 .stroke-B3{stroke:#9499AB;} + .d2-2856230419 .stroke-B4{stroke:#CFD2DD;} + .d2-2856230419 .stroke-B5{stroke:#DEE1EB;} + .d2-2856230419 .stroke-B6{stroke:#EEF1F8;} + .d2-2856230419 .stroke-AA2{stroke:#676C7E;} + .d2-2856230419 .stroke-AA4{stroke:#CFD2DD;} + .d2-2856230419 .stroke-AA5{stroke:#DEE1EB;} + .d2-2856230419 .stroke-AB4{stroke:#CFD2DD;} + .d2-2856230419 .stroke-AB5{stroke:#DEE1EB;} + .d2-2856230419 .background-color-N1{background-color:#0A0F25;} + .d2-2856230419 .background-color-N2{background-color:#676C7E;} + .d2-2856230419 .background-color-N3{background-color:#9499AB;} + .d2-2856230419 .background-color-N4{background-color:#CFD2DD;} + .d2-2856230419 .background-color-N5{background-color:#DEE1EB;} + .d2-2856230419 .background-color-N6{background-color:#EEF1F8;} + .d2-2856230419 .background-color-N7{background-color:#FFFFFF;} + .d2-2856230419 .background-color-B1{background-color:#0A0F25;} + .d2-2856230419 .background-color-B2{background-color:#676C7E;} + .d2-2856230419 .background-color-B3{background-color:#9499AB;} + .d2-2856230419 .background-color-B4{background-color:#CFD2DD;} + .d2-2856230419 .background-color-B5{background-color:#DEE1EB;} + .d2-2856230419 .background-color-B6{background-color:#EEF1F8;} + .d2-2856230419 .background-color-AA2{background-color:#676C7E;} + .d2-2856230419 .background-color-AA4{background-color:#CFD2DD;} + .d2-2856230419 .background-color-AA5{background-color:#DEE1EB;} + .d2-2856230419 .background-color-AB4{background-color:#CFD2DD;} + .d2-2856230419 .background-color-AB5{background-color:#DEE1EB;} + .d2-2856230419 .color-N1{color:#0A0F25;} + .d2-2856230419 .color-N2{color:#676C7E;} + .d2-2856230419 .color-N3{color:#9499AB;} + .d2-2856230419 .color-N4{color:#CFD2DD;} + .d2-2856230419 .color-N5{color:#DEE1EB;} + .d2-2856230419 .color-N6{color:#EEF1F8;} + .d2-2856230419 .color-N7{color:#FFFFFF;} + .d2-2856230419 .color-B1{color:#0A0F25;} + .d2-2856230419 .color-B2{color:#676C7E;} + .d2-2856230419 .color-B3{color:#9499AB;} + .d2-2856230419 .color-B4{color:#CFD2DD;} + .d2-2856230419 .color-B5{color:#DEE1EB;} + .d2-2856230419 .color-B6{color:#EEF1F8;} + .d2-2856230419 .color-AA2{color:#676C7E;} + .d2-2856230419 .color-AA4{color:#CFD2DD;} + .d2-2856230419 .color-AA5{color:#DEE1EB;} + .d2-2856230419 .color-AB4{color:#CFD2DD;} + .d2-2856230419 .color-AB5{color:#DEE1EB;}.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:#0A0F25;--color-border-muted:#676C7E;--color-neutral-muted:#EEF1F8;--color-accent-fg:#676C7E;--color-accent-emphasis:#676C7E;--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-dark);mix-blend-mode:overlay}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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}]]> @@ -104,7 +104,7 @@ -xyaitwasalli used to readdream +xyaitwasalli used to readdream diff --git a/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg index 5129029d3..8ec1b86ca 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg @@ -1,16 +1,16 @@ -Why do computers get sick often?Because their Windows are always open! italic font + .d2-1771907023 .fill-N1{fill:#0A0F25;} + .d2-1771907023 .fill-N2{fill:#676C7E;} + .d2-1771907023 .fill-N3{fill:#9499AB;} + .d2-1771907023 .fill-N4{fill:#CFD2DD;} + .d2-1771907023 .fill-N5{fill:#DEE1EB;} + .d2-1771907023 .fill-N6{fill:#EEF1F8;} + .d2-1771907023 .fill-N7{fill:#FFFFFF;} + .d2-1771907023 .fill-B1{fill:#0D32B2;} + .d2-1771907023 .fill-B2{fill:#0D32B2;} + .d2-1771907023 .fill-B3{fill:#E3E9FD;} + .d2-1771907023 .fill-B4{fill:#E3E9FD;} + .d2-1771907023 .fill-B5{fill:#EDF0FD;} + .d2-1771907023 .fill-B6{fill:#F7F8FE;} + .d2-1771907023 .fill-AA2{fill:#4A6FF3;} + .d2-1771907023 .fill-AA4{fill:#EDF0FD;} + .d2-1771907023 .fill-AA5{fill:#F7F8FE;} + .d2-1771907023 .fill-AB4{fill:#EDF0FD;} + .d2-1771907023 .fill-AB5{fill:#F7F8FE;} + .d2-1771907023 .stroke-N1{stroke:#0A0F25;} + .d2-1771907023 .stroke-N2{stroke:#676C7E;} + .d2-1771907023 .stroke-N3{stroke:#9499AB;} + .d2-1771907023 .stroke-N4{stroke:#CFD2DD;} + .d2-1771907023 .stroke-N5{stroke:#DEE1EB;} + .d2-1771907023 .stroke-N6{stroke:#EEF1F8;} + .d2-1771907023 .stroke-N7{stroke:#FFFFFF;} + .d2-1771907023 .stroke-B1{stroke:#0D32B2;} + .d2-1771907023 .stroke-B2{stroke:#0D32B2;} + .d2-1771907023 .stroke-B3{stroke:#E3E9FD;} + .d2-1771907023 .stroke-B4{stroke:#E3E9FD;} + .d2-1771907023 .stroke-B5{stroke:#EDF0FD;} + .d2-1771907023 .stroke-B6{stroke:#F7F8FE;} + .d2-1771907023 .stroke-AA2{stroke:#4A6FF3;} + .d2-1771907023 .stroke-AA4{stroke:#EDF0FD;} + .d2-1771907023 .stroke-AA5{stroke:#F7F8FE;} + .d2-1771907023 .stroke-AB4{stroke:#EDF0FD;} + .d2-1771907023 .stroke-AB5{stroke:#F7F8FE;} + .d2-1771907023 .background-color-N1{background-color:#0A0F25;} + .d2-1771907023 .background-color-N2{background-color:#676C7E;} + .d2-1771907023 .background-color-N3{background-color:#9499AB;} + .d2-1771907023 .background-color-N4{background-color:#CFD2DD;} + .d2-1771907023 .background-color-N5{background-color:#DEE1EB;} + .d2-1771907023 .background-color-N6{background-color:#EEF1F8;} + .d2-1771907023 .background-color-N7{background-color:#FFFFFF;} + .d2-1771907023 .background-color-B1{background-color:#0D32B2;} + .d2-1771907023 .background-color-B2{background-color:#0D32B2;} + .d2-1771907023 .background-color-B3{background-color:#E3E9FD;} + .d2-1771907023 .background-color-B4{background-color:#E3E9FD;} + .d2-1771907023 .background-color-B5{background-color:#EDF0FD;} + .d2-1771907023 .background-color-B6{background-color:#F7F8FE;} + .d2-1771907023 .background-color-AA2{background-color:#4A6FF3;} + .d2-1771907023 .background-color-AA4{background-color:#EDF0FD;} + .d2-1771907023 .background-color-AA5{background-color:#F7F8FE;} + .d2-1771907023 .background-color-AB4{background-color:#EDF0FD;} + .d2-1771907023 .background-color-AB5{background-color:#F7F8FE;} + .d2-1771907023 .color-N1{color:#0A0F25;} + .d2-1771907023 .color-N2{color:#676C7E;} + .d2-1771907023 .color-N3{color:#9499AB;} + .d2-1771907023 .color-N4{color:#CFD2DD;} + .d2-1771907023 .color-N5{color:#DEE1EB;} + .d2-1771907023 .color-N6{color:#EEF1F8;} + .d2-1771907023 .color-N7{color:#FFFFFF;} + .d2-1771907023 .color-B1{color:#0D32B2;} + .d2-1771907023 .color-B2{color:#0D32B2;} + .d2-1771907023 .color-B3{color:#E3E9FD;} + .d2-1771907023 .color-B4{color:#E3E9FD;} + .d2-1771907023 .color-B5{color:#EDF0FD;} + .d2-1771907023 .color-B6{color:#F7F8FE;} + .d2-1771907023 .color-AA2{color:#4A6FF3;} + .d2-1771907023 .color-AA4{color:#EDF0FD;} + .d2-1771907023 .color-AA5{color:#F7F8FE;} + .d2-1771907023 .color-AB4{color:#EDF0FD;} + .d2-1771907023 .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}]]>Why do computers get sick often?Because their Windows are always open! italic font diff --git a/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg index 061d5aa9e..30b647fcd 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 @@ - + .d2-3617998837 .fill-N1{fill:#0A0F25;} + .d2-3617998837 .fill-N2{fill:#676C7E;} + .d2-3617998837 .fill-N3{fill:#9499AB;} + .d2-3617998837 .fill-N4{fill:#CFD2DD;} + .d2-3617998837 .fill-N5{fill:#DEE1EB;} + .d2-3617998837 .fill-N6{fill:#EEF1F8;} + .d2-3617998837 .fill-N7{fill:#FFFFFF;} + .d2-3617998837 .fill-B1{fill:#0D32B2;} + .d2-3617998837 .fill-B2{fill:#0D32B2;} + .d2-3617998837 .fill-B3{fill:#E3E9FD;} + .d2-3617998837 .fill-B4{fill:#E3E9FD;} + .d2-3617998837 .fill-B5{fill:#EDF0FD;} + .d2-3617998837 .fill-B6{fill:#F7F8FE;} + .d2-3617998837 .fill-AA2{fill:#4A6FF3;} + .d2-3617998837 .fill-AA4{fill:#EDF0FD;} + .d2-3617998837 .fill-AA5{fill:#F7F8FE;} + .d2-3617998837 .fill-AB4{fill:#EDF0FD;} + .d2-3617998837 .fill-AB5{fill:#F7F8FE;} + .d2-3617998837 .stroke-N1{stroke:#0A0F25;} + .d2-3617998837 .stroke-N2{stroke:#676C7E;} + .d2-3617998837 .stroke-N3{stroke:#9499AB;} + .d2-3617998837 .stroke-N4{stroke:#CFD2DD;} + .d2-3617998837 .stroke-N5{stroke:#DEE1EB;} + .d2-3617998837 .stroke-N6{stroke:#EEF1F8;} + .d2-3617998837 .stroke-N7{stroke:#FFFFFF;} + .d2-3617998837 .stroke-B1{stroke:#0D32B2;} + .d2-3617998837 .stroke-B2{stroke:#0D32B2;} + .d2-3617998837 .stroke-B3{stroke:#E3E9FD;} + .d2-3617998837 .stroke-B4{stroke:#E3E9FD;} + .d2-3617998837 .stroke-B5{stroke:#EDF0FD;} + .d2-3617998837 .stroke-B6{stroke:#F7F8FE;} + .d2-3617998837 .stroke-AA2{stroke:#4A6FF3;} + .d2-3617998837 .stroke-AA4{stroke:#EDF0FD;} + .d2-3617998837 .stroke-AA5{stroke:#F7F8FE;} + .d2-3617998837 .stroke-AB4{stroke:#EDF0FD;} + .d2-3617998837 .stroke-AB5{stroke:#F7F8FE;} + .d2-3617998837 .background-color-N1{background-color:#0A0F25;} + .d2-3617998837 .background-color-N2{background-color:#676C7E;} + .d2-3617998837 .background-color-N3{background-color:#9499AB;} + .d2-3617998837 .background-color-N4{background-color:#CFD2DD;} + .d2-3617998837 .background-color-N5{background-color:#DEE1EB;} + .d2-3617998837 .background-color-N6{background-color:#EEF1F8;} + .d2-3617998837 .background-color-N7{background-color:#FFFFFF;} + .d2-3617998837 .background-color-B1{background-color:#0D32B2;} + .d2-3617998837 .background-color-B2{background-color:#0D32B2;} + .d2-3617998837 .background-color-B3{background-color:#E3E9FD;} + .d2-3617998837 .background-color-B4{background-color:#E3E9FD;} + .d2-3617998837 .background-color-B5{background-color:#EDF0FD;} + .d2-3617998837 .background-color-B6{background-color:#F7F8FE;} + .d2-3617998837 .background-color-AA2{background-color:#4A6FF3;} + .d2-3617998837 .background-color-AA4{background-color:#EDF0FD;} + .d2-3617998837 .background-color-AA5{background-color:#F7F8FE;} + .d2-3617998837 .background-color-AB4{background-color:#EDF0FD;} + .d2-3617998837 .background-color-AB5{background-color:#F7F8FE;} + .d2-3617998837 .color-N1{color:#0A0F25;} + .d2-3617998837 .color-N2{color:#676C7E;} + .d2-3617998837 .color-N3{color:#9499AB;} + .d2-3617998837 .color-N4{color:#CFD2DD;} + .d2-3617998837 .color-N5{color:#DEE1EB;} + .d2-3617998837 .color-N6{color:#EEF1F8;} + .d2-3617998837 .color-N7{color:#FFFFFF;} + .d2-3617998837 .color-B1{color:#0D32B2;} + .d2-3617998837 .color-B2{color:#0D32B2;} + .d2-3617998837 .color-B3{color:#E3E9FD;} + .d2-3617998837 .color-B4{color:#E3E9FD;} + .d2-3617998837 .color-B5{color:#EDF0FD;} + .d2-3617998837 .color-B6{color:#F7F8FE;} + .d2-3617998837 .color-AA2{color:#4A6FF3;} + .d2-3617998837 .color-AA4{color:#EDF0FD;} + .d2-3617998837 .color-AA5{color:#F7F8FE;} + .d2-3617998837 .color-AB4{color:#EDF0FD;} + .d2-3617998837 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg index defcc74f7..9cfd8c596 100644 --- a/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg +++ b/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-2143901571 .fill-N1{fill:#0A0F25;} + .d2-2143901571 .fill-N2{fill:#676C7E;} + .d2-2143901571 .fill-N3{fill:#9499AB;} + .d2-2143901571 .fill-N4{fill:#CFD2DD;} + .d2-2143901571 .fill-N5{fill:#DEE1EB;} + .d2-2143901571 .fill-N6{fill:#EEF1F8;} + .d2-2143901571 .fill-N7{fill:#FFFFFF;} + .d2-2143901571 .fill-B1{fill:#0D32B2;} + .d2-2143901571 .fill-B2{fill:#0D32B2;} + .d2-2143901571 .fill-B3{fill:#E3E9FD;} + .d2-2143901571 .fill-B4{fill:#E3E9FD;} + .d2-2143901571 .fill-B5{fill:#EDF0FD;} + .d2-2143901571 .fill-B6{fill:#F7F8FE;} + .d2-2143901571 .fill-AA2{fill:#4A6FF3;} + .d2-2143901571 .fill-AA4{fill:#EDF0FD;} + .d2-2143901571 .fill-AA5{fill:#F7F8FE;} + .d2-2143901571 .fill-AB4{fill:#EDF0FD;} + .d2-2143901571 .fill-AB5{fill:#F7F8FE;} + .d2-2143901571 .stroke-N1{stroke:#0A0F25;} + .d2-2143901571 .stroke-N2{stroke:#676C7E;} + .d2-2143901571 .stroke-N3{stroke:#9499AB;} + .d2-2143901571 .stroke-N4{stroke:#CFD2DD;} + .d2-2143901571 .stroke-N5{stroke:#DEE1EB;} + .d2-2143901571 .stroke-N6{stroke:#EEF1F8;} + .d2-2143901571 .stroke-N7{stroke:#FFFFFF;} + .d2-2143901571 .stroke-B1{stroke:#0D32B2;} + .d2-2143901571 .stroke-B2{stroke:#0D32B2;} + .d2-2143901571 .stroke-B3{stroke:#E3E9FD;} + .d2-2143901571 .stroke-B4{stroke:#E3E9FD;} + .d2-2143901571 .stroke-B5{stroke:#EDF0FD;} + .d2-2143901571 .stroke-B6{stroke:#F7F8FE;} + .d2-2143901571 .stroke-AA2{stroke:#4A6FF3;} + .d2-2143901571 .stroke-AA4{stroke:#EDF0FD;} + .d2-2143901571 .stroke-AA5{stroke:#F7F8FE;} + .d2-2143901571 .stroke-AB4{stroke:#EDF0FD;} + .d2-2143901571 .stroke-AB5{stroke:#F7F8FE;} + .d2-2143901571 .background-color-N1{background-color:#0A0F25;} + .d2-2143901571 .background-color-N2{background-color:#676C7E;} + .d2-2143901571 .background-color-N3{background-color:#9499AB;} + .d2-2143901571 .background-color-N4{background-color:#CFD2DD;} + .d2-2143901571 .background-color-N5{background-color:#DEE1EB;} + .d2-2143901571 .background-color-N6{background-color:#EEF1F8;} + .d2-2143901571 .background-color-N7{background-color:#FFFFFF;} + .d2-2143901571 .background-color-B1{background-color:#0D32B2;} + .d2-2143901571 .background-color-B2{background-color:#0D32B2;} + .d2-2143901571 .background-color-B3{background-color:#E3E9FD;} + .d2-2143901571 .background-color-B4{background-color:#E3E9FD;} + .d2-2143901571 .background-color-B5{background-color:#EDF0FD;} + .d2-2143901571 .background-color-B6{background-color:#F7F8FE;} + .d2-2143901571 .background-color-AA2{background-color:#4A6FF3;} + .d2-2143901571 .background-color-AA4{background-color:#EDF0FD;} + .d2-2143901571 .background-color-AA5{background-color:#F7F8FE;} + .d2-2143901571 .background-color-AB4{background-color:#EDF0FD;} + .d2-2143901571 .background-color-AB5{background-color:#F7F8FE;} + .d2-2143901571 .color-N1{color:#0A0F25;} + .d2-2143901571 .color-N2{color:#676C7E;} + .d2-2143901571 .color-N3{color:#9499AB;} + .d2-2143901571 .color-N4{color:#CFD2DD;} + .d2-2143901571 .color-N5{color:#DEE1EB;} + .d2-2143901571 .color-N6{color:#EEF1F8;} + .d2-2143901571 .color-N7{color:#FFFFFF;} + .d2-2143901571 .color-B1{color:#0D32B2;} + .d2-2143901571 .color-B2{color:#0D32B2;} + .d2-2143901571 .color-B3{color:#E3E9FD;} + .d2-2143901571 .color-B4{color:#E3E9FD;} + .d2-2143901571 .color-B5{color:#EDF0FD;} + .d2-2143901571 .color-B6{color:#F7F8FE;} + .d2-2143901571 .color-AA2{color:#4A6FF3;} + .d2-2143901571 .color-AA4{color:#EDF0FD;} + .d2-2143901571 .color-AA5{color:#F7F8FE;} + .d2-2143901571 .color-AB4{color:#EDF0FD;} + .d2-2143901571 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg index 9c5a9b6f0..adfeb879a 100644 --- a/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg +++ b/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-3053928353 .fill-N1{fill:#0A0F25;} + .d2-3053928353 .fill-N2{fill:#676C7E;} + .d2-3053928353 .fill-N3{fill:#9499AB;} + .d2-3053928353 .fill-N4{fill:#CFD2DD;} + .d2-3053928353 .fill-N5{fill:#DEE1EB;} + .d2-3053928353 .fill-N6{fill:#EEF1F8;} + .d2-3053928353 .fill-N7{fill:#FFFFFF;} + .d2-3053928353 .fill-B1{fill:#0D32B2;} + .d2-3053928353 .fill-B2{fill:#0D32B2;} + .d2-3053928353 .fill-B3{fill:#E3E9FD;} + .d2-3053928353 .fill-B4{fill:#E3E9FD;} + .d2-3053928353 .fill-B5{fill:#EDF0FD;} + .d2-3053928353 .fill-B6{fill:#F7F8FE;} + .d2-3053928353 .fill-AA2{fill:#4A6FF3;} + .d2-3053928353 .fill-AA4{fill:#EDF0FD;} + .d2-3053928353 .fill-AA5{fill:#F7F8FE;} + .d2-3053928353 .fill-AB4{fill:#EDF0FD;} + .d2-3053928353 .fill-AB5{fill:#F7F8FE;} + .d2-3053928353 .stroke-N1{stroke:#0A0F25;} + .d2-3053928353 .stroke-N2{stroke:#676C7E;} + .d2-3053928353 .stroke-N3{stroke:#9499AB;} + .d2-3053928353 .stroke-N4{stroke:#CFD2DD;} + .d2-3053928353 .stroke-N5{stroke:#DEE1EB;} + .d2-3053928353 .stroke-N6{stroke:#EEF1F8;} + .d2-3053928353 .stroke-N7{stroke:#FFFFFF;} + .d2-3053928353 .stroke-B1{stroke:#0D32B2;} + .d2-3053928353 .stroke-B2{stroke:#0D32B2;} + .d2-3053928353 .stroke-B3{stroke:#E3E9FD;} + .d2-3053928353 .stroke-B4{stroke:#E3E9FD;} + .d2-3053928353 .stroke-B5{stroke:#EDF0FD;} + .d2-3053928353 .stroke-B6{stroke:#F7F8FE;} + .d2-3053928353 .stroke-AA2{stroke:#4A6FF3;} + .d2-3053928353 .stroke-AA4{stroke:#EDF0FD;} + .d2-3053928353 .stroke-AA5{stroke:#F7F8FE;} + .d2-3053928353 .stroke-AB4{stroke:#EDF0FD;} + .d2-3053928353 .stroke-AB5{stroke:#F7F8FE;} + .d2-3053928353 .background-color-N1{background-color:#0A0F25;} + .d2-3053928353 .background-color-N2{background-color:#676C7E;} + .d2-3053928353 .background-color-N3{background-color:#9499AB;} + .d2-3053928353 .background-color-N4{background-color:#CFD2DD;} + .d2-3053928353 .background-color-N5{background-color:#DEE1EB;} + .d2-3053928353 .background-color-N6{background-color:#EEF1F8;} + .d2-3053928353 .background-color-N7{background-color:#FFFFFF;} + .d2-3053928353 .background-color-B1{background-color:#0D32B2;} + .d2-3053928353 .background-color-B2{background-color:#0D32B2;} + .d2-3053928353 .background-color-B3{background-color:#E3E9FD;} + .d2-3053928353 .background-color-B4{background-color:#E3E9FD;} + .d2-3053928353 .background-color-B5{background-color:#EDF0FD;} + .d2-3053928353 .background-color-B6{background-color:#F7F8FE;} + .d2-3053928353 .background-color-AA2{background-color:#4A6FF3;} + .d2-3053928353 .background-color-AA4{background-color:#EDF0FD;} + .d2-3053928353 .background-color-AA5{background-color:#F7F8FE;} + .d2-3053928353 .background-color-AB4{background-color:#EDF0FD;} + .d2-3053928353 .background-color-AB5{background-color:#F7F8FE;} + .d2-3053928353 .color-N1{color:#0A0F25;} + .d2-3053928353 .color-N2{color:#676C7E;} + .d2-3053928353 .color-N3{color:#9499AB;} + .d2-3053928353 .color-N4{color:#CFD2DD;} + .d2-3053928353 .color-N5{color:#DEE1EB;} + .d2-3053928353 .color-N6{color:#EEF1F8;} + .d2-3053928353 .color-N7{color:#FFFFFF;} + .d2-3053928353 .color-B1{color:#0D32B2;} + .d2-3053928353 .color-B2{color:#0D32B2;} + .d2-3053928353 .color-B3{color:#E3E9FD;} + .d2-3053928353 .color-B4{color:#E3E9FD;} + .d2-3053928353 .color-B5{color:#EDF0FD;} + .d2-3053928353 .color-B6{color:#F7F8FE;} + .d2-3053928353 .color-AA2{color:#4A6FF3;} + .d2-3053928353 .color-AA4{color:#EDF0FD;} + .d2-3053928353 .color-AA5{color:#F7F8FE;} + .d2-3053928353 .color-AB4{color:#EDF0FD;} + .d2-3053928353 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg b/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg index 4c029c034..d5e4ea857 100644 --- a/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -&∈beans & ricefoo&barbeans & rice + .d2-4185264130 .fill-N1{fill:#0A0F25;} + .d2-4185264130 .fill-N2{fill:#676C7E;} + .d2-4185264130 .fill-N3{fill:#9499AB;} + .d2-4185264130 .fill-N4{fill:#CFD2DD;} + .d2-4185264130 .fill-N5{fill:#DEE1EB;} + .d2-4185264130 .fill-N6{fill:#EEF1F8;} + .d2-4185264130 .fill-N7{fill:#FFFFFF;} + .d2-4185264130 .fill-B1{fill:#0D32B2;} + .d2-4185264130 .fill-B2{fill:#0D32B2;} + .d2-4185264130 .fill-B3{fill:#E3E9FD;} + .d2-4185264130 .fill-B4{fill:#E3E9FD;} + .d2-4185264130 .fill-B5{fill:#EDF0FD;} + .d2-4185264130 .fill-B6{fill:#F7F8FE;} + .d2-4185264130 .fill-AA2{fill:#4A6FF3;} + .d2-4185264130 .fill-AA4{fill:#EDF0FD;} + .d2-4185264130 .fill-AA5{fill:#F7F8FE;} + .d2-4185264130 .fill-AB4{fill:#EDF0FD;} + .d2-4185264130 .fill-AB5{fill:#F7F8FE;} + .d2-4185264130 .stroke-N1{stroke:#0A0F25;} + .d2-4185264130 .stroke-N2{stroke:#676C7E;} + .d2-4185264130 .stroke-N3{stroke:#9499AB;} + .d2-4185264130 .stroke-N4{stroke:#CFD2DD;} + .d2-4185264130 .stroke-N5{stroke:#DEE1EB;} + .d2-4185264130 .stroke-N6{stroke:#EEF1F8;} + .d2-4185264130 .stroke-N7{stroke:#FFFFFF;} + .d2-4185264130 .stroke-B1{stroke:#0D32B2;} + .d2-4185264130 .stroke-B2{stroke:#0D32B2;} + .d2-4185264130 .stroke-B3{stroke:#E3E9FD;} + .d2-4185264130 .stroke-B4{stroke:#E3E9FD;} + .d2-4185264130 .stroke-B5{stroke:#EDF0FD;} + .d2-4185264130 .stroke-B6{stroke:#F7F8FE;} + .d2-4185264130 .stroke-AA2{stroke:#4A6FF3;} + .d2-4185264130 .stroke-AA4{stroke:#EDF0FD;} + .d2-4185264130 .stroke-AA5{stroke:#F7F8FE;} + .d2-4185264130 .stroke-AB4{stroke:#EDF0FD;} + .d2-4185264130 .stroke-AB5{stroke:#F7F8FE;} + .d2-4185264130 .background-color-N1{background-color:#0A0F25;} + .d2-4185264130 .background-color-N2{background-color:#676C7E;} + .d2-4185264130 .background-color-N3{background-color:#9499AB;} + .d2-4185264130 .background-color-N4{background-color:#CFD2DD;} + .d2-4185264130 .background-color-N5{background-color:#DEE1EB;} + .d2-4185264130 .background-color-N6{background-color:#EEF1F8;} + .d2-4185264130 .background-color-N7{background-color:#FFFFFF;} + .d2-4185264130 .background-color-B1{background-color:#0D32B2;} + .d2-4185264130 .background-color-B2{background-color:#0D32B2;} + .d2-4185264130 .background-color-B3{background-color:#E3E9FD;} + .d2-4185264130 .background-color-B4{background-color:#E3E9FD;} + .d2-4185264130 .background-color-B5{background-color:#EDF0FD;} + .d2-4185264130 .background-color-B6{background-color:#F7F8FE;} + .d2-4185264130 .background-color-AA2{background-color:#4A6FF3;} + .d2-4185264130 .background-color-AA4{background-color:#EDF0FD;} + .d2-4185264130 .background-color-AA5{background-color:#F7F8FE;} + .d2-4185264130 .background-color-AB4{background-color:#EDF0FD;} + .d2-4185264130 .background-color-AB5{background-color:#F7F8FE;} + .d2-4185264130 .color-N1{color:#0A0F25;} + .d2-4185264130 .color-N2{color:#676C7E;} + .d2-4185264130 .color-N3{color:#9499AB;} + .d2-4185264130 .color-N4{color:#CFD2DD;} + .d2-4185264130 .color-N5{color:#DEE1EB;} + .d2-4185264130 .color-N6{color:#EEF1F8;} + .d2-4185264130 .color-N7{color:#FFFFFF;} + .d2-4185264130 .color-B1{color:#0D32B2;} + .d2-4185264130 .color-B2{color:#0D32B2;} + .d2-4185264130 .color-B3{color:#E3E9FD;} + .d2-4185264130 .color-B4{color:#E3E9FD;} + .d2-4185264130 .color-B5{color:#EDF0FD;} + .d2-4185264130 .color-B6{color:#F7F8FE;} + .d2-4185264130 .color-AA2{color:#4A6FF3;} + .d2-4185264130 .color-AA4{color:#EDF0FD;} + .d2-4185264130 .color-AA5{color:#F7F8FE;} + .d2-4185264130 .color-AB4{color:#EDF0FD;} + .d2-4185264130 .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}]]>&∈beans & ricefoo&barbeans & rice @@ -105,7 +105,7 @@ - + diff --git a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg index 53f45f176..90424ee6b 100644 --- a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -&∈beans & ricefoo&barbeans & rice + .d2-185267393 .fill-N1{fill:#0A0F25;} + .d2-185267393 .fill-N2{fill:#676C7E;} + .d2-185267393 .fill-N3{fill:#9499AB;} + .d2-185267393 .fill-N4{fill:#CFD2DD;} + .d2-185267393 .fill-N5{fill:#DEE1EB;} + .d2-185267393 .fill-N6{fill:#EEF1F8;} + .d2-185267393 .fill-N7{fill:#FFFFFF;} + .d2-185267393 .fill-B1{fill:#0D32B2;} + .d2-185267393 .fill-B2{fill:#0D32B2;} + .d2-185267393 .fill-B3{fill:#E3E9FD;} + .d2-185267393 .fill-B4{fill:#E3E9FD;} + .d2-185267393 .fill-B5{fill:#EDF0FD;} + .d2-185267393 .fill-B6{fill:#F7F8FE;} + .d2-185267393 .fill-AA2{fill:#4A6FF3;} + .d2-185267393 .fill-AA4{fill:#EDF0FD;} + .d2-185267393 .fill-AA5{fill:#F7F8FE;} + .d2-185267393 .fill-AB4{fill:#EDF0FD;} + .d2-185267393 .fill-AB5{fill:#F7F8FE;} + .d2-185267393 .stroke-N1{stroke:#0A0F25;} + .d2-185267393 .stroke-N2{stroke:#676C7E;} + .d2-185267393 .stroke-N3{stroke:#9499AB;} + .d2-185267393 .stroke-N4{stroke:#CFD2DD;} + .d2-185267393 .stroke-N5{stroke:#DEE1EB;} + .d2-185267393 .stroke-N6{stroke:#EEF1F8;} + .d2-185267393 .stroke-N7{stroke:#FFFFFF;} + .d2-185267393 .stroke-B1{stroke:#0D32B2;} + .d2-185267393 .stroke-B2{stroke:#0D32B2;} + .d2-185267393 .stroke-B3{stroke:#E3E9FD;} + .d2-185267393 .stroke-B4{stroke:#E3E9FD;} + .d2-185267393 .stroke-B5{stroke:#EDF0FD;} + .d2-185267393 .stroke-B6{stroke:#F7F8FE;} + .d2-185267393 .stroke-AA2{stroke:#4A6FF3;} + .d2-185267393 .stroke-AA4{stroke:#EDF0FD;} + .d2-185267393 .stroke-AA5{stroke:#F7F8FE;} + .d2-185267393 .stroke-AB4{stroke:#EDF0FD;} + .d2-185267393 .stroke-AB5{stroke:#F7F8FE;} + .d2-185267393 .background-color-N1{background-color:#0A0F25;} + .d2-185267393 .background-color-N2{background-color:#676C7E;} + .d2-185267393 .background-color-N3{background-color:#9499AB;} + .d2-185267393 .background-color-N4{background-color:#CFD2DD;} + .d2-185267393 .background-color-N5{background-color:#DEE1EB;} + .d2-185267393 .background-color-N6{background-color:#EEF1F8;} + .d2-185267393 .background-color-N7{background-color:#FFFFFF;} + .d2-185267393 .background-color-B1{background-color:#0D32B2;} + .d2-185267393 .background-color-B2{background-color:#0D32B2;} + .d2-185267393 .background-color-B3{background-color:#E3E9FD;} + .d2-185267393 .background-color-B4{background-color:#E3E9FD;} + .d2-185267393 .background-color-B5{background-color:#EDF0FD;} + .d2-185267393 .background-color-B6{background-color:#F7F8FE;} + .d2-185267393 .background-color-AA2{background-color:#4A6FF3;} + .d2-185267393 .background-color-AA4{background-color:#EDF0FD;} + .d2-185267393 .background-color-AA5{background-color:#F7F8FE;} + .d2-185267393 .background-color-AB4{background-color:#EDF0FD;} + .d2-185267393 .background-color-AB5{background-color:#F7F8FE;} + .d2-185267393 .color-N1{color:#0A0F25;} + .d2-185267393 .color-N2{color:#676C7E;} + .d2-185267393 .color-N3{color:#9499AB;} + .d2-185267393 .color-N4{color:#CFD2DD;} + .d2-185267393 .color-N5{color:#DEE1EB;} + .d2-185267393 .color-N6{color:#EEF1F8;} + .d2-185267393 .color-N7{color:#FFFFFF;} + .d2-185267393 .color-B1{color:#0D32B2;} + .d2-185267393 .color-B2{color:#0D32B2;} + .d2-185267393 .color-B3{color:#E3E9FD;} + .d2-185267393 .color-B4{color:#E3E9FD;} + .d2-185267393 .color-B5{color:#EDF0FD;} + .d2-185267393 .color-B6{color:#F7F8FE;} + .d2-185267393 .color-AA2{color:#4A6FF3;} + .d2-185267393 .color-AA4{color:#EDF0FD;} + .d2-185267393 .color-AA5{color:#F7F8FE;} + .d2-185267393 .color-AB4{color:#EDF0FD;} + .d2-185267393 .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}]]>&∈beans & ricefoo&barbeans & rice @@ -105,7 +105,7 @@ - + diff --git a/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg index a4eee609e..79f19b5b3 100644 --- a/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -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 + .d2-3069999377 .fill-N1{fill:#0A0F25;} + .d2-3069999377 .fill-N2{fill:#676C7E;} + .d2-3069999377 .fill-N3{fill:#9499AB;} + .d2-3069999377 .fill-N4{fill:#CFD2DD;} + .d2-3069999377 .fill-N5{fill:#DEE1EB;} + .d2-3069999377 .fill-N6{fill:#EEF1F8;} + .d2-3069999377 .fill-N7{fill:#FFFFFF;} + .d2-3069999377 .fill-B1{fill:#0D32B2;} + .d2-3069999377 .fill-B2{fill:#0D32B2;} + .d2-3069999377 .fill-B3{fill:#E3E9FD;} + .d2-3069999377 .fill-B4{fill:#E3E9FD;} + .d2-3069999377 .fill-B5{fill:#EDF0FD;} + .d2-3069999377 .fill-B6{fill:#F7F8FE;} + .d2-3069999377 .fill-AA2{fill:#4A6FF3;} + .d2-3069999377 .fill-AA4{fill:#EDF0FD;} + .d2-3069999377 .fill-AA5{fill:#F7F8FE;} + .d2-3069999377 .fill-AB4{fill:#EDF0FD;} + .d2-3069999377 .fill-AB5{fill:#F7F8FE;} + .d2-3069999377 .stroke-N1{stroke:#0A0F25;} + .d2-3069999377 .stroke-N2{stroke:#676C7E;} + .d2-3069999377 .stroke-N3{stroke:#9499AB;} + .d2-3069999377 .stroke-N4{stroke:#CFD2DD;} + .d2-3069999377 .stroke-N5{stroke:#DEE1EB;} + .d2-3069999377 .stroke-N6{stroke:#EEF1F8;} + .d2-3069999377 .stroke-N7{stroke:#FFFFFF;} + .d2-3069999377 .stroke-B1{stroke:#0D32B2;} + .d2-3069999377 .stroke-B2{stroke:#0D32B2;} + .d2-3069999377 .stroke-B3{stroke:#E3E9FD;} + .d2-3069999377 .stroke-B4{stroke:#E3E9FD;} + .d2-3069999377 .stroke-B5{stroke:#EDF0FD;} + .d2-3069999377 .stroke-B6{stroke:#F7F8FE;} + .d2-3069999377 .stroke-AA2{stroke:#4A6FF3;} + .d2-3069999377 .stroke-AA4{stroke:#EDF0FD;} + .d2-3069999377 .stroke-AA5{stroke:#F7F8FE;} + .d2-3069999377 .stroke-AB4{stroke:#EDF0FD;} + .d2-3069999377 .stroke-AB5{stroke:#F7F8FE;} + .d2-3069999377 .background-color-N1{background-color:#0A0F25;} + .d2-3069999377 .background-color-N2{background-color:#676C7E;} + .d2-3069999377 .background-color-N3{background-color:#9499AB;} + .d2-3069999377 .background-color-N4{background-color:#CFD2DD;} + .d2-3069999377 .background-color-N5{background-color:#DEE1EB;} + .d2-3069999377 .background-color-N6{background-color:#EEF1F8;} + .d2-3069999377 .background-color-N7{background-color:#FFFFFF;} + .d2-3069999377 .background-color-B1{background-color:#0D32B2;} + .d2-3069999377 .background-color-B2{background-color:#0D32B2;} + .d2-3069999377 .background-color-B3{background-color:#E3E9FD;} + .d2-3069999377 .background-color-B4{background-color:#E3E9FD;} + .d2-3069999377 .background-color-B5{background-color:#EDF0FD;} + .d2-3069999377 .background-color-B6{background-color:#F7F8FE;} + .d2-3069999377 .background-color-AA2{background-color:#4A6FF3;} + .d2-3069999377 .background-color-AA4{background-color:#EDF0FD;} + .d2-3069999377 .background-color-AA5{background-color:#F7F8FE;} + .d2-3069999377 .background-color-AB4{background-color:#EDF0FD;} + .d2-3069999377 .background-color-AB5{background-color:#F7F8FE;} + .d2-3069999377 .color-N1{color:#0A0F25;} + .d2-3069999377 .color-N2{color:#676C7E;} + .d2-3069999377 .color-N3{color:#9499AB;} + .d2-3069999377 .color-N4{color:#CFD2DD;} + .d2-3069999377 .color-N5{color:#DEE1EB;} + .d2-3069999377 .color-N6{color:#EEF1F8;} + .d2-3069999377 .color-N7{color:#FFFFFF;} + .d2-3069999377 .color-B1{color:#0D32B2;} + .d2-3069999377 .color-B2{color:#0D32B2;} + .d2-3069999377 .color-B3{color:#E3E9FD;} + .d2-3069999377 .color-B4{color:#E3E9FD;} + .d2-3069999377 .color-B5{color:#EDF0FD;} + .d2-3069999377 .color-B6{color:#F7F8FE;} + .d2-3069999377 .color-AA2{color:#4A6FF3;} + .d2-3069999377 .color-AA4{color:#EDF0FD;} + .d2-3069999377 .color-AA5{color:#F7F8FE;} + .d2-3069999377 .color-AB4{color:#EDF0FD;} + .d2-3069999377 .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}]]>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 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 63af7d00a..e5cd22f40 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,23 +1,23 @@ -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 + .d2-2455158177 .fill-N1{fill:#0A0F25;} + .d2-2455158177 .fill-N2{fill:#676C7E;} + .d2-2455158177 .fill-N3{fill:#9499AB;} + .d2-2455158177 .fill-N4{fill:#CFD2DD;} + .d2-2455158177 .fill-N5{fill:#DEE1EB;} + .d2-2455158177 .fill-N6{fill:#EEF1F8;} + .d2-2455158177 .fill-N7{fill:#FFFFFF;} + .d2-2455158177 .fill-B1{fill:#0D32B2;} + .d2-2455158177 .fill-B2{fill:#0D32B2;} + .d2-2455158177 .fill-B3{fill:#E3E9FD;} + .d2-2455158177 .fill-B4{fill:#E3E9FD;} + .d2-2455158177 .fill-B5{fill:#EDF0FD;} + .d2-2455158177 .fill-B6{fill:#F7F8FE;} + .d2-2455158177 .fill-AA2{fill:#4A6FF3;} + .d2-2455158177 .fill-AA4{fill:#EDF0FD;} + .d2-2455158177 .fill-AA5{fill:#F7F8FE;} + .d2-2455158177 .fill-AB4{fill:#EDF0FD;} + .d2-2455158177 .fill-AB5{fill:#F7F8FE;} + .d2-2455158177 .stroke-N1{stroke:#0A0F25;} + .d2-2455158177 .stroke-N2{stroke:#676C7E;} + .d2-2455158177 .stroke-N3{stroke:#9499AB;} + .d2-2455158177 .stroke-N4{stroke:#CFD2DD;} + .d2-2455158177 .stroke-N5{stroke:#DEE1EB;} + .d2-2455158177 .stroke-N6{stroke:#EEF1F8;} + .d2-2455158177 .stroke-N7{stroke:#FFFFFF;} + .d2-2455158177 .stroke-B1{stroke:#0D32B2;} + .d2-2455158177 .stroke-B2{stroke:#0D32B2;} + .d2-2455158177 .stroke-B3{stroke:#E3E9FD;} + .d2-2455158177 .stroke-B4{stroke:#E3E9FD;} + .d2-2455158177 .stroke-B5{stroke:#EDF0FD;} + .d2-2455158177 .stroke-B6{stroke:#F7F8FE;} + .d2-2455158177 .stroke-AA2{stroke:#4A6FF3;} + .d2-2455158177 .stroke-AA4{stroke:#EDF0FD;} + .d2-2455158177 .stroke-AA5{stroke:#F7F8FE;} + .d2-2455158177 .stroke-AB4{stroke:#EDF0FD;} + .d2-2455158177 .stroke-AB5{stroke:#F7F8FE;} + .d2-2455158177 .background-color-N1{background-color:#0A0F25;} + .d2-2455158177 .background-color-N2{background-color:#676C7E;} + .d2-2455158177 .background-color-N3{background-color:#9499AB;} + .d2-2455158177 .background-color-N4{background-color:#CFD2DD;} + .d2-2455158177 .background-color-N5{background-color:#DEE1EB;} + .d2-2455158177 .background-color-N6{background-color:#EEF1F8;} + .d2-2455158177 .background-color-N7{background-color:#FFFFFF;} + .d2-2455158177 .background-color-B1{background-color:#0D32B2;} + .d2-2455158177 .background-color-B2{background-color:#0D32B2;} + .d2-2455158177 .background-color-B3{background-color:#E3E9FD;} + .d2-2455158177 .background-color-B4{background-color:#E3E9FD;} + .d2-2455158177 .background-color-B5{background-color:#EDF0FD;} + .d2-2455158177 .background-color-B6{background-color:#F7F8FE;} + .d2-2455158177 .background-color-AA2{background-color:#4A6FF3;} + .d2-2455158177 .background-color-AA4{background-color:#EDF0FD;} + .d2-2455158177 .background-color-AA5{background-color:#F7F8FE;} + .d2-2455158177 .background-color-AB4{background-color:#EDF0FD;} + .d2-2455158177 .background-color-AB5{background-color:#F7F8FE;} + .d2-2455158177 .color-N1{color:#0A0F25;} + .d2-2455158177 .color-N2{color:#676C7E;} + .d2-2455158177 .color-N3{color:#9499AB;} + .d2-2455158177 .color-N4{color:#CFD2DD;} + .d2-2455158177 .color-N5{color:#DEE1EB;} + .d2-2455158177 .color-N6{color:#EEF1F8;} + .d2-2455158177 .color-N7{color:#FFFFFF;} + .d2-2455158177 .color-B1{color:#0D32B2;} + .d2-2455158177 .color-B2{color:#0D32B2;} + .d2-2455158177 .color-B3{color:#E3E9FD;} + .d2-2455158177 .color-B4{color:#E3E9FD;} + .d2-2455158177 .color-B5{color:#EDF0FD;} + .d2-2455158177 .color-B6{color:#F7F8FE;} + .d2-2455158177 .color-AA2{color:#4A6FF3;} + .d2-2455158177 .color-AA4{color:#EDF0FD;} + .d2-2455158177 .color-AA5{color:#F7F8FE;} + .d2-2455158177 .color-AB4{color:#EDF0FD;} + .d2-2455158177 .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}]]>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 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 edf0b3747..9771c22b5 100644 --- a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz syncsync + .d2-3295824007 .fill-N1{fill:#0A0F25;} + .d2-3295824007 .fill-N2{fill:#676C7E;} + .d2-3295824007 .fill-N3{fill:#9499AB;} + .d2-3295824007 .fill-N4{fill:#CFD2DD;} + .d2-3295824007 .fill-N5{fill:#DEE1EB;} + .d2-3295824007 .fill-N6{fill:#EEF1F8;} + .d2-3295824007 .fill-N7{fill:#FFFFFF;} + .d2-3295824007 .fill-B1{fill:#0D32B2;} + .d2-3295824007 .fill-B2{fill:#0D32B2;} + .d2-3295824007 .fill-B3{fill:#E3E9FD;} + .d2-3295824007 .fill-B4{fill:#E3E9FD;} + .d2-3295824007 .fill-B5{fill:#EDF0FD;} + .d2-3295824007 .fill-B6{fill:#F7F8FE;} + .d2-3295824007 .fill-AA2{fill:#4A6FF3;} + .d2-3295824007 .fill-AA4{fill:#EDF0FD;} + .d2-3295824007 .fill-AA5{fill:#F7F8FE;} + .d2-3295824007 .fill-AB4{fill:#EDF0FD;} + .d2-3295824007 .fill-AB5{fill:#F7F8FE;} + .d2-3295824007 .stroke-N1{stroke:#0A0F25;} + .d2-3295824007 .stroke-N2{stroke:#676C7E;} + .d2-3295824007 .stroke-N3{stroke:#9499AB;} + .d2-3295824007 .stroke-N4{stroke:#CFD2DD;} + .d2-3295824007 .stroke-N5{stroke:#DEE1EB;} + .d2-3295824007 .stroke-N6{stroke:#EEF1F8;} + .d2-3295824007 .stroke-N7{stroke:#FFFFFF;} + .d2-3295824007 .stroke-B1{stroke:#0D32B2;} + .d2-3295824007 .stroke-B2{stroke:#0D32B2;} + .d2-3295824007 .stroke-B3{stroke:#E3E9FD;} + .d2-3295824007 .stroke-B4{stroke:#E3E9FD;} + .d2-3295824007 .stroke-B5{stroke:#EDF0FD;} + .d2-3295824007 .stroke-B6{stroke:#F7F8FE;} + .d2-3295824007 .stroke-AA2{stroke:#4A6FF3;} + .d2-3295824007 .stroke-AA4{stroke:#EDF0FD;} + .d2-3295824007 .stroke-AA5{stroke:#F7F8FE;} + .d2-3295824007 .stroke-AB4{stroke:#EDF0FD;} + .d2-3295824007 .stroke-AB5{stroke:#F7F8FE;} + .d2-3295824007 .background-color-N1{background-color:#0A0F25;} + .d2-3295824007 .background-color-N2{background-color:#676C7E;} + .d2-3295824007 .background-color-N3{background-color:#9499AB;} + .d2-3295824007 .background-color-N4{background-color:#CFD2DD;} + .d2-3295824007 .background-color-N5{background-color:#DEE1EB;} + .d2-3295824007 .background-color-N6{background-color:#EEF1F8;} + .d2-3295824007 .background-color-N7{background-color:#FFFFFF;} + .d2-3295824007 .background-color-B1{background-color:#0D32B2;} + .d2-3295824007 .background-color-B2{background-color:#0D32B2;} + .d2-3295824007 .background-color-B3{background-color:#E3E9FD;} + .d2-3295824007 .background-color-B4{background-color:#E3E9FD;} + .d2-3295824007 .background-color-B5{background-color:#EDF0FD;} + .d2-3295824007 .background-color-B6{background-color:#F7F8FE;} + .d2-3295824007 .background-color-AA2{background-color:#4A6FF3;} + .d2-3295824007 .background-color-AA4{background-color:#EDF0FD;} + .d2-3295824007 .background-color-AA5{background-color:#F7F8FE;} + .d2-3295824007 .background-color-AB4{background-color:#EDF0FD;} + .d2-3295824007 .background-color-AB5{background-color:#F7F8FE;} + .d2-3295824007 .color-N1{color:#0A0F25;} + .d2-3295824007 .color-N2{color:#676C7E;} + .d2-3295824007 .color-N3{color:#9499AB;} + .d2-3295824007 .color-N4{color:#CFD2DD;} + .d2-3295824007 .color-N5{color:#DEE1EB;} + .d2-3295824007 .color-N6{color:#EEF1F8;} + .d2-3295824007 .color-N7{color:#FFFFFF;} + .d2-3295824007 .color-B1{color:#0D32B2;} + .d2-3295824007 .color-B2{color:#0D32B2;} + .d2-3295824007 .color-B3{color:#E3E9FD;} + .d2-3295824007 .color-B4{color:#E3E9FD;} + .d2-3295824007 .color-B5{color:#EDF0FD;} + .d2-3295824007 .color-B6{color:#F7F8FE;} + .d2-3295824007 .color-AA2{color:#4A6FF3;} + .d2-3295824007 .color-AA4{color:#EDF0FD;} + .d2-3295824007 .color-AA5{color:#F7F8FE;} + .d2-3295824007 .color-AB4{color:#EDF0FD;} + .d2-3295824007 .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}]]>xyz syncsync 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 f5cabc27a..d63de3aa3 100644 --- a/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz syncsync + .d2-1721623843 .fill-N1{fill:#0A0F25;} + .d2-1721623843 .fill-N2{fill:#676C7E;} + .d2-1721623843 .fill-N3{fill:#9499AB;} + .d2-1721623843 .fill-N4{fill:#CFD2DD;} + .d2-1721623843 .fill-N5{fill:#DEE1EB;} + .d2-1721623843 .fill-N6{fill:#EEF1F8;} + .d2-1721623843 .fill-N7{fill:#FFFFFF;} + .d2-1721623843 .fill-B1{fill:#0D32B2;} + .d2-1721623843 .fill-B2{fill:#0D32B2;} + .d2-1721623843 .fill-B3{fill:#E3E9FD;} + .d2-1721623843 .fill-B4{fill:#E3E9FD;} + .d2-1721623843 .fill-B5{fill:#EDF0FD;} + .d2-1721623843 .fill-B6{fill:#F7F8FE;} + .d2-1721623843 .fill-AA2{fill:#4A6FF3;} + .d2-1721623843 .fill-AA4{fill:#EDF0FD;} + .d2-1721623843 .fill-AA5{fill:#F7F8FE;} + .d2-1721623843 .fill-AB4{fill:#EDF0FD;} + .d2-1721623843 .fill-AB5{fill:#F7F8FE;} + .d2-1721623843 .stroke-N1{stroke:#0A0F25;} + .d2-1721623843 .stroke-N2{stroke:#676C7E;} + .d2-1721623843 .stroke-N3{stroke:#9499AB;} + .d2-1721623843 .stroke-N4{stroke:#CFD2DD;} + .d2-1721623843 .stroke-N5{stroke:#DEE1EB;} + .d2-1721623843 .stroke-N6{stroke:#EEF1F8;} + .d2-1721623843 .stroke-N7{stroke:#FFFFFF;} + .d2-1721623843 .stroke-B1{stroke:#0D32B2;} + .d2-1721623843 .stroke-B2{stroke:#0D32B2;} + .d2-1721623843 .stroke-B3{stroke:#E3E9FD;} + .d2-1721623843 .stroke-B4{stroke:#E3E9FD;} + .d2-1721623843 .stroke-B5{stroke:#EDF0FD;} + .d2-1721623843 .stroke-B6{stroke:#F7F8FE;} + .d2-1721623843 .stroke-AA2{stroke:#4A6FF3;} + .d2-1721623843 .stroke-AA4{stroke:#EDF0FD;} + .d2-1721623843 .stroke-AA5{stroke:#F7F8FE;} + .d2-1721623843 .stroke-AB4{stroke:#EDF0FD;} + .d2-1721623843 .stroke-AB5{stroke:#F7F8FE;} + .d2-1721623843 .background-color-N1{background-color:#0A0F25;} + .d2-1721623843 .background-color-N2{background-color:#676C7E;} + .d2-1721623843 .background-color-N3{background-color:#9499AB;} + .d2-1721623843 .background-color-N4{background-color:#CFD2DD;} + .d2-1721623843 .background-color-N5{background-color:#DEE1EB;} + .d2-1721623843 .background-color-N6{background-color:#EEF1F8;} + .d2-1721623843 .background-color-N7{background-color:#FFFFFF;} + .d2-1721623843 .background-color-B1{background-color:#0D32B2;} + .d2-1721623843 .background-color-B2{background-color:#0D32B2;} + .d2-1721623843 .background-color-B3{background-color:#E3E9FD;} + .d2-1721623843 .background-color-B4{background-color:#E3E9FD;} + .d2-1721623843 .background-color-B5{background-color:#EDF0FD;} + .d2-1721623843 .background-color-B6{background-color:#F7F8FE;} + .d2-1721623843 .background-color-AA2{background-color:#4A6FF3;} + .d2-1721623843 .background-color-AA4{background-color:#EDF0FD;} + .d2-1721623843 .background-color-AA5{background-color:#F7F8FE;} + .d2-1721623843 .background-color-AB4{background-color:#EDF0FD;} + .d2-1721623843 .background-color-AB5{background-color:#F7F8FE;} + .d2-1721623843 .color-N1{color:#0A0F25;} + .d2-1721623843 .color-N2{color:#676C7E;} + .d2-1721623843 .color-N3{color:#9499AB;} + .d2-1721623843 .color-N4{color:#CFD2DD;} + .d2-1721623843 .color-N5{color:#DEE1EB;} + .d2-1721623843 .color-N6{color:#EEF1F8;} + .d2-1721623843 .color-N7{color:#FFFFFF;} + .d2-1721623843 .color-B1{color:#0D32B2;} + .d2-1721623843 .color-B2{color:#0D32B2;} + .d2-1721623843 .color-B3{color:#E3E9FD;} + .d2-1721623843 .color-B4{color:#E3E9FD;} + .d2-1721623843 .color-B5{color:#EDF0FD;} + .d2-1721623843 .color-B6{color:#F7F8FE;} + .d2-1721623843 .color-AA2{color:#4A6FF3;} + .d2-1721623843 .color-AA4{color:#EDF0FD;} + .d2-1721623843 .color-AA5{color:#F7F8FE;} + .d2-1721623843 .color-AB4{color:#EDF0FD;} + .d2-1721623843 .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}]]>xyz syncsync 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 be9a387c4..802d9d632 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,9 +1,9 @@ -a + .d2-965117370 .fill-N1{fill:#0A0F25;} + .d2-965117370 .fill-N2{fill:#676C7E;} + .d2-965117370 .fill-N3{fill:#9499AB;} + .d2-965117370 .fill-N4{fill:#CFD2DD;} + .d2-965117370 .fill-N5{fill:#DEE1EB;} + .d2-965117370 .fill-N6{fill:#EEF1F8;} + .d2-965117370 .fill-N7{fill:#FFFFFF;} + .d2-965117370 .fill-B1{fill:#0D32B2;} + .d2-965117370 .fill-B2{fill:#0D32B2;} + .d2-965117370 .fill-B3{fill:#E3E9FD;} + .d2-965117370 .fill-B4{fill:#E3E9FD;} + .d2-965117370 .fill-B5{fill:#EDF0FD;} + .d2-965117370 .fill-B6{fill:#F7F8FE;} + .d2-965117370 .fill-AA2{fill:#4A6FF3;} + .d2-965117370 .fill-AA4{fill:#EDF0FD;} + .d2-965117370 .fill-AA5{fill:#F7F8FE;} + .d2-965117370 .fill-AB4{fill:#EDF0FD;} + .d2-965117370 .fill-AB5{fill:#F7F8FE;} + .d2-965117370 .stroke-N1{stroke:#0A0F25;} + .d2-965117370 .stroke-N2{stroke:#676C7E;} + .d2-965117370 .stroke-N3{stroke:#9499AB;} + .d2-965117370 .stroke-N4{stroke:#CFD2DD;} + .d2-965117370 .stroke-N5{stroke:#DEE1EB;} + .d2-965117370 .stroke-N6{stroke:#EEF1F8;} + .d2-965117370 .stroke-N7{stroke:#FFFFFF;} + .d2-965117370 .stroke-B1{stroke:#0D32B2;} + .d2-965117370 .stroke-B2{stroke:#0D32B2;} + .d2-965117370 .stroke-B3{stroke:#E3E9FD;} + .d2-965117370 .stroke-B4{stroke:#E3E9FD;} + .d2-965117370 .stroke-B5{stroke:#EDF0FD;} + .d2-965117370 .stroke-B6{stroke:#F7F8FE;} + .d2-965117370 .stroke-AA2{stroke:#4A6FF3;} + .d2-965117370 .stroke-AA4{stroke:#EDF0FD;} + .d2-965117370 .stroke-AA5{stroke:#F7F8FE;} + .d2-965117370 .stroke-AB4{stroke:#EDF0FD;} + .d2-965117370 .stroke-AB5{stroke:#F7F8FE;} + .d2-965117370 .background-color-N1{background-color:#0A0F25;} + .d2-965117370 .background-color-N2{background-color:#676C7E;} + .d2-965117370 .background-color-N3{background-color:#9499AB;} + .d2-965117370 .background-color-N4{background-color:#CFD2DD;} + .d2-965117370 .background-color-N5{background-color:#DEE1EB;} + .d2-965117370 .background-color-N6{background-color:#EEF1F8;} + .d2-965117370 .background-color-N7{background-color:#FFFFFF;} + .d2-965117370 .background-color-B1{background-color:#0D32B2;} + .d2-965117370 .background-color-B2{background-color:#0D32B2;} + .d2-965117370 .background-color-B3{background-color:#E3E9FD;} + .d2-965117370 .background-color-B4{background-color:#E3E9FD;} + .d2-965117370 .background-color-B5{background-color:#EDF0FD;} + .d2-965117370 .background-color-B6{background-color:#F7F8FE;} + .d2-965117370 .background-color-AA2{background-color:#4A6FF3;} + .d2-965117370 .background-color-AA4{background-color:#EDF0FD;} + .d2-965117370 .background-color-AA5{background-color:#F7F8FE;} + .d2-965117370 .background-color-AB4{background-color:#EDF0FD;} + .d2-965117370 .background-color-AB5{background-color:#F7F8FE;} + .d2-965117370 .color-N1{color:#0A0F25;} + .d2-965117370 .color-N2{color:#676C7E;} + .d2-965117370 .color-N3{color:#9499AB;} + .d2-965117370 .color-N4{color:#CFD2DD;} + .d2-965117370 .color-N5{color:#DEE1EB;} + .d2-965117370 .color-N6{color:#EEF1F8;} + .d2-965117370 .color-N7{color:#FFFFFF;} + .d2-965117370 .color-B1{color:#0D32B2;} + .d2-965117370 .color-B2{color:#0D32B2;} + .d2-965117370 .color-B3{color:#E3E9FD;} + .d2-965117370 .color-B4{color:#E3E9FD;} + .d2-965117370 .color-B5{color:#EDF0FD;} + .d2-965117370 .color-B6{color:#F7F8FE;} + .d2-965117370 .color-AA2{color:#4A6FF3;} + .d2-965117370 .color-AA4{color:#EDF0FD;} + .d2-965117370 .color-AA5{color:#F7F8FE;} + .d2-965117370 .color-AB4{color:#EDF0FD;} + .d2-965117370 .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 \ No newline at end of file diff --git a/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg b/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg index be9a387c4..802d9d632 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -a + .d2-965117370 .fill-N1{fill:#0A0F25;} + .d2-965117370 .fill-N2{fill:#676C7E;} + .d2-965117370 .fill-N3{fill:#9499AB;} + .d2-965117370 .fill-N4{fill:#CFD2DD;} + .d2-965117370 .fill-N5{fill:#DEE1EB;} + .d2-965117370 .fill-N6{fill:#EEF1F8;} + .d2-965117370 .fill-N7{fill:#FFFFFF;} + .d2-965117370 .fill-B1{fill:#0D32B2;} + .d2-965117370 .fill-B2{fill:#0D32B2;} + .d2-965117370 .fill-B3{fill:#E3E9FD;} + .d2-965117370 .fill-B4{fill:#E3E9FD;} + .d2-965117370 .fill-B5{fill:#EDF0FD;} + .d2-965117370 .fill-B6{fill:#F7F8FE;} + .d2-965117370 .fill-AA2{fill:#4A6FF3;} + .d2-965117370 .fill-AA4{fill:#EDF0FD;} + .d2-965117370 .fill-AA5{fill:#F7F8FE;} + .d2-965117370 .fill-AB4{fill:#EDF0FD;} + .d2-965117370 .fill-AB5{fill:#F7F8FE;} + .d2-965117370 .stroke-N1{stroke:#0A0F25;} + .d2-965117370 .stroke-N2{stroke:#676C7E;} + .d2-965117370 .stroke-N3{stroke:#9499AB;} + .d2-965117370 .stroke-N4{stroke:#CFD2DD;} + .d2-965117370 .stroke-N5{stroke:#DEE1EB;} + .d2-965117370 .stroke-N6{stroke:#EEF1F8;} + .d2-965117370 .stroke-N7{stroke:#FFFFFF;} + .d2-965117370 .stroke-B1{stroke:#0D32B2;} + .d2-965117370 .stroke-B2{stroke:#0D32B2;} + .d2-965117370 .stroke-B3{stroke:#E3E9FD;} + .d2-965117370 .stroke-B4{stroke:#E3E9FD;} + .d2-965117370 .stroke-B5{stroke:#EDF0FD;} + .d2-965117370 .stroke-B6{stroke:#F7F8FE;} + .d2-965117370 .stroke-AA2{stroke:#4A6FF3;} + .d2-965117370 .stroke-AA4{stroke:#EDF0FD;} + .d2-965117370 .stroke-AA5{stroke:#F7F8FE;} + .d2-965117370 .stroke-AB4{stroke:#EDF0FD;} + .d2-965117370 .stroke-AB5{stroke:#F7F8FE;} + .d2-965117370 .background-color-N1{background-color:#0A0F25;} + .d2-965117370 .background-color-N2{background-color:#676C7E;} + .d2-965117370 .background-color-N3{background-color:#9499AB;} + .d2-965117370 .background-color-N4{background-color:#CFD2DD;} + .d2-965117370 .background-color-N5{background-color:#DEE1EB;} + .d2-965117370 .background-color-N6{background-color:#EEF1F8;} + .d2-965117370 .background-color-N7{background-color:#FFFFFF;} + .d2-965117370 .background-color-B1{background-color:#0D32B2;} + .d2-965117370 .background-color-B2{background-color:#0D32B2;} + .d2-965117370 .background-color-B3{background-color:#E3E9FD;} + .d2-965117370 .background-color-B4{background-color:#E3E9FD;} + .d2-965117370 .background-color-B5{background-color:#EDF0FD;} + .d2-965117370 .background-color-B6{background-color:#F7F8FE;} + .d2-965117370 .background-color-AA2{background-color:#4A6FF3;} + .d2-965117370 .background-color-AA4{background-color:#EDF0FD;} + .d2-965117370 .background-color-AA5{background-color:#F7F8FE;} + .d2-965117370 .background-color-AB4{background-color:#EDF0FD;} + .d2-965117370 .background-color-AB5{background-color:#F7F8FE;} + .d2-965117370 .color-N1{color:#0A0F25;} + .d2-965117370 .color-N2{color:#676C7E;} + .d2-965117370 .color-N3{color:#9499AB;} + .d2-965117370 .color-N4{color:#CFD2DD;} + .d2-965117370 .color-N5{color:#DEE1EB;} + .d2-965117370 .color-N6{color:#EEF1F8;} + .d2-965117370 .color-N7{color:#FFFFFF;} + .d2-965117370 .color-B1{color:#0D32B2;} + .d2-965117370 .color-B2{color:#0D32B2;} + .d2-965117370 .color-B3{color:#E3E9FD;} + .d2-965117370 .color-B4{color:#E3E9FD;} + .d2-965117370 .color-B5{color:#EDF0FD;} + .d2-965117370 .color-B6{color:#F7F8FE;} + .d2-965117370 .color-AA2{color:#4A6FF3;} + .d2-965117370 .color-AA4{color:#EDF0FD;} + .d2-965117370 .color-AA5{color:#F7F8FE;} + .d2-965117370 .color-AB4{color:#EDF0FD;} + .d2-965117370 .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 \ No newline at end of file diff --git a/e2etests/testdata/regression/code_leading_newlines/dagre/sketch.exp.svg b/e2etests/testdata/regression/code_leading_newlines/dagre/sketch.exp.svg index e5edccf82..d9153c45e 100644 --- a/e2etests/testdata/regression/code_leading_newlines/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/code_leading_newlines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-1174935043 .fill-N1{fill:#0A0F25;} + .d2-1174935043 .fill-N2{fill:#676C7E;} + .d2-1174935043 .fill-N3{fill:#9499AB;} + .d2-1174935043 .fill-N4{fill:#CFD2DD;} + .d2-1174935043 .fill-N5{fill:#DEE1EB;} + .d2-1174935043 .fill-N6{fill:#EEF1F8;} + .d2-1174935043 .fill-N7{fill:#FFFFFF;} + .d2-1174935043 .fill-B1{fill:#0D32B2;} + .d2-1174935043 .fill-B2{fill:#0D32B2;} + .d2-1174935043 .fill-B3{fill:#E3E9FD;} + .d2-1174935043 .fill-B4{fill:#E3E9FD;} + .d2-1174935043 .fill-B5{fill:#EDF0FD;} + .d2-1174935043 .fill-B6{fill:#F7F8FE;} + .d2-1174935043 .fill-AA2{fill:#4A6FF3;} + .d2-1174935043 .fill-AA4{fill:#EDF0FD;} + .d2-1174935043 .fill-AA5{fill:#F7F8FE;} + .d2-1174935043 .fill-AB4{fill:#EDF0FD;} + .d2-1174935043 .fill-AB5{fill:#F7F8FE;} + .d2-1174935043 .stroke-N1{stroke:#0A0F25;} + .d2-1174935043 .stroke-N2{stroke:#676C7E;} + .d2-1174935043 .stroke-N3{stroke:#9499AB;} + .d2-1174935043 .stroke-N4{stroke:#CFD2DD;} + .d2-1174935043 .stroke-N5{stroke:#DEE1EB;} + .d2-1174935043 .stroke-N6{stroke:#EEF1F8;} + .d2-1174935043 .stroke-N7{stroke:#FFFFFF;} + .d2-1174935043 .stroke-B1{stroke:#0D32B2;} + .d2-1174935043 .stroke-B2{stroke:#0D32B2;} + .d2-1174935043 .stroke-B3{stroke:#E3E9FD;} + .d2-1174935043 .stroke-B4{stroke:#E3E9FD;} + .d2-1174935043 .stroke-B5{stroke:#EDF0FD;} + .d2-1174935043 .stroke-B6{stroke:#F7F8FE;} + .d2-1174935043 .stroke-AA2{stroke:#4A6FF3;} + .d2-1174935043 .stroke-AA4{stroke:#EDF0FD;} + .d2-1174935043 .stroke-AA5{stroke:#F7F8FE;} + .d2-1174935043 .stroke-AB4{stroke:#EDF0FD;} + .d2-1174935043 .stroke-AB5{stroke:#F7F8FE;} + .d2-1174935043 .background-color-N1{background-color:#0A0F25;} + .d2-1174935043 .background-color-N2{background-color:#676C7E;} + .d2-1174935043 .background-color-N3{background-color:#9499AB;} + .d2-1174935043 .background-color-N4{background-color:#CFD2DD;} + .d2-1174935043 .background-color-N5{background-color:#DEE1EB;} + .d2-1174935043 .background-color-N6{background-color:#EEF1F8;} + .d2-1174935043 .background-color-N7{background-color:#FFFFFF;} + .d2-1174935043 .background-color-B1{background-color:#0D32B2;} + .d2-1174935043 .background-color-B2{background-color:#0D32B2;} + .d2-1174935043 .background-color-B3{background-color:#E3E9FD;} + .d2-1174935043 .background-color-B4{background-color:#E3E9FD;} + .d2-1174935043 .background-color-B5{background-color:#EDF0FD;} + .d2-1174935043 .background-color-B6{background-color:#F7F8FE;} + .d2-1174935043 .background-color-AA2{background-color:#4A6FF3;} + .d2-1174935043 .background-color-AA4{background-color:#EDF0FD;} + .d2-1174935043 .background-color-AA5{background-color:#F7F8FE;} + .d2-1174935043 .background-color-AB4{background-color:#EDF0FD;} + .d2-1174935043 .background-color-AB5{background-color:#F7F8FE;} + .d2-1174935043 .color-N1{color:#0A0F25;} + .d2-1174935043 .color-N2{color:#676C7E;} + .d2-1174935043 .color-N3{color:#9499AB;} + .d2-1174935043 .color-N4{color:#CFD2DD;} + .d2-1174935043 .color-N5{color:#DEE1EB;} + .d2-1174935043 .color-N6{color:#EEF1F8;} + .d2-1174935043 .color-N7{color:#FFFFFF;} + .d2-1174935043 .color-B1{color:#0D32B2;} + .d2-1174935043 .color-B2{color:#0D32B2;} + .d2-1174935043 .color-B3{color:#E3E9FD;} + .d2-1174935043 .color-B4{color:#E3E9FD;} + .d2-1174935043 .color-B5{color:#EDF0FD;} + .d2-1174935043 .color-B6{color:#F7F8FE;} + .d2-1174935043 .color-AA2{color:#4A6FF3;} + .d2-1174935043 .color-AA4{color:#EDF0FD;} + .d2-1174935043 .color-AA5{color:#F7F8FE;} + .d2-1174935043 .color-AB4{color:#EDF0FD;} + .d2-1174935043 .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}]]> @@ -159,7 +159,7 @@ # 2 leading def hello(): -  print "world" +  print "world" diff --git a/e2etests/testdata/regression/code_leading_newlines/elk/sketch.exp.svg b/e2etests/testdata/regression/code_leading_newlines/elk/sketch.exp.svg index 01a8ebebd..fed659fad 100644 --- a/e2etests/testdata/regression/code_leading_newlines/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/code_leading_newlines/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-2028186600 .fill-N1{fill:#0A0F25;} + .d2-2028186600 .fill-N2{fill:#676C7E;} + .d2-2028186600 .fill-N3{fill:#9499AB;} + .d2-2028186600 .fill-N4{fill:#CFD2DD;} + .d2-2028186600 .fill-N5{fill:#DEE1EB;} + .d2-2028186600 .fill-N6{fill:#EEF1F8;} + .d2-2028186600 .fill-N7{fill:#FFFFFF;} + .d2-2028186600 .fill-B1{fill:#0D32B2;} + .d2-2028186600 .fill-B2{fill:#0D32B2;} + .d2-2028186600 .fill-B3{fill:#E3E9FD;} + .d2-2028186600 .fill-B4{fill:#E3E9FD;} + .d2-2028186600 .fill-B5{fill:#EDF0FD;} + .d2-2028186600 .fill-B6{fill:#F7F8FE;} + .d2-2028186600 .fill-AA2{fill:#4A6FF3;} + .d2-2028186600 .fill-AA4{fill:#EDF0FD;} + .d2-2028186600 .fill-AA5{fill:#F7F8FE;} + .d2-2028186600 .fill-AB4{fill:#EDF0FD;} + .d2-2028186600 .fill-AB5{fill:#F7F8FE;} + .d2-2028186600 .stroke-N1{stroke:#0A0F25;} + .d2-2028186600 .stroke-N2{stroke:#676C7E;} + .d2-2028186600 .stroke-N3{stroke:#9499AB;} + .d2-2028186600 .stroke-N4{stroke:#CFD2DD;} + .d2-2028186600 .stroke-N5{stroke:#DEE1EB;} + .d2-2028186600 .stroke-N6{stroke:#EEF1F8;} + .d2-2028186600 .stroke-N7{stroke:#FFFFFF;} + .d2-2028186600 .stroke-B1{stroke:#0D32B2;} + .d2-2028186600 .stroke-B2{stroke:#0D32B2;} + .d2-2028186600 .stroke-B3{stroke:#E3E9FD;} + .d2-2028186600 .stroke-B4{stroke:#E3E9FD;} + .d2-2028186600 .stroke-B5{stroke:#EDF0FD;} + .d2-2028186600 .stroke-B6{stroke:#F7F8FE;} + .d2-2028186600 .stroke-AA2{stroke:#4A6FF3;} + .d2-2028186600 .stroke-AA4{stroke:#EDF0FD;} + .d2-2028186600 .stroke-AA5{stroke:#F7F8FE;} + .d2-2028186600 .stroke-AB4{stroke:#EDF0FD;} + .d2-2028186600 .stroke-AB5{stroke:#F7F8FE;} + .d2-2028186600 .background-color-N1{background-color:#0A0F25;} + .d2-2028186600 .background-color-N2{background-color:#676C7E;} + .d2-2028186600 .background-color-N3{background-color:#9499AB;} + .d2-2028186600 .background-color-N4{background-color:#CFD2DD;} + .d2-2028186600 .background-color-N5{background-color:#DEE1EB;} + .d2-2028186600 .background-color-N6{background-color:#EEF1F8;} + .d2-2028186600 .background-color-N7{background-color:#FFFFFF;} + .d2-2028186600 .background-color-B1{background-color:#0D32B2;} + .d2-2028186600 .background-color-B2{background-color:#0D32B2;} + .d2-2028186600 .background-color-B3{background-color:#E3E9FD;} + .d2-2028186600 .background-color-B4{background-color:#E3E9FD;} + .d2-2028186600 .background-color-B5{background-color:#EDF0FD;} + .d2-2028186600 .background-color-B6{background-color:#F7F8FE;} + .d2-2028186600 .background-color-AA2{background-color:#4A6FF3;} + .d2-2028186600 .background-color-AA4{background-color:#EDF0FD;} + .d2-2028186600 .background-color-AA5{background-color:#F7F8FE;} + .d2-2028186600 .background-color-AB4{background-color:#EDF0FD;} + .d2-2028186600 .background-color-AB5{background-color:#F7F8FE;} + .d2-2028186600 .color-N1{color:#0A0F25;} + .d2-2028186600 .color-N2{color:#676C7E;} + .d2-2028186600 .color-N3{color:#9499AB;} + .d2-2028186600 .color-N4{color:#CFD2DD;} + .d2-2028186600 .color-N5{color:#DEE1EB;} + .d2-2028186600 .color-N6{color:#EEF1F8;} + .d2-2028186600 .color-N7{color:#FFFFFF;} + .d2-2028186600 .color-B1{color:#0D32B2;} + .d2-2028186600 .color-B2{color:#0D32B2;} + .d2-2028186600 .color-B3{color:#E3E9FD;} + .d2-2028186600 .color-B4{color:#E3E9FD;} + .d2-2028186600 .color-B5{color:#EDF0FD;} + .d2-2028186600 .color-B6{color:#F7F8FE;} + .d2-2028186600 .color-AA2{color:#4A6FF3;} + .d2-2028186600 .color-AA4{color:#EDF0FD;} + .d2-2028186600 .color-AA5{color:#F7F8FE;} + .d2-2028186600 .color-AB4{color:#EDF0FD;} + .d2-2028186600 .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}]]> @@ -159,7 +159,7 @@ # 2 leading def hello(): -  print "world" +  print "world" diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg index 790aa5051..599518cf7 100644 --- a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-3795367203 .fill-N1{fill:#0A0F25;} + .d2-3795367203 .fill-N2{fill:#676C7E;} + .d2-3795367203 .fill-N3{fill:#9499AB;} + .d2-3795367203 .fill-N4{fill:#CFD2DD;} + .d2-3795367203 .fill-N5{fill:#DEE1EB;} + .d2-3795367203 .fill-N6{fill:#EEF1F8;} + .d2-3795367203 .fill-N7{fill:#FFFFFF;} + .d2-3795367203 .fill-B1{fill:#0D32B2;} + .d2-3795367203 .fill-B2{fill:#0D32B2;} + .d2-3795367203 .fill-B3{fill:#E3E9FD;} + .d2-3795367203 .fill-B4{fill:#E3E9FD;} + .d2-3795367203 .fill-B5{fill:#EDF0FD;} + .d2-3795367203 .fill-B6{fill:#F7F8FE;} + .d2-3795367203 .fill-AA2{fill:#4A6FF3;} + .d2-3795367203 .fill-AA4{fill:#EDF0FD;} + .d2-3795367203 .fill-AA5{fill:#F7F8FE;} + .d2-3795367203 .fill-AB4{fill:#EDF0FD;} + .d2-3795367203 .fill-AB5{fill:#F7F8FE;} + .d2-3795367203 .stroke-N1{stroke:#0A0F25;} + .d2-3795367203 .stroke-N2{stroke:#676C7E;} + .d2-3795367203 .stroke-N3{stroke:#9499AB;} + .d2-3795367203 .stroke-N4{stroke:#CFD2DD;} + .d2-3795367203 .stroke-N5{stroke:#DEE1EB;} + .d2-3795367203 .stroke-N6{stroke:#EEF1F8;} + .d2-3795367203 .stroke-N7{stroke:#FFFFFF;} + .d2-3795367203 .stroke-B1{stroke:#0D32B2;} + .d2-3795367203 .stroke-B2{stroke:#0D32B2;} + .d2-3795367203 .stroke-B3{stroke:#E3E9FD;} + .d2-3795367203 .stroke-B4{stroke:#E3E9FD;} + .d2-3795367203 .stroke-B5{stroke:#EDF0FD;} + .d2-3795367203 .stroke-B6{stroke:#F7F8FE;} + .d2-3795367203 .stroke-AA2{stroke:#4A6FF3;} + .d2-3795367203 .stroke-AA4{stroke:#EDF0FD;} + .d2-3795367203 .stroke-AA5{stroke:#F7F8FE;} + .d2-3795367203 .stroke-AB4{stroke:#EDF0FD;} + .d2-3795367203 .stroke-AB5{stroke:#F7F8FE;} + .d2-3795367203 .background-color-N1{background-color:#0A0F25;} + .d2-3795367203 .background-color-N2{background-color:#676C7E;} + .d2-3795367203 .background-color-N3{background-color:#9499AB;} + .d2-3795367203 .background-color-N4{background-color:#CFD2DD;} + .d2-3795367203 .background-color-N5{background-color:#DEE1EB;} + .d2-3795367203 .background-color-N6{background-color:#EEF1F8;} + .d2-3795367203 .background-color-N7{background-color:#FFFFFF;} + .d2-3795367203 .background-color-B1{background-color:#0D32B2;} + .d2-3795367203 .background-color-B2{background-color:#0D32B2;} + .d2-3795367203 .background-color-B3{background-color:#E3E9FD;} + .d2-3795367203 .background-color-B4{background-color:#E3E9FD;} + .d2-3795367203 .background-color-B5{background-color:#EDF0FD;} + .d2-3795367203 .background-color-B6{background-color:#F7F8FE;} + .d2-3795367203 .background-color-AA2{background-color:#4A6FF3;} + .d2-3795367203 .background-color-AA4{background-color:#EDF0FD;} + .d2-3795367203 .background-color-AA5{background-color:#F7F8FE;} + .d2-3795367203 .background-color-AB4{background-color:#EDF0FD;} + .d2-3795367203 .background-color-AB5{background-color:#F7F8FE;} + .d2-3795367203 .color-N1{color:#0A0F25;} + .d2-3795367203 .color-N2{color:#676C7E;} + .d2-3795367203 .color-N3{color:#9499AB;} + .d2-3795367203 .color-N4{color:#CFD2DD;} + .d2-3795367203 .color-N5{color:#DEE1EB;} + .d2-3795367203 .color-N6{color:#EEF1F8;} + .d2-3795367203 .color-N7{color:#FFFFFF;} + .d2-3795367203 .color-B1{color:#0D32B2;} + .d2-3795367203 .color-B2{color:#0D32B2;} + .d2-3795367203 .color-B3{color:#E3E9FD;} + .d2-3795367203 .color-B4{color:#E3E9FD;} + .d2-3795367203 .color-B5{color:#EDF0FD;} + .d2-3795367203 .color-B6{color:#F7F8FE;} + .d2-3795367203 .color-AA2{color:#4A6FF3;} + .d2-3795367203 .color-AA4{color:#EDF0FD;} + .d2-3795367203 .color-AA5{color:#F7F8FE;} + .d2-3795367203 .color-AB4{color:#EDF0FD;} + .d2-3795367203 .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}]]> # 2 leading, 2 trailing def hello(): @@ -137,7 +137,7 @@   print "world" - + diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg index 00cb65a1c..884966592 100644 --- a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-1582537308 .fill-N1{fill:#0A0F25;} + .d2-1582537308 .fill-N2{fill:#676C7E;} + .d2-1582537308 .fill-N3{fill:#9499AB;} + .d2-1582537308 .fill-N4{fill:#CFD2DD;} + .d2-1582537308 .fill-N5{fill:#DEE1EB;} + .d2-1582537308 .fill-N6{fill:#EEF1F8;} + .d2-1582537308 .fill-N7{fill:#FFFFFF;} + .d2-1582537308 .fill-B1{fill:#0D32B2;} + .d2-1582537308 .fill-B2{fill:#0D32B2;} + .d2-1582537308 .fill-B3{fill:#E3E9FD;} + .d2-1582537308 .fill-B4{fill:#E3E9FD;} + .d2-1582537308 .fill-B5{fill:#EDF0FD;} + .d2-1582537308 .fill-B6{fill:#F7F8FE;} + .d2-1582537308 .fill-AA2{fill:#4A6FF3;} + .d2-1582537308 .fill-AA4{fill:#EDF0FD;} + .d2-1582537308 .fill-AA5{fill:#F7F8FE;} + .d2-1582537308 .fill-AB4{fill:#EDF0FD;} + .d2-1582537308 .fill-AB5{fill:#F7F8FE;} + .d2-1582537308 .stroke-N1{stroke:#0A0F25;} + .d2-1582537308 .stroke-N2{stroke:#676C7E;} + .d2-1582537308 .stroke-N3{stroke:#9499AB;} + .d2-1582537308 .stroke-N4{stroke:#CFD2DD;} + .d2-1582537308 .stroke-N5{stroke:#DEE1EB;} + .d2-1582537308 .stroke-N6{stroke:#EEF1F8;} + .d2-1582537308 .stroke-N7{stroke:#FFFFFF;} + .d2-1582537308 .stroke-B1{stroke:#0D32B2;} + .d2-1582537308 .stroke-B2{stroke:#0D32B2;} + .d2-1582537308 .stroke-B3{stroke:#E3E9FD;} + .d2-1582537308 .stroke-B4{stroke:#E3E9FD;} + .d2-1582537308 .stroke-B5{stroke:#EDF0FD;} + .d2-1582537308 .stroke-B6{stroke:#F7F8FE;} + .d2-1582537308 .stroke-AA2{stroke:#4A6FF3;} + .d2-1582537308 .stroke-AA4{stroke:#EDF0FD;} + .d2-1582537308 .stroke-AA5{stroke:#F7F8FE;} + .d2-1582537308 .stroke-AB4{stroke:#EDF0FD;} + .d2-1582537308 .stroke-AB5{stroke:#F7F8FE;} + .d2-1582537308 .background-color-N1{background-color:#0A0F25;} + .d2-1582537308 .background-color-N2{background-color:#676C7E;} + .d2-1582537308 .background-color-N3{background-color:#9499AB;} + .d2-1582537308 .background-color-N4{background-color:#CFD2DD;} + .d2-1582537308 .background-color-N5{background-color:#DEE1EB;} + .d2-1582537308 .background-color-N6{background-color:#EEF1F8;} + .d2-1582537308 .background-color-N7{background-color:#FFFFFF;} + .d2-1582537308 .background-color-B1{background-color:#0D32B2;} + .d2-1582537308 .background-color-B2{background-color:#0D32B2;} + .d2-1582537308 .background-color-B3{background-color:#E3E9FD;} + .d2-1582537308 .background-color-B4{background-color:#E3E9FD;} + .d2-1582537308 .background-color-B5{background-color:#EDF0FD;} + .d2-1582537308 .background-color-B6{background-color:#F7F8FE;} + .d2-1582537308 .background-color-AA2{background-color:#4A6FF3;} + .d2-1582537308 .background-color-AA4{background-color:#EDF0FD;} + .d2-1582537308 .background-color-AA5{background-color:#F7F8FE;} + .d2-1582537308 .background-color-AB4{background-color:#EDF0FD;} + .d2-1582537308 .background-color-AB5{background-color:#F7F8FE;} + .d2-1582537308 .color-N1{color:#0A0F25;} + .d2-1582537308 .color-N2{color:#676C7E;} + .d2-1582537308 .color-N3{color:#9499AB;} + .d2-1582537308 .color-N4{color:#CFD2DD;} + .d2-1582537308 .color-N5{color:#DEE1EB;} + .d2-1582537308 .color-N6{color:#EEF1F8;} + .d2-1582537308 .color-N7{color:#FFFFFF;} + .d2-1582537308 .color-B1{color:#0D32B2;} + .d2-1582537308 .color-B2{color:#0D32B2;} + .d2-1582537308 .color-B3{color:#E3E9FD;} + .d2-1582537308 .color-B4{color:#E3E9FD;} + .d2-1582537308 .color-B5{color:#EDF0FD;} + .d2-1582537308 .color-B6{color:#F7F8FE;} + .d2-1582537308 .color-AA2{color:#4A6FF3;} + .d2-1582537308 .color-AA4{color:#EDF0FD;} + .d2-1582537308 .color-AA5{color:#F7F8FE;} + .d2-1582537308 .color-AB4{color:#EDF0FD;} + .d2-1582537308 .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}]]> # 2 leading, 2 trailing def hello(): @@ -137,7 +137,7 @@   print "world" - + diff --git a/e2etests/testdata/regression/code_trailing_newlines/dagre/sketch.exp.svg b/e2etests/testdata/regression/code_trailing_newlines/dagre/sketch.exp.svg index 0f7fe8c2e..1b16da8d0 100644 --- a/e2etests/testdata/regression/code_trailing_newlines/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/code_trailing_newlines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -def hello(): + .d2-3532429885 .fill-N1{fill:#0A0F25;} + .d2-3532429885 .fill-N2{fill:#676C7E;} + .d2-3532429885 .fill-N3{fill:#9499AB;} + .d2-3532429885 .fill-N4{fill:#CFD2DD;} + .d2-3532429885 .fill-N5{fill:#DEE1EB;} + .d2-3532429885 .fill-N6{fill:#EEF1F8;} + .d2-3532429885 .fill-N7{fill:#FFFFFF;} + .d2-3532429885 .fill-B1{fill:#0D32B2;} + .d2-3532429885 .fill-B2{fill:#0D32B2;} + .d2-3532429885 .fill-B3{fill:#E3E9FD;} + .d2-3532429885 .fill-B4{fill:#E3E9FD;} + .d2-3532429885 .fill-B5{fill:#EDF0FD;} + .d2-3532429885 .fill-B6{fill:#F7F8FE;} + .d2-3532429885 .fill-AA2{fill:#4A6FF3;} + .d2-3532429885 .fill-AA4{fill:#EDF0FD;} + .d2-3532429885 .fill-AA5{fill:#F7F8FE;} + .d2-3532429885 .fill-AB4{fill:#EDF0FD;} + .d2-3532429885 .fill-AB5{fill:#F7F8FE;} + .d2-3532429885 .stroke-N1{stroke:#0A0F25;} + .d2-3532429885 .stroke-N2{stroke:#676C7E;} + .d2-3532429885 .stroke-N3{stroke:#9499AB;} + .d2-3532429885 .stroke-N4{stroke:#CFD2DD;} + .d2-3532429885 .stroke-N5{stroke:#DEE1EB;} + .d2-3532429885 .stroke-N6{stroke:#EEF1F8;} + .d2-3532429885 .stroke-N7{stroke:#FFFFFF;} + .d2-3532429885 .stroke-B1{stroke:#0D32B2;} + .d2-3532429885 .stroke-B2{stroke:#0D32B2;} + .d2-3532429885 .stroke-B3{stroke:#E3E9FD;} + .d2-3532429885 .stroke-B4{stroke:#E3E9FD;} + .d2-3532429885 .stroke-B5{stroke:#EDF0FD;} + .d2-3532429885 .stroke-B6{stroke:#F7F8FE;} + .d2-3532429885 .stroke-AA2{stroke:#4A6FF3;} + .d2-3532429885 .stroke-AA4{stroke:#EDF0FD;} + .d2-3532429885 .stroke-AA5{stroke:#F7F8FE;} + .d2-3532429885 .stroke-AB4{stroke:#EDF0FD;} + .d2-3532429885 .stroke-AB5{stroke:#F7F8FE;} + .d2-3532429885 .background-color-N1{background-color:#0A0F25;} + .d2-3532429885 .background-color-N2{background-color:#676C7E;} + .d2-3532429885 .background-color-N3{background-color:#9499AB;} + .d2-3532429885 .background-color-N4{background-color:#CFD2DD;} + .d2-3532429885 .background-color-N5{background-color:#DEE1EB;} + .d2-3532429885 .background-color-N6{background-color:#EEF1F8;} + .d2-3532429885 .background-color-N7{background-color:#FFFFFF;} + .d2-3532429885 .background-color-B1{background-color:#0D32B2;} + .d2-3532429885 .background-color-B2{background-color:#0D32B2;} + .d2-3532429885 .background-color-B3{background-color:#E3E9FD;} + .d2-3532429885 .background-color-B4{background-color:#E3E9FD;} + .d2-3532429885 .background-color-B5{background-color:#EDF0FD;} + .d2-3532429885 .background-color-B6{background-color:#F7F8FE;} + .d2-3532429885 .background-color-AA2{background-color:#4A6FF3;} + .d2-3532429885 .background-color-AA4{background-color:#EDF0FD;} + .d2-3532429885 .background-color-AA5{background-color:#F7F8FE;} + .d2-3532429885 .background-color-AB4{background-color:#EDF0FD;} + .d2-3532429885 .background-color-AB5{background-color:#F7F8FE;} + .d2-3532429885 .color-N1{color:#0A0F25;} + .d2-3532429885 .color-N2{color:#676C7E;} + .d2-3532429885 .color-N3{color:#9499AB;} + .d2-3532429885 .color-N4{color:#CFD2DD;} + .d2-3532429885 .color-N5{color:#DEE1EB;} + .d2-3532429885 .color-N6{color:#EEF1F8;} + .d2-3532429885 .color-N7{color:#FFFFFF;} + .d2-3532429885 .color-B1{color:#0D32B2;} + .d2-3532429885 .color-B2{color:#0D32B2;} + .d2-3532429885 .color-B3{color:#E3E9FD;} + .d2-3532429885 .color-B4{color:#E3E9FD;} + .d2-3532429885 .color-B5{color:#EDF0FD;} + .d2-3532429885 .color-B6{color:#F7F8FE;} + .d2-3532429885 .color-AA2{color:#4A6FF3;} + .d2-3532429885 .color-AA4{color:#EDF0FD;} + .d2-3532429885 .color-AA5{color:#F7F8FE;} + .d2-3532429885 .color-AB4{color:#EDF0FD;} + .d2-3532429885 .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}]]>def hello():   print "world" @@ -159,7 +159,7 @@   print "world" # 1 trailing -# 2 trailing +# 2 trailing diff --git a/e2etests/testdata/regression/code_trailing_newlines/elk/sketch.exp.svg b/e2etests/testdata/regression/code_trailing_newlines/elk/sketch.exp.svg index 3e1f8e850..85bc05f38 100644 --- a/e2etests/testdata/regression/code_trailing_newlines/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/code_trailing_newlines/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -def hello(): + .d2-2388562350 .fill-N1{fill:#0A0F25;} + .d2-2388562350 .fill-N2{fill:#676C7E;} + .d2-2388562350 .fill-N3{fill:#9499AB;} + .d2-2388562350 .fill-N4{fill:#CFD2DD;} + .d2-2388562350 .fill-N5{fill:#DEE1EB;} + .d2-2388562350 .fill-N6{fill:#EEF1F8;} + .d2-2388562350 .fill-N7{fill:#FFFFFF;} + .d2-2388562350 .fill-B1{fill:#0D32B2;} + .d2-2388562350 .fill-B2{fill:#0D32B2;} + .d2-2388562350 .fill-B3{fill:#E3E9FD;} + .d2-2388562350 .fill-B4{fill:#E3E9FD;} + .d2-2388562350 .fill-B5{fill:#EDF0FD;} + .d2-2388562350 .fill-B6{fill:#F7F8FE;} + .d2-2388562350 .fill-AA2{fill:#4A6FF3;} + .d2-2388562350 .fill-AA4{fill:#EDF0FD;} + .d2-2388562350 .fill-AA5{fill:#F7F8FE;} + .d2-2388562350 .fill-AB4{fill:#EDF0FD;} + .d2-2388562350 .fill-AB5{fill:#F7F8FE;} + .d2-2388562350 .stroke-N1{stroke:#0A0F25;} + .d2-2388562350 .stroke-N2{stroke:#676C7E;} + .d2-2388562350 .stroke-N3{stroke:#9499AB;} + .d2-2388562350 .stroke-N4{stroke:#CFD2DD;} + .d2-2388562350 .stroke-N5{stroke:#DEE1EB;} + .d2-2388562350 .stroke-N6{stroke:#EEF1F8;} + .d2-2388562350 .stroke-N7{stroke:#FFFFFF;} + .d2-2388562350 .stroke-B1{stroke:#0D32B2;} + .d2-2388562350 .stroke-B2{stroke:#0D32B2;} + .d2-2388562350 .stroke-B3{stroke:#E3E9FD;} + .d2-2388562350 .stroke-B4{stroke:#E3E9FD;} + .d2-2388562350 .stroke-B5{stroke:#EDF0FD;} + .d2-2388562350 .stroke-B6{stroke:#F7F8FE;} + .d2-2388562350 .stroke-AA2{stroke:#4A6FF3;} + .d2-2388562350 .stroke-AA4{stroke:#EDF0FD;} + .d2-2388562350 .stroke-AA5{stroke:#F7F8FE;} + .d2-2388562350 .stroke-AB4{stroke:#EDF0FD;} + .d2-2388562350 .stroke-AB5{stroke:#F7F8FE;} + .d2-2388562350 .background-color-N1{background-color:#0A0F25;} + .d2-2388562350 .background-color-N2{background-color:#676C7E;} + .d2-2388562350 .background-color-N3{background-color:#9499AB;} + .d2-2388562350 .background-color-N4{background-color:#CFD2DD;} + .d2-2388562350 .background-color-N5{background-color:#DEE1EB;} + .d2-2388562350 .background-color-N6{background-color:#EEF1F8;} + .d2-2388562350 .background-color-N7{background-color:#FFFFFF;} + .d2-2388562350 .background-color-B1{background-color:#0D32B2;} + .d2-2388562350 .background-color-B2{background-color:#0D32B2;} + .d2-2388562350 .background-color-B3{background-color:#E3E9FD;} + .d2-2388562350 .background-color-B4{background-color:#E3E9FD;} + .d2-2388562350 .background-color-B5{background-color:#EDF0FD;} + .d2-2388562350 .background-color-B6{background-color:#F7F8FE;} + .d2-2388562350 .background-color-AA2{background-color:#4A6FF3;} + .d2-2388562350 .background-color-AA4{background-color:#EDF0FD;} + .d2-2388562350 .background-color-AA5{background-color:#F7F8FE;} + .d2-2388562350 .background-color-AB4{background-color:#EDF0FD;} + .d2-2388562350 .background-color-AB5{background-color:#F7F8FE;} + .d2-2388562350 .color-N1{color:#0A0F25;} + .d2-2388562350 .color-N2{color:#676C7E;} + .d2-2388562350 .color-N3{color:#9499AB;} + .d2-2388562350 .color-N4{color:#CFD2DD;} + .d2-2388562350 .color-N5{color:#DEE1EB;} + .d2-2388562350 .color-N6{color:#EEF1F8;} + .d2-2388562350 .color-N7{color:#FFFFFF;} + .d2-2388562350 .color-B1{color:#0D32B2;} + .d2-2388562350 .color-B2{color:#0D32B2;} + .d2-2388562350 .color-B3{color:#E3E9FD;} + .d2-2388562350 .color-B4{color:#E3E9FD;} + .d2-2388562350 .color-B5{color:#EDF0FD;} + .d2-2388562350 .color-B6{color:#F7F8FE;} + .d2-2388562350 .color-AA2{color:#4A6FF3;} + .d2-2388562350 .color-AA4{color:#EDF0FD;} + .d2-2388562350 .color-AA5{color:#F7F8FE;} + .d2-2388562350 .color-AB4{color:#EDF0FD;} + .d2-2388562350 .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}]]>def hello():   print "world" @@ -159,7 +159,7 @@   print "world" # 1 trailing -# 2 trailing +# 2 trailing diff --git a/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg index 833469825..3dc05ae94 100644 --- a/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -container title is hiddenfirstsecond + .d2-804052265 .fill-N1{fill:#0A0F25;} + .d2-804052265 .fill-N2{fill:#676C7E;} + .d2-804052265 .fill-N3{fill:#9499AB;} + .d2-804052265 .fill-N4{fill:#CFD2DD;} + .d2-804052265 .fill-N5{fill:#DEE1EB;} + .d2-804052265 .fill-N6{fill:#EEF1F8;} + .d2-804052265 .fill-N7{fill:#FFFFFF;} + .d2-804052265 .fill-B1{fill:#0D32B2;} + .d2-804052265 .fill-B2{fill:#0D32B2;} + .d2-804052265 .fill-B3{fill:#E3E9FD;} + .d2-804052265 .fill-B4{fill:#E3E9FD;} + .d2-804052265 .fill-B5{fill:#EDF0FD;} + .d2-804052265 .fill-B6{fill:#F7F8FE;} + .d2-804052265 .fill-AA2{fill:#4A6FF3;} + .d2-804052265 .fill-AA4{fill:#EDF0FD;} + .d2-804052265 .fill-AA5{fill:#F7F8FE;} + .d2-804052265 .fill-AB4{fill:#EDF0FD;} + .d2-804052265 .fill-AB5{fill:#F7F8FE;} + .d2-804052265 .stroke-N1{stroke:#0A0F25;} + .d2-804052265 .stroke-N2{stroke:#676C7E;} + .d2-804052265 .stroke-N3{stroke:#9499AB;} + .d2-804052265 .stroke-N4{stroke:#CFD2DD;} + .d2-804052265 .stroke-N5{stroke:#DEE1EB;} + .d2-804052265 .stroke-N6{stroke:#EEF1F8;} + .d2-804052265 .stroke-N7{stroke:#FFFFFF;} + .d2-804052265 .stroke-B1{stroke:#0D32B2;} + .d2-804052265 .stroke-B2{stroke:#0D32B2;} + .d2-804052265 .stroke-B3{stroke:#E3E9FD;} + .d2-804052265 .stroke-B4{stroke:#E3E9FD;} + .d2-804052265 .stroke-B5{stroke:#EDF0FD;} + .d2-804052265 .stroke-B6{stroke:#F7F8FE;} + .d2-804052265 .stroke-AA2{stroke:#4A6FF3;} + .d2-804052265 .stroke-AA4{stroke:#EDF0FD;} + .d2-804052265 .stroke-AA5{stroke:#F7F8FE;} + .d2-804052265 .stroke-AB4{stroke:#EDF0FD;} + .d2-804052265 .stroke-AB5{stroke:#F7F8FE;} + .d2-804052265 .background-color-N1{background-color:#0A0F25;} + .d2-804052265 .background-color-N2{background-color:#676C7E;} + .d2-804052265 .background-color-N3{background-color:#9499AB;} + .d2-804052265 .background-color-N4{background-color:#CFD2DD;} + .d2-804052265 .background-color-N5{background-color:#DEE1EB;} + .d2-804052265 .background-color-N6{background-color:#EEF1F8;} + .d2-804052265 .background-color-N7{background-color:#FFFFFF;} + .d2-804052265 .background-color-B1{background-color:#0D32B2;} + .d2-804052265 .background-color-B2{background-color:#0D32B2;} + .d2-804052265 .background-color-B3{background-color:#E3E9FD;} + .d2-804052265 .background-color-B4{background-color:#E3E9FD;} + .d2-804052265 .background-color-B5{background-color:#EDF0FD;} + .d2-804052265 .background-color-B6{background-color:#F7F8FE;} + .d2-804052265 .background-color-AA2{background-color:#4A6FF3;} + .d2-804052265 .background-color-AA4{background-color:#EDF0FD;} + .d2-804052265 .background-color-AA5{background-color:#F7F8FE;} + .d2-804052265 .background-color-AB4{background-color:#EDF0FD;} + .d2-804052265 .background-color-AB5{background-color:#F7F8FE;} + .d2-804052265 .color-N1{color:#0A0F25;} + .d2-804052265 .color-N2{color:#676C7E;} + .d2-804052265 .color-N3{color:#9499AB;} + .d2-804052265 .color-N4{color:#CFD2DD;} + .d2-804052265 .color-N5{color:#DEE1EB;} + .d2-804052265 .color-N6{color:#EEF1F8;} + .d2-804052265 .color-N7{color:#FFFFFF;} + .d2-804052265 .color-B1{color:#0D32B2;} + .d2-804052265 .color-B2{color:#0D32B2;} + .d2-804052265 .color-B3{color:#E3E9FD;} + .d2-804052265 .color-B4{color:#E3E9FD;} + .d2-804052265 .color-B5{color:#EDF0FD;} + .d2-804052265 .color-B6{color:#F7F8FE;} + .d2-804052265 .color-AA2{color:#4A6FF3;} + .d2-804052265 .color-AA4{color:#EDF0FD;} + .d2-804052265 .color-AA5{color:#F7F8FE;} + .d2-804052265 .color-AB4{color:#EDF0FD;} + .d2-804052265 .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}]]>container title is hiddenfirstsecond 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 a545229b9..bf2d7f19f 100644 --- a/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -container title is hiddenfirstsecond + .d2-165715486 .fill-N1{fill:#0A0F25;} + .d2-165715486 .fill-N2{fill:#676C7E;} + .d2-165715486 .fill-N3{fill:#9499AB;} + .d2-165715486 .fill-N4{fill:#CFD2DD;} + .d2-165715486 .fill-N5{fill:#DEE1EB;} + .d2-165715486 .fill-N6{fill:#EEF1F8;} + .d2-165715486 .fill-N7{fill:#FFFFFF;} + .d2-165715486 .fill-B1{fill:#0D32B2;} + .d2-165715486 .fill-B2{fill:#0D32B2;} + .d2-165715486 .fill-B3{fill:#E3E9FD;} + .d2-165715486 .fill-B4{fill:#E3E9FD;} + .d2-165715486 .fill-B5{fill:#EDF0FD;} + .d2-165715486 .fill-B6{fill:#F7F8FE;} + .d2-165715486 .fill-AA2{fill:#4A6FF3;} + .d2-165715486 .fill-AA4{fill:#EDF0FD;} + .d2-165715486 .fill-AA5{fill:#F7F8FE;} + .d2-165715486 .fill-AB4{fill:#EDF0FD;} + .d2-165715486 .fill-AB5{fill:#F7F8FE;} + .d2-165715486 .stroke-N1{stroke:#0A0F25;} + .d2-165715486 .stroke-N2{stroke:#676C7E;} + .d2-165715486 .stroke-N3{stroke:#9499AB;} + .d2-165715486 .stroke-N4{stroke:#CFD2DD;} + .d2-165715486 .stroke-N5{stroke:#DEE1EB;} + .d2-165715486 .stroke-N6{stroke:#EEF1F8;} + .d2-165715486 .stroke-N7{stroke:#FFFFFF;} + .d2-165715486 .stroke-B1{stroke:#0D32B2;} + .d2-165715486 .stroke-B2{stroke:#0D32B2;} + .d2-165715486 .stroke-B3{stroke:#E3E9FD;} + .d2-165715486 .stroke-B4{stroke:#E3E9FD;} + .d2-165715486 .stroke-B5{stroke:#EDF0FD;} + .d2-165715486 .stroke-B6{stroke:#F7F8FE;} + .d2-165715486 .stroke-AA2{stroke:#4A6FF3;} + .d2-165715486 .stroke-AA4{stroke:#EDF0FD;} + .d2-165715486 .stroke-AA5{stroke:#F7F8FE;} + .d2-165715486 .stroke-AB4{stroke:#EDF0FD;} + .d2-165715486 .stroke-AB5{stroke:#F7F8FE;} + .d2-165715486 .background-color-N1{background-color:#0A0F25;} + .d2-165715486 .background-color-N2{background-color:#676C7E;} + .d2-165715486 .background-color-N3{background-color:#9499AB;} + .d2-165715486 .background-color-N4{background-color:#CFD2DD;} + .d2-165715486 .background-color-N5{background-color:#DEE1EB;} + .d2-165715486 .background-color-N6{background-color:#EEF1F8;} + .d2-165715486 .background-color-N7{background-color:#FFFFFF;} + .d2-165715486 .background-color-B1{background-color:#0D32B2;} + .d2-165715486 .background-color-B2{background-color:#0D32B2;} + .d2-165715486 .background-color-B3{background-color:#E3E9FD;} + .d2-165715486 .background-color-B4{background-color:#E3E9FD;} + .d2-165715486 .background-color-B5{background-color:#EDF0FD;} + .d2-165715486 .background-color-B6{background-color:#F7F8FE;} + .d2-165715486 .background-color-AA2{background-color:#4A6FF3;} + .d2-165715486 .background-color-AA4{background-color:#EDF0FD;} + .d2-165715486 .background-color-AA5{background-color:#F7F8FE;} + .d2-165715486 .background-color-AB4{background-color:#EDF0FD;} + .d2-165715486 .background-color-AB5{background-color:#F7F8FE;} + .d2-165715486 .color-N1{color:#0A0F25;} + .d2-165715486 .color-N2{color:#676C7E;} + .d2-165715486 .color-N3{color:#9499AB;} + .d2-165715486 .color-N4{color:#CFD2DD;} + .d2-165715486 .color-N5{color:#DEE1EB;} + .d2-165715486 .color-N6{color:#EEF1F8;} + .d2-165715486 .color-N7{color:#FFFFFF;} + .d2-165715486 .color-B1{color:#0D32B2;} + .d2-165715486 .color-B2{color:#0D32B2;} + .d2-165715486 .color-B3{color:#E3E9FD;} + .d2-165715486 .color-B4{color:#E3E9FD;} + .d2-165715486 .color-B5{color:#EDF0FD;} + .d2-165715486 .color-B6{color:#F7F8FE;} + .d2-165715486 .color-AA2{color:#4A6FF3;} + .d2-165715486 .color-AA4{color:#EDF0FD;} + .d2-165715486 .color-AA5{color:#F7F8FE;} + .d2-165715486 .color-AB4{color:#EDF0FD;} + .d2-165715486 .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}]]>container title is hiddenfirstsecond diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg index 365b26303..e4ff7867f 100644 --- a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 + .d2-870597429 .fill-N1{fill:#0A0F25;} + .d2-870597429 .fill-N2{fill:#676C7E;} + .d2-870597429 .fill-N3{fill:#9499AB;} + .d2-870597429 .fill-N4{fill:#CFD2DD;} + .d2-870597429 .fill-N5{fill:#DEE1EB;} + .d2-870597429 .fill-N6{fill:#EEF1F8;} + .d2-870597429 .fill-N7{fill:#FFFFFF;} + .d2-870597429 .fill-B1{fill:#0D32B2;} + .d2-870597429 .fill-B2{fill:#0D32B2;} + .d2-870597429 .fill-B3{fill:#E3E9FD;} + .d2-870597429 .fill-B4{fill:#E3E9FD;} + .d2-870597429 .fill-B5{fill:#EDF0FD;} + .d2-870597429 .fill-B6{fill:#F7F8FE;} + .d2-870597429 .fill-AA2{fill:#4A6FF3;} + .d2-870597429 .fill-AA4{fill:#EDF0FD;} + .d2-870597429 .fill-AA5{fill:#F7F8FE;} + .d2-870597429 .fill-AB4{fill:#EDF0FD;} + .d2-870597429 .fill-AB5{fill:#F7F8FE;} + .d2-870597429 .stroke-N1{stroke:#0A0F25;} + .d2-870597429 .stroke-N2{stroke:#676C7E;} + .d2-870597429 .stroke-N3{stroke:#9499AB;} + .d2-870597429 .stroke-N4{stroke:#CFD2DD;} + .d2-870597429 .stroke-N5{stroke:#DEE1EB;} + .d2-870597429 .stroke-N6{stroke:#EEF1F8;} + .d2-870597429 .stroke-N7{stroke:#FFFFFF;} + .d2-870597429 .stroke-B1{stroke:#0D32B2;} + .d2-870597429 .stroke-B2{stroke:#0D32B2;} + .d2-870597429 .stroke-B3{stroke:#E3E9FD;} + .d2-870597429 .stroke-B4{stroke:#E3E9FD;} + .d2-870597429 .stroke-B5{stroke:#EDF0FD;} + .d2-870597429 .stroke-B6{stroke:#F7F8FE;} + .d2-870597429 .stroke-AA2{stroke:#4A6FF3;} + .d2-870597429 .stroke-AA4{stroke:#EDF0FD;} + .d2-870597429 .stroke-AA5{stroke:#F7F8FE;} + .d2-870597429 .stroke-AB4{stroke:#EDF0FD;} + .d2-870597429 .stroke-AB5{stroke:#F7F8FE;} + .d2-870597429 .background-color-N1{background-color:#0A0F25;} + .d2-870597429 .background-color-N2{background-color:#676C7E;} + .d2-870597429 .background-color-N3{background-color:#9499AB;} + .d2-870597429 .background-color-N4{background-color:#CFD2DD;} + .d2-870597429 .background-color-N5{background-color:#DEE1EB;} + .d2-870597429 .background-color-N6{background-color:#EEF1F8;} + .d2-870597429 .background-color-N7{background-color:#FFFFFF;} + .d2-870597429 .background-color-B1{background-color:#0D32B2;} + .d2-870597429 .background-color-B2{background-color:#0D32B2;} + .d2-870597429 .background-color-B3{background-color:#E3E9FD;} + .d2-870597429 .background-color-B4{background-color:#E3E9FD;} + .d2-870597429 .background-color-B5{background-color:#EDF0FD;} + .d2-870597429 .background-color-B6{background-color:#F7F8FE;} + .d2-870597429 .background-color-AA2{background-color:#4A6FF3;} + .d2-870597429 .background-color-AA4{background-color:#EDF0FD;} + .d2-870597429 .background-color-AA5{background-color:#F7F8FE;} + .d2-870597429 .background-color-AB4{background-color:#EDF0FD;} + .d2-870597429 .background-color-AB5{background-color:#F7F8FE;} + .d2-870597429 .color-N1{color:#0A0F25;} + .d2-870597429 .color-N2{color:#676C7E;} + .d2-870597429 .color-N3{color:#9499AB;} + .d2-870597429 .color-N4{color:#CFD2DD;} + .d2-870597429 .color-N5{color:#DEE1EB;} + .d2-870597429 .color-N6{color:#EEF1F8;} + .d2-870597429 .color-N7{color:#FFFFFF;} + .d2-870597429 .color-B1{color:#0D32B2;} + .d2-870597429 .color-B2{color:#0D32B2;} + .d2-870597429 .color-B3{color:#E3E9FD;} + .d2-870597429 .color-B4{color:#E3E9FD;} + .d2-870597429 .color-B5{color:#EDF0FD;} + .d2-870597429 .color-B6{color:#F7F8FE;} + .d2-870597429 .color-AA2{color:#4A6FF3;} + .d2-870597429 .color-AA4{color:#EDF0FD;} + .d2-870597429 .color-AA5{color:#F7F8FE;} + .d2-870597429 .color-AB4{color:#EDF0FD;} + .d2-870597429 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg index 9df0dffc9..ae9205e0b 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 + .d2-1904899960 .fill-N1{fill:#0A0F25;} + .d2-1904899960 .fill-N2{fill:#676C7E;} + .d2-1904899960 .fill-N3{fill:#9499AB;} + .d2-1904899960 .fill-N4{fill:#CFD2DD;} + .d2-1904899960 .fill-N5{fill:#DEE1EB;} + .d2-1904899960 .fill-N6{fill:#EEF1F8;} + .d2-1904899960 .fill-N7{fill:#FFFFFF;} + .d2-1904899960 .fill-B1{fill:#0D32B2;} + .d2-1904899960 .fill-B2{fill:#0D32B2;} + .d2-1904899960 .fill-B3{fill:#E3E9FD;} + .d2-1904899960 .fill-B4{fill:#E3E9FD;} + .d2-1904899960 .fill-B5{fill:#EDF0FD;} + .d2-1904899960 .fill-B6{fill:#F7F8FE;} + .d2-1904899960 .fill-AA2{fill:#4A6FF3;} + .d2-1904899960 .fill-AA4{fill:#EDF0FD;} + .d2-1904899960 .fill-AA5{fill:#F7F8FE;} + .d2-1904899960 .fill-AB4{fill:#EDF0FD;} + .d2-1904899960 .fill-AB5{fill:#F7F8FE;} + .d2-1904899960 .stroke-N1{stroke:#0A0F25;} + .d2-1904899960 .stroke-N2{stroke:#676C7E;} + .d2-1904899960 .stroke-N3{stroke:#9499AB;} + .d2-1904899960 .stroke-N4{stroke:#CFD2DD;} + .d2-1904899960 .stroke-N5{stroke:#DEE1EB;} + .d2-1904899960 .stroke-N6{stroke:#EEF1F8;} + .d2-1904899960 .stroke-N7{stroke:#FFFFFF;} + .d2-1904899960 .stroke-B1{stroke:#0D32B2;} + .d2-1904899960 .stroke-B2{stroke:#0D32B2;} + .d2-1904899960 .stroke-B3{stroke:#E3E9FD;} + .d2-1904899960 .stroke-B4{stroke:#E3E9FD;} + .d2-1904899960 .stroke-B5{stroke:#EDF0FD;} + .d2-1904899960 .stroke-B6{stroke:#F7F8FE;} + .d2-1904899960 .stroke-AA2{stroke:#4A6FF3;} + .d2-1904899960 .stroke-AA4{stroke:#EDF0FD;} + .d2-1904899960 .stroke-AA5{stroke:#F7F8FE;} + .d2-1904899960 .stroke-AB4{stroke:#EDF0FD;} + .d2-1904899960 .stroke-AB5{stroke:#F7F8FE;} + .d2-1904899960 .background-color-N1{background-color:#0A0F25;} + .d2-1904899960 .background-color-N2{background-color:#676C7E;} + .d2-1904899960 .background-color-N3{background-color:#9499AB;} + .d2-1904899960 .background-color-N4{background-color:#CFD2DD;} + .d2-1904899960 .background-color-N5{background-color:#DEE1EB;} + .d2-1904899960 .background-color-N6{background-color:#EEF1F8;} + .d2-1904899960 .background-color-N7{background-color:#FFFFFF;} + .d2-1904899960 .background-color-B1{background-color:#0D32B2;} + .d2-1904899960 .background-color-B2{background-color:#0D32B2;} + .d2-1904899960 .background-color-B3{background-color:#E3E9FD;} + .d2-1904899960 .background-color-B4{background-color:#E3E9FD;} + .d2-1904899960 .background-color-B5{background-color:#EDF0FD;} + .d2-1904899960 .background-color-B6{background-color:#F7F8FE;} + .d2-1904899960 .background-color-AA2{background-color:#4A6FF3;} + .d2-1904899960 .background-color-AA4{background-color:#EDF0FD;} + .d2-1904899960 .background-color-AA5{background-color:#F7F8FE;} + .d2-1904899960 .background-color-AB4{background-color:#EDF0FD;} + .d2-1904899960 .background-color-AB5{background-color:#F7F8FE;} + .d2-1904899960 .color-N1{color:#0A0F25;} + .d2-1904899960 .color-N2{color:#676C7E;} + .d2-1904899960 .color-N3{color:#9499AB;} + .d2-1904899960 .color-N4{color:#CFD2DD;} + .d2-1904899960 .color-N5{color:#DEE1EB;} + .d2-1904899960 .color-N6{color:#EEF1F8;} + .d2-1904899960 .color-N7{color:#FFFFFF;} + .d2-1904899960 .color-B1{color:#0D32B2;} + .d2-1904899960 .color-B2{color:#0D32B2;} + .d2-1904899960 .color-B3{color:#E3E9FD;} + .d2-1904899960 .color-B4{color:#E3E9FD;} + .d2-1904899960 .color-B5{color:#EDF0FD;} + .d2-1904899960 .color-B6{color:#F7F8FE;} + .d2-1904899960 .color-AA2{color:#4A6FF3;} + .d2-1904899960 .color-AA4{color:#EDF0FD;} + .d2-1904899960 .color-AA5{color:#F7F8FE;} + .d2-1904899960 .color-AB4{color:#EDF0FD;} + .d2-1904899960 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 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 2f5dfe717..7b728c060 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -abc12d line 1line 2line 3line 4 + .d2-991260467 .fill-N1{fill:#0A0F25;} + .d2-991260467 .fill-N2{fill:#676C7E;} + .d2-991260467 .fill-N3{fill:#9499AB;} + .d2-991260467 .fill-N4{fill:#CFD2DD;} + .d2-991260467 .fill-N5{fill:#DEE1EB;} + .d2-991260467 .fill-N6{fill:#EEF1F8;} + .d2-991260467 .fill-N7{fill:#FFFFFF;} + .d2-991260467 .fill-B1{fill:#0D32B2;} + .d2-991260467 .fill-B2{fill:#0D32B2;} + .d2-991260467 .fill-B3{fill:#E3E9FD;} + .d2-991260467 .fill-B4{fill:#E3E9FD;} + .d2-991260467 .fill-B5{fill:#EDF0FD;} + .d2-991260467 .fill-B6{fill:#F7F8FE;} + .d2-991260467 .fill-AA2{fill:#4A6FF3;} + .d2-991260467 .fill-AA4{fill:#EDF0FD;} + .d2-991260467 .fill-AA5{fill:#F7F8FE;} + .d2-991260467 .fill-AB4{fill:#EDF0FD;} + .d2-991260467 .fill-AB5{fill:#F7F8FE;} + .d2-991260467 .stroke-N1{stroke:#0A0F25;} + .d2-991260467 .stroke-N2{stroke:#676C7E;} + .d2-991260467 .stroke-N3{stroke:#9499AB;} + .d2-991260467 .stroke-N4{stroke:#CFD2DD;} + .d2-991260467 .stroke-N5{stroke:#DEE1EB;} + .d2-991260467 .stroke-N6{stroke:#EEF1F8;} + .d2-991260467 .stroke-N7{stroke:#FFFFFF;} + .d2-991260467 .stroke-B1{stroke:#0D32B2;} + .d2-991260467 .stroke-B2{stroke:#0D32B2;} + .d2-991260467 .stroke-B3{stroke:#E3E9FD;} + .d2-991260467 .stroke-B4{stroke:#E3E9FD;} + .d2-991260467 .stroke-B5{stroke:#EDF0FD;} + .d2-991260467 .stroke-B6{stroke:#F7F8FE;} + .d2-991260467 .stroke-AA2{stroke:#4A6FF3;} + .d2-991260467 .stroke-AA4{stroke:#EDF0FD;} + .d2-991260467 .stroke-AA5{stroke:#F7F8FE;} + .d2-991260467 .stroke-AB4{stroke:#EDF0FD;} + .d2-991260467 .stroke-AB5{stroke:#F7F8FE;} + .d2-991260467 .background-color-N1{background-color:#0A0F25;} + .d2-991260467 .background-color-N2{background-color:#676C7E;} + .d2-991260467 .background-color-N3{background-color:#9499AB;} + .d2-991260467 .background-color-N4{background-color:#CFD2DD;} + .d2-991260467 .background-color-N5{background-color:#DEE1EB;} + .d2-991260467 .background-color-N6{background-color:#EEF1F8;} + .d2-991260467 .background-color-N7{background-color:#FFFFFF;} + .d2-991260467 .background-color-B1{background-color:#0D32B2;} + .d2-991260467 .background-color-B2{background-color:#0D32B2;} + .d2-991260467 .background-color-B3{background-color:#E3E9FD;} + .d2-991260467 .background-color-B4{background-color:#E3E9FD;} + .d2-991260467 .background-color-B5{background-color:#EDF0FD;} + .d2-991260467 .background-color-B6{background-color:#F7F8FE;} + .d2-991260467 .background-color-AA2{background-color:#4A6FF3;} + .d2-991260467 .background-color-AA4{background-color:#EDF0FD;} + .d2-991260467 .background-color-AA5{background-color:#F7F8FE;} + .d2-991260467 .background-color-AB4{background-color:#EDF0FD;} + .d2-991260467 .background-color-AB5{background-color:#F7F8FE;} + .d2-991260467 .color-N1{color:#0A0F25;} + .d2-991260467 .color-N2{color:#676C7E;} + .d2-991260467 .color-N3{color:#9499AB;} + .d2-991260467 .color-N4{color:#CFD2DD;} + .d2-991260467 .color-N5{color:#DEE1EB;} + .d2-991260467 .color-N6{color:#EEF1F8;} + .d2-991260467 .color-N7{color:#FFFFFF;} + .d2-991260467 .color-B1{color:#0D32B2;} + .d2-991260467 .color-B2{color:#0D32B2;} + .d2-991260467 .color-B3{color:#E3E9FD;} + .d2-991260467 .color-B4{color:#E3E9FD;} + .d2-991260467 .color-B5{color:#EDF0FD;} + .d2-991260467 .color-B6{color:#F7F8FE;} + .d2-991260467 .color-AA2{color:#4A6FF3;} + .d2-991260467 .color-AA4{color:#EDF0FD;} + .d2-991260467 .color-AA5{color:#F7F8FE;} + .d2-991260467 .color-AB4{color:#EDF0FD;} + .d2-991260467 .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}]]>abc12d line 1line 2line 3line 4 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 07329e871..9dbde40b0 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -abc12d line 1line 2line 3line 4 + .d2-3319507261 .fill-N1{fill:#0A0F25;} + .d2-3319507261 .fill-N2{fill:#676C7E;} + .d2-3319507261 .fill-N3{fill:#9499AB;} + .d2-3319507261 .fill-N4{fill:#CFD2DD;} + .d2-3319507261 .fill-N5{fill:#DEE1EB;} + .d2-3319507261 .fill-N6{fill:#EEF1F8;} + .d2-3319507261 .fill-N7{fill:#FFFFFF;} + .d2-3319507261 .fill-B1{fill:#0D32B2;} + .d2-3319507261 .fill-B2{fill:#0D32B2;} + .d2-3319507261 .fill-B3{fill:#E3E9FD;} + .d2-3319507261 .fill-B4{fill:#E3E9FD;} + .d2-3319507261 .fill-B5{fill:#EDF0FD;} + .d2-3319507261 .fill-B6{fill:#F7F8FE;} + .d2-3319507261 .fill-AA2{fill:#4A6FF3;} + .d2-3319507261 .fill-AA4{fill:#EDF0FD;} + .d2-3319507261 .fill-AA5{fill:#F7F8FE;} + .d2-3319507261 .fill-AB4{fill:#EDF0FD;} + .d2-3319507261 .fill-AB5{fill:#F7F8FE;} + .d2-3319507261 .stroke-N1{stroke:#0A0F25;} + .d2-3319507261 .stroke-N2{stroke:#676C7E;} + .d2-3319507261 .stroke-N3{stroke:#9499AB;} + .d2-3319507261 .stroke-N4{stroke:#CFD2DD;} + .d2-3319507261 .stroke-N5{stroke:#DEE1EB;} + .d2-3319507261 .stroke-N6{stroke:#EEF1F8;} + .d2-3319507261 .stroke-N7{stroke:#FFFFFF;} + .d2-3319507261 .stroke-B1{stroke:#0D32B2;} + .d2-3319507261 .stroke-B2{stroke:#0D32B2;} + .d2-3319507261 .stroke-B3{stroke:#E3E9FD;} + .d2-3319507261 .stroke-B4{stroke:#E3E9FD;} + .d2-3319507261 .stroke-B5{stroke:#EDF0FD;} + .d2-3319507261 .stroke-B6{stroke:#F7F8FE;} + .d2-3319507261 .stroke-AA2{stroke:#4A6FF3;} + .d2-3319507261 .stroke-AA4{stroke:#EDF0FD;} + .d2-3319507261 .stroke-AA5{stroke:#F7F8FE;} + .d2-3319507261 .stroke-AB4{stroke:#EDF0FD;} + .d2-3319507261 .stroke-AB5{stroke:#F7F8FE;} + .d2-3319507261 .background-color-N1{background-color:#0A0F25;} + .d2-3319507261 .background-color-N2{background-color:#676C7E;} + .d2-3319507261 .background-color-N3{background-color:#9499AB;} + .d2-3319507261 .background-color-N4{background-color:#CFD2DD;} + .d2-3319507261 .background-color-N5{background-color:#DEE1EB;} + .d2-3319507261 .background-color-N6{background-color:#EEF1F8;} + .d2-3319507261 .background-color-N7{background-color:#FFFFFF;} + .d2-3319507261 .background-color-B1{background-color:#0D32B2;} + .d2-3319507261 .background-color-B2{background-color:#0D32B2;} + .d2-3319507261 .background-color-B3{background-color:#E3E9FD;} + .d2-3319507261 .background-color-B4{background-color:#E3E9FD;} + .d2-3319507261 .background-color-B5{background-color:#EDF0FD;} + .d2-3319507261 .background-color-B6{background-color:#F7F8FE;} + .d2-3319507261 .background-color-AA2{background-color:#4A6FF3;} + .d2-3319507261 .background-color-AA4{background-color:#EDF0FD;} + .d2-3319507261 .background-color-AA5{background-color:#F7F8FE;} + .d2-3319507261 .background-color-AB4{background-color:#EDF0FD;} + .d2-3319507261 .background-color-AB5{background-color:#F7F8FE;} + .d2-3319507261 .color-N1{color:#0A0F25;} + .d2-3319507261 .color-N2{color:#676C7E;} + .d2-3319507261 .color-N3{color:#9499AB;} + .d2-3319507261 .color-N4{color:#CFD2DD;} + .d2-3319507261 .color-N5{color:#DEE1EB;} + .d2-3319507261 .color-N6{color:#EEF1F8;} + .d2-3319507261 .color-N7{color:#FFFFFF;} + .d2-3319507261 .color-B1{color:#0D32B2;} + .d2-3319507261 .color-B2{color:#0D32B2;} + .d2-3319507261 .color-B3{color:#E3E9FD;} + .d2-3319507261 .color-B4{color:#E3E9FD;} + .d2-3319507261 .color-B5{color:#EDF0FD;} + .d2-3319507261 .color-B6{color:#F7F8FE;} + .d2-3319507261 .color-AA2{color:#4A6FF3;} + .d2-3319507261 .color-AA4{color:#EDF0FD;} + .d2-3319507261 .color-AA5{color:#F7F8FE;} + .d2-3319507261 .color-AB4{color:#EDF0FD;} + .d2-3319507261 .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}]]>abc12d line 1line 2line 3line 4 diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg index 7fcca0eb3..1e3dad003 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -programprofits + .d2-1021923722 .fill-N1{fill:#0A0F25;} + .d2-1021923722 .fill-N2{fill:#676C7E;} + .d2-1021923722 .fill-N3{fill:#9499AB;} + .d2-1021923722 .fill-N4{fill:#CFD2DD;} + .d2-1021923722 .fill-N5{fill:#DEE1EB;} + .d2-1021923722 .fill-N6{fill:#EEF1F8;} + .d2-1021923722 .fill-N7{fill:#FFFFFF;} + .d2-1021923722 .fill-B1{fill:#0D32B2;} + .d2-1021923722 .fill-B2{fill:#0D32B2;} + .d2-1021923722 .fill-B3{fill:#E3E9FD;} + .d2-1021923722 .fill-B4{fill:#E3E9FD;} + .d2-1021923722 .fill-B5{fill:#EDF0FD;} + .d2-1021923722 .fill-B6{fill:#F7F8FE;} + .d2-1021923722 .fill-AA2{fill:#4A6FF3;} + .d2-1021923722 .fill-AA4{fill:#EDF0FD;} + .d2-1021923722 .fill-AA5{fill:#F7F8FE;} + .d2-1021923722 .fill-AB4{fill:#EDF0FD;} + .d2-1021923722 .fill-AB5{fill:#F7F8FE;} + .d2-1021923722 .stroke-N1{stroke:#0A0F25;} + .d2-1021923722 .stroke-N2{stroke:#676C7E;} + .d2-1021923722 .stroke-N3{stroke:#9499AB;} + .d2-1021923722 .stroke-N4{stroke:#CFD2DD;} + .d2-1021923722 .stroke-N5{stroke:#DEE1EB;} + .d2-1021923722 .stroke-N6{stroke:#EEF1F8;} + .d2-1021923722 .stroke-N7{stroke:#FFFFFF;} + .d2-1021923722 .stroke-B1{stroke:#0D32B2;} + .d2-1021923722 .stroke-B2{stroke:#0D32B2;} + .d2-1021923722 .stroke-B3{stroke:#E3E9FD;} + .d2-1021923722 .stroke-B4{stroke:#E3E9FD;} + .d2-1021923722 .stroke-B5{stroke:#EDF0FD;} + .d2-1021923722 .stroke-B6{stroke:#F7F8FE;} + .d2-1021923722 .stroke-AA2{stroke:#4A6FF3;} + .d2-1021923722 .stroke-AA4{stroke:#EDF0FD;} + .d2-1021923722 .stroke-AA5{stroke:#F7F8FE;} + .d2-1021923722 .stroke-AB4{stroke:#EDF0FD;} + .d2-1021923722 .stroke-AB5{stroke:#F7F8FE;} + .d2-1021923722 .background-color-N1{background-color:#0A0F25;} + .d2-1021923722 .background-color-N2{background-color:#676C7E;} + .d2-1021923722 .background-color-N3{background-color:#9499AB;} + .d2-1021923722 .background-color-N4{background-color:#CFD2DD;} + .d2-1021923722 .background-color-N5{background-color:#DEE1EB;} + .d2-1021923722 .background-color-N6{background-color:#EEF1F8;} + .d2-1021923722 .background-color-N7{background-color:#FFFFFF;} + .d2-1021923722 .background-color-B1{background-color:#0D32B2;} + .d2-1021923722 .background-color-B2{background-color:#0D32B2;} + .d2-1021923722 .background-color-B3{background-color:#E3E9FD;} + .d2-1021923722 .background-color-B4{background-color:#E3E9FD;} + .d2-1021923722 .background-color-B5{background-color:#EDF0FD;} + .d2-1021923722 .background-color-B6{background-color:#F7F8FE;} + .d2-1021923722 .background-color-AA2{background-color:#4A6FF3;} + .d2-1021923722 .background-color-AA4{background-color:#EDF0FD;} + .d2-1021923722 .background-color-AA5{background-color:#F7F8FE;} + .d2-1021923722 .background-color-AB4{background-color:#EDF0FD;} + .d2-1021923722 .background-color-AB5{background-color:#F7F8FE;} + .d2-1021923722 .color-N1{color:#0A0F25;} + .d2-1021923722 .color-N2{color:#676C7E;} + .d2-1021923722 .color-N3{color:#9499AB;} + .d2-1021923722 .color-N4{color:#CFD2DD;} + .d2-1021923722 .color-N5{color:#DEE1EB;} + .d2-1021923722 .color-N6{color:#EEF1F8;} + .d2-1021923722 .color-N7{color:#FFFFFF;} + .d2-1021923722 .color-B1{color:#0D32B2;} + .d2-1021923722 .color-B2{color:#0D32B2;} + .d2-1021923722 .color-B3{color:#E3E9FD;} + .d2-1021923722 .color-B4{color:#E3E9FD;} + .d2-1021923722 .color-B5{color:#EDF0FD;} + .d2-1021923722 .color-B6{color:#F7F8FE;} + .d2-1021923722 .color-AA2{color:#4A6FF3;} + .d2-1021923722 .color-AA4{color:#EDF0FD;} + .d2-1021923722 .color-AA5{color:#F7F8FE;} + .d2-1021923722 .color-AB4{color:#EDF0FD;} + .d2-1021923722 .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}]]>programprofits diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg index 93a255fb8..02c46b745 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -programprofits + .d2-1665344798 .fill-N1{fill:#0A0F25;} + .d2-1665344798 .fill-N2{fill:#676C7E;} + .d2-1665344798 .fill-N3{fill:#9499AB;} + .d2-1665344798 .fill-N4{fill:#CFD2DD;} + .d2-1665344798 .fill-N5{fill:#DEE1EB;} + .d2-1665344798 .fill-N6{fill:#EEF1F8;} + .d2-1665344798 .fill-N7{fill:#FFFFFF;} + .d2-1665344798 .fill-B1{fill:#0D32B2;} + .d2-1665344798 .fill-B2{fill:#0D32B2;} + .d2-1665344798 .fill-B3{fill:#E3E9FD;} + .d2-1665344798 .fill-B4{fill:#E3E9FD;} + .d2-1665344798 .fill-B5{fill:#EDF0FD;} + .d2-1665344798 .fill-B6{fill:#F7F8FE;} + .d2-1665344798 .fill-AA2{fill:#4A6FF3;} + .d2-1665344798 .fill-AA4{fill:#EDF0FD;} + .d2-1665344798 .fill-AA5{fill:#F7F8FE;} + .d2-1665344798 .fill-AB4{fill:#EDF0FD;} + .d2-1665344798 .fill-AB5{fill:#F7F8FE;} + .d2-1665344798 .stroke-N1{stroke:#0A0F25;} + .d2-1665344798 .stroke-N2{stroke:#676C7E;} + .d2-1665344798 .stroke-N3{stroke:#9499AB;} + .d2-1665344798 .stroke-N4{stroke:#CFD2DD;} + .d2-1665344798 .stroke-N5{stroke:#DEE1EB;} + .d2-1665344798 .stroke-N6{stroke:#EEF1F8;} + .d2-1665344798 .stroke-N7{stroke:#FFFFFF;} + .d2-1665344798 .stroke-B1{stroke:#0D32B2;} + .d2-1665344798 .stroke-B2{stroke:#0D32B2;} + .d2-1665344798 .stroke-B3{stroke:#E3E9FD;} + .d2-1665344798 .stroke-B4{stroke:#E3E9FD;} + .d2-1665344798 .stroke-B5{stroke:#EDF0FD;} + .d2-1665344798 .stroke-B6{stroke:#F7F8FE;} + .d2-1665344798 .stroke-AA2{stroke:#4A6FF3;} + .d2-1665344798 .stroke-AA4{stroke:#EDF0FD;} + .d2-1665344798 .stroke-AA5{stroke:#F7F8FE;} + .d2-1665344798 .stroke-AB4{stroke:#EDF0FD;} + .d2-1665344798 .stroke-AB5{stroke:#F7F8FE;} + .d2-1665344798 .background-color-N1{background-color:#0A0F25;} + .d2-1665344798 .background-color-N2{background-color:#676C7E;} + .d2-1665344798 .background-color-N3{background-color:#9499AB;} + .d2-1665344798 .background-color-N4{background-color:#CFD2DD;} + .d2-1665344798 .background-color-N5{background-color:#DEE1EB;} + .d2-1665344798 .background-color-N6{background-color:#EEF1F8;} + .d2-1665344798 .background-color-N7{background-color:#FFFFFF;} + .d2-1665344798 .background-color-B1{background-color:#0D32B2;} + .d2-1665344798 .background-color-B2{background-color:#0D32B2;} + .d2-1665344798 .background-color-B3{background-color:#E3E9FD;} + .d2-1665344798 .background-color-B4{background-color:#E3E9FD;} + .d2-1665344798 .background-color-B5{background-color:#EDF0FD;} + .d2-1665344798 .background-color-B6{background-color:#F7F8FE;} + .d2-1665344798 .background-color-AA2{background-color:#4A6FF3;} + .d2-1665344798 .background-color-AA4{background-color:#EDF0FD;} + .d2-1665344798 .background-color-AA5{background-color:#F7F8FE;} + .d2-1665344798 .background-color-AB4{background-color:#EDF0FD;} + .d2-1665344798 .background-color-AB5{background-color:#F7F8FE;} + .d2-1665344798 .color-N1{color:#0A0F25;} + .d2-1665344798 .color-N2{color:#676C7E;} + .d2-1665344798 .color-N3{color:#9499AB;} + .d2-1665344798 .color-N4{color:#CFD2DD;} + .d2-1665344798 .color-N5{color:#DEE1EB;} + .d2-1665344798 .color-N6{color:#EEF1F8;} + .d2-1665344798 .color-N7{color:#FFFFFF;} + .d2-1665344798 .color-B1{color:#0D32B2;} + .d2-1665344798 .color-B2{color:#0D32B2;} + .d2-1665344798 .color-B3{color:#E3E9FD;} + .d2-1665344798 .color-B4{color:#E3E9FD;} + .d2-1665344798 .color-B5{color:#EDF0FD;} + .d2-1665344798 .color-B6{color:#F7F8FE;} + .d2-1665344798 .color-AA2{color:#4A6FF3;} + .d2-1665344798 .color-AA4{color:#EDF0FD;} + .d2-1665344798 .color-AA5{color:#F7F8FE;} + .d2-1665344798 .color-AB4{color:#EDF0FD;} + .d2-1665344798 .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}]]>programprofits 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 f6b65b939..92317dd50 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,23 +1,23 @@ -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas + .d2-586779041 .fill-N1{fill:#0A0F25;} + .d2-586779041 .fill-N2{fill:#676C7E;} + .d2-586779041 .fill-N3{fill:#9499AB;} + .d2-586779041 .fill-N4{fill:#CFD2DD;} + .d2-586779041 .fill-N5{fill:#DEE1EB;} + .d2-586779041 .fill-N6{fill:#EEF1F8;} + .d2-586779041 .fill-N7{fill:#FFFFFF;} + .d2-586779041 .fill-B1{fill:#0D32B2;} + .d2-586779041 .fill-B2{fill:#0D32B2;} + .d2-586779041 .fill-B3{fill:#E3E9FD;} + .d2-586779041 .fill-B4{fill:#E3E9FD;} + .d2-586779041 .fill-B5{fill:#EDF0FD;} + .d2-586779041 .fill-B6{fill:#F7F8FE;} + .d2-586779041 .fill-AA2{fill:#4A6FF3;} + .d2-586779041 .fill-AA4{fill:#EDF0FD;} + .d2-586779041 .fill-AA5{fill:#F7F8FE;} + .d2-586779041 .fill-AB4{fill:#EDF0FD;} + .d2-586779041 .fill-AB5{fill:#F7F8FE;} + .d2-586779041 .stroke-N1{stroke:#0A0F25;} + .d2-586779041 .stroke-N2{stroke:#676C7E;} + .d2-586779041 .stroke-N3{stroke:#9499AB;} + .d2-586779041 .stroke-N4{stroke:#CFD2DD;} + .d2-586779041 .stroke-N5{stroke:#DEE1EB;} + .d2-586779041 .stroke-N6{stroke:#EEF1F8;} + .d2-586779041 .stroke-N7{stroke:#FFFFFF;} + .d2-586779041 .stroke-B1{stroke:#0D32B2;} + .d2-586779041 .stroke-B2{stroke:#0D32B2;} + .d2-586779041 .stroke-B3{stroke:#E3E9FD;} + .d2-586779041 .stroke-B4{stroke:#E3E9FD;} + .d2-586779041 .stroke-B5{stroke:#EDF0FD;} + .d2-586779041 .stroke-B6{stroke:#F7F8FE;} + .d2-586779041 .stroke-AA2{stroke:#4A6FF3;} + .d2-586779041 .stroke-AA4{stroke:#EDF0FD;} + .d2-586779041 .stroke-AA5{stroke:#F7F8FE;} + .d2-586779041 .stroke-AB4{stroke:#EDF0FD;} + .d2-586779041 .stroke-AB5{stroke:#F7F8FE;} + .d2-586779041 .background-color-N1{background-color:#0A0F25;} + .d2-586779041 .background-color-N2{background-color:#676C7E;} + .d2-586779041 .background-color-N3{background-color:#9499AB;} + .d2-586779041 .background-color-N4{background-color:#CFD2DD;} + .d2-586779041 .background-color-N5{background-color:#DEE1EB;} + .d2-586779041 .background-color-N6{background-color:#EEF1F8;} + .d2-586779041 .background-color-N7{background-color:#FFFFFF;} + .d2-586779041 .background-color-B1{background-color:#0D32B2;} + .d2-586779041 .background-color-B2{background-color:#0D32B2;} + .d2-586779041 .background-color-B3{background-color:#E3E9FD;} + .d2-586779041 .background-color-B4{background-color:#E3E9FD;} + .d2-586779041 .background-color-B5{background-color:#EDF0FD;} + .d2-586779041 .background-color-B6{background-color:#F7F8FE;} + .d2-586779041 .background-color-AA2{background-color:#4A6FF3;} + .d2-586779041 .background-color-AA4{background-color:#EDF0FD;} + .d2-586779041 .background-color-AA5{background-color:#F7F8FE;} + .d2-586779041 .background-color-AB4{background-color:#EDF0FD;} + .d2-586779041 .background-color-AB5{background-color:#F7F8FE;} + .d2-586779041 .color-N1{color:#0A0F25;} + .d2-586779041 .color-N2{color:#676C7E;} + .d2-586779041 .color-N3{color:#9499AB;} + .d2-586779041 .color-N4{color:#CFD2DD;} + .d2-586779041 .color-N5{color:#DEE1EB;} + .d2-586779041 .color-N6{color:#EEF1F8;} + .d2-586779041 .color-N7{color:#FFFFFF;} + .d2-586779041 .color-B1{color:#0D32B2;} + .d2-586779041 .color-B2{color:#0D32B2;} + .d2-586779041 .color-B3{color:#E3E9FD;} + .d2-586779041 .color-B4{color:#E3E9FD;} + .d2-586779041 .color-B5{color:#EDF0FD;} + .d2-586779041 .color-B6{color:#F7F8FE;} + .d2-586779041 .color-AA2{color:#4A6FF3;} + .d2-586779041 .color-AA4{color:#EDF0FD;} + .d2-586779041 .color-AA5{color:#F7F8FE;} + .d2-586779041 .color-AB4{color:#EDF0FD;} + .d2-586779041 .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}]]>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 6d024aba6..62daa3520 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,23 +1,23 @@ -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas + .d2-2111939939 .fill-N1{fill:#0A0F25;} + .d2-2111939939 .fill-N2{fill:#676C7E;} + .d2-2111939939 .fill-N3{fill:#9499AB;} + .d2-2111939939 .fill-N4{fill:#CFD2DD;} + .d2-2111939939 .fill-N5{fill:#DEE1EB;} + .d2-2111939939 .fill-N6{fill:#EEF1F8;} + .d2-2111939939 .fill-N7{fill:#FFFFFF;} + .d2-2111939939 .fill-B1{fill:#0D32B2;} + .d2-2111939939 .fill-B2{fill:#0D32B2;} + .d2-2111939939 .fill-B3{fill:#E3E9FD;} + .d2-2111939939 .fill-B4{fill:#E3E9FD;} + .d2-2111939939 .fill-B5{fill:#EDF0FD;} + .d2-2111939939 .fill-B6{fill:#F7F8FE;} + .d2-2111939939 .fill-AA2{fill:#4A6FF3;} + .d2-2111939939 .fill-AA4{fill:#EDF0FD;} + .d2-2111939939 .fill-AA5{fill:#F7F8FE;} + .d2-2111939939 .fill-AB4{fill:#EDF0FD;} + .d2-2111939939 .fill-AB5{fill:#F7F8FE;} + .d2-2111939939 .stroke-N1{stroke:#0A0F25;} + .d2-2111939939 .stroke-N2{stroke:#676C7E;} + .d2-2111939939 .stroke-N3{stroke:#9499AB;} + .d2-2111939939 .stroke-N4{stroke:#CFD2DD;} + .d2-2111939939 .stroke-N5{stroke:#DEE1EB;} + .d2-2111939939 .stroke-N6{stroke:#EEF1F8;} + .d2-2111939939 .stroke-N7{stroke:#FFFFFF;} + .d2-2111939939 .stroke-B1{stroke:#0D32B2;} + .d2-2111939939 .stroke-B2{stroke:#0D32B2;} + .d2-2111939939 .stroke-B3{stroke:#E3E9FD;} + .d2-2111939939 .stroke-B4{stroke:#E3E9FD;} + .d2-2111939939 .stroke-B5{stroke:#EDF0FD;} + .d2-2111939939 .stroke-B6{stroke:#F7F8FE;} + .d2-2111939939 .stroke-AA2{stroke:#4A6FF3;} + .d2-2111939939 .stroke-AA4{stroke:#EDF0FD;} + .d2-2111939939 .stroke-AA5{stroke:#F7F8FE;} + .d2-2111939939 .stroke-AB4{stroke:#EDF0FD;} + .d2-2111939939 .stroke-AB5{stroke:#F7F8FE;} + .d2-2111939939 .background-color-N1{background-color:#0A0F25;} + .d2-2111939939 .background-color-N2{background-color:#676C7E;} + .d2-2111939939 .background-color-N3{background-color:#9499AB;} + .d2-2111939939 .background-color-N4{background-color:#CFD2DD;} + .d2-2111939939 .background-color-N5{background-color:#DEE1EB;} + .d2-2111939939 .background-color-N6{background-color:#EEF1F8;} + .d2-2111939939 .background-color-N7{background-color:#FFFFFF;} + .d2-2111939939 .background-color-B1{background-color:#0D32B2;} + .d2-2111939939 .background-color-B2{background-color:#0D32B2;} + .d2-2111939939 .background-color-B3{background-color:#E3E9FD;} + .d2-2111939939 .background-color-B4{background-color:#E3E9FD;} + .d2-2111939939 .background-color-B5{background-color:#EDF0FD;} + .d2-2111939939 .background-color-B6{background-color:#F7F8FE;} + .d2-2111939939 .background-color-AA2{background-color:#4A6FF3;} + .d2-2111939939 .background-color-AA4{background-color:#EDF0FD;} + .d2-2111939939 .background-color-AA5{background-color:#F7F8FE;} + .d2-2111939939 .background-color-AB4{background-color:#EDF0FD;} + .d2-2111939939 .background-color-AB5{background-color:#F7F8FE;} + .d2-2111939939 .color-N1{color:#0A0F25;} + .d2-2111939939 .color-N2{color:#676C7E;} + .d2-2111939939 .color-N3{color:#9499AB;} + .d2-2111939939 .color-N4{color:#CFD2DD;} + .d2-2111939939 .color-N5{color:#DEE1EB;} + .d2-2111939939 .color-N6{color:#EEF1F8;} + .d2-2111939939 .color-N7{color:#FFFFFF;} + .d2-2111939939 .color-B1{color:#0D32B2;} + .d2-2111939939 .color-B2{color:#0D32B2;} + .d2-2111939939 .color-B3{color:#E3E9FD;} + .d2-2111939939 .color-B4{color:#E3E9FD;} + .d2-2111939939 .color-B5{color:#EDF0FD;} + .d2-2111939939 .color-B6{color:#F7F8FE;} + .d2-2111939939 .color-AA2{color:#4A6FF3;} + .d2-2111939939 .color-AA4{color:#EDF0FD;} + .d2-2111939939 .color-AA5{color:#F7F8FE;} + .d2-2111939939 .color-AB4{color:#EDF0FD;} + .d2-2111939939 .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}]]>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 80470f1ea..bc9f05cba 100644 --- a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ninetynineeighty eightseventy sevena\yodetherea\"odea\node + .d2-1607318345 .fill-N1{fill:#0A0F25;} + .d2-1607318345 .fill-N2{fill:#676C7E;} + .d2-1607318345 .fill-N3{fill:#9499AB;} + .d2-1607318345 .fill-N4{fill:#CFD2DD;} + .d2-1607318345 .fill-N5{fill:#DEE1EB;} + .d2-1607318345 .fill-N6{fill:#EEF1F8;} + .d2-1607318345 .fill-N7{fill:#FFFFFF;} + .d2-1607318345 .fill-B1{fill:#0D32B2;} + .d2-1607318345 .fill-B2{fill:#0D32B2;} + .d2-1607318345 .fill-B3{fill:#E3E9FD;} + .d2-1607318345 .fill-B4{fill:#E3E9FD;} + .d2-1607318345 .fill-B5{fill:#EDF0FD;} + .d2-1607318345 .fill-B6{fill:#F7F8FE;} + .d2-1607318345 .fill-AA2{fill:#4A6FF3;} + .d2-1607318345 .fill-AA4{fill:#EDF0FD;} + .d2-1607318345 .fill-AA5{fill:#F7F8FE;} + .d2-1607318345 .fill-AB4{fill:#EDF0FD;} + .d2-1607318345 .fill-AB5{fill:#F7F8FE;} + .d2-1607318345 .stroke-N1{stroke:#0A0F25;} + .d2-1607318345 .stroke-N2{stroke:#676C7E;} + .d2-1607318345 .stroke-N3{stroke:#9499AB;} + .d2-1607318345 .stroke-N4{stroke:#CFD2DD;} + .d2-1607318345 .stroke-N5{stroke:#DEE1EB;} + .d2-1607318345 .stroke-N6{stroke:#EEF1F8;} + .d2-1607318345 .stroke-N7{stroke:#FFFFFF;} + .d2-1607318345 .stroke-B1{stroke:#0D32B2;} + .d2-1607318345 .stroke-B2{stroke:#0D32B2;} + .d2-1607318345 .stroke-B3{stroke:#E3E9FD;} + .d2-1607318345 .stroke-B4{stroke:#E3E9FD;} + .d2-1607318345 .stroke-B5{stroke:#EDF0FD;} + .d2-1607318345 .stroke-B6{stroke:#F7F8FE;} + .d2-1607318345 .stroke-AA2{stroke:#4A6FF3;} + .d2-1607318345 .stroke-AA4{stroke:#EDF0FD;} + .d2-1607318345 .stroke-AA5{stroke:#F7F8FE;} + .d2-1607318345 .stroke-AB4{stroke:#EDF0FD;} + .d2-1607318345 .stroke-AB5{stroke:#F7F8FE;} + .d2-1607318345 .background-color-N1{background-color:#0A0F25;} + .d2-1607318345 .background-color-N2{background-color:#676C7E;} + .d2-1607318345 .background-color-N3{background-color:#9499AB;} + .d2-1607318345 .background-color-N4{background-color:#CFD2DD;} + .d2-1607318345 .background-color-N5{background-color:#DEE1EB;} + .d2-1607318345 .background-color-N6{background-color:#EEF1F8;} + .d2-1607318345 .background-color-N7{background-color:#FFFFFF;} + .d2-1607318345 .background-color-B1{background-color:#0D32B2;} + .d2-1607318345 .background-color-B2{background-color:#0D32B2;} + .d2-1607318345 .background-color-B3{background-color:#E3E9FD;} + .d2-1607318345 .background-color-B4{background-color:#E3E9FD;} + .d2-1607318345 .background-color-B5{background-color:#EDF0FD;} + .d2-1607318345 .background-color-B6{background-color:#F7F8FE;} + .d2-1607318345 .background-color-AA2{background-color:#4A6FF3;} + .d2-1607318345 .background-color-AA4{background-color:#EDF0FD;} + .d2-1607318345 .background-color-AA5{background-color:#F7F8FE;} + .d2-1607318345 .background-color-AB4{background-color:#EDF0FD;} + .d2-1607318345 .background-color-AB5{background-color:#F7F8FE;} + .d2-1607318345 .color-N1{color:#0A0F25;} + .d2-1607318345 .color-N2{color:#676C7E;} + .d2-1607318345 .color-N3{color:#9499AB;} + .d2-1607318345 .color-N4{color:#CFD2DD;} + .d2-1607318345 .color-N5{color:#DEE1EB;} + .d2-1607318345 .color-N6{color:#EEF1F8;} + .d2-1607318345 .color-N7{color:#FFFFFF;} + .d2-1607318345 .color-B1{color:#0D32B2;} + .d2-1607318345 .color-B2{color:#0D32B2;} + .d2-1607318345 .color-B3{color:#E3E9FD;} + .d2-1607318345 .color-B4{color:#E3E9FD;} + .d2-1607318345 .color-B5{color:#EDF0FD;} + .d2-1607318345 .color-B6{color:#F7F8FE;} + .d2-1607318345 .color-AA2{color:#4A6FF3;} + .d2-1607318345 .color-AA4{color:#EDF0FD;} + .d2-1607318345 .color-AA5{color:#F7F8FE;} + .d2-1607318345 .color-AB4{color:#EDF0FD;} + .d2-1607318345 .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}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node 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 ff4154c86..43a2b5306 100644 --- a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ninetynineeighty eightseventy sevena\yodetherea\"odea\node + .d2-679618464 .fill-N1{fill:#0A0F25;} + .d2-679618464 .fill-N2{fill:#676C7E;} + .d2-679618464 .fill-N3{fill:#9499AB;} + .d2-679618464 .fill-N4{fill:#CFD2DD;} + .d2-679618464 .fill-N5{fill:#DEE1EB;} + .d2-679618464 .fill-N6{fill:#EEF1F8;} + .d2-679618464 .fill-N7{fill:#FFFFFF;} + .d2-679618464 .fill-B1{fill:#0D32B2;} + .d2-679618464 .fill-B2{fill:#0D32B2;} + .d2-679618464 .fill-B3{fill:#E3E9FD;} + .d2-679618464 .fill-B4{fill:#E3E9FD;} + .d2-679618464 .fill-B5{fill:#EDF0FD;} + .d2-679618464 .fill-B6{fill:#F7F8FE;} + .d2-679618464 .fill-AA2{fill:#4A6FF3;} + .d2-679618464 .fill-AA4{fill:#EDF0FD;} + .d2-679618464 .fill-AA5{fill:#F7F8FE;} + .d2-679618464 .fill-AB4{fill:#EDF0FD;} + .d2-679618464 .fill-AB5{fill:#F7F8FE;} + .d2-679618464 .stroke-N1{stroke:#0A0F25;} + .d2-679618464 .stroke-N2{stroke:#676C7E;} + .d2-679618464 .stroke-N3{stroke:#9499AB;} + .d2-679618464 .stroke-N4{stroke:#CFD2DD;} + .d2-679618464 .stroke-N5{stroke:#DEE1EB;} + .d2-679618464 .stroke-N6{stroke:#EEF1F8;} + .d2-679618464 .stroke-N7{stroke:#FFFFFF;} + .d2-679618464 .stroke-B1{stroke:#0D32B2;} + .d2-679618464 .stroke-B2{stroke:#0D32B2;} + .d2-679618464 .stroke-B3{stroke:#E3E9FD;} + .d2-679618464 .stroke-B4{stroke:#E3E9FD;} + .d2-679618464 .stroke-B5{stroke:#EDF0FD;} + .d2-679618464 .stroke-B6{stroke:#F7F8FE;} + .d2-679618464 .stroke-AA2{stroke:#4A6FF3;} + .d2-679618464 .stroke-AA4{stroke:#EDF0FD;} + .d2-679618464 .stroke-AA5{stroke:#F7F8FE;} + .d2-679618464 .stroke-AB4{stroke:#EDF0FD;} + .d2-679618464 .stroke-AB5{stroke:#F7F8FE;} + .d2-679618464 .background-color-N1{background-color:#0A0F25;} + .d2-679618464 .background-color-N2{background-color:#676C7E;} + .d2-679618464 .background-color-N3{background-color:#9499AB;} + .d2-679618464 .background-color-N4{background-color:#CFD2DD;} + .d2-679618464 .background-color-N5{background-color:#DEE1EB;} + .d2-679618464 .background-color-N6{background-color:#EEF1F8;} + .d2-679618464 .background-color-N7{background-color:#FFFFFF;} + .d2-679618464 .background-color-B1{background-color:#0D32B2;} + .d2-679618464 .background-color-B2{background-color:#0D32B2;} + .d2-679618464 .background-color-B3{background-color:#E3E9FD;} + .d2-679618464 .background-color-B4{background-color:#E3E9FD;} + .d2-679618464 .background-color-B5{background-color:#EDF0FD;} + .d2-679618464 .background-color-B6{background-color:#F7F8FE;} + .d2-679618464 .background-color-AA2{background-color:#4A6FF3;} + .d2-679618464 .background-color-AA4{background-color:#EDF0FD;} + .d2-679618464 .background-color-AA5{background-color:#F7F8FE;} + .d2-679618464 .background-color-AB4{background-color:#EDF0FD;} + .d2-679618464 .background-color-AB5{background-color:#F7F8FE;} + .d2-679618464 .color-N1{color:#0A0F25;} + .d2-679618464 .color-N2{color:#676C7E;} + .d2-679618464 .color-N3{color:#9499AB;} + .d2-679618464 .color-N4{color:#CFD2DD;} + .d2-679618464 .color-N5{color:#DEE1EB;} + .d2-679618464 .color-N6{color:#EEF1F8;} + .d2-679618464 .color-N7{color:#FFFFFF;} + .d2-679618464 .color-B1{color:#0D32B2;} + .d2-679618464 .color-B2{color:#0D32B2;} + .d2-679618464 .color-B3{color:#E3E9FD;} + .d2-679618464 .color-B4{color:#E3E9FD;} + .d2-679618464 .color-B5{color:#EDF0FD;} + .d2-679618464 .color-B6{color:#F7F8FE;} + .d2-679618464 .color-AA2{color:#4A6FF3;} + .d2-679618464 .color-AA4{color:#EDF0FD;} + .d2-679618464 .color-AA5{color:#F7F8FE;} + .d2-679618464 .color-AB4{color:#EDF0FD;} + .d2-679618464 .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}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node diff --git a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg index 3516e3f0e..5d10e7ca7 100644 --- a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -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 + .d2-2496202090 .fill-N1{fill:#0A0F25;} + .d2-2496202090 .fill-N2{fill:#676C7E;} + .d2-2496202090 .fill-N3{fill:#9499AB;} + .d2-2496202090 .fill-N4{fill:#CFD2DD;} + .d2-2496202090 .fill-N5{fill:#DEE1EB;} + .d2-2496202090 .fill-N6{fill:#EEF1F8;} + .d2-2496202090 .fill-N7{fill:#FFFFFF;} + .d2-2496202090 .fill-B1{fill:#0D32B2;} + .d2-2496202090 .fill-B2{fill:#0D32B2;} + .d2-2496202090 .fill-B3{fill:#E3E9FD;} + .d2-2496202090 .fill-B4{fill:#E3E9FD;} + .d2-2496202090 .fill-B5{fill:#EDF0FD;} + .d2-2496202090 .fill-B6{fill:#F7F8FE;} + .d2-2496202090 .fill-AA2{fill:#4A6FF3;} + .d2-2496202090 .fill-AA4{fill:#EDF0FD;} + .d2-2496202090 .fill-AA5{fill:#F7F8FE;} + .d2-2496202090 .fill-AB4{fill:#EDF0FD;} + .d2-2496202090 .fill-AB5{fill:#F7F8FE;} + .d2-2496202090 .stroke-N1{stroke:#0A0F25;} + .d2-2496202090 .stroke-N2{stroke:#676C7E;} + .d2-2496202090 .stroke-N3{stroke:#9499AB;} + .d2-2496202090 .stroke-N4{stroke:#CFD2DD;} + .d2-2496202090 .stroke-N5{stroke:#DEE1EB;} + .d2-2496202090 .stroke-N6{stroke:#EEF1F8;} + .d2-2496202090 .stroke-N7{stroke:#FFFFFF;} + .d2-2496202090 .stroke-B1{stroke:#0D32B2;} + .d2-2496202090 .stroke-B2{stroke:#0D32B2;} + .d2-2496202090 .stroke-B3{stroke:#E3E9FD;} + .d2-2496202090 .stroke-B4{stroke:#E3E9FD;} + .d2-2496202090 .stroke-B5{stroke:#EDF0FD;} + .d2-2496202090 .stroke-B6{stroke:#F7F8FE;} + .d2-2496202090 .stroke-AA2{stroke:#4A6FF3;} + .d2-2496202090 .stroke-AA4{stroke:#EDF0FD;} + .d2-2496202090 .stroke-AA5{stroke:#F7F8FE;} + .d2-2496202090 .stroke-AB4{stroke:#EDF0FD;} + .d2-2496202090 .stroke-AB5{stroke:#F7F8FE;} + .d2-2496202090 .background-color-N1{background-color:#0A0F25;} + .d2-2496202090 .background-color-N2{background-color:#676C7E;} + .d2-2496202090 .background-color-N3{background-color:#9499AB;} + .d2-2496202090 .background-color-N4{background-color:#CFD2DD;} + .d2-2496202090 .background-color-N5{background-color:#DEE1EB;} + .d2-2496202090 .background-color-N6{background-color:#EEF1F8;} + .d2-2496202090 .background-color-N7{background-color:#FFFFFF;} + .d2-2496202090 .background-color-B1{background-color:#0D32B2;} + .d2-2496202090 .background-color-B2{background-color:#0D32B2;} + .d2-2496202090 .background-color-B3{background-color:#E3E9FD;} + .d2-2496202090 .background-color-B4{background-color:#E3E9FD;} + .d2-2496202090 .background-color-B5{background-color:#EDF0FD;} + .d2-2496202090 .background-color-B6{background-color:#F7F8FE;} + .d2-2496202090 .background-color-AA2{background-color:#4A6FF3;} + .d2-2496202090 .background-color-AA4{background-color:#EDF0FD;} + .d2-2496202090 .background-color-AA5{background-color:#F7F8FE;} + .d2-2496202090 .background-color-AB4{background-color:#EDF0FD;} + .d2-2496202090 .background-color-AB5{background-color:#F7F8FE;} + .d2-2496202090 .color-N1{color:#0A0F25;} + .d2-2496202090 .color-N2{color:#676C7E;} + .d2-2496202090 .color-N3{color:#9499AB;} + .d2-2496202090 .color-N4{color:#CFD2DD;} + .d2-2496202090 .color-N5{color:#DEE1EB;} + .d2-2496202090 .color-N6{color:#EEF1F8;} + .d2-2496202090 .color-N7{color:#FFFFFF;} + .d2-2496202090 .color-B1{color:#0D32B2;} + .d2-2496202090 .color-B2{color:#0D32B2;} + .d2-2496202090 .color-B3{color:#E3E9FD;} + .d2-2496202090 .color-B4{color:#E3E9FD;} + .d2-2496202090 .color-B5{color:#EDF0FD;} + .d2-2496202090 .color-B6{color:#F7F8FE;} + .d2-2496202090 .color-AA2{color:#4A6FF3;} + .d2-2496202090 .color-AA4{color:#EDF0FD;} + .d2-2496202090 .color-AA5{color:#F7F8FE;} + .d2-2496202090 .color-AB4{color:#EDF0FD;} + .d2-2496202090 .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}]]>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 1f2b51e0a..64da47e60 100644 --- a/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -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 + .d2-4227073958 .fill-N1{fill:#0A0F25;} + .d2-4227073958 .fill-N2{fill:#676C7E;} + .d2-4227073958 .fill-N3{fill:#9499AB;} + .d2-4227073958 .fill-N4{fill:#CFD2DD;} + .d2-4227073958 .fill-N5{fill:#DEE1EB;} + .d2-4227073958 .fill-N6{fill:#EEF1F8;} + .d2-4227073958 .fill-N7{fill:#FFFFFF;} + .d2-4227073958 .fill-B1{fill:#0D32B2;} + .d2-4227073958 .fill-B2{fill:#0D32B2;} + .d2-4227073958 .fill-B3{fill:#E3E9FD;} + .d2-4227073958 .fill-B4{fill:#E3E9FD;} + .d2-4227073958 .fill-B5{fill:#EDF0FD;} + .d2-4227073958 .fill-B6{fill:#F7F8FE;} + .d2-4227073958 .fill-AA2{fill:#4A6FF3;} + .d2-4227073958 .fill-AA4{fill:#EDF0FD;} + .d2-4227073958 .fill-AA5{fill:#F7F8FE;} + .d2-4227073958 .fill-AB4{fill:#EDF0FD;} + .d2-4227073958 .fill-AB5{fill:#F7F8FE;} + .d2-4227073958 .stroke-N1{stroke:#0A0F25;} + .d2-4227073958 .stroke-N2{stroke:#676C7E;} + .d2-4227073958 .stroke-N3{stroke:#9499AB;} + .d2-4227073958 .stroke-N4{stroke:#CFD2DD;} + .d2-4227073958 .stroke-N5{stroke:#DEE1EB;} + .d2-4227073958 .stroke-N6{stroke:#EEF1F8;} + .d2-4227073958 .stroke-N7{stroke:#FFFFFF;} + .d2-4227073958 .stroke-B1{stroke:#0D32B2;} + .d2-4227073958 .stroke-B2{stroke:#0D32B2;} + .d2-4227073958 .stroke-B3{stroke:#E3E9FD;} + .d2-4227073958 .stroke-B4{stroke:#E3E9FD;} + .d2-4227073958 .stroke-B5{stroke:#EDF0FD;} + .d2-4227073958 .stroke-B6{stroke:#F7F8FE;} + .d2-4227073958 .stroke-AA2{stroke:#4A6FF3;} + .d2-4227073958 .stroke-AA4{stroke:#EDF0FD;} + .d2-4227073958 .stroke-AA5{stroke:#F7F8FE;} + .d2-4227073958 .stroke-AB4{stroke:#EDF0FD;} + .d2-4227073958 .stroke-AB5{stroke:#F7F8FE;} + .d2-4227073958 .background-color-N1{background-color:#0A0F25;} + .d2-4227073958 .background-color-N2{background-color:#676C7E;} + .d2-4227073958 .background-color-N3{background-color:#9499AB;} + .d2-4227073958 .background-color-N4{background-color:#CFD2DD;} + .d2-4227073958 .background-color-N5{background-color:#DEE1EB;} + .d2-4227073958 .background-color-N6{background-color:#EEF1F8;} + .d2-4227073958 .background-color-N7{background-color:#FFFFFF;} + .d2-4227073958 .background-color-B1{background-color:#0D32B2;} + .d2-4227073958 .background-color-B2{background-color:#0D32B2;} + .d2-4227073958 .background-color-B3{background-color:#E3E9FD;} + .d2-4227073958 .background-color-B4{background-color:#E3E9FD;} + .d2-4227073958 .background-color-B5{background-color:#EDF0FD;} + .d2-4227073958 .background-color-B6{background-color:#F7F8FE;} + .d2-4227073958 .background-color-AA2{background-color:#4A6FF3;} + .d2-4227073958 .background-color-AA4{background-color:#EDF0FD;} + .d2-4227073958 .background-color-AA5{background-color:#F7F8FE;} + .d2-4227073958 .background-color-AB4{background-color:#EDF0FD;} + .d2-4227073958 .background-color-AB5{background-color:#F7F8FE;} + .d2-4227073958 .color-N1{color:#0A0F25;} + .d2-4227073958 .color-N2{color:#676C7E;} + .d2-4227073958 .color-N3{color:#9499AB;} + .d2-4227073958 .color-N4{color:#CFD2DD;} + .d2-4227073958 .color-N5{color:#DEE1EB;} + .d2-4227073958 .color-N6{color:#EEF1F8;} + .d2-4227073958 .color-N7{color:#FFFFFF;} + .d2-4227073958 .color-B1{color:#0D32B2;} + .d2-4227073958 .color-B2{color:#0D32B2;} + .d2-4227073958 .color-B3{color:#E3E9FD;} + .d2-4227073958 .color-B4{color:#E3E9FD;} + .d2-4227073958 .color-B5{color:#EDF0FD;} + .d2-4227073958 .color-B6{color:#F7F8FE;} + .d2-4227073958 .color-AA2{color:#4A6FF3;} + .d2-4227073958 .color-AA4{color:#EDF0FD;} + .d2-4227073958 .color-AA5{color:#F7F8FE;} + .d2-4227073958 .color-AB4{color:#EDF0FD;} + .d2-4227073958 .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}]]>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 a7d502586..3eb7e0a39 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 @@ - + .d2-2684491004 .fill-N1{fill:#0A0F25;} + .d2-2684491004 .fill-N2{fill:#676C7E;} + .d2-2684491004 .fill-N3{fill:#9499AB;} + .d2-2684491004 .fill-N4{fill:#CFD2DD;} + .d2-2684491004 .fill-N5{fill:#DEE1EB;} + .d2-2684491004 .fill-N6{fill:#EEF1F8;} + .d2-2684491004 .fill-N7{fill:#FFFFFF;} + .d2-2684491004 .fill-B1{fill:#0D32B2;} + .d2-2684491004 .fill-B2{fill:#0D32B2;} + .d2-2684491004 .fill-B3{fill:#E3E9FD;} + .d2-2684491004 .fill-B4{fill:#E3E9FD;} + .d2-2684491004 .fill-B5{fill:#EDF0FD;} + .d2-2684491004 .fill-B6{fill:#F7F8FE;} + .d2-2684491004 .fill-AA2{fill:#4A6FF3;} + .d2-2684491004 .fill-AA4{fill:#EDF0FD;} + .d2-2684491004 .fill-AA5{fill:#F7F8FE;} + .d2-2684491004 .fill-AB4{fill:#EDF0FD;} + .d2-2684491004 .fill-AB5{fill:#F7F8FE;} + .d2-2684491004 .stroke-N1{stroke:#0A0F25;} + .d2-2684491004 .stroke-N2{stroke:#676C7E;} + .d2-2684491004 .stroke-N3{stroke:#9499AB;} + .d2-2684491004 .stroke-N4{stroke:#CFD2DD;} + .d2-2684491004 .stroke-N5{stroke:#DEE1EB;} + .d2-2684491004 .stroke-N6{stroke:#EEF1F8;} + .d2-2684491004 .stroke-N7{stroke:#FFFFFF;} + .d2-2684491004 .stroke-B1{stroke:#0D32B2;} + .d2-2684491004 .stroke-B2{stroke:#0D32B2;} + .d2-2684491004 .stroke-B3{stroke:#E3E9FD;} + .d2-2684491004 .stroke-B4{stroke:#E3E9FD;} + .d2-2684491004 .stroke-B5{stroke:#EDF0FD;} + .d2-2684491004 .stroke-B6{stroke:#F7F8FE;} + .d2-2684491004 .stroke-AA2{stroke:#4A6FF3;} + .d2-2684491004 .stroke-AA4{stroke:#EDF0FD;} + .d2-2684491004 .stroke-AA5{stroke:#F7F8FE;} + .d2-2684491004 .stroke-AB4{stroke:#EDF0FD;} + .d2-2684491004 .stroke-AB5{stroke:#F7F8FE;} + .d2-2684491004 .background-color-N1{background-color:#0A0F25;} + .d2-2684491004 .background-color-N2{background-color:#676C7E;} + .d2-2684491004 .background-color-N3{background-color:#9499AB;} + .d2-2684491004 .background-color-N4{background-color:#CFD2DD;} + .d2-2684491004 .background-color-N5{background-color:#DEE1EB;} + .d2-2684491004 .background-color-N6{background-color:#EEF1F8;} + .d2-2684491004 .background-color-N7{background-color:#FFFFFF;} + .d2-2684491004 .background-color-B1{background-color:#0D32B2;} + .d2-2684491004 .background-color-B2{background-color:#0D32B2;} + .d2-2684491004 .background-color-B3{background-color:#E3E9FD;} + .d2-2684491004 .background-color-B4{background-color:#E3E9FD;} + .d2-2684491004 .background-color-B5{background-color:#EDF0FD;} + .d2-2684491004 .background-color-B6{background-color:#F7F8FE;} + .d2-2684491004 .background-color-AA2{background-color:#4A6FF3;} + .d2-2684491004 .background-color-AA4{background-color:#EDF0FD;} + .d2-2684491004 .background-color-AA5{background-color:#F7F8FE;} + .d2-2684491004 .background-color-AB4{background-color:#EDF0FD;} + .d2-2684491004 .background-color-AB5{background-color:#F7F8FE;} + .d2-2684491004 .color-N1{color:#0A0F25;} + .d2-2684491004 .color-N2{color:#676C7E;} + .d2-2684491004 .color-N3{color:#9499AB;} + .d2-2684491004 .color-N4{color:#CFD2DD;} + .d2-2684491004 .color-N5{color:#DEE1EB;} + .d2-2684491004 .color-N6{color:#EEF1F8;} + .d2-2684491004 .color-N7{color:#FFFFFF;} + .d2-2684491004 .color-B1{color:#0D32B2;} + .d2-2684491004 .color-B2{color:#0D32B2;} + .d2-2684491004 .color-B3{color:#E3E9FD;} + .d2-2684491004 .color-B4{color:#E3E9FD;} + .d2-2684491004 .color-B5{color:#EDF0FD;} + .d2-2684491004 .color-B6{color:#F7F8FE;} + .d2-2684491004 .color-AA2{color:#4A6FF3;} + .d2-2684491004 .color-AA4{color:#EDF0FD;} + .d2-2684491004 .color-AA5{color:#F7F8FE;} + .d2-2684491004 .color-AB4{color:#EDF0FD;} + .d2-2684491004 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg index 1c9db4837..ee47804de 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-2231164388 .fill-N1{fill:#0A0F25;} + .d2-2231164388 .fill-N2{fill:#676C7E;} + .d2-2231164388 .fill-N3{fill:#9499AB;} + .d2-2231164388 .fill-N4{fill:#CFD2DD;} + .d2-2231164388 .fill-N5{fill:#DEE1EB;} + .d2-2231164388 .fill-N6{fill:#EEF1F8;} + .d2-2231164388 .fill-N7{fill:#FFFFFF;} + .d2-2231164388 .fill-B1{fill:#0D32B2;} + .d2-2231164388 .fill-B2{fill:#0D32B2;} + .d2-2231164388 .fill-B3{fill:#E3E9FD;} + .d2-2231164388 .fill-B4{fill:#E3E9FD;} + .d2-2231164388 .fill-B5{fill:#EDF0FD;} + .d2-2231164388 .fill-B6{fill:#F7F8FE;} + .d2-2231164388 .fill-AA2{fill:#4A6FF3;} + .d2-2231164388 .fill-AA4{fill:#EDF0FD;} + .d2-2231164388 .fill-AA5{fill:#F7F8FE;} + .d2-2231164388 .fill-AB4{fill:#EDF0FD;} + .d2-2231164388 .fill-AB5{fill:#F7F8FE;} + .d2-2231164388 .stroke-N1{stroke:#0A0F25;} + .d2-2231164388 .stroke-N2{stroke:#676C7E;} + .d2-2231164388 .stroke-N3{stroke:#9499AB;} + .d2-2231164388 .stroke-N4{stroke:#CFD2DD;} + .d2-2231164388 .stroke-N5{stroke:#DEE1EB;} + .d2-2231164388 .stroke-N6{stroke:#EEF1F8;} + .d2-2231164388 .stroke-N7{stroke:#FFFFFF;} + .d2-2231164388 .stroke-B1{stroke:#0D32B2;} + .d2-2231164388 .stroke-B2{stroke:#0D32B2;} + .d2-2231164388 .stroke-B3{stroke:#E3E9FD;} + .d2-2231164388 .stroke-B4{stroke:#E3E9FD;} + .d2-2231164388 .stroke-B5{stroke:#EDF0FD;} + .d2-2231164388 .stroke-B6{stroke:#F7F8FE;} + .d2-2231164388 .stroke-AA2{stroke:#4A6FF3;} + .d2-2231164388 .stroke-AA4{stroke:#EDF0FD;} + .d2-2231164388 .stroke-AA5{stroke:#F7F8FE;} + .d2-2231164388 .stroke-AB4{stroke:#EDF0FD;} + .d2-2231164388 .stroke-AB5{stroke:#F7F8FE;} + .d2-2231164388 .background-color-N1{background-color:#0A0F25;} + .d2-2231164388 .background-color-N2{background-color:#676C7E;} + .d2-2231164388 .background-color-N3{background-color:#9499AB;} + .d2-2231164388 .background-color-N4{background-color:#CFD2DD;} + .d2-2231164388 .background-color-N5{background-color:#DEE1EB;} + .d2-2231164388 .background-color-N6{background-color:#EEF1F8;} + .d2-2231164388 .background-color-N7{background-color:#FFFFFF;} + .d2-2231164388 .background-color-B1{background-color:#0D32B2;} + .d2-2231164388 .background-color-B2{background-color:#0D32B2;} + .d2-2231164388 .background-color-B3{background-color:#E3E9FD;} + .d2-2231164388 .background-color-B4{background-color:#E3E9FD;} + .d2-2231164388 .background-color-B5{background-color:#EDF0FD;} + .d2-2231164388 .background-color-B6{background-color:#F7F8FE;} + .d2-2231164388 .background-color-AA2{background-color:#4A6FF3;} + .d2-2231164388 .background-color-AA4{background-color:#EDF0FD;} + .d2-2231164388 .background-color-AA5{background-color:#F7F8FE;} + .d2-2231164388 .background-color-AB4{background-color:#EDF0FD;} + .d2-2231164388 .background-color-AB5{background-color:#F7F8FE;} + .d2-2231164388 .color-N1{color:#0A0F25;} + .d2-2231164388 .color-N2{color:#676C7E;} + .d2-2231164388 .color-N3{color:#9499AB;} + .d2-2231164388 .color-N4{color:#CFD2DD;} + .d2-2231164388 .color-N5{color:#DEE1EB;} + .d2-2231164388 .color-N6{color:#EEF1F8;} + .d2-2231164388 .color-N7{color:#FFFFFF;} + .d2-2231164388 .color-B1{color:#0D32B2;} + .d2-2231164388 .color-B2{color:#0D32B2;} + .d2-2231164388 .color-B3{color:#E3E9FD;} + .d2-2231164388 .color-B4{color:#E3E9FD;} + .d2-2231164388 .color-B5{color:#EDF0FD;} + .d2-2231164388 .color-B6{color:#F7F8FE;} + .d2-2231164388 .color-AA2{color:#4A6FF3;} + .d2-2231164388 .color-AA4{color:#EDF0FD;} + .d2-2231164388 .color-AA5{color:#F7F8FE;} + .d2-2231164388 .color-AB4{color:#EDF0FD;} + .d2-2231164388 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg index 6e4eaac29..a1065e79a 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xab + .d2-3696763502 .fill-N1{fill:#0A0F25;} + .d2-3696763502 .fill-N2{fill:#676C7E;} + .d2-3696763502 .fill-N3{fill:#9499AB;} + .d2-3696763502 .fill-N4{fill:#CFD2DD;} + .d2-3696763502 .fill-N5{fill:#DEE1EB;} + .d2-3696763502 .fill-N6{fill:#EEF1F8;} + .d2-3696763502 .fill-N7{fill:#FFFFFF;} + .d2-3696763502 .fill-B1{fill:#0D32B2;} + .d2-3696763502 .fill-B2{fill:#0D32B2;} + .d2-3696763502 .fill-B3{fill:#E3E9FD;} + .d2-3696763502 .fill-B4{fill:#E3E9FD;} + .d2-3696763502 .fill-B5{fill:#EDF0FD;} + .d2-3696763502 .fill-B6{fill:#F7F8FE;} + .d2-3696763502 .fill-AA2{fill:#4A6FF3;} + .d2-3696763502 .fill-AA4{fill:#EDF0FD;} + .d2-3696763502 .fill-AA5{fill:#F7F8FE;} + .d2-3696763502 .fill-AB4{fill:#EDF0FD;} + .d2-3696763502 .fill-AB5{fill:#F7F8FE;} + .d2-3696763502 .stroke-N1{stroke:#0A0F25;} + .d2-3696763502 .stroke-N2{stroke:#676C7E;} + .d2-3696763502 .stroke-N3{stroke:#9499AB;} + .d2-3696763502 .stroke-N4{stroke:#CFD2DD;} + .d2-3696763502 .stroke-N5{stroke:#DEE1EB;} + .d2-3696763502 .stroke-N6{stroke:#EEF1F8;} + .d2-3696763502 .stroke-N7{stroke:#FFFFFF;} + .d2-3696763502 .stroke-B1{stroke:#0D32B2;} + .d2-3696763502 .stroke-B2{stroke:#0D32B2;} + .d2-3696763502 .stroke-B3{stroke:#E3E9FD;} + .d2-3696763502 .stroke-B4{stroke:#E3E9FD;} + .d2-3696763502 .stroke-B5{stroke:#EDF0FD;} + .d2-3696763502 .stroke-B6{stroke:#F7F8FE;} + .d2-3696763502 .stroke-AA2{stroke:#4A6FF3;} + .d2-3696763502 .stroke-AA4{stroke:#EDF0FD;} + .d2-3696763502 .stroke-AA5{stroke:#F7F8FE;} + .d2-3696763502 .stroke-AB4{stroke:#EDF0FD;} + .d2-3696763502 .stroke-AB5{stroke:#F7F8FE;} + .d2-3696763502 .background-color-N1{background-color:#0A0F25;} + .d2-3696763502 .background-color-N2{background-color:#676C7E;} + .d2-3696763502 .background-color-N3{background-color:#9499AB;} + .d2-3696763502 .background-color-N4{background-color:#CFD2DD;} + .d2-3696763502 .background-color-N5{background-color:#DEE1EB;} + .d2-3696763502 .background-color-N6{background-color:#EEF1F8;} + .d2-3696763502 .background-color-N7{background-color:#FFFFFF;} + .d2-3696763502 .background-color-B1{background-color:#0D32B2;} + .d2-3696763502 .background-color-B2{background-color:#0D32B2;} + .d2-3696763502 .background-color-B3{background-color:#E3E9FD;} + .d2-3696763502 .background-color-B4{background-color:#E3E9FD;} + .d2-3696763502 .background-color-B5{background-color:#EDF0FD;} + .d2-3696763502 .background-color-B6{background-color:#F7F8FE;} + .d2-3696763502 .background-color-AA2{background-color:#4A6FF3;} + .d2-3696763502 .background-color-AA4{background-color:#EDF0FD;} + .d2-3696763502 .background-color-AA5{background-color:#F7F8FE;} + .d2-3696763502 .background-color-AB4{background-color:#EDF0FD;} + .d2-3696763502 .background-color-AB5{background-color:#F7F8FE;} + .d2-3696763502 .color-N1{color:#0A0F25;} + .d2-3696763502 .color-N2{color:#676C7E;} + .d2-3696763502 .color-N3{color:#9499AB;} + .d2-3696763502 .color-N4{color:#CFD2DD;} + .d2-3696763502 .color-N5{color:#DEE1EB;} + .d2-3696763502 .color-N6{color:#EEF1F8;} + .d2-3696763502 .color-N7{color:#FFFFFF;} + .d2-3696763502 .color-B1{color:#0D32B2;} + .d2-3696763502 .color-B2{color:#0D32B2;} + .d2-3696763502 .color-B3{color:#E3E9FD;} + .d2-3696763502 .color-B4{color:#E3E9FD;} + .d2-3696763502 .color-B5{color:#EDF0FD;} + .d2-3696763502 .color-B6{color:#F7F8FE;} + .d2-3696763502 .color-AA2{color:#4A6FF3;} + .d2-3696763502 .color-AA4{color:#EDF0FD;} + .d2-3696763502 .color-AA5{color:#F7F8FE;} + .d2-3696763502 .color-AB4{color:#EDF0FD;} + .d2-3696763502 .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}]]>xab 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 499f0f0e6..17b0218e8 100644 --- a/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xab + .d2-3690897739 .fill-N1{fill:#0A0F25;} + .d2-3690897739 .fill-N2{fill:#676C7E;} + .d2-3690897739 .fill-N3{fill:#9499AB;} + .d2-3690897739 .fill-N4{fill:#CFD2DD;} + .d2-3690897739 .fill-N5{fill:#DEE1EB;} + .d2-3690897739 .fill-N6{fill:#EEF1F8;} + .d2-3690897739 .fill-N7{fill:#FFFFFF;} + .d2-3690897739 .fill-B1{fill:#0D32B2;} + .d2-3690897739 .fill-B2{fill:#0D32B2;} + .d2-3690897739 .fill-B3{fill:#E3E9FD;} + .d2-3690897739 .fill-B4{fill:#E3E9FD;} + .d2-3690897739 .fill-B5{fill:#EDF0FD;} + .d2-3690897739 .fill-B6{fill:#F7F8FE;} + .d2-3690897739 .fill-AA2{fill:#4A6FF3;} + .d2-3690897739 .fill-AA4{fill:#EDF0FD;} + .d2-3690897739 .fill-AA5{fill:#F7F8FE;} + .d2-3690897739 .fill-AB4{fill:#EDF0FD;} + .d2-3690897739 .fill-AB5{fill:#F7F8FE;} + .d2-3690897739 .stroke-N1{stroke:#0A0F25;} + .d2-3690897739 .stroke-N2{stroke:#676C7E;} + .d2-3690897739 .stroke-N3{stroke:#9499AB;} + .d2-3690897739 .stroke-N4{stroke:#CFD2DD;} + .d2-3690897739 .stroke-N5{stroke:#DEE1EB;} + .d2-3690897739 .stroke-N6{stroke:#EEF1F8;} + .d2-3690897739 .stroke-N7{stroke:#FFFFFF;} + .d2-3690897739 .stroke-B1{stroke:#0D32B2;} + .d2-3690897739 .stroke-B2{stroke:#0D32B2;} + .d2-3690897739 .stroke-B3{stroke:#E3E9FD;} + .d2-3690897739 .stroke-B4{stroke:#E3E9FD;} + .d2-3690897739 .stroke-B5{stroke:#EDF0FD;} + .d2-3690897739 .stroke-B6{stroke:#F7F8FE;} + .d2-3690897739 .stroke-AA2{stroke:#4A6FF3;} + .d2-3690897739 .stroke-AA4{stroke:#EDF0FD;} + .d2-3690897739 .stroke-AA5{stroke:#F7F8FE;} + .d2-3690897739 .stroke-AB4{stroke:#EDF0FD;} + .d2-3690897739 .stroke-AB5{stroke:#F7F8FE;} + .d2-3690897739 .background-color-N1{background-color:#0A0F25;} + .d2-3690897739 .background-color-N2{background-color:#676C7E;} + .d2-3690897739 .background-color-N3{background-color:#9499AB;} + .d2-3690897739 .background-color-N4{background-color:#CFD2DD;} + .d2-3690897739 .background-color-N5{background-color:#DEE1EB;} + .d2-3690897739 .background-color-N6{background-color:#EEF1F8;} + .d2-3690897739 .background-color-N7{background-color:#FFFFFF;} + .d2-3690897739 .background-color-B1{background-color:#0D32B2;} + .d2-3690897739 .background-color-B2{background-color:#0D32B2;} + .d2-3690897739 .background-color-B3{background-color:#E3E9FD;} + .d2-3690897739 .background-color-B4{background-color:#E3E9FD;} + .d2-3690897739 .background-color-B5{background-color:#EDF0FD;} + .d2-3690897739 .background-color-B6{background-color:#F7F8FE;} + .d2-3690897739 .background-color-AA2{background-color:#4A6FF3;} + .d2-3690897739 .background-color-AA4{background-color:#EDF0FD;} + .d2-3690897739 .background-color-AA5{background-color:#F7F8FE;} + .d2-3690897739 .background-color-AB4{background-color:#EDF0FD;} + .d2-3690897739 .background-color-AB5{background-color:#F7F8FE;} + .d2-3690897739 .color-N1{color:#0A0F25;} + .d2-3690897739 .color-N2{color:#676C7E;} + .d2-3690897739 .color-N3{color:#9499AB;} + .d2-3690897739 .color-N4{color:#CFD2DD;} + .d2-3690897739 .color-N5{color:#DEE1EB;} + .d2-3690897739 .color-N6{color:#EEF1F8;} + .d2-3690897739 .color-N7{color:#FFFFFF;} + .d2-3690897739 .color-B1{color:#0D32B2;} + .d2-3690897739 .color-B2{color:#0D32B2;} + .d2-3690897739 .color-B3{color:#E3E9FD;} + .d2-3690897739 .color-B4{color:#E3E9FD;} + .d2-3690897739 .color-B5{color:#EDF0FD;} + .d2-3690897739 .color-B6{color:#F7F8FE;} + .d2-3690897739 .color-AA2{color:#4A6FF3;} + .d2-3690897739 .color-AA4{color:#EDF0FD;} + .d2-3690897739 .color-AA5{color:#F7F8FE;} + .d2-3690897739 .color-AB4{color:#EDF0FD;} + .d2-3690897739 .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}]]>xab diff --git a/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg index b1aa1359a..897f8d876 100644 --- a/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Oldest message

    @@ -841,7 +841,7 @@

    Last message

    Next message will be
    inserted here

    -
    M0M1M2M3M4M5M6 +    M0M1M2M3M4M5M6 diff --git a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg index 139232b7d..3da4cc14c 100644 --- a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Oldest message

    @@ -841,7 +841,7 @@

    Last message

    Next message will be
    inserted here

    -
    M0M1M2M3M4M5M6 +    M0M1M2M3M4M5M6 diff --git a/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg index 4ea0b8679..6b1c1e68e 100644 --- a/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -class with rows-numint-timeoutintclass without rows + .d2-39546754 .fill-N1{fill:#0A0F25;} + .d2-39546754 .fill-N2{fill:#676C7E;} + .d2-39546754 .fill-N3{fill:#9499AB;} + .d2-39546754 .fill-N4{fill:#CFD2DD;} + .d2-39546754 .fill-N5{fill:#DEE1EB;} + .d2-39546754 .fill-N6{fill:#EEF1F8;} + .d2-39546754 .fill-N7{fill:#FFFFFF;} + .d2-39546754 .fill-B1{fill:#0D32B2;} + .d2-39546754 .fill-B2{fill:#0D32B2;} + .d2-39546754 .fill-B3{fill:#E3E9FD;} + .d2-39546754 .fill-B4{fill:#E3E9FD;} + .d2-39546754 .fill-B5{fill:#EDF0FD;} + .d2-39546754 .fill-B6{fill:#F7F8FE;} + .d2-39546754 .fill-AA2{fill:#4A6FF3;} + .d2-39546754 .fill-AA4{fill:#EDF0FD;} + .d2-39546754 .fill-AA5{fill:#F7F8FE;} + .d2-39546754 .fill-AB4{fill:#EDF0FD;} + .d2-39546754 .fill-AB5{fill:#F7F8FE;} + .d2-39546754 .stroke-N1{stroke:#0A0F25;} + .d2-39546754 .stroke-N2{stroke:#676C7E;} + .d2-39546754 .stroke-N3{stroke:#9499AB;} + .d2-39546754 .stroke-N4{stroke:#CFD2DD;} + .d2-39546754 .stroke-N5{stroke:#DEE1EB;} + .d2-39546754 .stroke-N6{stroke:#EEF1F8;} + .d2-39546754 .stroke-N7{stroke:#FFFFFF;} + .d2-39546754 .stroke-B1{stroke:#0D32B2;} + .d2-39546754 .stroke-B2{stroke:#0D32B2;} + .d2-39546754 .stroke-B3{stroke:#E3E9FD;} + .d2-39546754 .stroke-B4{stroke:#E3E9FD;} + .d2-39546754 .stroke-B5{stroke:#EDF0FD;} + .d2-39546754 .stroke-B6{stroke:#F7F8FE;} + .d2-39546754 .stroke-AA2{stroke:#4A6FF3;} + .d2-39546754 .stroke-AA4{stroke:#EDF0FD;} + .d2-39546754 .stroke-AA5{stroke:#F7F8FE;} + .d2-39546754 .stroke-AB4{stroke:#EDF0FD;} + .d2-39546754 .stroke-AB5{stroke:#F7F8FE;} + .d2-39546754 .background-color-N1{background-color:#0A0F25;} + .d2-39546754 .background-color-N2{background-color:#676C7E;} + .d2-39546754 .background-color-N3{background-color:#9499AB;} + .d2-39546754 .background-color-N4{background-color:#CFD2DD;} + .d2-39546754 .background-color-N5{background-color:#DEE1EB;} + .d2-39546754 .background-color-N6{background-color:#EEF1F8;} + .d2-39546754 .background-color-N7{background-color:#FFFFFF;} + .d2-39546754 .background-color-B1{background-color:#0D32B2;} + .d2-39546754 .background-color-B2{background-color:#0D32B2;} + .d2-39546754 .background-color-B3{background-color:#E3E9FD;} + .d2-39546754 .background-color-B4{background-color:#E3E9FD;} + .d2-39546754 .background-color-B5{background-color:#EDF0FD;} + .d2-39546754 .background-color-B6{background-color:#F7F8FE;} + .d2-39546754 .background-color-AA2{background-color:#4A6FF3;} + .d2-39546754 .background-color-AA4{background-color:#EDF0FD;} + .d2-39546754 .background-color-AA5{background-color:#F7F8FE;} + .d2-39546754 .background-color-AB4{background-color:#EDF0FD;} + .d2-39546754 .background-color-AB5{background-color:#F7F8FE;} + .d2-39546754 .color-N1{color:#0A0F25;} + .d2-39546754 .color-N2{color:#676C7E;} + .d2-39546754 .color-N3{color:#9499AB;} + .d2-39546754 .color-N4{color:#CFD2DD;} + .d2-39546754 .color-N5{color:#DEE1EB;} + .d2-39546754 .color-N6{color:#EEF1F8;} + .d2-39546754 .color-N7{color:#FFFFFF;} + .d2-39546754 .color-B1{color:#0D32B2;} + .d2-39546754 .color-B2{color:#0D32B2;} + .d2-39546754 .color-B3{color:#E3E9FD;} + .d2-39546754 .color-B4{color:#E3E9FD;} + .d2-39546754 .color-B5{color:#EDF0FD;} + .d2-39546754 .color-B6{color:#F7F8FE;} + .d2-39546754 .color-AA2{color:#4A6FF3;} + .d2-39546754 .color-AA4{color:#EDF0FD;} + .d2-39546754 .color-AA5{color:#F7F8FE;} + .d2-39546754 .color-AB4{color:#EDF0FD;} + .d2-39546754 .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}]]>class with rows-numint-timeoutintclass without rows \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg index 47b06e434..f67fc5c8e 100644 --- a/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -class with rows-numint-timeoutintclass without rows + .d2-817380429 .fill-N1{fill:#0A0F25;} + .d2-817380429 .fill-N2{fill:#676C7E;} + .d2-817380429 .fill-N3{fill:#9499AB;} + .d2-817380429 .fill-N4{fill:#CFD2DD;} + .d2-817380429 .fill-N5{fill:#DEE1EB;} + .d2-817380429 .fill-N6{fill:#EEF1F8;} + .d2-817380429 .fill-N7{fill:#FFFFFF;} + .d2-817380429 .fill-B1{fill:#0D32B2;} + .d2-817380429 .fill-B2{fill:#0D32B2;} + .d2-817380429 .fill-B3{fill:#E3E9FD;} + .d2-817380429 .fill-B4{fill:#E3E9FD;} + .d2-817380429 .fill-B5{fill:#EDF0FD;} + .d2-817380429 .fill-B6{fill:#F7F8FE;} + .d2-817380429 .fill-AA2{fill:#4A6FF3;} + .d2-817380429 .fill-AA4{fill:#EDF0FD;} + .d2-817380429 .fill-AA5{fill:#F7F8FE;} + .d2-817380429 .fill-AB4{fill:#EDF0FD;} + .d2-817380429 .fill-AB5{fill:#F7F8FE;} + .d2-817380429 .stroke-N1{stroke:#0A0F25;} + .d2-817380429 .stroke-N2{stroke:#676C7E;} + .d2-817380429 .stroke-N3{stroke:#9499AB;} + .d2-817380429 .stroke-N4{stroke:#CFD2DD;} + .d2-817380429 .stroke-N5{stroke:#DEE1EB;} + .d2-817380429 .stroke-N6{stroke:#EEF1F8;} + .d2-817380429 .stroke-N7{stroke:#FFFFFF;} + .d2-817380429 .stroke-B1{stroke:#0D32B2;} + .d2-817380429 .stroke-B2{stroke:#0D32B2;} + .d2-817380429 .stroke-B3{stroke:#E3E9FD;} + .d2-817380429 .stroke-B4{stroke:#E3E9FD;} + .d2-817380429 .stroke-B5{stroke:#EDF0FD;} + .d2-817380429 .stroke-B6{stroke:#F7F8FE;} + .d2-817380429 .stroke-AA2{stroke:#4A6FF3;} + .d2-817380429 .stroke-AA4{stroke:#EDF0FD;} + .d2-817380429 .stroke-AA5{stroke:#F7F8FE;} + .d2-817380429 .stroke-AB4{stroke:#EDF0FD;} + .d2-817380429 .stroke-AB5{stroke:#F7F8FE;} + .d2-817380429 .background-color-N1{background-color:#0A0F25;} + .d2-817380429 .background-color-N2{background-color:#676C7E;} + .d2-817380429 .background-color-N3{background-color:#9499AB;} + .d2-817380429 .background-color-N4{background-color:#CFD2DD;} + .d2-817380429 .background-color-N5{background-color:#DEE1EB;} + .d2-817380429 .background-color-N6{background-color:#EEF1F8;} + .d2-817380429 .background-color-N7{background-color:#FFFFFF;} + .d2-817380429 .background-color-B1{background-color:#0D32B2;} + .d2-817380429 .background-color-B2{background-color:#0D32B2;} + .d2-817380429 .background-color-B3{background-color:#E3E9FD;} + .d2-817380429 .background-color-B4{background-color:#E3E9FD;} + .d2-817380429 .background-color-B5{background-color:#EDF0FD;} + .d2-817380429 .background-color-B6{background-color:#F7F8FE;} + .d2-817380429 .background-color-AA2{background-color:#4A6FF3;} + .d2-817380429 .background-color-AA4{background-color:#EDF0FD;} + .d2-817380429 .background-color-AA5{background-color:#F7F8FE;} + .d2-817380429 .background-color-AB4{background-color:#EDF0FD;} + .d2-817380429 .background-color-AB5{background-color:#F7F8FE;} + .d2-817380429 .color-N1{color:#0A0F25;} + .d2-817380429 .color-N2{color:#676C7E;} + .d2-817380429 .color-N3{color:#9499AB;} + .d2-817380429 .color-N4{color:#CFD2DD;} + .d2-817380429 .color-N5{color:#DEE1EB;} + .d2-817380429 .color-N6{color:#EEF1F8;} + .d2-817380429 .color-N7{color:#FFFFFF;} + .d2-817380429 .color-B1{color:#0D32B2;} + .d2-817380429 .color-B2{color:#0D32B2;} + .d2-817380429 .color-B3{color:#E3E9FD;} + .d2-817380429 .color-B4{color:#E3E9FD;} + .d2-817380429 .color-B5{color:#EDF0FD;} + .d2-817380429 .color-B6{color:#F7F8FE;} + .d2-817380429 .color-AA2{color:#4A6FF3;} + .d2-817380429 .color-AA4{color:#EDF0FD;} + .d2-817380429 .color-AA5{color:#F7F8FE;} + .d2-817380429 .color-AB4{color:#EDF0FD;} + .d2-817380429 .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}]]>class with rows-numint-timeoutintclass without rows \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg index b0a8e753c..8c0522b09 100644 --- a/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -hellogoodbye + .d2-3421221401 .fill-N1{fill:#0A0F25;} + .d2-3421221401 .fill-N2{fill:#676C7E;} + .d2-3421221401 .fill-N3{fill:#9499AB;} + .d2-3421221401 .fill-N4{fill:#CFD2DD;} + .d2-3421221401 .fill-N5{fill:#DEE1EB;} + .d2-3421221401 .fill-N6{fill:#EEF1F8;} + .d2-3421221401 .fill-N7{fill:#FFFFFF;} + .d2-3421221401 .fill-B1{fill:#0D32B2;} + .d2-3421221401 .fill-B2{fill:#0D32B2;} + .d2-3421221401 .fill-B3{fill:#E3E9FD;} + .d2-3421221401 .fill-B4{fill:#E3E9FD;} + .d2-3421221401 .fill-B5{fill:#EDF0FD;} + .d2-3421221401 .fill-B6{fill:#F7F8FE;} + .d2-3421221401 .fill-AA2{fill:#4A6FF3;} + .d2-3421221401 .fill-AA4{fill:#EDF0FD;} + .d2-3421221401 .fill-AA5{fill:#F7F8FE;} + .d2-3421221401 .fill-AB4{fill:#EDF0FD;} + .d2-3421221401 .fill-AB5{fill:#F7F8FE;} + .d2-3421221401 .stroke-N1{stroke:#0A0F25;} + .d2-3421221401 .stroke-N2{stroke:#676C7E;} + .d2-3421221401 .stroke-N3{stroke:#9499AB;} + .d2-3421221401 .stroke-N4{stroke:#CFD2DD;} + .d2-3421221401 .stroke-N5{stroke:#DEE1EB;} + .d2-3421221401 .stroke-N6{stroke:#EEF1F8;} + .d2-3421221401 .stroke-N7{stroke:#FFFFFF;} + .d2-3421221401 .stroke-B1{stroke:#0D32B2;} + .d2-3421221401 .stroke-B2{stroke:#0D32B2;} + .d2-3421221401 .stroke-B3{stroke:#E3E9FD;} + .d2-3421221401 .stroke-B4{stroke:#E3E9FD;} + .d2-3421221401 .stroke-B5{stroke:#EDF0FD;} + .d2-3421221401 .stroke-B6{stroke:#F7F8FE;} + .d2-3421221401 .stroke-AA2{stroke:#4A6FF3;} + .d2-3421221401 .stroke-AA4{stroke:#EDF0FD;} + .d2-3421221401 .stroke-AA5{stroke:#F7F8FE;} + .d2-3421221401 .stroke-AB4{stroke:#EDF0FD;} + .d2-3421221401 .stroke-AB5{stroke:#F7F8FE;} + .d2-3421221401 .background-color-N1{background-color:#0A0F25;} + .d2-3421221401 .background-color-N2{background-color:#676C7E;} + .d2-3421221401 .background-color-N3{background-color:#9499AB;} + .d2-3421221401 .background-color-N4{background-color:#CFD2DD;} + .d2-3421221401 .background-color-N5{background-color:#DEE1EB;} + .d2-3421221401 .background-color-N6{background-color:#EEF1F8;} + .d2-3421221401 .background-color-N7{background-color:#FFFFFF;} + .d2-3421221401 .background-color-B1{background-color:#0D32B2;} + .d2-3421221401 .background-color-B2{background-color:#0D32B2;} + .d2-3421221401 .background-color-B3{background-color:#E3E9FD;} + .d2-3421221401 .background-color-B4{background-color:#E3E9FD;} + .d2-3421221401 .background-color-B5{background-color:#EDF0FD;} + .d2-3421221401 .background-color-B6{background-color:#F7F8FE;} + .d2-3421221401 .background-color-AA2{background-color:#4A6FF3;} + .d2-3421221401 .background-color-AA4{background-color:#EDF0FD;} + .d2-3421221401 .background-color-AA5{background-color:#F7F8FE;} + .d2-3421221401 .background-color-AB4{background-color:#EDF0FD;} + .d2-3421221401 .background-color-AB5{background-color:#F7F8FE;} + .d2-3421221401 .color-N1{color:#0A0F25;} + .d2-3421221401 .color-N2{color:#676C7E;} + .d2-3421221401 .color-N3{color:#9499AB;} + .d2-3421221401 .color-N4{color:#CFD2DD;} + .d2-3421221401 .color-N5{color:#DEE1EB;} + .d2-3421221401 .color-N6{color:#EEF1F8;} + .d2-3421221401 .color-N7{color:#FFFFFF;} + .d2-3421221401 .color-B1{color:#0D32B2;} + .d2-3421221401 .color-B2{color:#0D32B2;} + .d2-3421221401 .color-B3{color:#E3E9FD;} + .d2-3421221401 .color-B4{color:#E3E9FD;} + .d2-3421221401 .color-B5{color:#EDF0FD;} + .d2-3421221401 .color-B6{color:#F7F8FE;} + .d2-3421221401 .color-AA2{color:#4A6FF3;} + .d2-3421221401 .color-AA4{color:#EDF0FD;} + .d2-3421221401 .color-AA5{color:#F7F8FE;} + .d2-3421221401 .color-AB4{color:#EDF0FD;} + .d2-3421221401 .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}]]>hellogoodbye diff --git a/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg index a056eacd7..73d62a6f4 100644 --- a/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -hellogoodbye + .d2-4171250924 .fill-N1{fill:#0A0F25;} + .d2-4171250924 .fill-N2{fill:#676C7E;} + .d2-4171250924 .fill-N3{fill:#9499AB;} + .d2-4171250924 .fill-N4{fill:#CFD2DD;} + .d2-4171250924 .fill-N5{fill:#DEE1EB;} + .d2-4171250924 .fill-N6{fill:#EEF1F8;} + .d2-4171250924 .fill-N7{fill:#FFFFFF;} + .d2-4171250924 .fill-B1{fill:#0D32B2;} + .d2-4171250924 .fill-B2{fill:#0D32B2;} + .d2-4171250924 .fill-B3{fill:#E3E9FD;} + .d2-4171250924 .fill-B4{fill:#E3E9FD;} + .d2-4171250924 .fill-B5{fill:#EDF0FD;} + .d2-4171250924 .fill-B6{fill:#F7F8FE;} + .d2-4171250924 .fill-AA2{fill:#4A6FF3;} + .d2-4171250924 .fill-AA4{fill:#EDF0FD;} + .d2-4171250924 .fill-AA5{fill:#F7F8FE;} + .d2-4171250924 .fill-AB4{fill:#EDF0FD;} + .d2-4171250924 .fill-AB5{fill:#F7F8FE;} + .d2-4171250924 .stroke-N1{stroke:#0A0F25;} + .d2-4171250924 .stroke-N2{stroke:#676C7E;} + .d2-4171250924 .stroke-N3{stroke:#9499AB;} + .d2-4171250924 .stroke-N4{stroke:#CFD2DD;} + .d2-4171250924 .stroke-N5{stroke:#DEE1EB;} + .d2-4171250924 .stroke-N6{stroke:#EEF1F8;} + .d2-4171250924 .stroke-N7{stroke:#FFFFFF;} + .d2-4171250924 .stroke-B1{stroke:#0D32B2;} + .d2-4171250924 .stroke-B2{stroke:#0D32B2;} + .d2-4171250924 .stroke-B3{stroke:#E3E9FD;} + .d2-4171250924 .stroke-B4{stroke:#E3E9FD;} + .d2-4171250924 .stroke-B5{stroke:#EDF0FD;} + .d2-4171250924 .stroke-B6{stroke:#F7F8FE;} + .d2-4171250924 .stroke-AA2{stroke:#4A6FF3;} + .d2-4171250924 .stroke-AA4{stroke:#EDF0FD;} + .d2-4171250924 .stroke-AA5{stroke:#F7F8FE;} + .d2-4171250924 .stroke-AB4{stroke:#EDF0FD;} + .d2-4171250924 .stroke-AB5{stroke:#F7F8FE;} + .d2-4171250924 .background-color-N1{background-color:#0A0F25;} + .d2-4171250924 .background-color-N2{background-color:#676C7E;} + .d2-4171250924 .background-color-N3{background-color:#9499AB;} + .d2-4171250924 .background-color-N4{background-color:#CFD2DD;} + .d2-4171250924 .background-color-N5{background-color:#DEE1EB;} + .d2-4171250924 .background-color-N6{background-color:#EEF1F8;} + .d2-4171250924 .background-color-N7{background-color:#FFFFFF;} + .d2-4171250924 .background-color-B1{background-color:#0D32B2;} + .d2-4171250924 .background-color-B2{background-color:#0D32B2;} + .d2-4171250924 .background-color-B3{background-color:#E3E9FD;} + .d2-4171250924 .background-color-B4{background-color:#E3E9FD;} + .d2-4171250924 .background-color-B5{background-color:#EDF0FD;} + .d2-4171250924 .background-color-B6{background-color:#F7F8FE;} + .d2-4171250924 .background-color-AA2{background-color:#4A6FF3;} + .d2-4171250924 .background-color-AA4{background-color:#EDF0FD;} + .d2-4171250924 .background-color-AA5{background-color:#F7F8FE;} + .d2-4171250924 .background-color-AB4{background-color:#EDF0FD;} + .d2-4171250924 .background-color-AB5{background-color:#F7F8FE;} + .d2-4171250924 .color-N1{color:#0A0F25;} + .d2-4171250924 .color-N2{color:#676C7E;} + .d2-4171250924 .color-N3{color:#9499AB;} + .d2-4171250924 .color-N4{color:#CFD2DD;} + .d2-4171250924 .color-N5{color:#DEE1EB;} + .d2-4171250924 .color-N6{color:#EEF1F8;} + .d2-4171250924 .color-N7{color:#FFFFFF;} + .d2-4171250924 .color-B1{color:#0D32B2;} + .d2-4171250924 .color-B2{color:#0D32B2;} + .d2-4171250924 .color-B3{color:#E3E9FD;} + .d2-4171250924 .color-B4{color:#E3E9FD;} + .d2-4171250924 .color-B5{color:#EDF0FD;} + .d2-4171250924 .color-B6{color:#F7F8FE;} + .d2-4171250924 .color-AA2{color:#4A6FF3;} + .d2-4171250924 .color-AA4{color:#EDF0FD;} + .d2-4171250924 .color-AA5{color:#F7F8FE;} + .d2-4171250924 .color-AB4{color:#EDF0FD;} + .d2-4171250924 .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}]]>hellogoodbye 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 27f91aa49..4365ec26c 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,16 +1,16 @@ -abcxyz + .d2-1778933596 .fill-N1{fill:#0A0F25;} + .d2-1778933596 .fill-N2{fill:#676C7E;} + .d2-1778933596 .fill-N3{fill:#9499AB;} + .d2-1778933596 .fill-N4{fill:#CFD2DD;} + .d2-1778933596 .fill-N5{fill:#DEE1EB;} + .d2-1778933596 .fill-N6{fill:#EEF1F8;} + .d2-1778933596 .fill-N7{fill:#FFFFFF;} + .d2-1778933596 .fill-B1{fill:#0D32B2;} + .d2-1778933596 .fill-B2{fill:#0D32B2;} + .d2-1778933596 .fill-B3{fill:#E3E9FD;} + .d2-1778933596 .fill-B4{fill:#E3E9FD;} + .d2-1778933596 .fill-B5{fill:#EDF0FD;} + .d2-1778933596 .fill-B6{fill:#F7F8FE;} + .d2-1778933596 .fill-AA2{fill:#4A6FF3;} + .d2-1778933596 .fill-AA4{fill:#EDF0FD;} + .d2-1778933596 .fill-AA5{fill:#F7F8FE;} + .d2-1778933596 .fill-AB4{fill:#EDF0FD;} + .d2-1778933596 .fill-AB5{fill:#F7F8FE;} + .d2-1778933596 .stroke-N1{stroke:#0A0F25;} + .d2-1778933596 .stroke-N2{stroke:#676C7E;} + .d2-1778933596 .stroke-N3{stroke:#9499AB;} + .d2-1778933596 .stroke-N4{stroke:#CFD2DD;} + .d2-1778933596 .stroke-N5{stroke:#DEE1EB;} + .d2-1778933596 .stroke-N6{stroke:#EEF1F8;} + .d2-1778933596 .stroke-N7{stroke:#FFFFFF;} + .d2-1778933596 .stroke-B1{stroke:#0D32B2;} + .d2-1778933596 .stroke-B2{stroke:#0D32B2;} + .d2-1778933596 .stroke-B3{stroke:#E3E9FD;} + .d2-1778933596 .stroke-B4{stroke:#E3E9FD;} + .d2-1778933596 .stroke-B5{stroke:#EDF0FD;} + .d2-1778933596 .stroke-B6{stroke:#F7F8FE;} + .d2-1778933596 .stroke-AA2{stroke:#4A6FF3;} + .d2-1778933596 .stroke-AA4{stroke:#EDF0FD;} + .d2-1778933596 .stroke-AA5{stroke:#F7F8FE;} + .d2-1778933596 .stroke-AB4{stroke:#EDF0FD;} + .d2-1778933596 .stroke-AB5{stroke:#F7F8FE;} + .d2-1778933596 .background-color-N1{background-color:#0A0F25;} + .d2-1778933596 .background-color-N2{background-color:#676C7E;} + .d2-1778933596 .background-color-N3{background-color:#9499AB;} + .d2-1778933596 .background-color-N4{background-color:#CFD2DD;} + .d2-1778933596 .background-color-N5{background-color:#DEE1EB;} + .d2-1778933596 .background-color-N6{background-color:#EEF1F8;} + .d2-1778933596 .background-color-N7{background-color:#FFFFFF;} + .d2-1778933596 .background-color-B1{background-color:#0D32B2;} + .d2-1778933596 .background-color-B2{background-color:#0D32B2;} + .d2-1778933596 .background-color-B3{background-color:#E3E9FD;} + .d2-1778933596 .background-color-B4{background-color:#E3E9FD;} + .d2-1778933596 .background-color-B5{background-color:#EDF0FD;} + .d2-1778933596 .background-color-B6{background-color:#F7F8FE;} + .d2-1778933596 .background-color-AA2{background-color:#4A6FF3;} + .d2-1778933596 .background-color-AA4{background-color:#EDF0FD;} + .d2-1778933596 .background-color-AA5{background-color:#F7F8FE;} + .d2-1778933596 .background-color-AB4{background-color:#EDF0FD;} + .d2-1778933596 .background-color-AB5{background-color:#F7F8FE;} + .d2-1778933596 .color-N1{color:#0A0F25;} + .d2-1778933596 .color-N2{color:#676C7E;} + .d2-1778933596 .color-N3{color:#9499AB;} + .d2-1778933596 .color-N4{color:#CFD2DD;} + .d2-1778933596 .color-N5{color:#DEE1EB;} + .d2-1778933596 .color-N6{color:#EEF1F8;} + .d2-1778933596 .color-N7{color:#FFFFFF;} + .d2-1778933596 .color-B1{color:#0D32B2;} + .d2-1778933596 .color-B2{color:#0D32B2;} + .d2-1778933596 .color-B3{color:#E3E9FD;} + .d2-1778933596 .color-B4{color:#E3E9FD;} + .d2-1778933596 .color-B5{color:#EDF0FD;} + .d2-1778933596 .color-B6{color:#F7F8FE;} + .d2-1778933596 .color-AA2{color:#4A6FF3;} + .d2-1778933596 .color-AA4{color:#EDF0FD;} + .d2-1778933596 .color-AA5{color:#F7F8FE;} + .d2-1778933596 .color-AB4{color:#EDF0FD;} + .d2-1778933596 .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}]]>abcxyz 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 bdbd23c88..9d2200a2b 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,16 +1,16 @@ -abcxyz + .d2-980958901 .fill-N1{fill:#0A0F25;} + .d2-980958901 .fill-N2{fill:#676C7E;} + .d2-980958901 .fill-N3{fill:#9499AB;} + .d2-980958901 .fill-N4{fill:#CFD2DD;} + .d2-980958901 .fill-N5{fill:#DEE1EB;} + .d2-980958901 .fill-N6{fill:#EEF1F8;} + .d2-980958901 .fill-N7{fill:#FFFFFF;} + .d2-980958901 .fill-B1{fill:#0D32B2;} + .d2-980958901 .fill-B2{fill:#0D32B2;} + .d2-980958901 .fill-B3{fill:#E3E9FD;} + .d2-980958901 .fill-B4{fill:#E3E9FD;} + .d2-980958901 .fill-B5{fill:#EDF0FD;} + .d2-980958901 .fill-B6{fill:#F7F8FE;} + .d2-980958901 .fill-AA2{fill:#4A6FF3;} + .d2-980958901 .fill-AA4{fill:#EDF0FD;} + .d2-980958901 .fill-AA5{fill:#F7F8FE;} + .d2-980958901 .fill-AB4{fill:#EDF0FD;} + .d2-980958901 .fill-AB5{fill:#F7F8FE;} + .d2-980958901 .stroke-N1{stroke:#0A0F25;} + .d2-980958901 .stroke-N2{stroke:#676C7E;} + .d2-980958901 .stroke-N3{stroke:#9499AB;} + .d2-980958901 .stroke-N4{stroke:#CFD2DD;} + .d2-980958901 .stroke-N5{stroke:#DEE1EB;} + .d2-980958901 .stroke-N6{stroke:#EEF1F8;} + .d2-980958901 .stroke-N7{stroke:#FFFFFF;} + .d2-980958901 .stroke-B1{stroke:#0D32B2;} + .d2-980958901 .stroke-B2{stroke:#0D32B2;} + .d2-980958901 .stroke-B3{stroke:#E3E9FD;} + .d2-980958901 .stroke-B4{stroke:#E3E9FD;} + .d2-980958901 .stroke-B5{stroke:#EDF0FD;} + .d2-980958901 .stroke-B6{stroke:#F7F8FE;} + .d2-980958901 .stroke-AA2{stroke:#4A6FF3;} + .d2-980958901 .stroke-AA4{stroke:#EDF0FD;} + .d2-980958901 .stroke-AA5{stroke:#F7F8FE;} + .d2-980958901 .stroke-AB4{stroke:#EDF0FD;} + .d2-980958901 .stroke-AB5{stroke:#F7F8FE;} + .d2-980958901 .background-color-N1{background-color:#0A0F25;} + .d2-980958901 .background-color-N2{background-color:#676C7E;} + .d2-980958901 .background-color-N3{background-color:#9499AB;} + .d2-980958901 .background-color-N4{background-color:#CFD2DD;} + .d2-980958901 .background-color-N5{background-color:#DEE1EB;} + .d2-980958901 .background-color-N6{background-color:#EEF1F8;} + .d2-980958901 .background-color-N7{background-color:#FFFFFF;} + .d2-980958901 .background-color-B1{background-color:#0D32B2;} + .d2-980958901 .background-color-B2{background-color:#0D32B2;} + .d2-980958901 .background-color-B3{background-color:#E3E9FD;} + .d2-980958901 .background-color-B4{background-color:#E3E9FD;} + .d2-980958901 .background-color-B5{background-color:#EDF0FD;} + .d2-980958901 .background-color-B6{background-color:#F7F8FE;} + .d2-980958901 .background-color-AA2{background-color:#4A6FF3;} + .d2-980958901 .background-color-AA4{background-color:#EDF0FD;} + .d2-980958901 .background-color-AA5{background-color:#F7F8FE;} + .d2-980958901 .background-color-AB4{background-color:#EDF0FD;} + .d2-980958901 .background-color-AB5{background-color:#F7F8FE;} + .d2-980958901 .color-N1{color:#0A0F25;} + .d2-980958901 .color-N2{color:#676C7E;} + .d2-980958901 .color-N3{color:#9499AB;} + .d2-980958901 .color-N4{color:#CFD2DD;} + .d2-980958901 .color-N5{color:#DEE1EB;} + .d2-980958901 .color-N6{color:#EEF1F8;} + .d2-980958901 .color-N7{color:#FFFFFF;} + .d2-980958901 .color-B1{color:#0D32B2;} + .d2-980958901 .color-B2{color:#0D32B2;} + .d2-980958901 .color-B3{color:#E3E9FD;} + .d2-980958901 .color-B4{color:#E3E9FD;} + .d2-980958901 .color-B5{color:#EDF0FD;} + .d2-980958901 .color-B6{color:#F7F8FE;} + .d2-980958901 .color-AA2{color:#4A6FF3;} + .d2-980958901 .color-AA4{color:#EDF0FD;} + .d2-980958901 .color-AA5{color:#F7F8FE;} + .d2-980958901 .color-AB4{color:#EDF0FD;} + .d2-980958901 .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}]]>abcxyz diff --git a/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg index fa81a3997..821672833 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-541041613 .fill-N1{fill:#0A0F25;} + .d2-541041613 .fill-N2{fill:#676C7E;} + .d2-541041613 .fill-N3{fill:#9499AB;} + .d2-541041613 .fill-N4{fill:#CFD2DD;} + .d2-541041613 .fill-N5{fill:#DEE1EB;} + .d2-541041613 .fill-N6{fill:#EEF1F8;} + .d2-541041613 .fill-N7{fill:#FFFFFF;} + .d2-541041613 .fill-B1{fill:#0D32B2;} + .d2-541041613 .fill-B2{fill:#0D32B2;} + .d2-541041613 .fill-B3{fill:#E3E9FD;} + .d2-541041613 .fill-B4{fill:#E3E9FD;} + .d2-541041613 .fill-B5{fill:#EDF0FD;} + .d2-541041613 .fill-B6{fill:#F7F8FE;} + .d2-541041613 .fill-AA2{fill:#4A6FF3;} + .d2-541041613 .fill-AA4{fill:#EDF0FD;} + .d2-541041613 .fill-AA5{fill:#F7F8FE;} + .d2-541041613 .fill-AB4{fill:#EDF0FD;} + .d2-541041613 .fill-AB5{fill:#F7F8FE;} + .d2-541041613 .stroke-N1{stroke:#0A0F25;} + .d2-541041613 .stroke-N2{stroke:#676C7E;} + .d2-541041613 .stroke-N3{stroke:#9499AB;} + .d2-541041613 .stroke-N4{stroke:#CFD2DD;} + .d2-541041613 .stroke-N5{stroke:#DEE1EB;} + .d2-541041613 .stroke-N6{stroke:#EEF1F8;} + .d2-541041613 .stroke-N7{stroke:#FFFFFF;} + .d2-541041613 .stroke-B1{stroke:#0D32B2;} + .d2-541041613 .stroke-B2{stroke:#0D32B2;} + .d2-541041613 .stroke-B3{stroke:#E3E9FD;} + .d2-541041613 .stroke-B4{stroke:#E3E9FD;} + .d2-541041613 .stroke-B5{stroke:#EDF0FD;} + .d2-541041613 .stroke-B6{stroke:#F7F8FE;} + .d2-541041613 .stroke-AA2{stroke:#4A6FF3;} + .d2-541041613 .stroke-AA4{stroke:#EDF0FD;} + .d2-541041613 .stroke-AA5{stroke:#F7F8FE;} + .d2-541041613 .stroke-AB4{stroke:#EDF0FD;} + .d2-541041613 .stroke-AB5{stroke:#F7F8FE;} + .d2-541041613 .background-color-N1{background-color:#0A0F25;} + .d2-541041613 .background-color-N2{background-color:#676C7E;} + .d2-541041613 .background-color-N3{background-color:#9499AB;} + .d2-541041613 .background-color-N4{background-color:#CFD2DD;} + .d2-541041613 .background-color-N5{background-color:#DEE1EB;} + .d2-541041613 .background-color-N6{background-color:#EEF1F8;} + .d2-541041613 .background-color-N7{background-color:#FFFFFF;} + .d2-541041613 .background-color-B1{background-color:#0D32B2;} + .d2-541041613 .background-color-B2{background-color:#0D32B2;} + .d2-541041613 .background-color-B3{background-color:#E3E9FD;} + .d2-541041613 .background-color-B4{background-color:#E3E9FD;} + .d2-541041613 .background-color-B5{background-color:#EDF0FD;} + .d2-541041613 .background-color-B6{background-color:#F7F8FE;} + .d2-541041613 .background-color-AA2{background-color:#4A6FF3;} + .d2-541041613 .background-color-AA4{background-color:#EDF0FD;} + .d2-541041613 .background-color-AA5{background-color:#F7F8FE;} + .d2-541041613 .background-color-AB4{background-color:#EDF0FD;} + .d2-541041613 .background-color-AB5{background-color:#F7F8FE;} + .d2-541041613 .color-N1{color:#0A0F25;} + .d2-541041613 .color-N2{color:#676C7E;} + .d2-541041613 .color-N3{color:#9499AB;} + .d2-541041613 .color-N4{color:#CFD2DD;} + .d2-541041613 .color-N5{color:#DEE1EB;} + .d2-541041613 .color-N6{color:#EEF1F8;} + .d2-541041613 .color-N7{color:#FFFFFF;} + .d2-541041613 .color-B1{color:#0D32B2;} + .d2-541041613 .color-B2{color:#0D32B2;} + .d2-541041613 .color-B3{color:#E3E9FD;} + .d2-541041613 .color-B4{color:#E3E9FD;} + .d2-541041613 .color-B5{color:#EDF0FD;} + .d2-541041613 .color-B6{color:#F7F8FE;} + .d2-541041613 .color-AA2{color:#4A6FF3;} + .d2-541041613 .color-AA4{color:#EDF0FD;} + .d2-541041613 .color-AA5{color:#F7F8FE;} + .d2-541041613 .color-AB4{color:#EDF0FD;} + .d2-541041613 .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/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg index fa81a3997..821672833 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-541041613 .fill-N1{fill:#0A0F25;} + .d2-541041613 .fill-N2{fill:#676C7E;} + .d2-541041613 .fill-N3{fill:#9499AB;} + .d2-541041613 .fill-N4{fill:#CFD2DD;} + .d2-541041613 .fill-N5{fill:#DEE1EB;} + .d2-541041613 .fill-N6{fill:#EEF1F8;} + .d2-541041613 .fill-N7{fill:#FFFFFF;} + .d2-541041613 .fill-B1{fill:#0D32B2;} + .d2-541041613 .fill-B2{fill:#0D32B2;} + .d2-541041613 .fill-B3{fill:#E3E9FD;} + .d2-541041613 .fill-B4{fill:#E3E9FD;} + .d2-541041613 .fill-B5{fill:#EDF0FD;} + .d2-541041613 .fill-B6{fill:#F7F8FE;} + .d2-541041613 .fill-AA2{fill:#4A6FF3;} + .d2-541041613 .fill-AA4{fill:#EDF0FD;} + .d2-541041613 .fill-AA5{fill:#F7F8FE;} + .d2-541041613 .fill-AB4{fill:#EDF0FD;} + .d2-541041613 .fill-AB5{fill:#F7F8FE;} + .d2-541041613 .stroke-N1{stroke:#0A0F25;} + .d2-541041613 .stroke-N2{stroke:#676C7E;} + .d2-541041613 .stroke-N3{stroke:#9499AB;} + .d2-541041613 .stroke-N4{stroke:#CFD2DD;} + .d2-541041613 .stroke-N5{stroke:#DEE1EB;} + .d2-541041613 .stroke-N6{stroke:#EEF1F8;} + .d2-541041613 .stroke-N7{stroke:#FFFFFF;} + .d2-541041613 .stroke-B1{stroke:#0D32B2;} + .d2-541041613 .stroke-B2{stroke:#0D32B2;} + .d2-541041613 .stroke-B3{stroke:#E3E9FD;} + .d2-541041613 .stroke-B4{stroke:#E3E9FD;} + .d2-541041613 .stroke-B5{stroke:#EDF0FD;} + .d2-541041613 .stroke-B6{stroke:#F7F8FE;} + .d2-541041613 .stroke-AA2{stroke:#4A6FF3;} + .d2-541041613 .stroke-AA4{stroke:#EDF0FD;} + .d2-541041613 .stroke-AA5{stroke:#F7F8FE;} + .d2-541041613 .stroke-AB4{stroke:#EDF0FD;} + .d2-541041613 .stroke-AB5{stroke:#F7F8FE;} + .d2-541041613 .background-color-N1{background-color:#0A0F25;} + .d2-541041613 .background-color-N2{background-color:#676C7E;} + .d2-541041613 .background-color-N3{background-color:#9499AB;} + .d2-541041613 .background-color-N4{background-color:#CFD2DD;} + .d2-541041613 .background-color-N5{background-color:#DEE1EB;} + .d2-541041613 .background-color-N6{background-color:#EEF1F8;} + .d2-541041613 .background-color-N7{background-color:#FFFFFF;} + .d2-541041613 .background-color-B1{background-color:#0D32B2;} + .d2-541041613 .background-color-B2{background-color:#0D32B2;} + .d2-541041613 .background-color-B3{background-color:#E3E9FD;} + .d2-541041613 .background-color-B4{background-color:#E3E9FD;} + .d2-541041613 .background-color-B5{background-color:#EDF0FD;} + .d2-541041613 .background-color-B6{background-color:#F7F8FE;} + .d2-541041613 .background-color-AA2{background-color:#4A6FF3;} + .d2-541041613 .background-color-AA4{background-color:#EDF0FD;} + .d2-541041613 .background-color-AA5{background-color:#F7F8FE;} + .d2-541041613 .background-color-AB4{background-color:#EDF0FD;} + .d2-541041613 .background-color-AB5{background-color:#F7F8FE;} + .d2-541041613 .color-N1{color:#0A0F25;} + .d2-541041613 .color-N2{color:#676C7E;} + .d2-541041613 .color-N3{color:#9499AB;} + .d2-541041613 .color-N4{color:#CFD2DD;} + .d2-541041613 .color-N5{color:#DEE1EB;} + .d2-541041613 .color-N6{color:#EEF1F8;} + .d2-541041613 .color-N7{color:#FFFFFF;} + .d2-541041613 .color-B1{color:#0D32B2;} + .d2-541041613 .color-B2{color:#0D32B2;} + .d2-541041613 .color-B3{color:#E3E9FD;} + .d2-541041613 .color-B4{color:#E3E9FD;} + .d2-541041613 .color-B5{color:#EDF0FD;} + .d2-541041613 .color-B6{color:#F7F8FE;} + .d2-541041613 .color-AA2{color:#4A6FF3;} + .d2-541041613 .color-AA4{color:#EDF0FD;} + .d2-541041613 .color-AA5{color:#F7F8FE;} + .d2-541041613 .color-AB4{color:#EDF0FD;} + .d2-541041613 .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 005567d0d..cf7edb7b3 100644 --- a/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo + .d2-1953358309 .fill-N1{fill:#0A0F25;} + .d2-1953358309 .fill-N2{fill:#676C7E;} + .d2-1953358309 .fill-N3{fill:#9499AB;} + .d2-1953358309 .fill-N4{fill:#CFD2DD;} + .d2-1953358309 .fill-N5{fill:#DEE1EB;} + .d2-1953358309 .fill-N6{fill:#EEF1F8;} + .d2-1953358309 .fill-N7{fill:#FFFFFF;} + .d2-1953358309 .fill-B1{fill:#0D32B2;} + .d2-1953358309 .fill-B2{fill:#0D32B2;} + .d2-1953358309 .fill-B3{fill:#E3E9FD;} + .d2-1953358309 .fill-B4{fill:#E3E9FD;} + .d2-1953358309 .fill-B5{fill:#EDF0FD;} + .d2-1953358309 .fill-B6{fill:#F7F8FE;} + .d2-1953358309 .fill-AA2{fill:#4A6FF3;} + .d2-1953358309 .fill-AA4{fill:#EDF0FD;} + .d2-1953358309 .fill-AA5{fill:#F7F8FE;} + .d2-1953358309 .fill-AB4{fill:#EDF0FD;} + .d2-1953358309 .fill-AB5{fill:#F7F8FE;} + .d2-1953358309 .stroke-N1{stroke:#0A0F25;} + .d2-1953358309 .stroke-N2{stroke:#676C7E;} + .d2-1953358309 .stroke-N3{stroke:#9499AB;} + .d2-1953358309 .stroke-N4{stroke:#CFD2DD;} + .d2-1953358309 .stroke-N5{stroke:#DEE1EB;} + .d2-1953358309 .stroke-N6{stroke:#EEF1F8;} + .d2-1953358309 .stroke-N7{stroke:#FFFFFF;} + .d2-1953358309 .stroke-B1{stroke:#0D32B2;} + .d2-1953358309 .stroke-B2{stroke:#0D32B2;} + .d2-1953358309 .stroke-B3{stroke:#E3E9FD;} + .d2-1953358309 .stroke-B4{stroke:#E3E9FD;} + .d2-1953358309 .stroke-B5{stroke:#EDF0FD;} + .d2-1953358309 .stroke-B6{stroke:#F7F8FE;} + .d2-1953358309 .stroke-AA2{stroke:#4A6FF3;} + .d2-1953358309 .stroke-AA4{stroke:#EDF0FD;} + .d2-1953358309 .stroke-AA5{stroke:#F7F8FE;} + .d2-1953358309 .stroke-AB4{stroke:#EDF0FD;} + .d2-1953358309 .stroke-AB5{stroke:#F7F8FE;} + .d2-1953358309 .background-color-N1{background-color:#0A0F25;} + .d2-1953358309 .background-color-N2{background-color:#676C7E;} + .d2-1953358309 .background-color-N3{background-color:#9499AB;} + .d2-1953358309 .background-color-N4{background-color:#CFD2DD;} + .d2-1953358309 .background-color-N5{background-color:#DEE1EB;} + .d2-1953358309 .background-color-N6{background-color:#EEF1F8;} + .d2-1953358309 .background-color-N7{background-color:#FFFFFF;} + .d2-1953358309 .background-color-B1{background-color:#0D32B2;} + .d2-1953358309 .background-color-B2{background-color:#0D32B2;} + .d2-1953358309 .background-color-B3{background-color:#E3E9FD;} + .d2-1953358309 .background-color-B4{background-color:#E3E9FD;} + .d2-1953358309 .background-color-B5{background-color:#EDF0FD;} + .d2-1953358309 .background-color-B6{background-color:#F7F8FE;} + .d2-1953358309 .background-color-AA2{background-color:#4A6FF3;} + .d2-1953358309 .background-color-AA4{background-color:#EDF0FD;} + .d2-1953358309 .background-color-AA5{background-color:#F7F8FE;} + .d2-1953358309 .background-color-AB4{background-color:#EDF0FD;} + .d2-1953358309 .background-color-AB5{background-color:#F7F8FE;} + .d2-1953358309 .color-N1{color:#0A0F25;} + .d2-1953358309 .color-N2{color:#676C7E;} + .d2-1953358309 .color-N3{color:#9499AB;} + .d2-1953358309 .color-N4{color:#CFD2DD;} + .d2-1953358309 .color-N5{color:#DEE1EB;} + .d2-1953358309 .color-N6{color:#EEF1F8;} + .d2-1953358309 .color-N7{color:#FFFFFF;} + .d2-1953358309 .color-B1{color:#0D32B2;} + .d2-1953358309 .color-B2{color:#0D32B2;} + .d2-1953358309 .color-B3{color:#E3E9FD;} + .d2-1953358309 .color-B4{color:#E3E9FD;} + .d2-1953358309 .color-B5{color:#EDF0FD;} + .d2-1953358309 .color-B6{color:#F7F8FE;} + .d2-1953358309 .color-AA2{color:#4A6FF3;} + .d2-1953358309 .color-AA4{color:#EDF0FD;} + .d2-1953358309 .color-AA5{color:#F7F8FE;} + .d2-1953358309 .color-AB4{color:#EDF0FD;} + .d2-1953358309 .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}]]>2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo diff --git a/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg index c7ffd2313..8edecdd59 100644 --- a/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo + .d2-600570647 .fill-N1{fill:#0A0F25;} + .d2-600570647 .fill-N2{fill:#676C7E;} + .d2-600570647 .fill-N3{fill:#9499AB;} + .d2-600570647 .fill-N4{fill:#CFD2DD;} + .d2-600570647 .fill-N5{fill:#DEE1EB;} + .d2-600570647 .fill-N6{fill:#EEF1F8;} + .d2-600570647 .fill-N7{fill:#FFFFFF;} + .d2-600570647 .fill-B1{fill:#0D32B2;} + .d2-600570647 .fill-B2{fill:#0D32B2;} + .d2-600570647 .fill-B3{fill:#E3E9FD;} + .d2-600570647 .fill-B4{fill:#E3E9FD;} + .d2-600570647 .fill-B5{fill:#EDF0FD;} + .d2-600570647 .fill-B6{fill:#F7F8FE;} + .d2-600570647 .fill-AA2{fill:#4A6FF3;} + .d2-600570647 .fill-AA4{fill:#EDF0FD;} + .d2-600570647 .fill-AA5{fill:#F7F8FE;} + .d2-600570647 .fill-AB4{fill:#EDF0FD;} + .d2-600570647 .fill-AB5{fill:#F7F8FE;} + .d2-600570647 .stroke-N1{stroke:#0A0F25;} + .d2-600570647 .stroke-N2{stroke:#676C7E;} + .d2-600570647 .stroke-N3{stroke:#9499AB;} + .d2-600570647 .stroke-N4{stroke:#CFD2DD;} + .d2-600570647 .stroke-N5{stroke:#DEE1EB;} + .d2-600570647 .stroke-N6{stroke:#EEF1F8;} + .d2-600570647 .stroke-N7{stroke:#FFFFFF;} + .d2-600570647 .stroke-B1{stroke:#0D32B2;} + .d2-600570647 .stroke-B2{stroke:#0D32B2;} + .d2-600570647 .stroke-B3{stroke:#E3E9FD;} + .d2-600570647 .stroke-B4{stroke:#E3E9FD;} + .d2-600570647 .stroke-B5{stroke:#EDF0FD;} + .d2-600570647 .stroke-B6{stroke:#F7F8FE;} + .d2-600570647 .stroke-AA2{stroke:#4A6FF3;} + .d2-600570647 .stroke-AA4{stroke:#EDF0FD;} + .d2-600570647 .stroke-AA5{stroke:#F7F8FE;} + .d2-600570647 .stroke-AB4{stroke:#EDF0FD;} + .d2-600570647 .stroke-AB5{stroke:#F7F8FE;} + .d2-600570647 .background-color-N1{background-color:#0A0F25;} + .d2-600570647 .background-color-N2{background-color:#676C7E;} + .d2-600570647 .background-color-N3{background-color:#9499AB;} + .d2-600570647 .background-color-N4{background-color:#CFD2DD;} + .d2-600570647 .background-color-N5{background-color:#DEE1EB;} + .d2-600570647 .background-color-N6{background-color:#EEF1F8;} + .d2-600570647 .background-color-N7{background-color:#FFFFFF;} + .d2-600570647 .background-color-B1{background-color:#0D32B2;} + .d2-600570647 .background-color-B2{background-color:#0D32B2;} + .d2-600570647 .background-color-B3{background-color:#E3E9FD;} + .d2-600570647 .background-color-B4{background-color:#E3E9FD;} + .d2-600570647 .background-color-B5{background-color:#EDF0FD;} + .d2-600570647 .background-color-B6{background-color:#F7F8FE;} + .d2-600570647 .background-color-AA2{background-color:#4A6FF3;} + .d2-600570647 .background-color-AA4{background-color:#EDF0FD;} + .d2-600570647 .background-color-AA5{background-color:#F7F8FE;} + .d2-600570647 .background-color-AB4{background-color:#EDF0FD;} + .d2-600570647 .background-color-AB5{background-color:#F7F8FE;} + .d2-600570647 .color-N1{color:#0A0F25;} + .d2-600570647 .color-N2{color:#676C7E;} + .d2-600570647 .color-N3{color:#9499AB;} + .d2-600570647 .color-N4{color:#CFD2DD;} + .d2-600570647 .color-N5{color:#DEE1EB;} + .d2-600570647 .color-N6{color:#EEF1F8;} + .d2-600570647 .color-N7{color:#FFFFFF;} + .d2-600570647 .color-B1{color:#0D32B2;} + .d2-600570647 .color-B2{color:#0D32B2;} + .d2-600570647 .color-B3{color:#E3E9FD;} + .d2-600570647 .color-B4{color:#E3E9FD;} + .d2-600570647 .color-B5{color:#EDF0FD;} + .d2-600570647 .color-B6{color:#F7F8FE;} + .d2-600570647 .color-AA2{color:#4A6FF3;} + .d2-600570647 .color-AA4{color:#EDF0FD;} + .d2-600570647 .color-AA5{color:#F7F8FE;} + .d2-600570647 .color-AB4{color:#EDF0FD;} + .d2-600570647 .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}]]>2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo diff --git a/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg index f1ea24a00..6bb8ad904 100644 --- a/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzabab +xyzabab diff --git a/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg index 8ed6219be..44f378124 100644 --- a/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzabab +xyzabab diff --git a/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg b/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg index cd073cce6..f7e900a62 100644 --- a/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -x + .d2-2828774672 .fill-N1{fill:#0A0F25;} + .d2-2828774672 .fill-N2{fill:#676C7E;} + .d2-2828774672 .fill-N3{fill:#9499AB;} + .d2-2828774672 .fill-N4{fill:#CFD2DD;} + .d2-2828774672 .fill-N5{fill:#DEE1EB;} + .d2-2828774672 .fill-N6{fill:#EEF1F8;} + .d2-2828774672 .fill-N7{fill:#FFFFFF;} + .d2-2828774672 .fill-B1{fill:#0D32B2;} + .d2-2828774672 .fill-B2{fill:#0D32B2;} + .d2-2828774672 .fill-B3{fill:#E3E9FD;} + .d2-2828774672 .fill-B4{fill:#E3E9FD;} + .d2-2828774672 .fill-B5{fill:#EDF0FD;} + .d2-2828774672 .fill-B6{fill:#F7F8FE;} + .d2-2828774672 .fill-AA2{fill:#4A6FF3;} + .d2-2828774672 .fill-AA4{fill:#EDF0FD;} + .d2-2828774672 .fill-AA5{fill:#F7F8FE;} + .d2-2828774672 .fill-AB4{fill:#EDF0FD;} + .d2-2828774672 .fill-AB5{fill:#F7F8FE;} + .d2-2828774672 .stroke-N1{stroke:#0A0F25;} + .d2-2828774672 .stroke-N2{stroke:#676C7E;} + .d2-2828774672 .stroke-N3{stroke:#9499AB;} + .d2-2828774672 .stroke-N4{stroke:#CFD2DD;} + .d2-2828774672 .stroke-N5{stroke:#DEE1EB;} + .d2-2828774672 .stroke-N6{stroke:#EEF1F8;} + .d2-2828774672 .stroke-N7{stroke:#FFFFFF;} + .d2-2828774672 .stroke-B1{stroke:#0D32B2;} + .d2-2828774672 .stroke-B2{stroke:#0D32B2;} + .d2-2828774672 .stroke-B3{stroke:#E3E9FD;} + .d2-2828774672 .stroke-B4{stroke:#E3E9FD;} + .d2-2828774672 .stroke-B5{stroke:#EDF0FD;} + .d2-2828774672 .stroke-B6{stroke:#F7F8FE;} + .d2-2828774672 .stroke-AA2{stroke:#4A6FF3;} + .d2-2828774672 .stroke-AA4{stroke:#EDF0FD;} + .d2-2828774672 .stroke-AA5{stroke:#F7F8FE;} + .d2-2828774672 .stroke-AB4{stroke:#EDF0FD;} + .d2-2828774672 .stroke-AB5{stroke:#F7F8FE;} + .d2-2828774672 .background-color-N1{background-color:#0A0F25;} + .d2-2828774672 .background-color-N2{background-color:#676C7E;} + .d2-2828774672 .background-color-N3{background-color:#9499AB;} + .d2-2828774672 .background-color-N4{background-color:#CFD2DD;} + .d2-2828774672 .background-color-N5{background-color:#DEE1EB;} + .d2-2828774672 .background-color-N6{background-color:#EEF1F8;} + .d2-2828774672 .background-color-N7{background-color:#FFFFFF;} + .d2-2828774672 .background-color-B1{background-color:#0D32B2;} + .d2-2828774672 .background-color-B2{background-color:#0D32B2;} + .d2-2828774672 .background-color-B3{background-color:#E3E9FD;} + .d2-2828774672 .background-color-B4{background-color:#E3E9FD;} + .d2-2828774672 .background-color-B5{background-color:#EDF0FD;} + .d2-2828774672 .background-color-B6{background-color:#F7F8FE;} + .d2-2828774672 .background-color-AA2{background-color:#4A6FF3;} + .d2-2828774672 .background-color-AA4{background-color:#EDF0FD;} + .d2-2828774672 .background-color-AA5{background-color:#F7F8FE;} + .d2-2828774672 .background-color-AB4{background-color:#EDF0FD;} + .d2-2828774672 .background-color-AB5{background-color:#F7F8FE;} + .d2-2828774672 .color-N1{color:#0A0F25;} + .d2-2828774672 .color-N2{color:#676C7E;} + .d2-2828774672 .color-N3{color:#9499AB;} + .d2-2828774672 .color-N4{color:#CFD2DD;} + .d2-2828774672 .color-N5{color:#DEE1EB;} + .d2-2828774672 .color-N6{color:#EEF1F8;} + .d2-2828774672 .color-N7{color:#FFFFFF;} + .d2-2828774672 .color-B1{color:#0D32B2;} + .d2-2828774672 .color-B2{color:#0D32B2;} + .d2-2828774672 .color-B3{color:#E3E9FD;} + .d2-2828774672 .color-B4{color:#E3E9FD;} + .d2-2828774672 .color-B5{color:#EDF0FD;} + .d2-2828774672 .color-B6{color:#F7F8FE;} + .d2-2828774672 .color-AA2{color:#4A6FF3;} + .d2-2828774672 .color-AA4{color:#EDF0FD;} + .d2-2828774672 .color-AA5{color:#F7F8FE;} + .d2-2828774672 .color-AB4{color:#EDF0FD;} + .d2-2828774672 .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}]]>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 cd3e08120..249fdd978 100644 --- a/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -x + .d2-3453799592 .fill-N1{fill:#0A0F25;} + .d2-3453799592 .fill-N2{fill:#676C7E;} + .d2-3453799592 .fill-N3{fill:#9499AB;} + .d2-3453799592 .fill-N4{fill:#CFD2DD;} + .d2-3453799592 .fill-N5{fill:#DEE1EB;} + .d2-3453799592 .fill-N6{fill:#EEF1F8;} + .d2-3453799592 .fill-N7{fill:#FFFFFF;} + .d2-3453799592 .fill-B1{fill:#0D32B2;} + .d2-3453799592 .fill-B2{fill:#0D32B2;} + .d2-3453799592 .fill-B3{fill:#E3E9FD;} + .d2-3453799592 .fill-B4{fill:#E3E9FD;} + .d2-3453799592 .fill-B5{fill:#EDF0FD;} + .d2-3453799592 .fill-B6{fill:#F7F8FE;} + .d2-3453799592 .fill-AA2{fill:#4A6FF3;} + .d2-3453799592 .fill-AA4{fill:#EDF0FD;} + .d2-3453799592 .fill-AA5{fill:#F7F8FE;} + .d2-3453799592 .fill-AB4{fill:#EDF0FD;} + .d2-3453799592 .fill-AB5{fill:#F7F8FE;} + .d2-3453799592 .stroke-N1{stroke:#0A0F25;} + .d2-3453799592 .stroke-N2{stroke:#676C7E;} + .d2-3453799592 .stroke-N3{stroke:#9499AB;} + .d2-3453799592 .stroke-N4{stroke:#CFD2DD;} + .d2-3453799592 .stroke-N5{stroke:#DEE1EB;} + .d2-3453799592 .stroke-N6{stroke:#EEF1F8;} + .d2-3453799592 .stroke-N7{stroke:#FFFFFF;} + .d2-3453799592 .stroke-B1{stroke:#0D32B2;} + .d2-3453799592 .stroke-B2{stroke:#0D32B2;} + .d2-3453799592 .stroke-B3{stroke:#E3E9FD;} + .d2-3453799592 .stroke-B4{stroke:#E3E9FD;} + .d2-3453799592 .stroke-B5{stroke:#EDF0FD;} + .d2-3453799592 .stroke-B6{stroke:#F7F8FE;} + .d2-3453799592 .stroke-AA2{stroke:#4A6FF3;} + .d2-3453799592 .stroke-AA4{stroke:#EDF0FD;} + .d2-3453799592 .stroke-AA5{stroke:#F7F8FE;} + .d2-3453799592 .stroke-AB4{stroke:#EDF0FD;} + .d2-3453799592 .stroke-AB5{stroke:#F7F8FE;} + .d2-3453799592 .background-color-N1{background-color:#0A0F25;} + .d2-3453799592 .background-color-N2{background-color:#676C7E;} + .d2-3453799592 .background-color-N3{background-color:#9499AB;} + .d2-3453799592 .background-color-N4{background-color:#CFD2DD;} + .d2-3453799592 .background-color-N5{background-color:#DEE1EB;} + .d2-3453799592 .background-color-N6{background-color:#EEF1F8;} + .d2-3453799592 .background-color-N7{background-color:#FFFFFF;} + .d2-3453799592 .background-color-B1{background-color:#0D32B2;} + .d2-3453799592 .background-color-B2{background-color:#0D32B2;} + .d2-3453799592 .background-color-B3{background-color:#E3E9FD;} + .d2-3453799592 .background-color-B4{background-color:#E3E9FD;} + .d2-3453799592 .background-color-B5{background-color:#EDF0FD;} + .d2-3453799592 .background-color-B6{background-color:#F7F8FE;} + .d2-3453799592 .background-color-AA2{background-color:#4A6FF3;} + .d2-3453799592 .background-color-AA4{background-color:#EDF0FD;} + .d2-3453799592 .background-color-AA5{background-color:#F7F8FE;} + .d2-3453799592 .background-color-AB4{background-color:#EDF0FD;} + .d2-3453799592 .background-color-AB5{background-color:#F7F8FE;} + .d2-3453799592 .color-N1{color:#0A0F25;} + .d2-3453799592 .color-N2{color:#676C7E;} + .d2-3453799592 .color-N3{color:#9499AB;} + .d2-3453799592 .color-N4{color:#CFD2DD;} + .d2-3453799592 .color-N5{color:#DEE1EB;} + .d2-3453799592 .color-N6{color:#EEF1F8;} + .d2-3453799592 .color-N7{color:#FFFFFF;} + .d2-3453799592 .color-B1{color:#0D32B2;} + .d2-3453799592 .color-B2{color:#0D32B2;} + .d2-3453799592 .color-B3{color:#E3E9FD;} + .d2-3453799592 .color-B4{color:#E3E9FD;} + .d2-3453799592 .color-B5{color:#EDF0FD;} + .d2-3453799592 .color-B6{color:#F7F8FE;} + .d2-3453799592 .color-AA2{color:#4A6FF3;} + .d2-3453799592 .color-AA4{color:#EDF0FD;} + .d2-3453799592 .color-AA5{color:#F7F8FE;} + .d2-3453799592 .color-AB4{color:#EDF0FD;} + .d2-3453799592 .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}]]>x \ No newline at end of file diff --git a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg index 98c9c13c4..7982326d1 100644 --- a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -linknonelink, tooltiptooltipnone + .d2-1248816746 .fill-N1{fill:#0A0F25;} + .d2-1248816746 .fill-N2{fill:#676C7E;} + .d2-1248816746 .fill-N3{fill:#9499AB;} + .d2-1248816746 .fill-N4{fill:#CFD2DD;} + .d2-1248816746 .fill-N5{fill:#DEE1EB;} + .d2-1248816746 .fill-N6{fill:#EEF1F8;} + .d2-1248816746 .fill-N7{fill:#FFFFFF;} + .d2-1248816746 .fill-B1{fill:#0D32B2;} + .d2-1248816746 .fill-B2{fill:#0D32B2;} + .d2-1248816746 .fill-B3{fill:#E3E9FD;} + .d2-1248816746 .fill-B4{fill:#E3E9FD;} + .d2-1248816746 .fill-B5{fill:#EDF0FD;} + .d2-1248816746 .fill-B6{fill:#F7F8FE;} + .d2-1248816746 .fill-AA2{fill:#4A6FF3;} + .d2-1248816746 .fill-AA4{fill:#EDF0FD;} + .d2-1248816746 .fill-AA5{fill:#F7F8FE;} + .d2-1248816746 .fill-AB4{fill:#EDF0FD;} + .d2-1248816746 .fill-AB5{fill:#F7F8FE;} + .d2-1248816746 .stroke-N1{stroke:#0A0F25;} + .d2-1248816746 .stroke-N2{stroke:#676C7E;} + .d2-1248816746 .stroke-N3{stroke:#9499AB;} + .d2-1248816746 .stroke-N4{stroke:#CFD2DD;} + .d2-1248816746 .stroke-N5{stroke:#DEE1EB;} + .d2-1248816746 .stroke-N6{stroke:#EEF1F8;} + .d2-1248816746 .stroke-N7{stroke:#FFFFFF;} + .d2-1248816746 .stroke-B1{stroke:#0D32B2;} + .d2-1248816746 .stroke-B2{stroke:#0D32B2;} + .d2-1248816746 .stroke-B3{stroke:#E3E9FD;} + .d2-1248816746 .stroke-B4{stroke:#E3E9FD;} + .d2-1248816746 .stroke-B5{stroke:#EDF0FD;} + .d2-1248816746 .stroke-B6{stroke:#F7F8FE;} + .d2-1248816746 .stroke-AA2{stroke:#4A6FF3;} + .d2-1248816746 .stroke-AA4{stroke:#EDF0FD;} + .d2-1248816746 .stroke-AA5{stroke:#F7F8FE;} + .d2-1248816746 .stroke-AB4{stroke:#EDF0FD;} + .d2-1248816746 .stroke-AB5{stroke:#F7F8FE;} + .d2-1248816746 .background-color-N1{background-color:#0A0F25;} + .d2-1248816746 .background-color-N2{background-color:#676C7E;} + .d2-1248816746 .background-color-N3{background-color:#9499AB;} + .d2-1248816746 .background-color-N4{background-color:#CFD2DD;} + .d2-1248816746 .background-color-N5{background-color:#DEE1EB;} + .d2-1248816746 .background-color-N6{background-color:#EEF1F8;} + .d2-1248816746 .background-color-N7{background-color:#FFFFFF;} + .d2-1248816746 .background-color-B1{background-color:#0D32B2;} + .d2-1248816746 .background-color-B2{background-color:#0D32B2;} + .d2-1248816746 .background-color-B3{background-color:#E3E9FD;} + .d2-1248816746 .background-color-B4{background-color:#E3E9FD;} + .d2-1248816746 .background-color-B5{background-color:#EDF0FD;} + .d2-1248816746 .background-color-B6{background-color:#F7F8FE;} + .d2-1248816746 .background-color-AA2{background-color:#4A6FF3;} + .d2-1248816746 .background-color-AA4{background-color:#EDF0FD;} + .d2-1248816746 .background-color-AA5{background-color:#F7F8FE;} + .d2-1248816746 .background-color-AB4{background-color:#EDF0FD;} + .d2-1248816746 .background-color-AB5{background-color:#F7F8FE;} + .d2-1248816746 .color-N1{color:#0A0F25;} + .d2-1248816746 .color-N2{color:#676C7E;} + .d2-1248816746 .color-N3{color:#9499AB;} + .d2-1248816746 .color-N4{color:#CFD2DD;} + .d2-1248816746 .color-N5{color:#DEE1EB;} + .d2-1248816746 .color-N6{color:#EEF1F8;} + .d2-1248816746 .color-N7{color:#FFFFFF;} + .d2-1248816746 .color-B1{color:#0D32B2;} + .d2-1248816746 .color-B2{color:#0D32B2;} + .d2-1248816746 .color-B3{color:#E3E9FD;} + .d2-1248816746 .color-B4{color:#E3E9FD;} + .d2-1248816746 .color-B5{color:#EDF0FD;} + .d2-1248816746 .color-B6{color:#F7F8FE;} + .d2-1248816746 .color-AA2{color:#4A6FF3;} + .d2-1248816746 .color-AA4{color:#EDF0FD;} + .d2-1248816746 .color-AA5{color:#F7F8FE;} + .d2-1248816746 .color-AB4{color:#EDF0FD;} + .d2-1248816746 .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}]]>linknonelink, tooltiptooltipnone @@ -129,7 +129,7 @@ - + diff --git a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg index 98c9c13c4..7982326d1 100644 --- a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -linknonelink, tooltiptooltipnone + .d2-1248816746 .fill-N1{fill:#0A0F25;} + .d2-1248816746 .fill-N2{fill:#676C7E;} + .d2-1248816746 .fill-N3{fill:#9499AB;} + .d2-1248816746 .fill-N4{fill:#CFD2DD;} + .d2-1248816746 .fill-N5{fill:#DEE1EB;} + .d2-1248816746 .fill-N6{fill:#EEF1F8;} + .d2-1248816746 .fill-N7{fill:#FFFFFF;} + .d2-1248816746 .fill-B1{fill:#0D32B2;} + .d2-1248816746 .fill-B2{fill:#0D32B2;} + .d2-1248816746 .fill-B3{fill:#E3E9FD;} + .d2-1248816746 .fill-B4{fill:#E3E9FD;} + .d2-1248816746 .fill-B5{fill:#EDF0FD;} + .d2-1248816746 .fill-B6{fill:#F7F8FE;} + .d2-1248816746 .fill-AA2{fill:#4A6FF3;} + .d2-1248816746 .fill-AA4{fill:#EDF0FD;} + .d2-1248816746 .fill-AA5{fill:#F7F8FE;} + .d2-1248816746 .fill-AB4{fill:#EDF0FD;} + .d2-1248816746 .fill-AB5{fill:#F7F8FE;} + .d2-1248816746 .stroke-N1{stroke:#0A0F25;} + .d2-1248816746 .stroke-N2{stroke:#676C7E;} + .d2-1248816746 .stroke-N3{stroke:#9499AB;} + .d2-1248816746 .stroke-N4{stroke:#CFD2DD;} + .d2-1248816746 .stroke-N5{stroke:#DEE1EB;} + .d2-1248816746 .stroke-N6{stroke:#EEF1F8;} + .d2-1248816746 .stroke-N7{stroke:#FFFFFF;} + .d2-1248816746 .stroke-B1{stroke:#0D32B2;} + .d2-1248816746 .stroke-B2{stroke:#0D32B2;} + .d2-1248816746 .stroke-B3{stroke:#E3E9FD;} + .d2-1248816746 .stroke-B4{stroke:#E3E9FD;} + .d2-1248816746 .stroke-B5{stroke:#EDF0FD;} + .d2-1248816746 .stroke-B6{stroke:#F7F8FE;} + .d2-1248816746 .stroke-AA2{stroke:#4A6FF3;} + .d2-1248816746 .stroke-AA4{stroke:#EDF0FD;} + .d2-1248816746 .stroke-AA5{stroke:#F7F8FE;} + .d2-1248816746 .stroke-AB4{stroke:#EDF0FD;} + .d2-1248816746 .stroke-AB5{stroke:#F7F8FE;} + .d2-1248816746 .background-color-N1{background-color:#0A0F25;} + .d2-1248816746 .background-color-N2{background-color:#676C7E;} + .d2-1248816746 .background-color-N3{background-color:#9499AB;} + .d2-1248816746 .background-color-N4{background-color:#CFD2DD;} + .d2-1248816746 .background-color-N5{background-color:#DEE1EB;} + .d2-1248816746 .background-color-N6{background-color:#EEF1F8;} + .d2-1248816746 .background-color-N7{background-color:#FFFFFF;} + .d2-1248816746 .background-color-B1{background-color:#0D32B2;} + .d2-1248816746 .background-color-B2{background-color:#0D32B2;} + .d2-1248816746 .background-color-B3{background-color:#E3E9FD;} + .d2-1248816746 .background-color-B4{background-color:#E3E9FD;} + .d2-1248816746 .background-color-B5{background-color:#EDF0FD;} + .d2-1248816746 .background-color-B6{background-color:#F7F8FE;} + .d2-1248816746 .background-color-AA2{background-color:#4A6FF3;} + .d2-1248816746 .background-color-AA4{background-color:#EDF0FD;} + .d2-1248816746 .background-color-AA5{background-color:#F7F8FE;} + .d2-1248816746 .background-color-AB4{background-color:#EDF0FD;} + .d2-1248816746 .background-color-AB5{background-color:#F7F8FE;} + .d2-1248816746 .color-N1{color:#0A0F25;} + .d2-1248816746 .color-N2{color:#676C7E;} + .d2-1248816746 .color-N3{color:#9499AB;} + .d2-1248816746 .color-N4{color:#CFD2DD;} + .d2-1248816746 .color-N5{color:#DEE1EB;} + .d2-1248816746 .color-N6{color:#EEF1F8;} + .d2-1248816746 .color-N7{color:#FFFFFF;} + .d2-1248816746 .color-B1{color:#0D32B2;} + .d2-1248816746 .color-B2{color:#0D32B2;} + .d2-1248816746 .color-B3{color:#E3E9FD;} + .d2-1248816746 .color-B4{color:#E3E9FD;} + .d2-1248816746 .color-B5{color:#EDF0FD;} + .d2-1248816746 .color-B6{color:#F7F8FE;} + .d2-1248816746 .color-AA2{color:#4A6FF3;} + .d2-1248816746 .color-AA4{color:#EDF0FD;} + .d2-1248816746 .color-AA5{color:#F7F8FE;} + .d2-1248816746 .color-AB4{color:#EDF0FD;} + .d2-1248816746 .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}]]>linknonelink, tooltiptooltipnone @@ -129,7 +129,7 @@ - + diff --git a/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg b/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg index 772a914bf..fb4cf5070 100644 --- a/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -teamwork: having someone to blame + .d2-1364462136 .fill-N1{fill:#0A0F25;} + .d2-1364462136 .fill-N2{fill:#676C7E;} + .d2-1364462136 .fill-N3{fill:#9499AB;} + .d2-1364462136 .fill-N4{fill:#CFD2DD;} + .d2-1364462136 .fill-N5{fill:#DEE1EB;} + .d2-1364462136 .fill-N6{fill:#EEF1F8;} + .d2-1364462136 .fill-N7{fill:#FFFFFF;} + .d2-1364462136 .fill-B1{fill:#0D32B2;} + .d2-1364462136 .fill-B2{fill:#0D32B2;} + .d2-1364462136 .fill-B3{fill:#E3E9FD;} + .d2-1364462136 .fill-B4{fill:#E3E9FD;} + .d2-1364462136 .fill-B5{fill:#EDF0FD;} + .d2-1364462136 .fill-B6{fill:#F7F8FE;} + .d2-1364462136 .fill-AA2{fill:#4A6FF3;} + .d2-1364462136 .fill-AA4{fill:#EDF0FD;} + .d2-1364462136 .fill-AA5{fill:#F7F8FE;} + .d2-1364462136 .fill-AB4{fill:#EDF0FD;} + .d2-1364462136 .fill-AB5{fill:#F7F8FE;} + .d2-1364462136 .stroke-N1{stroke:#0A0F25;} + .d2-1364462136 .stroke-N2{stroke:#676C7E;} + .d2-1364462136 .stroke-N3{stroke:#9499AB;} + .d2-1364462136 .stroke-N4{stroke:#CFD2DD;} + .d2-1364462136 .stroke-N5{stroke:#DEE1EB;} + .d2-1364462136 .stroke-N6{stroke:#EEF1F8;} + .d2-1364462136 .stroke-N7{stroke:#FFFFFF;} + .d2-1364462136 .stroke-B1{stroke:#0D32B2;} + .d2-1364462136 .stroke-B2{stroke:#0D32B2;} + .d2-1364462136 .stroke-B3{stroke:#E3E9FD;} + .d2-1364462136 .stroke-B4{stroke:#E3E9FD;} + .d2-1364462136 .stroke-B5{stroke:#EDF0FD;} + .d2-1364462136 .stroke-B6{stroke:#F7F8FE;} + .d2-1364462136 .stroke-AA2{stroke:#4A6FF3;} + .d2-1364462136 .stroke-AA4{stroke:#EDF0FD;} + .d2-1364462136 .stroke-AA5{stroke:#F7F8FE;} + .d2-1364462136 .stroke-AB4{stroke:#EDF0FD;} + .d2-1364462136 .stroke-AB5{stroke:#F7F8FE;} + .d2-1364462136 .background-color-N1{background-color:#0A0F25;} + .d2-1364462136 .background-color-N2{background-color:#676C7E;} + .d2-1364462136 .background-color-N3{background-color:#9499AB;} + .d2-1364462136 .background-color-N4{background-color:#CFD2DD;} + .d2-1364462136 .background-color-N5{background-color:#DEE1EB;} + .d2-1364462136 .background-color-N6{background-color:#EEF1F8;} + .d2-1364462136 .background-color-N7{background-color:#FFFFFF;} + .d2-1364462136 .background-color-B1{background-color:#0D32B2;} + .d2-1364462136 .background-color-B2{background-color:#0D32B2;} + .d2-1364462136 .background-color-B3{background-color:#E3E9FD;} + .d2-1364462136 .background-color-B4{background-color:#E3E9FD;} + .d2-1364462136 .background-color-B5{background-color:#EDF0FD;} + .d2-1364462136 .background-color-B6{background-color:#F7F8FE;} + .d2-1364462136 .background-color-AA2{background-color:#4A6FF3;} + .d2-1364462136 .background-color-AA4{background-color:#EDF0FD;} + .d2-1364462136 .background-color-AA5{background-color:#F7F8FE;} + .d2-1364462136 .background-color-AB4{background-color:#EDF0FD;} + .d2-1364462136 .background-color-AB5{background-color:#F7F8FE;} + .d2-1364462136 .color-N1{color:#0A0F25;} + .d2-1364462136 .color-N2{color:#676C7E;} + .d2-1364462136 .color-N3{color:#9499AB;} + .d2-1364462136 .color-N4{color:#CFD2DD;} + .d2-1364462136 .color-N5{color:#DEE1EB;} + .d2-1364462136 .color-N6{color:#EEF1F8;} + .d2-1364462136 .color-N7{color:#FFFFFF;} + .d2-1364462136 .color-B1{color:#0D32B2;} + .d2-1364462136 .color-B2{color:#0D32B2;} + .d2-1364462136 .color-B3{color:#E3E9FD;} + .d2-1364462136 .color-B4{color:#E3E9FD;} + .d2-1364462136 .color-B5{color:#EDF0FD;} + .d2-1364462136 .color-B6{color:#F7F8FE;} + .d2-1364462136 .color-AA2{color:#4A6FF3;} + .d2-1364462136 .color-AA4{color:#EDF0FD;} + .d2-1364462136 .color-AA5{color:#F7F8FE;} + .d2-1364462136 .color-AB4{color:#EDF0FD;} + .d2-1364462136 .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}]]>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 1eb2198d5..796222b9e 100644 --- a/e2etests/testdata/regression/just-width/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/just-width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -teamwork: having someone to blame + .d2-2648560688 .fill-N1{fill:#0A0F25;} + .d2-2648560688 .fill-N2{fill:#676C7E;} + .d2-2648560688 .fill-N3{fill:#9499AB;} + .d2-2648560688 .fill-N4{fill:#CFD2DD;} + .d2-2648560688 .fill-N5{fill:#DEE1EB;} + .d2-2648560688 .fill-N6{fill:#EEF1F8;} + .d2-2648560688 .fill-N7{fill:#FFFFFF;} + .d2-2648560688 .fill-B1{fill:#0D32B2;} + .d2-2648560688 .fill-B2{fill:#0D32B2;} + .d2-2648560688 .fill-B3{fill:#E3E9FD;} + .d2-2648560688 .fill-B4{fill:#E3E9FD;} + .d2-2648560688 .fill-B5{fill:#EDF0FD;} + .d2-2648560688 .fill-B6{fill:#F7F8FE;} + .d2-2648560688 .fill-AA2{fill:#4A6FF3;} + .d2-2648560688 .fill-AA4{fill:#EDF0FD;} + .d2-2648560688 .fill-AA5{fill:#F7F8FE;} + .d2-2648560688 .fill-AB4{fill:#EDF0FD;} + .d2-2648560688 .fill-AB5{fill:#F7F8FE;} + .d2-2648560688 .stroke-N1{stroke:#0A0F25;} + .d2-2648560688 .stroke-N2{stroke:#676C7E;} + .d2-2648560688 .stroke-N3{stroke:#9499AB;} + .d2-2648560688 .stroke-N4{stroke:#CFD2DD;} + .d2-2648560688 .stroke-N5{stroke:#DEE1EB;} + .d2-2648560688 .stroke-N6{stroke:#EEF1F8;} + .d2-2648560688 .stroke-N7{stroke:#FFFFFF;} + .d2-2648560688 .stroke-B1{stroke:#0D32B2;} + .d2-2648560688 .stroke-B2{stroke:#0D32B2;} + .d2-2648560688 .stroke-B3{stroke:#E3E9FD;} + .d2-2648560688 .stroke-B4{stroke:#E3E9FD;} + .d2-2648560688 .stroke-B5{stroke:#EDF0FD;} + .d2-2648560688 .stroke-B6{stroke:#F7F8FE;} + .d2-2648560688 .stroke-AA2{stroke:#4A6FF3;} + .d2-2648560688 .stroke-AA4{stroke:#EDF0FD;} + .d2-2648560688 .stroke-AA5{stroke:#F7F8FE;} + .d2-2648560688 .stroke-AB4{stroke:#EDF0FD;} + .d2-2648560688 .stroke-AB5{stroke:#F7F8FE;} + .d2-2648560688 .background-color-N1{background-color:#0A0F25;} + .d2-2648560688 .background-color-N2{background-color:#676C7E;} + .d2-2648560688 .background-color-N3{background-color:#9499AB;} + .d2-2648560688 .background-color-N4{background-color:#CFD2DD;} + .d2-2648560688 .background-color-N5{background-color:#DEE1EB;} + .d2-2648560688 .background-color-N6{background-color:#EEF1F8;} + .d2-2648560688 .background-color-N7{background-color:#FFFFFF;} + .d2-2648560688 .background-color-B1{background-color:#0D32B2;} + .d2-2648560688 .background-color-B2{background-color:#0D32B2;} + .d2-2648560688 .background-color-B3{background-color:#E3E9FD;} + .d2-2648560688 .background-color-B4{background-color:#E3E9FD;} + .d2-2648560688 .background-color-B5{background-color:#EDF0FD;} + .d2-2648560688 .background-color-B6{background-color:#F7F8FE;} + .d2-2648560688 .background-color-AA2{background-color:#4A6FF3;} + .d2-2648560688 .background-color-AA4{background-color:#EDF0FD;} + .d2-2648560688 .background-color-AA5{background-color:#F7F8FE;} + .d2-2648560688 .background-color-AB4{background-color:#EDF0FD;} + .d2-2648560688 .background-color-AB5{background-color:#F7F8FE;} + .d2-2648560688 .color-N1{color:#0A0F25;} + .d2-2648560688 .color-N2{color:#676C7E;} + .d2-2648560688 .color-N3{color:#9499AB;} + .d2-2648560688 .color-N4{color:#CFD2DD;} + .d2-2648560688 .color-N5{color:#DEE1EB;} + .d2-2648560688 .color-N6{color:#EEF1F8;} + .d2-2648560688 .color-N7{color:#FFFFFF;} + .d2-2648560688 .color-B1{color:#0D32B2;} + .d2-2648560688 .color-B2{color:#0D32B2;} + .d2-2648560688 .color-B3{color:#E3E9FD;} + .d2-2648560688 .color-B4{color:#E3E9FD;} + .d2-2648560688 .color-B5{color:#EDF0FD;} + .d2-2648560688 .color-B6{color:#F7F8FE;} + .d2-2648560688 .color-AA2{color:#4A6FF3;} + .d2-2648560688 .color-AA4{color:#EDF0FD;} + .d2-2648560688 .color-AA5{color:#F7F8FE;} + .d2-2648560688 .color-AB4{color:#EDF0FD;} + .d2-2648560688 .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}]]>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 14885f667..fd12618d6 100644 --- a/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -a + .d2-2332549614 .fill-N1{fill:#0A0F25;} + .d2-2332549614 .fill-N2{fill:#676C7E;} + .d2-2332549614 .fill-N3{fill:#9499AB;} + .d2-2332549614 .fill-N4{fill:#CFD2DD;} + .d2-2332549614 .fill-N5{fill:#DEE1EB;} + .d2-2332549614 .fill-N6{fill:#EEF1F8;} + .d2-2332549614 .fill-N7{fill:#FFFFFF;} + .d2-2332549614 .fill-B1{fill:#0D32B2;} + .d2-2332549614 .fill-B2{fill:#0D32B2;} + .d2-2332549614 .fill-B3{fill:#E3E9FD;} + .d2-2332549614 .fill-B4{fill:#E3E9FD;} + .d2-2332549614 .fill-B5{fill:#EDF0FD;} + .d2-2332549614 .fill-B6{fill:#F7F8FE;} + .d2-2332549614 .fill-AA2{fill:#4A6FF3;} + .d2-2332549614 .fill-AA4{fill:#EDF0FD;} + .d2-2332549614 .fill-AA5{fill:#F7F8FE;} + .d2-2332549614 .fill-AB4{fill:#EDF0FD;} + .d2-2332549614 .fill-AB5{fill:#F7F8FE;} + .d2-2332549614 .stroke-N1{stroke:#0A0F25;} + .d2-2332549614 .stroke-N2{stroke:#676C7E;} + .d2-2332549614 .stroke-N3{stroke:#9499AB;} + .d2-2332549614 .stroke-N4{stroke:#CFD2DD;} + .d2-2332549614 .stroke-N5{stroke:#DEE1EB;} + .d2-2332549614 .stroke-N6{stroke:#EEF1F8;} + .d2-2332549614 .stroke-N7{stroke:#FFFFFF;} + .d2-2332549614 .stroke-B1{stroke:#0D32B2;} + .d2-2332549614 .stroke-B2{stroke:#0D32B2;} + .d2-2332549614 .stroke-B3{stroke:#E3E9FD;} + .d2-2332549614 .stroke-B4{stroke:#E3E9FD;} + .d2-2332549614 .stroke-B5{stroke:#EDF0FD;} + .d2-2332549614 .stroke-B6{stroke:#F7F8FE;} + .d2-2332549614 .stroke-AA2{stroke:#4A6FF3;} + .d2-2332549614 .stroke-AA4{stroke:#EDF0FD;} + .d2-2332549614 .stroke-AA5{stroke:#F7F8FE;} + .d2-2332549614 .stroke-AB4{stroke:#EDF0FD;} + .d2-2332549614 .stroke-AB5{stroke:#F7F8FE;} + .d2-2332549614 .background-color-N1{background-color:#0A0F25;} + .d2-2332549614 .background-color-N2{background-color:#676C7E;} + .d2-2332549614 .background-color-N3{background-color:#9499AB;} + .d2-2332549614 .background-color-N4{background-color:#CFD2DD;} + .d2-2332549614 .background-color-N5{background-color:#DEE1EB;} + .d2-2332549614 .background-color-N6{background-color:#EEF1F8;} + .d2-2332549614 .background-color-N7{background-color:#FFFFFF;} + .d2-2332549614 .background-color-B1{background-color:#0D32B2;} + .d2-2332549614 .background-color-B2{background-color:#0D32B2;} + .d2-2332549614 .background-color-B3{background-color:#E3E9FD;} + .d2-2332549614 .background-color-B4{background-color:#E3E9FD;} + .d2-2332549614 .background-color-B5{background-color:#EDF0FD;} + .d2-2332549614 .background-color-B6{background-color:#F7F8FE;} + .d2-2332549614 .background-color-AA2{background-color:#4A6FF3;} + .d2-2332549614 .background-color-AA4{background-color:#EDF0FD;} + .d2-2332549614 .background-color-AA5{background-color:#F7F8FE;} + .d2-2332549614 .background-color-AB4{background-color:#EDF0FD;} + .d2-2332549614 .background-color-AB5{background-color:#F7F8FE;} + .d2-2332549614 .color-N1{color:#0A0F25;} + .d2-2332549614 .color-N2{color:#676C7E;} + .d2-2332549614 .color-N3{color:#9499AB;} + .d2-2332549614 .color-N4{color:#CFD2DD;} + .d2-2332549614 .color-N5{color:#DEE1EB;} + .d2-2332549614 .color-N6{color:#EEF1F8;} + .d2-2332549614 .color-N7{color:#FFFFFF;} + .d2-2332549614 .color-B1{color:#0D32B2;} + .d2-2332549614 .color-B2{color:#0D32B2;} + .d2-2332549614 .color-B3{color:#E3E9FD;} + .d2-2332549614 .color-B4{color:#E3E9FD;} + .d2-2332549614 .color-B5{color:#EDF0FD;} + .d2-2332549614 .color-B6{color:#F7F8FE;} + .d2-2332549614 .color-AA2{color:#4A6FF3;} + .d2-2332549614 .color-AA4{color:#EDF0FD;} + .d2-2332549614 .color-AA5{color:#F7F8FE;} + .d2-2332549614 .color-AB4{color:#EDF0FD;} + .d2-2332549614 .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 @@ -104,7 +104,7 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg b/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg index 330604146..bbaa3cab0 100644 --- a/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -a + .d2-4014689926 .fill-N1{fill:#0A0F25;} + .d2-4014689926 .fill-N2{fill:#676C7E;} + .d2-4014689926 .fill-N3{fill:#9499AB;} + .d2-4014689926 .fill-N4{fill:#CFD2DD;} + .d2-4014689926 .fill-N5{fill:#DEE1EB;} + .d2-4014689926 .fill-N6{fill:#EEF1F8;} + .d2-4014689926 .fill-N7{fill:#FFFFFF;} + .d2-4014689926 .fill-B1{fill:#0D32B2;} + .d2-4014689926 .fill-B2{fill:#0D32B2;} + .d2-4014689926 .fill-B3{fill:#E3E9FD;} + .d2-4014689926 .fill-B4{fill:#E3E9FD;} + .d2-4014689926 .fill-B5{fill:#EDF0FD;} + .d2-4014689926 .fill-B6{fill:#F7F8FE;} + .d2-4014689926 .fill-AA2{fill:#4A6FF3;} + .d2-4014689926 .fill-AA4{fill:#EDF0FD;} + .d2-4014689926 .fill-AA5{fill:#F7F8FE;} + .d2-4014689926 .fill-AB4{fill:#EDF0FD;} + .d2-4014689926 .fill-AB5{fill:#F7F8FE;} + .d2-4014689926 .stroke-N1{stroke:#0A0F25;} + .d2-4014689926 .stroke-N2{stroke:#676C7E;} + .d2-4014689926 .stroke-N3{stroke:#9499AB;} + .d2-4014689926 .stroke-N4{stroke:#CFD2DD;} + .d2-4014689926 .stroke-N5{stroke:#DEE1EB;} + .d2-4014689926 .stroke-N6{stroke:#EEF1F8;} + .d2-4014689926 .stroke-N7{stroke:#FFFFFF;} + .d2-4014689926 .stroke-B1{stroke:#0D32B2;} + .d2-4014689926 .stroke-B2{stroke:#0D32B2;} + .d2-4014689926 .stroke-B3{stroke:#E3E9FD;} + .d2-4014689926 .stroke-B4{stroke:#E3E9FD;} + .d2-4014689926 .stroke-B5{stroke:#EDF0FD;} + .d2-4014689926 .stroke-B6{stroke:#F7F8FE;} + .d2-4014689926 .stroke-AA2{stroke:#4A6FF3;} + .d2-4014689926 .stroke-AA4{stroke:#EDF0FD;} + .d2-4014689926 .stroke-AA5{stroke:#F7F8FE;} + .d2-4014689926 .stroke-AB4{stroke:#EDF0FD;} + .d2-4014689926 .stroke-AB5{stroke:#F7F8FE;} + .d2-4014689926 .background-color-N1{background-color:#0A0F25;} + .d2-4014689926 .background-color-N2{background-color:#676C7E;} + .d2-4014689926 .background-color-N3{background-color:#9499AB;} + .d2-4014689926 .background-color-N4{background-color:#CFD2DD;} + .d2-4014689926 .background-color-N5{background-color:#DEE1EB;} + .d2-4014689926 .background-color-N6{background-color:#EEF1F8;} + .d2-4014689926 .background-color-N7{background-color:#FFFFFF;} + .d2-4014689926 .background-color-B1{background-color:#0D32B2;} + .d2-4014689926 .background-color-B2{background-color:#0D32B2;} + .d2-4014689926 .background-color-B3{background-color:#E3E9FD;} + .d2-4014689926 .background-color-B4{background-color:#E3E9FD;} + .d2-4014689926 .background-color-B5{background-color:#EDF0FD;} + .d2-4014689926 .background-color-B6{background-color:#F7F8FE;} + .d2-4014689926 .background-color-AA2{background-color:#4A6FF3;} + .d2-4014689926 .background-color-AA4{background-color:#EDF0FD;} + .d2-4014689926 .background-color-AA5{background-color:#F7F8FE;} + .d2-4014689926 .background-color-AB4{background-color:#EDF0FD;} + .d2-4014689926 .background-color-AB5{background-color:#F7F8FE;} + .d2-4014689926 .color-N1{color:#0A0F25;} + .d2-4014689926 .color-N2{color:#676C7E;} + .d2-4014689926 .color-N3{color:#9499AB;} + .d2-4014689926 .color-N4{color:#CFD2DD;} + .d2-4014689926 .color-N5{color:#DEE1EB;} + .d2-4014689926 .color-N6{color:#EEF1F8;} + .d2-4014689926 .color-N7{color:#FFFFFF;} + .d2-4014689926 .color-B1{color:#0D32B2;} + .d2-4014689926 .color-B2{color:#0D32B2;} + .d2-4014689926 .color-B3{color:#E3E9FD;} + .d2-4014689926 .color-B4{color:#E3E9FD;} + .d2-4014689926 .color-B5{color:#EDF0FD;} + .d2-4014689926 .color-B6{color:#F7F8FE;} + .d2-4014689926 .color-AA2{color:#4A6FF3;} + .d2-4014689926 .color-AA4{color:#EDF0FD;} + .d2-4014689926 .color-AA5{color:#F7F8FE;} + .d2-4014689926 .color-AB4{color:#EDF0FD;} + .d2-4014689926 .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 @@ -104,7 +104,7 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg index e87efe934..21ecee241 100644 --- a/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab a to b with unexpectedly long target arrowhead label + .d2-3350411599 .fill-N1{fill:#0A0F25;} + .d2-3350411599 .fill-N2{fill:#676C7E;} + .d2-3350411599 .fill-N3{fill:#9499AB;} + .d2-3350411599 .fill-N4{fill:#CFD2DD;} + .d2-3350411599 .fill-N5{fill:#DEE1EB;} + .d2-3350411599 .fill-N6{fill:#EEF1F8;} + .d2-3350411599 .fill-N7{fill:#FFFFFF;} + .d2-3350411599 .fill-B1{fill:#0D32B2;} + .d2-3350411599 .fill-B2{fill:#0D32B2;} + .d2-3350411599 .fill-B3{fill:#E3E9FD;} + .d2-3350411599 .fill-B4{fill:#E3E9FD;} + .d2-3350411599 .fill-B5{fill:#EDF0FD;} + .d2-3350411599 .fill-B6{fill:#F7F8FE;} + .d2-3350411599 .fill-AA2{fill:#4A6FF3;} + .d2-3350411599 .fill-AA4{fill:#EDF0FD;} + .d2-3350411599 .fill-AA5{fill:#F7F8FE;} + .d2-3350411599 .fill-AB4{fill:#EDF0FD;} + .d2-3350411599 .fill-AB5{fill:#F7F8FE;} + .d2-3350411599 .stroke-N1{stroke:#0A0F25;} + .d2-3350411599 .stroke-N2{stroke:#676C7E;} + .d2-3350411599 .stroke-N3{stroke:#9499AB;} + .d2-3350411599 .stroke-N4{stroke:#CFD2DD;} + .d2-3350411599 .stroke-N5{stroke:#DEE1EB;} + .d2-3350411599 .stroke-N6{stroke:#EEF1F8;} + .d2-3350411599 .stroke-N7{stroke:#FFFFFF;} + .d2-3350411599 .stroke-B1{stroke:#0D32B2;} + .d2-3350411599 .stroke-B2{stroke:#0D32B2;} + .d2-3350411599 .stroke-B3{stroke:#E3E9FD;} + .d2-3350411599 .stroke-B4{stroke:#E3E9FD;} + .d2-3350411599 .stroke-B5{stroke:#EDF0FD;} + .d2-3350411599 .stroke-B6{stroke:#F7F8FE;} + .d2-3350411599 .stroke-AA2{stroke:#4A6FF3;} + .d2-3350411599 .stroke-AA4{stroke:#EDF0FD;} + .d2-3350411599 .stroke-AA5{stroke:#F7F8FE;} + .d2-3350411599 .stroke-AB4{stroke:#EDF0FD;} + .d2-3350411599 .stroke-AB5{stroke:#F7F8FE;} + .d2-3350411599 .background-color-N1{background-color:#0A0F25;} + .d2-3350411599 .background-color-N2{background-color:#676C7E;} + .d2-3350411599 .background-color-N3{background-color:#9499AB;} + .d2-3350411599 .background-color-N4{background-color:#CFD2DD;} + .d2-3350411599 .background-color-N5{background-color:#DEE1EB;} + .d2-3350411599 .background-color-N6{background-color:#EEF1F8;} + .d2-3350411599 .background-color-N7{background-color:#FFFFFF;} + .d2-3350411599 .background-color-B1{background-color:#0D32B2;} + .d2-3350411599 .background-color-B2{background-color:#0D32B2;} + .d2-3350411599 .background-color-B3{background-color:#E3E9FD;} + .d2-3350411599 .background-color-B4{background-color:#E3E9FD;} + .d2-3350411599 .background-color-B5{background-color:#EDF0FD;} + .d2-3350411599 .background-color-B6{background-color:#F7F8FE;} + .d2-3350411599 .background-color-AA2{background-color:#4A6FF3;} + .d2-3350411599 .background-color-AA4{background-color:#EDF0FD;} + .d2-3350411599 .background-color-AA5{background-color:#F7F8FE;} + .d2-3350411599 .background-color-AB4{background-color:#EDF0FD;} + .d2-3350411599 .background-color-AB5{background-color:#F7F8FE;} + .d2-3350411599 .color-N1{color:#0A0F25;} + .d2-3350411599 .color-N2{color:#676C7E;} + .d2-3350411599 .color-N3{color:#9499AB;} + .d2-3350411599 .color-N4{color:#CFD2DD;} + .d2-3350411599 .color-N5{color:#DEE1EB;} + .d2-3350411599 .color-N6{color:#EEF1F8;} + .d2-3350411599 .color-N7{color:#FFFFFF;} + .d2-3350411599 .color-B1{color:#0D32B2;} + .d2-3350411599 .color-B2{color:#0D32B2;} + .d2-3350411599 .color-B3{color:#E3E9FD;} + .d2-3350411599 .color-B4{color:#E3E9FD;} + .d2-3350411599 .color-B5{color:#EDF0FD;} + .d2-3350411599 .color-B6{color:#F7F8FE;} + .d2-3350411599 .color-AA2{color:#4A6FF3;} + .d2-3350411599 .color-AA4{color:#EDF0FD;} + .d2-3350411599 .color-AA5{color:#F7F8FE;} + .d2-3350411599 .color-AB4{color:#EDF0FD;} + .d2-3350411599 .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}]]>ab a to b with unexpectedly long target arrowhead label 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 e7ff84b76..688b7b539 100644 --- a/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab a to b with unexpectedly long target arrowhead label + .d2-784248580 .fill-N1{fill:#0A0F25;} + .d2-784248580 .fill-N2{fill:#676C7E;} + .d2-784248580 .fill-N3{fill:#9499AB;} + .d2-784248580 .fill-N4{fill:#CFD2DD;} + .d2-784248580 .fill-N5{fill:#DEE1EB;} + .d2-784248580 .fill-N6{fill:#EEF1F8;} + .d2-784248580 .fill-N7{fill:#FFFFFF;} + .d2-784248580 .fill-B1{fill:#0D32B2;} + .d2-784248580 .fill-B2{fill:#0D32B2;} + .d2-784248580 .fill-B3{fill:#E3E9FD;} + .d2-784248580 .fill-B4{fill:#E3E9FD;} + .d2-784248580 .fill-B5{fill:#EDF0FD;} + .d2-784248580 .fill-B6{fill:#F7F8FE;} + .d2-784248580 .fill-AA2{fill:#4A6FF3;} + .d2-784248580 .fill-AA4{fill:#EDF0FD;} + .d2-784248580 .fill-AA5{fill:#F7F8FE;} + .d2-784248580 .fill-AB4{fill:#EDF0FD;} + .d2-784248580 .fill-AB5{fill:#F7F8FE;} + .d2-784248580 .stroke-N1{stroke:#0A0F25;} + .d2-784248580 .stroke-N2{stroke:#676C7E;} + .d2-784248580 .stroke-N3{stroke:#9499AB;} + .d2-784248580 .stroke-N4{stroke:#CFD2DD;} + .d2-784248580 .stroke-N5{stroke:#DEE1EB;} + .d2-784248580 .stroke-N6{stroke:#EEF1F8;} + .d2-784248580 .stroke-N7{stroke:#FFFFFF;} + .d2-784248580 .stroke-B1{stroke:#0D32B2;} + .d2-784248580 .stroke-B2{stroke:#0D32B2;} + .d2-784248580 .stroke-B3{stroke:#E3E9FD;} + .d2-784248580 .stroke-B4{stroke:#E3E9FD;} + .d2-784248580 .stroke-B5{stroke:#EDF0FD;} + .d2-784248580 .stroke-B6{stroke:#F7F8FE;} + .d2-784248580 .stroke-AA2{stroke:#4A6FF3;} + .d2-784248580 .stroke-AA4{stroke:#EDF0FD;} + .d2-784248580 .stroke-AA5{stroke:#F7F8FE;} + .d2-784248580 .stroke-AB4{stroke:#EDF0FD;} + .d2-784248580 .stroke-AB5{stroke:#F7F8FE;} + .d2-784248580 .background-color-N1{background-color:#0A0F25;} + .d2-784248580 .background-color-N2{background-color:#676C7E;} + .d2-784248580 .background-color-N3{background-color:#9499AB;} + .d2-784248580 .background-color-N4{background-color:#CFD2DD;} + .d2-784248580 .background-color-N5{background-color:#DEE1EB;} + .d2-784248580 .background-color-N6{background-color:#EEF1F8;} + .d2-784248580 .background-color-N7{background-color:#FFFFFF;} + .d2-784248580 .background-color-B1{background-color:#0D32B2;} + .d2-784248580 .background-color-B2{background-color:#0D32B2;} + .d2-784248580 .background-color-B3{background-color:#E3E9FD;} + .d2-784248580 .background-color-B4{background-color:#E3E9FD;} + .d2-784248580 .background-color-B5{background-color:#EDF0FD;} + .d2-784248580 .background-color-B6{background-color:#F7F8FE;} + .d2-784248580 .background-color-AA2{background-color:#4A6FF3;} + .d2-784248580 .background-color-AA4{background-color:#EDF0FD;} + .d2-784248580 .background-color-AA5{background-color:#F7F8FE;} + .d2-784248580 .background-color-AB4{background-color:#EDF0FD;} + .d2-784248580 .background-color-AB5{background-color:#F7F8FE;} + .d2-784248580 .color-N1{color:#0A0F25;} + .d2-784248580 .color-N2{color:#676C7E;} + .d2-784248580 .color-N3{color:#9499AB;} + .d2-784248580 .color-N4{color:#CFD2DD;} + .d2-784248580 .color-N5{color:#DEE1EB;} + .d2-784248580 .color-N6{color:#EEF1F8;} + .d2-784248580 .color-N7{color:#FFFFFF;} + .d2-784248580 .color-B1{color:#0D32B2;} + .d2-784248580 .color-B2{color:#0D32B2;} + .d2-784248580 .color-B3{color:#E3E9FD;} + .d2-784248580 .color-B4{color:#E3E9FD;} + .d2-784248580 .color-B5{color:#EDF0FD;} + .d2-784248580 .color-B6{color:#F7F8FE;} + .d2-784248580 .color-AA2{color:#4A6FF3;} + .d2-784248580 .color-AA4{color:#EDF0FD;} + .d2-784248580 .color-AA5{color:#F7F8FE;} + .d2-784248580 .color-AB4{color:#EDF0FD;} + .d2-784248580 .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}]]>ab a to b with unexpectedly long target arrowhead label 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 82e89f8f2..08ea22197 100644 --- a/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -

    I can do headers

    @@ -835,7 +835,7 @@
  • lists

    • And other normal markdown stuff

    -
     +         \ No newline at end of file diff --git a/e2etests/testdata/regression/md_font_weight/elk/sketch.exp.svg b/e2etests/testdata/regression/md_font_weight/elk/sketch.exp.svg index e0f635906..53eca139d 100644 --- a/e2etests/testdata/regression/md_font_weight/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/md_font_weight/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -

    I can do headers

    @@ -835,7 +835,7 @@
  • lists

    • And other normal markdown stuff

    -
     +     \ No newline at end of file diff --git a/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg b/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg index d30ce1051..c7bf1b680 100644 --- a/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    hey

    @@ -844,7 +844,7 @@ -
    ab +ab diff --git a/e2etests/testdata/regression/md_h1_li_li/elk/sketch.exp.svg b/e2etests/testdata/regression/md_h1_li_li/elk/sketch.exp.svg index 9a5a6d66f..84d6dff8a 100644 --- a/e2etests/testdata/regression/md_h1_li_li/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/md_h1_li_li/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    hey

    @@ -844,7 +844,7 @@ -
    ab +ab diff --git a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg index 42b392c6a..00775b9e3 100644 --- a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdab + .d2-1386879104 .fill-N1{fill:#0A0F25;} + .d2-1386879104 .fill-N2{fill:#676C7E;} + .d2-1386879104 .fill-N3{fill:#9499AB;} + .d2-1386879104 .fill-N4{fill:#CFD2DD;} + .d2-1386879104 .fill-N5{fill:#DEE1EB;} + .d2-1386879104 .fill-N6{fill:#EEF1F8;} + .d2-1386879104 .fill-N7{fill:#FFFFFF;} + .d2-1386879104 .fill-B1{fill:#0D32B2;} + .d2-1386879104 .fill-B2{fill:#0D32B2;} + .d2-1386879104 .fill-B3{fill:#E3E9FD;} + .d2-1386879104 .fill-B4{fill:#E3E9FD;} + .d2-1386879104 .fill-B5{fill:#EDF0FD;} + .d2-1386879104 .fill-B6{fill:#F7F8FE;} + .d2-1386879104 .fill-AA2{fill:#4A6FF3;} + .d2-1386879104 .fill-AA4{fill:#EDF0FD;} + .d2-1386879104 .fill-AA5{fill:#F7F8FE;} + .d2-1386879104 .fill-AB4{fill:#EDF0FD;} + .d2-1386879104 .fill-AB5{fill:#F7F8FE;} + .d2-1386879104 .stroke-N1{stroke:#0A0F25;} + .d2-1386879104 .stroke-N2{stroke:#676C7E;} + .d2-1386879104 .stroke-N3{stroke:#9499AB;} + .d2-1386879104 .stroke-N4{stroke:#CFD2DD;} + .d2-1386879104 .stroke-N5{stroke:#DEE1EB;} + .d2-1386879104 .stroke-N6{stroke:#EEF1F8;} + .d2-1386879104 .stroke-N7{stroke:#FFFFFF;} + .d2-1386879104 .stroke-B1{stroke:#0D32B2;} + .d2-1386879104 .stroke-B2{stroke:#0D32B2;} + .d2-1386879104 .stroke-B3{stroke:#E3E9FD;} + .d2-1386879104 .stroke-B4{stroke:#E3E9FD;} + .d2-1386879104 .stroke-B5{stroke:#EDF0FD;} + .d2-1386879104 .stroke-B6{stroke:#F7F8FE;} + .d2-1386879104 .stroke-AA2{stroke:#4A6FF3;} + .d2-1386879104 .stroke-AA4{stroke:#EDF0FD;} + .d2-1386879104 .stroke-AA5{stroke:#F7F8FE;} + .d2-1386879104 .stroke-AB4{stroke:#EDF0FD;} + .d2-1386879104 .stroke-AB5{stroke:#F7F8FE;} + .d2-1386879104 .background-color-N1{background-color:#0A0F25;} + .d2-1386879104 .background-color-N2{background-color:#676C7E;} + .d2-1386879104 .background-color-N3{background-color:#9499AB;} + .d2-1386879104 .background-color-N4{background-color:#CFD2DD;} + .d2-1386879104 .background-color-N5{background-color:#DEE1EB;} + .d2-1386879104 .background-color-N6{background-color:#EEF1F8;} + .d2-1386879104 .background-color-N7{background-color:#FFFFFF;} + .d2-1386879104 .background-color-B1{background-color:#0D32B2;} + .d2-1386879104 .background-color-B2{background-color:#0D32B2;} + .d2-1386879104 .background-color-B3{background-color:#E3E9FD;} + .d2-1386879104 .background-color-B4{background-color:#E3E9FD;} + .d2-1386879104 .background-color-B5{background-color:#EDF0FD;} + .d2-1386879104 .background-color-B6{background-color:#F7F8FE;} + .d2-1386879104 .background-color-AA2{background-color:#4A6FF3;} + .d2-1386879104 .background-color-AA4{background-color:#EDF0FD;} + .d2-1386879104 .background-color-AA5{background-color:#F7F8FE;} + .d2-1386879104 .background-color-AB4{background-color:#EDF0FD;} + .d2-1386879104 .background-color-AB5{background-color:#F7F8FE;} + .d2-1386879104 .color-N1{color:#0A0F25;} + .d2-1386879104 .color-N2{color:#676C7E;} + .d2-1386879104 .color-N3{color:#9499AB;} + .d2-1386879104 .color-N4{color:#CFD2DD;} + .d2-1386879104 .color-N5{color:#DEE1EB;} + .d2-1386879104 .color-N6{color:#EEF1F8;} + .d2-1386879104 .color-N7{color:#FFFFFF;} + .d2-1386879104 .color-B1{color:#0D32B2;} + .d2-1386879104 .color-B2{color:#0D32B2;} + .d2-1386879104 .color-B3{color:#E3E9FD;} + .d2-1386879104 .color-B4{color:#E3E9FD;} + .d2-1386879104 .color-B5{color:#EDF0FD;} + .d2-1386879104 .color-B6{color:#F7F8FE;} + .d2-1386879104 .color-AA2{color:#4A6FF3;} + .d2-1386879104 .color-AA4{color:#EDF0FD;} + .d2-1386879104 .color-AA5{color:#F7F8FE;} + .d2-1386879104 .color-AB4{color:#EDF0FD;} + .d2-1386879104 .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}]]>acdab diff --git a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg index e262299ee..971632864 100644 --- a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acdab + .d2-1351697728 .fill-N1{fill:#0A0F25;} + .d2-1351697728 .fill-N2{fill:#676C7E;} + .d2-1351697728 .fill-N3{fill:#9499AB;} + .d2-1351697728 .fill-N4{fill:#CFD2DD;} + .d2-1351697728 .fill-N5{fill:#DEE1EB;} + .d2-1351697728 .fill-N6{fill:#EEF1F8;} + .d2-1351697728 .fill-N7{fill:#FFFFFF;} + .d2-1351697728 .fill-B1{fill:#0D32B2;} + .d2-1351697728 .fill-B2{fill:#0D32B2;} + .d2-1351697728 .fill-B3{fill:#E3E9FD;} + .d2-1351697728 .fill-B4{fill:#E3E9FD;} + .d2-1351697728 .fill-B5{fill:#EDF0FD;} + .d2-1351697728 .fill-B6{fill:#F7F8FE;} + .d2-1351697728 .fill-AA2{fill:#4A6FF3;} + .d2-1351697728 .fill-AA4{fill:#EDF0FD;} + .d2-1351697728 .fill-AA5{fill:#F7F8FE;} + .d2-1351697728 .fill-AB4{fill:#EDF0FD;} + .d2-1351697728 .fill-AB5{fill:#F7F8FE;} + .d2-1351697728 .stroke-N1{stroke:#0A0F25;} + .d2-1351697728 .stroke-N2{stroke:#676C7E;} + .d2-1351697728 .stroke-N3{stroke:#9499AB;} + .d2-1351697728 .stroke-N4{stroke:#CFD2DD;} + .d2-1351697728 .stroke-N5{stroke:#DEE1EB;} + .d2-1351697728 .stroke-N6{stroke:#EEF1F8;} + .d2-1351697728 .stroke-N7{stroke:#FFFFFF;} + .d2-1351697728 .stroke-B1{stroke:#0D32B2;} + .d2-1351697728 .stroke-B2{stroke:#0D32B2;} + .d2-1351697728 .stroke-B3{stroke:#E3E9FD;} + .d2-1351697728 .stroke-B4{stroke:#E3E9FD;} + .d2-1351697728 .stroke-B5{stroke:#EDF0FD;} + .d2-1351697728 .stroke-B6{stroke:#F7F8FE;} + .d2-1351697728 .stroke-AA2{stroke:#4A6FF3;} + .d2-1351697728 .stroke-AA4{stroke:#EDF0FD;} + .d2-1351697728 .stroke-AA5{stroke:#F7F8FE;} + .d2-1351697728 .stroke-AB4{stroke:#EDF0FD;} + .d2-1351697728 .stroke-AB5{stroke:#F7F8FE;} + .d2-1351697728 .background-color-N1{background-color:#0A0F25;} + .d2-1351697728 .background-color-N2{background-color:#676C7E;} + .d2-1351697728 .background-color-N3{background-color:#9499AB;} + .d2-1351697728 .background-color-N4{background-color:#CFD2DD;} + .d2-1351697728 .background-color-N5{background-color:#DEE1EB;} + .d2-1351697728 .background-color-N6{background-color:#EEF1F8;} + .d2-1351697728 .background-color-N7{background-color:#FFFFFF;} + .d2-1351697728 .background-color-B1{background-color:#0D32B2;} + .d2-1351697728 .background-color-B2{background-color:#0D32B2;} + .d2-1351697728 .background-color-B3{background-color:#E3E9FD;} + .d2-1351697728 .background-color-B4{background-color:#E3E9FD;} + .d2-1351697728 .background-color-B5{background-color:#EDF0FD;} + .d2-1351697728 .background-color-B6{background-color:#F7F8FE;} + .d2-1351697728 .background-color-AA2{background-color:#4A6FF3;} + .d2-1351697728 .background-color-AA4{background-color:#EDF0FD;} + .d2-1351697728 .background-color-AA5{background-color:#F7F8FE;} + .d2-1351697728 .background-color-AB4{background-color:#EDF0FD;} + .d2-1351697728 .background-color-AB5{background-color:#F7F8FE;} + .d2-1351697728 .color-N1{color:#0A0F25;} + .d2-1351697728 .color-N2{color:#676C7E;} + .d2-1351697728 .color-N3{color:#9499AB;} + .d2-1351697728 .color-N4{color:#CFD2DD;} + .d2-1351697728 .color-N5{color:#DEE1EB;} + .d2-1351697728 .color-N6{color:#EEF1F8;} + .d2-1351697728 .color-N7{color:#FFFFFF;} + .d2-1351697728 .color-B1{color:#0D32B2;} + .d2-1351697728 .color-B2{color:#0D32B2;} + .d2-1351697728 .color-B3{color:#E3E9FD;} + .d2-1351697728 .color-B4{color:#E3E9FD;} + .d2-1351697728 .color-B5{color:#EDF0FD;} + .d2-1351697728 .color-B6{color:#F7F8FE;} + .d2-1351697728 .color-AA2{color:#4A6FF3;} + .d2-1351697728 .color-AA4{color:#EDF0FD;} + .d2-1351697728 .color-AA5{color:#F7F8FE;} + .d2-1351697728 .color-AB4{color:#EDF0FD;} + .d2-1351697728 .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}]]>acdab diff --git a/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg b/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg index 7b97a3b7c..cce4c79af 100644 --- a/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -x -> yx -> y + .d2-2285073631 .fill-N1{fill:#0A0F25;} + .d2-2285073631 .fill-N2{fill:#676C7E;} + .d2-2285073631 .fill-N3{fill:#9499AB;} + .d2-2285073631 .fill-N4{fill:#CFD2DD;} + .d2-2285073631 .fill-N5{fill:#DEE1EB;} + .d2-2285073631 .fill-N6{fill:#EEF1F8;} + .d2-2285073631 .fill-N7{fill:#FFFFFF;} + .d2-2285073631 .fill-B1{fill:#0D32B2;} + .d2-2285073631 .fill-B2{fill:#0D32B2;} + .d2-2285073631 .fill-B3{fill:#E3E9FD;} + .d2-2285073631 .fill-B4{fill:#E3E9FD;} + .d2-2285073631 .fill-B5{fill:#EDF0FD;} + .d2-2285073631 .fill-B6{fill:#F7F8FE;} + .d2-2285073631 .fill-AA2{fill:#4A6FF3;} + .d2-2285073631 .fill-AA4{fill:#EDF0FD;} + .d2-2285073631 .fill-AA5{fill:#F7F8FE;} + .d2-2285073631 .fill-AB4{fill:#EDF0FD;} + .d2-2285073631 .fill-AB5{fill:#F7F8FE;} + .d2-2285073631 .stroke-N1{stroke:#0A0F25;} + .d2-2285073631 .stroke-N2{stroke:#676C7E;} + .d2-2285073631 .stroke-N3{stroke:#9499AB;} + .d2-2285073631 .stroke-N4{stroke:#CFD2DD;} + .d2-2285073631 .stroke-N5{stroke:#DEE1EB;} + .d2-2285073631 .stroke-N6{stroke:#EEF1F8;} + .d2-2285073631 .stroke-N7{stroke:#FFFFFF;} + .d2-2285073631 .stroke-B1{stroke:#0D32B2;} + .d2-2285073631 .stroke-B2{stroke:#0D32B2;} + .d2-2285073631 .stroke-B3{stroke:#E3E9FD;} + .d2-2285073631 .stroke-B4{stroke:#E3E9FD;} + .d2-2285073631 .stroke-B5{stroke:#EDF0FD;} + .d2-2285073631 .stroke-B6{stroke:#F7F8FE;} + .d2-2285073631 .stroke-AA2{stroke:#4A6FF3;} + .d2-2285073631 .stroke-AA4{stroke:#EDF0FD;} + .d2-2285073631 .stroke-AA5{stroke:#F7F8FE;} + .d2-2285073631 .stroke-AB4{stroke:#EDF0FD;} + .d2-2285073631 .stroke-AB5{stroke:#F7F8FE;} + .d2-2285073631 .background-color-N1{background-color:#0A0F25;} + .d2-2285073631 .background-color-N2{background-color:#676C7E;} + .d2-2285073631 .background-color-N3{background-color:#9499AB;} + .d2-2285073631 .background-color-N4{background-color:#CFD2DD;} + .d2-2285073631 .background-color-N5{background-color:#DEE1EB;} + .d2-2285073631 .background-color-N6{background-color:#EEF1F8;} + .d2-2285073631 .background-color-N7{background-color:#FFFFFF;} + .d2-2285073631 .background-color-B1{background-color:#0D32B2;} + .d2-2285073631 .background-color-B2{background-color:#0D32B2;} + .d2-2285073631 .background-color-B3{background-color:#E3E9FD;} + .d2-2285073631 .background-color-B4{background-color:#E3E9FD;} + .d2-2285073631 .background-color-B5{background-color:#EDF0FD;} + .d2-2285073631 .background-color-B6{background-color:#F7F8FE;} + .d2-2285073631 .background-color-AA2{background-color:#4A6FF3;} + .d2-2285073631 .background-color-AA4{background-color:#EDF0FD;} + .d2-2285073631 .background-color-AA5{background-color:#F7F8FE;} + .d2-2285073631 .background-color-AB4{background-color:#EDF0FD;} + .d2-2285073631 .background-color-AB5{background-color:#F7F8FE;} + .d2-2285073631 .color-N1{color:#0A0F25;} + .d2-2285073631 .color-N2{color:#676C7E;} + .d2-2285073631 .color-N3{color:#9499AB;} + .d2-2285073631 .color-N4{color:#CFD2DD;} + .d2-2285073631 .color-N5{color:#DEE1EB;} + .d2-2285073631 .color-N6{color:#EEF1F8;} + .d2-2285073631 .color-N7{color:#FFFFFF;} + .d2-2285073631 .color-B1{color:#0D32B2;} + .d2-2285073631 .color-B2{color:#0D32B2;} + .d2-2285073631 .color-B3{color:#E3E9FD;} + .d2-2285073631 .color-B4{color:#E3E9FD;} + .d2-2285073631 .color-B5{color:#EDF0FD;} + .d2-2285073631 .color-B6{color:#F7F8FE;} + .d2-2285073631 .color-AA2{color:#4A6FF3;} + .d2-2285073631 .color-AA4{color:#EDF0FD;} + .d2-2285073631 .color-AA5{color:#F7F8FE;} + .d2-2285073631 .color-AB4{color:#EDF0FD;} + .d2-2285073631 .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}]]>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 fc97e9d02..29b6c8678 100644 --- a/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -x -> yx -> y + .d2-280266919 .fill-N1{fill:#0A0F25;} + .d2-280266919 .fill-N2{fill:#676C7E;} + .d2-280266919 .fill-N3{fill:#9499AB;} + .d2-280266919 .fill-N4{fill:#CFD2DD;} + .d2-280266919 .fill-N5{fill:#DEE1EB;} + .d2-280266919 .fill-N6{fill:#EEF1F8;} + .d2-280266919 .fill-N7{fill:#FFFFFF;} + .d2-280266919 .fill-B1{fill:#0D32B2;} + .d2-280266919 .fill-B2{fill:#0D32B2;} + .d2-280266919 .fill-B3{fill:#E3E9FD;} + .d2-280266919 .fill-B4{fill:#E3E9FD;} + .d2-280266919 .fill-B5{fill:#EDF0FD;} + .d2-280266919 .fill-B6{fill:#F7F8FE;} + .d2-280266919 .fill-AA2{fill:#4A6FF3;} + .d2-280266919 .fill-AA4{fill:#EDF0FD;} + .d2-280266919 .fill-AA5{fill:#F7F8FE;} + .d2-280266919 .fill-AB4{fill:#EDF0FD;} + .d2-280266919 .fill-AB5{fill:#F7F8FE;} + .d2-280266919 .stroke-N1{stroke:#0A0F25;} + .d2-280266919 .stroke-N2{stroke:#676C7E;} + .d2-280266919 .stroke-N3{stroke:#9499AB;} + .d2-280266919 .stroke-N4{stroke:#CFD2DD;} + .d2-280266919 .stroke-N5{stroke:#DEE1EB;} + .d2-280266919 .stroke-N6{stroke:#EEF1F8;} + .d2-280266919 .stroke-N7{stroke:#FFFFFF;} + .d2-280266919 .stroke-B1{stroke:#0D32B2;} + .d2-280266919 .stroke-B2{stroke:#0D32B2;} + .d2-280266919 .stroke-B3{stroke:#E3E9FD;} + .d2-280266919 .stroke-B4{stroke:#E3E9FD;} + .d2-280266919 .stroke-B5{stroke:#EDF0FD;} + .d2-280266919 .stroke-B6{stroke:#F7F8FE;} + .d2-280266919 .stroke-AA2{stroke:#4A6FF3;} + .d2-280266919 .stroke-AA4{stroke:#EDF0FD;} + .d2-280266919 .stroke-AA5{stroke:#F7F8FE;} + .d2-280266919 .stroke-AB4{stroke:#EDF0FD;} + .d2-280266919 .stroke-AB5{stroke:#F7F8FE;} + .d2-280266919 .background-color-N1{background-color:#0A0F25;} + .d2-280266919 .background-color-N2{background-color:#676C7E;} + .d2-280266919 .background-color-N3{background-color:#9499AB;} + .d2-280266919 .background-color-N4{background-color:#CFD2DD;} + .d2-280266919 .background-color-N5{background-color:#DEE1EB;} + .d2-280266919 .background-color-N6{background-color:#EEF1F8;} + .d2-280266919 .background-color-N7{background-color:#FFFFFF;} + .d2-280266919 .background-color-B1{background-color:#0D32B2;} + .d2-280266919 .background-color-B2{background-color:#0D32B2;} + .d2-280266919 .background-color-B3{background-color:#E3E9FD;} + .d2-280266919 .background-color-B4{background-color:#E3E9FD;} + .d2-280266919 .background-color-B5{background-color:#EDF0FD;} + .d2-280266919 .background-color-B6{background-color:#F7F8FE;} + .d2-280266919 .background-color-AA2{background-color:#4A6FF3;} + .d2-280266919 .background-color-AA4{background-color:#EDF0FD;} + .d2-280266919 .background-color-AA5{background-color:#F7F8FE;} + .d2-280266919 .background-color-AB4{background-color:#EDF0FD;} + .d2-280266919 .background-color-AB5{background-color:#F7F8FE;} + .d2-280266919 .color-N1{color:#0A0F25;} + .d2-280266919 .color-N2{color:#676C7E;} + .d2-280266919 .color-N3{color:#9499AB;} + .d2-280266919 .color-N4{color:#CFD2DD;} + .d2-280266919 .color-N5{color:#DEE1EB;} + .d2-280266919 .color-N6{color:#EEF1F8;} + .d2-280266919 .color-N7{color:#FFFFFF;} + .d2-280266919 .color-B1{color:#0D32B2;} + .d2-280266919 .color-B2{color:#0D32B2;} + .d2-280266919 .color-B3{color:#E3E9FD;} + .d2-280266919 .color-B4{color:#E3E9FD;} + .d2-280266919 .color-B5{color:#EDF0FD;} + .d2-280266919 .color-B6{color:#F7F8FE;} + .d2-280266919 .color-AA2{color:#4A6FF3;} + .d2-280266919 .color-AA4{color:#EDF0FD;} + .d2-280266919 .color-AA5{color:#F7F8FE;} + .d2-280266919 .color-AB4{color:#EDF0FD;} + .d2-280266919 .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}]]>x -> yx -> y \ No newline at end of file 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 872b52bcf..f54ca0634 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-3631666954 .fill-N1{fill:#0A0F25;} + .d2-3631666954 .fill-N2{fill:#676C7E;} + .d2-3631666954 .fill-N3{fill:#9499AB;} + .d2-3631666954 .fill-N4{fill:#CFD2DD;} + .d2-3631666954 .fill-N5{fill:#DEE1EB;} + .d2-3631666954 .fill-N6{fill:#EEF1F8;} + .d2-3631666954 .fill-N7{fill:#FFFFFF;} + .d2-3631666954 .fill-B1{fill:#0D32B2;} + .d2-3631666954 .fill-B2{fill:#0D32B2;} + .d2-3631666954 .fill-B3{fill:#E3E9FD;} + .d2-3631666954 .fill-B4{fill:#E3E9FD;} + .d2-3631666954 .fill-B5{fill:#EDF0FD;} + .d2-3631666954 .fill-B6{fill:#F7F8FE;} + .d2-3631666954 .fill-AA2{fill:#4A6FF3;} + .d2-3631666954 .fill-AA4{fill:#EDF0FD;} + .d2-3631666954 .fill-AA5{fill:#F7F8FE;} + .d2-3631666954 .fill-AB4{fill:#EDF0FD;} + .d2-3631666954 .fill-AB5{fill:#F7F8FE;} + .d2-3631666954 .stroke-N1{stroke:#0A0F25;} + .d2-3631666954 .stroke-N2{stroke:#676C7E;} + .d2-3631666954 .stroke-N3{stroke:#9499AB;} + .d2-3631666954 .stroke-N4{stroke:#CFD2DD;} + .d2-3631666954 .stroke-N5{stroke:#DEE1EB;} + .d2-3631666954 .stroke-N6{stroke:#EEF1F8;} + .d2-3631666954 .stroke-N7{stroke:#FFFFFF;} + .d2-3631666954 .stroke-B1{stroke:#0D32B2;} + .d2-3631666954 .stroke-B2{stroke:#0D32B2;} + .d2-3631666954 .stroke-B3{stroke:#E3E9FD;} + .d2-3631666954 .stroke-B4{stroke:#E3E9FD;} + .d2-3631666954 .stroke-B5{stroke:#EDF0FD;} + .d2-3631666954 .stroke-B6{stroke:#F7F8FE;} + .d2-3631666954 .stroke-AA2{stroke:#4A6FF3;} + .d2-3631666954 .stroke-AA4{stroke:#EDF0FD;} + .d2-3631666954 .stroke-AA5{stroke:#F7F8FE;} + .d2-3631666954 .stroke-AB4{stroke:#EDF0FD;} + .d2-3631666954 .stroke-AB5{stroke:#F7F8FE;} + .d2-3631666954 .background-color-N1{background-color:#0A0F25;} + .d2-3631666954 .background-color-N2{background-color:#676C7E;} + .d2-3631666954 .background-color-N3{background-color:#9499AB;} + .d2-3631666954 .background-color-N4{background-color:#CFD2DD;} + .d2-3631666954 .background-color-N5{background-color:#DEE1EB;} + .d2-3631666954 .background-color-N6{background-color:#EEF1F8;} + .d2-3631666954 .background-color-N7{background-color:#FFFFFF;} + .d2-3631666954 .background-color-B1{background-color:#0D32B2;} + .d2-3631666954 .background-color-B2{background-color:#0D32B2;} + .d2-3631666954 .background-color-B3{background-color:#E3E9FD;} + .d2-3631666954 .background-color-B4{background-color:#E3E9FD;} + .d2-3631666954 .background-color-B5{background-color:#EDF0FD;} + .d2-3631666954 .background-color-B6{background-color:#F7F8FE;} + .d2-3631666954 .background-color-AA2{background-color:#4A6FF3;} + .d2-3631666954 .background-color-AA4{background-color:#EDF0FD;} + .d2-3631666954 .background-color-AA5{background-color:#F7F8FE;} + .d2-3631666954 .background-color-AB4{background-color:#EDF0FD;} + .d2-3631666954 .background-color-AB5{background-color:#F7F8FE;} + .d2-3631666954 .color-N1{color:#0A0F25;} + .d2-3631666954 .color-N2{color:#676C7E;} + .d2-3631666954 .color-N3{color:#9499AB;} + .d2-3631666954 .color-N4{color:#CFD2DD;} + .d2-3631666954 .color-N5{color:#DEE1EB;} + .d2-3631666954 .color-N6{color:#EEF1F8;} + .d2-3631666954 .color-N7{color:#FFFFFF;} + .d2-3631666954 .color-B1{color:#0D32B2;} + .d2-3631666954 .color-B2{color:#0D32B2;} + .d2-3631666954 .color-B3{color:#E3E9FD;} + .d2-3631666954 .color-B4{color:#E3E9FD;} + .d2-3631666954 .color-B5{color:#EDF0FD;} + .d2-3631666954 .color-B6{color:#F7F8FE;} + .d2-3631666954 .color-AA2{color:#4A6FF3;} + .d2-3631666954 .color-AA4{color:#EDF0FD;} + .d2-3631666954 .color-AA5{color:#F7F8FE;} + .d2-3631666954 .color-AB4{color:#EDF0FD;} + .d2-3631666954 .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/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg index 00e065d4b..26e3ece3f 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-505883705 .fill-N1{fill:#0A0F25;} + .d2-505883705 .fill-N2{fill:#676C7E;} + .d2-505883705 .fill-N3{fill:#9499AB;} + .d2-505883705 .fill-N4{fill:#CFD2DD;} + .d2-505883705 .fill-N5{fill:#DEE1EB;} + .d2-505883705 .fill-N6{fill:#EEF1F8;} + .d2-505883705 .fill-N7{fill:#FFFFFF;} + .d2-505883705 .fill-B1{fill:#0D32B2;} + .d2-505883705 .fill-B2{fill:#0D32B2;} + .d2-505883705 .fill-B3{fill:#E3E9FD;} + .d2-505883705 .fill-B4{fill:#E3E9FD;} + .d2-505883705 .fill-B5{fill:#EDF0FD;} + .d2-505883705 .fill-B6{fill:#F7F8FE;} + .d2-505883705 .fill-AA2{fill:#4A6FF3;} + .d2-505883705 .fill-AA4{fill:#EDF0FD;} + .d2-505883705 .fill-AA5{fill:#F7F8FE;} + .d2-505883705 .fill-AB4{fill:#EDF0FD;} + .d2-505883705 .fill-AB5{fill:#F7F8FE;} + .d2-505883705 .stroke-N1{stroke:#0A0F25;} + .d2-505883705 .stroke-N2{stroke:#676C7E;} + .d2-505883705 .stroke-N3{stroke:#9499AB;} + .d2-505883705 .stroke-N4{stroke:#CFD2DD;} + .d2-505883705 .stroke-N5{stroke:#DEE1EB;} + .d2-505883705 .stroke-N6{stroke:#EEF1F8;} + .d2-505883705 .stroke-N7{stroke:#FFFFFF;} + .d2-505883705 .stroke-B1{stroke:#0D32B2;} + .d2-505883705 .stroke-B2{stroke:#0D32B2;} + .d2-505883705 .stroke-B3{stroke:#E3E9FD;} + .d2-505883705 .stroke-B4{stroke:#E3E9FD;} + .d2-505883705 .stroke-B5{stroke:#EDF0FD;} + .d2-505883705 .stroke-B6{stroke:#F7F8FE;} + .d2-505883705 .stroke-AA2{stroke:#4A6FF3;} + .d2-505883705 .stroke-AA4{stroke:#EDF0FD;} + .d2-505883705 .stroke-AA5{stroke:#F7F8FE;} + .d2-505883705 .stroke-AB4{stroke:#EDF0FD;} + .d2-505883705 .stroke-AB5{stroke:#F7F8FE;} + .d2-505883705 .background-color-N1{background-color:#0A0F25;} + .d2-505883705 .background-color-N2{background-color:#676C7E;} + .d2-505883705 .background-color-N3{background-color:#9499AB;} + .d2-505883705 .background-color-N4{background-color:#CFD2DD;} + .d2-505883705 .background-color-N5{background-color:#DEE1EB;} + .d2-505883705 .background-color-N6{background-color:#EEF1F8;} + .d2-505883705 .background-color-N7{background-color:#FFFFFF;} + .d2-505883705 .background-color-B1{background-color:#0D32B2;} + .d2-505883705 .background-color-B2{background-color:#0D32B2;} + .d2-505883705 .background-color-B3{background-color:#E3E9FD;} + .d2-505883705 .background-color-B4{background-color:#E3E9FD;} + .d2-505883705 .background-color-B5{background-color:#EDF0FD;} + .d2-505883705 .background-color-B6{background-color:#F7F8FE;} + .d2-505883705 .background-color-AA2{background-color:#4A6FF3;} + .d2-505883705 .background-color-AA4{background-color:#EDF0FD;} + .d2-505883705 .background-color-AA5{background-color:#F7F8FE;} + .d2-505883705 .background-color-AB4{background-color:#EDF0FD;} + .d2-505883705 .background-color-AB5{background-color:#F7F8FE;} + .d2-505883705 .color-N1{color:#0A0F25;} + .d2-505883705 .color-N2{color:#676C7E;} + .d2-505883705 .color-N3{color:#9499AB;} + .d2-505883705 .color-N4{color:#CFD2DD;} + .d2-505883705 .color-N5{color:#DEE1EB;} + .d2-505883705 .color-N6{color:#EEF1F8;} + .d2-505883705 .color-N7{color:#FFFFFF;} + .d2-505883705 .color-B1{color:#0D32B2;} + .d2-505883705 .color-B2{color:#0D32B2;} + .d2-505883705 .color-B3{color:#E3E9FD;} + .d2-505883705 .color-B4{color:#E3E9FD;} + .d2-505883705 .color-B5{color:#EDF0FD;} + .d2-505883705 .color-B6{color:#F7F8FE;} + .d2-505883705 .color-AA2{color:#4A6FF3;} + .d2-505883705 .color-AA4{color:#EDF0FD;} + .d2-505883705 .color-AA5{color:#F7F8FE;} + .d2-505883705 .color-AB4{color:#EDF0FD;} + .d2-505883705 .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 fef4fd41e..9f10c7cc7 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -x

    linux: because a PC is a terrible thing to waste

    -
    a You don't have to know how the computer works,just how to work the computer. +a You don't have to know how the computer works,just how to work the computer. diff --git a/e2etests/testdata/regression/opacity-on-label/elk/sketch.exp.svg b/e2etests/testdata/regression/opacity-on-label/elk/sketch.exp.svg index f3ed667b5..3780f973b 100644 --- a/e2etests/testdata/regression/opacity-on-label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -x

    linux: because a PC is a terrible thing to waste

    -
    a You don't have to know how the computer works,just how to work the computer. +a You don't have to know how the computer works,just how to work the computer. diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg index b2ff6a24b..730cbf69d 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault + .d2-863162224 .fill-N1{fill:#0A0F25;} + .d2-863162224 .fill-N2{fill:#676C7E;} + .d2-863162224 .fill-N3{fill:#9499AB;} + .d2-863162224 .fill-N4{fill:#CFD2DD;} + .d2-863162224 .fill-N5{fill:#DEE1EB;} + .d2-863162224 .fill-N6{fill:#EEF1F8;} + .d2-863162224 .fill-N7{fill:#FFFFFF;} + .d2-863162224 .fill-B1{fill:#0D32B2;} + .d2-863162224 .fill-B2{fill:#0D32B2;} + .d2-863162224 .fill-B3{fill:#E3E9FD;} + .d2-863162224 .fill-B4{fill:#E3E9FD;} + .d2-863162224 .fill-B5{fill:#EDF0FD;} + .d2-863162224 .fill-B6{fill:#F7F8FE;} + .d2-863162224 .fill-AA2{fill:#4A6FF3;} + .d2-863162224 .fill-AA4{fill:#EDF0FD;} + .d2-863162224 .fill-AA5{fill:#F7F8FE;} + .d2-863162224 .fill-AB4{fill:#EDF0FD;} + .d2-863162224 .fill-AB5{fill:#F7F8FE;} + .d2-863162224 .stroke-N1{stroke:#0A0F25;} + .d2-863162224 .stroke-N2{stroke:#676C7E;} + .d2-863162224 .stroke-N3{stroke:#9499AB;} + .d2-863162224 .stroke-N4{stroke:#CFD2DD;} + .d2-863162224 .stroke-N5{stroke:#DEE1EB;} + .d2-863162224 .stroke-N6{stroke:#EEF1F8;} + .d2-863162224 .stroke-N7{stroke:#FFFFFF;} + .d2-863162224 .stroke-B1{stroke:#0D32B2;} + .d2-863162224 .stroke-B2{stroke:#0D32B2;} + .d2-863162224 .stroke-B3{stroke:#E3E9FD;} + .d2-863162224 .stroke-B4{stroke:#E3E9FD;} + .d2-863162224 .stroke-B5{stroke:#EDF0FD;} + .d2-863162224 .stroke-B6{stroke:#F7F8FE;} + .d2-863162224 .stroke-AA2{stroke:#4A6FF3;} + .d2-863162224 .stroke-AA4{stroke:#EDF0FD;} + .d2-863162224 .stroke-AA5{stroke:#F7F8FE;} + .d2-863162224 .stroke-AB4{stroke:#EDF0FD;} + .d2-863162224 .stroke-AB5{stroke:#F7F8FE;} + .d2-863162224 .background-color-N1{background-color:#0A0F25;} + .d2-863162224 .background-color-N2{background-color:#676C7E;} + .d2-863162224 .background-color-N3{background-color:#9499AB;} + .d2-863162224 .background-color-N4{background-color:#CFD2DD;} + .d2-863162224 .background-color-N5{background-color:#DEE1EB;} + .d2-863162224 .background-color-N6{background-color:#EEF1F8;} + .d2-863162224 .background-color-N7{background-color:#FFFFFF;} + .d2-863162224 .background-color-B1{background-color:#0D32B2;} + .d2-863162224 .background-color-B2{background-color:#0D32B2;} + .d2-863162224 .background-color-B3{background-color:#E3E9FD;} + .d2-863162224 .background-color-B4{background-color:#E3E9FD;} + .d2-863162224 .background-color-B5{background-color:#EDF0FD;} + .d2-863162224 .background-color-B6{background-color:#F7F8FE;} + .d2-863162224 .background-color-AA2{background-color:#4A6FF3;} + .d2-863162224 .background-color-AA4{background-color:#EDF0FD;} + .d2-863162224 .background-color-AA5{background-color:#F7F8FE;} + .d2-863162224 .background-color-AB4{background-color:#EDF0FD;} + .d2-863162224 .background-color-AB5{background-color:#F7F8FE;} + .d2-863162224 .color-N1{color:#0A0F25;} + .d2-863162224 .color-N2{color:#676C7E;} + .d2-863162224 .color-N3{color:#9499AB;} + .d2-863162224 .color-N4{color:#CFD2DD;} + .d2-863162224 .color-N5{color:#DEE1EB;} + .d2-863162224 .color-N6{color:#EEF1F8;} + .d2-863162224 .color-N7{color:#FFFFFF;} + .d2-863162224 .color-B1{color:#0D32B2;} + .d2-863162224 .color-B2{color:#0D32B2;} + .d2-863162224 .color-B3{color:#E3E9FD;} + .d2-863162224 .color-B4{color:#E3E9FD;} + .d2-863162224 .color-B5{color:#EDF0FD;} + .d2-863162224 .color-B6{color:#F7F8FE;} + .d2-863162224 .color-AA2{color:#4A6FF3;} + .d2-863162224 .color-AA4{color:#EDF0FD;} + .d2-863162224 .color-AA5{color:#F7F8FE;} + .d2-863162224 .color-AB4{color:#EDF0FD;} + .d2-863162224 .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 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 11fcad477..790317c45 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault + .d2-1180036549 .fill-N1{fill:#0A0F25;} + .d2-1180036549 .fill-N2{fill:#676C7E;} + .d2-1180036549 .fill-N3{fill:#9499AB;} + .d2-1180036549 .fill-N4{fill:#CFD2DD;} + .d2-1180036549 .fill-N5{fill:#DEE1EB;} + .d2-1180036549 .fill-N6{fill:#EEF1F8;} + .d2-1180036549 .fill-N7{fill:#FFFFFF;} + .d2-1180036549 .fill-B1{fill:#0D32B2;} + .d2-1180036549 .fill-B2{fill:#0D32B2;} + .d2-1180036549 .fill-B3{fill:#E3E9FD;} + .d2-1180036549 .fill-B4{fill:#E3E9FD;} + .d2-1180036549 .fill-B5{fill:#EDF0FD;} + .d2-1180036549 .fill-B6{fill:#F7F8FE;} + .d2-1180036549 .fill-AA2{fill:#4A6FF3;} + .d2-1180036549 .fill-AA4{fill:#EDF0FD;} + .d2-1180036549 .fill-AA5{fill:#F7F8FE;} + .d2-1180036549 .fill-AB4{fill:#EDF0FD;} + .d2-1180036549 .fill-AB5{fill:#F7F8FE;} + .d2-1180036549 .stroke-N1{stroke:#0A0F25;} + .d2-1180036549 .stroke-N2{stroke:#676C7E;} + .d2-1180036549 .stroke-N3{stroke:#9499AB;} + .d2-1180036549 .stroke-N4{stroke:#CFD2DD;} + .d2-1180036549 .stroke-N5{stroke:#DEE1EB;} + .d2-1180036549 .stroke-N6{stroke:#EEF1F8;} + .d2-1180036549 .stroke-N7{stroke:#FFFFFF;} + .d2-1180036549 .stroke-B1{stroke:#0D32B2;} + .d2-1180036549 .stroke-B2{stroke:#0D32B2;} + .d2-1180036549 .stroke-B3{stroke:#E3E9FD;} + .d2-1180036549 .stroke-B4{stroke:#E3E9FD;} + .d2-1180036549 .stroke-B5{stroke:#EDF0FD;} + .d2-1180036549 .stroke-B6{stroke:#F7F8FE;} + .d2-1180036549 .stroke-AA2{stroke:#4A6FF3;} + .d2-1180036549 .stroke-AA4{stroke:#EDF0FD;} + .d2-1180036549 .stroke-AA5{stroke:#F7F8FE;} + .d2-1180036549 .stroke-AB4{stroke:#EDF0FD;} + .d2-1180036549 .stroke-AB5{stroke:#F7F8FE;} + .d2-1180036549 .background-color-N1{background-color:#0A0F25;} + .d2-1180036549 .background-color-N2{background-color:#676C7E;} + .d2-1180036549 .background-color-N3{background-color:#9499AB;} + .d2-1180036549 .background-color-N4{background-color:#CFD2DD;} + .d2-1180036549 .background-color-N5{background-color:#DEE1EB;} + .d2-1180036549 .background-color-N6{background-color:#EEF1F8;} + .d2-1180036549 .background-color-N7{background-color:#FFFFFF;} + .d2-1180036549 .background-color-B1{background-color:#0D32B2;} + .d2-1180036549 .background-color-B2{background-color:#0D32B2;} + .d2-1180036549 .background-color-B3{background-color:#E3E9FD;} + .d2-1180036549 .background-color-B4{background-color:#E3E9FD;} + .d2-1180036549 .background-color-B5{background-color:#EDF0FD;} + .d2-1180036549 .background-color-B6{background-color:#F7F8FE;} + .d2-1180036549 .background-color-AA2{background-color:#4A6FF3;} + .d2-1180036549 .background-color-AA4{background-color:#EDF0FD;} + .d2-1180036549 .background-color-AA5{background-color:#F7F8FE;} + .d2-1180036549 .background-color-AB4{background-color:#EDF0FD;} + .d2-1180036549 .background-color-AB5{background-color:#F7F8FE;} + .d2-1180036549 .color-N1{color:#0A0F25;} + .d2-1180036549 .color-N2{color:#676C7E;} + .d2-1180036549 .color-N3{color:#9499AB;} + .d2-1180036549 .color-N4{color:#CFD2DD;} + .d2-1180036549 .color-N5{color:#DEE1EB;} + .d2-1180036549 .color-N6{color:#EEF1F8;} + .d2-1180036549 .color-N7{color:#FFFFFF;} + .d2-1180036549 .color-B1{color:#0D32B2;} + .d2-1180036549 .color-B2{color:#0D32B2;} + .d2-1180036549 .color-B3{color:#E3E9FD;} + .d2-1180036549 .color-B4{color:#E3E9FD;} + .d2-1180036549 .color-B5{color:#EDF0FD;} + .d2-1180036549 .color-B6{color:#F7F8FE;} + .d2-1180036549 .color-AA2{color:#4A6FF3;} + .d2-1180036549 .color-AA4{color:#EDF0FD;} + .d2-1180036549 .color-AA5{color:#F7F8FE;} + .d2-1180036549 .color-AB4{color:#EDF0FD;} + .d2-1180036549 .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 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 ff47a73a5..5fa4fca84 100644 --- a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -my network + .d2-67740778 .fill-N1{fill:#0A0F25;} + .d2-67740778 .fill-N2{fill:#676C7E;} + .d2-67740778 .fill-N3{fill:#9499AB;} + .d2-67740778 .fill-N4{fill:#CFD2DD;} + .d2-67740778 .fill-N5{fill:#DEE1EB;} + .d2-67740778 .fill-N6{fill:#EEF1F8;} + .d2-67740778 .fill-N7{fill:#FFFFFF;} + .d2-67740778 .fill-B1{fill:#0D32B2;} + .d2-67740778 .fill-B2{fill:#0D32B2;} + .d2-67740778 .fill-B3{fill:#E3E9FD;} + .d2-67740778 .fill-B4{fill:#E3E9FD;} + .d2-67740778 .fill-B5{fill:#EDF0FD;} + .d2-67740778 .fill-B6{fill:#F7F8FE;} + .d2-67740778 .fill-AA2{fill:#4A6FF3;} + .d2-67740778 .fill-AA4{fill:#EDF0FD;} + .d2-67740778 .fill-AA5{fill:#F7F8FE;} + .d2-67740778 .fill-AB4{fill:#EDF0FD;} + .d2-67740778 .fill-AB5{fill:#F7F8FE;} + .d2-67740778 .stroke-N1{stroke:#0A0F25;} + .d2-67740778 .stroke-N2{stroke:#676C7E;} + .d2-67740778 .stroke-N3{stroke:#9499AB;} + .d2-67740778 .stroke-N4{stroke:#CFD2DD;} + .d2-67740778 .stroke-N5{stroke:#DEE1EB;} + .d2-67740778 .stroke-N6{stroke:#EEF1F8;} + .d2-67740778 .stroke-N7{stroke:#FFFFFF;} + .d2-67740778 .stroke-B1{stroke:#0D32B2;} + .d2-67740778 .stroke-B2{stroke:#0D32B2;} + .d2-67740778 .stroke-B3{stroke:#E3E9FD;} + .d2-67740778 .stroke-B4{stroke:#E3E9FD;} + .d2-67740778 .stroke-B5{stroke:#EDF0FD;} + .d2-67740778 .stroke-B6{stroke:#F7F8FE;} + .d2-67740778 .stroke-AA2{stroke:#4A6FF3;} + .d2-67740778 .stroke-AA4{stroke:#EDF0FD;} + .d2-67740778 .stroke-AA5{stroke:#F7F8FE;} + .d2-67740778 .stroke-AB4{stroke:#EDF0FD;} + .d2-67740778 .stroke-AB5{stroke:#F7F8FE;} + .d2-67740778 .background-color-N1{background-color:#0A0F25;} + .d2-67740778 .background-color-N2{background-color:#676C7E;} + .d2-67740778 .background-color-N3{background-color:#9499AB;} + .d2-67740778 .background-color-N4{background-color:#CFD2DD;} + .d2-67740778 .background-color-N5{background-color:#DEE1EB;} + .d2-67740778 .background-color-N6{background-color:#EEF1F8;} + .d2-67740778 .background-color-N7{background-color:#FFFFFF;} + .d2-67740778 .background-color-B1{background-color:#0D32B2;} + .d2-67740778 .background-color-B2{background-color:#0D32B2;} + .d2-67740778 .background-color-B3{background-color:#E3E9FD;} + .d2-67740778 .background-color-B4{background-color:#E3E9FD;} + .d2-67740778 .background-color-B5{background-color:#EDF0FD;} + .d2-67740778 .background-color-B6{background-color:#F7F8FE;} + .d2-67740778 .background-color-AA2{background-color:#4A6FF3;} + .d2-67740778 .background-color-AA4{background-color:#EDF0FD;} + .d2-67740778 .background-color-AA5{background-color:#F7F8FE;} + .d2-67740778 .background-color-AB4{background-color:#EDF0FD;} + .d2-67740778 .background-color-AB5{background-color:#F7F8FE;} + .d2-67740778 .color-N1{color:#0A0F25;} + .d2-67740778 .color-N2{color:#676C7E;} + .d2-67740778 .color-N3{color:#9499AB;} + .d2-67740778 .color-N4{color:#CFD2DD;} + .d2-67740778 .color-N5{color:#DEE1EB;} + .d2-67740778 .color-N6{color:#EEF1F8;} + .d2-67740778 .color-N7{color:#FFFFFF;} + .d2-67740778 .color-B1{color:#0D32B2;} + .d2-67740778 .color-B2{color:#0D32B2;} + .d2-67740778 .color-B3{color:#E3E9FD;} + .d2-67740778 .color-B4{color:#E3E9FD;} + .d2-67740778 .color-B5{color:#EDF0FD;} + .d2-67740778 .color-B6{color:#F7F8FE;} + .d2-67740778 .color-AA2{color:#4A6FF3;} + .d2-67740778 .color-AA4{color:#EDF0FD;} + .d2-67740778 .color-AA5{color:#F7F8FE;} + .d2-67740778 .color-AB4{color:#EDF0FD;} + .d2-67740778 .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}]]>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 3d72ade61..429820c29 100644 --- a/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -my network + .d2-1662616225 .fill-N1{fill:#0A0F25;} + .d2-1662616225 .fill-N2{fill:#676C7E;} + .d2-1662616225 .fill-N3{fill:#9499AB;} + .d2-1662616225 .fill-N4{fill:#CFD2DD;} + .d2-1662616225 .fill-N5{fill:#DEE1EB;} + .d2-1662616225 .fill-N6{fill:#EEF1F8;} + .d2-1662616225 .fill-N7{fill:#FFFFFF;} + .d2-1662616225 .fill-B1{fill:#0D32B2;} + .d2-1662616225 .fill-B2{fill:#0D32B2;} + .d2-1662616225 .fill-B3{fill:#E3E9FD;} + .d2-1662616225 .fill-B4{fill:#E3E9FD;} + .d2-1662616225 .fill-B5{fill:#EDF0FD;} + .d2-1662616225 .fill-B6{fill:#F7F8FE;} + .d2-1662616225 .fill-AA2{fill:#4A6FF3;} + .d2-1662616225 .fill-AA4{fill:#EDF0FD;} + .d2-1662616225 .fill-AA5{fill:#F7F8FE;} + .d2-1662616225 .fill-AB4{fill:#EDF0FD;} + .d2-1662616225 .fill-AB5{fill:#F7F8FE;} + .d2-1662616225 .stroke-N1{stroke:#0A0F25;} + .d2-1662616225 .stroke-N2{stroke:#676C7E;} + .d2-1662616225 .stroke-N3{stroke:#9499AB;} + .d2-1662616225 .stroke-N4{stroke:#CFD2DD;} + .d2-1662616225 .stroke-N5{stroke:#DEE1EB;} + .d2-1662616225 .stroke-N6{stroke:#EEF1F8;} + .d2-1662616225 .stroke-N7{stroke:#FFFFFF;} + .d2-1662616225 .stroke-B1{stroke:#0D32B2;} + .d2-1662616225 .stroke-B2{stroke:#0D32B2;} + .d2-1662616225 .stroke-B3{stroke:#E3E9FD;} + .d2-1662616225 .stroke-B4{stroke:#E3E9FD;} + .d2-1662616225 .stroke-B5{stroke:#EDF0FD;} + .d2-1662616225 .stroke-B6{stroke:#F7F8FE;} + .d2-1662616225 .stroke-AA2{stroke:#4A6FF3;} + .d2-1662616225 .stroke-AA4{stroke:#EDF0FD;} + .d2-1662616225 .stroke-AA5{stroke:#F7F8FE;} + .d2-1662616225 .stroke-AB4{stroke:#EDF0FD;} + .d2-1662616225 .stroke-AB5{stroke:#F7F8FE;} + .d2-1662616225 .background-color-N1{background-color:#0A0F25;} + .d2-1662616225 .background-color-N2{background-color:#676C7E;} + .d2-1662616225 .background-color-N3{background-color:#9499AB;} + .d2-1662616225 .background-color-N4{background-color:#CFD2DD;} + .d2-1662616225 .background-color-N5{background-color:#DEE1EB;} + .d2-1662616225 .background-color-N6{background-color:#EEF1F8;} + .d2-1662616225 .background-color-N7{background-color:#FFFFFF;} + .d2-1662616225 .background-color-B1{background-color:#0D32B2;} + .d2-1662616225 .background-color-B2{background-color:#0D32B2;} + .d2-1662616225 .background-color-B3{background-color:#E3E9FD;} + .d2-1662616225 .background-color-B4{background-color:#E3E9FD;} + .d2-1662616225 .background-color-B5{background-color:#EDF0FD;} + .d2-1662616225 .background-color-B6{background-color:#F7F8FE;} + .d2-1662616225 .background-color-AA2{background-color:#4A6FF3;} + .d2-1662616225 .background-color-AA4{background-color:#EDF0FD;} + .d2-1662616225 .background-color-AA5{background-color:#F7F8FE;} + .d2-1662616225 .background-color-AB4{background-color:#EDF0FD;} + .d2-1662616225 .background-color-AB5{background-color:#F7F8FE;} + .d2-1662616225 .color-N1{color:#0A0F25;} + .d2-1662616225 .color-N2{color:#676C7E;} + .d2-1662616225 .color-N3{color:#9499AB;} + .d2-1662616225 .color-N4{color:#CFD2DD;} + .d2-1662616225 .color-N5{color:#DEE1EB;} + .d2-1662616225 .color-N6{color:#EEF1F8;} + .d2-1662616225 .color-N7{color:#FFFFFF;} + .d2-1662616225 .color-B1{color:#0D32B2;} + .d2-1662616225 .color-B2{color:#0D32B2;} + .d2-1662616225 .color-B3{color:#E3E9FD;} + .d2-1662616225 .color-B4{color:#E3E9FD;} + .d2-1662616225 .color-B5{color:#EDF0FD;} + .d2-1662616225 .color-B6{color:#F7F8FE;} + .d2-1662616225 .color-AA2{color:#4A6FF3;} + .d2-1662616225 .color-AA4{color:#EDF0FD;} + .d2-1662616225 .color-AA5{color:#F7F8FE;} + .d2-1662616225 .color-AB4{color:#EDF0FD;} + .d2-1662616225 .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}]]>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 5c110c97c..52b6c70c6 100644 --- a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -mainrootxyzxyz + .d2-2569152134 .fill-N1{fill:#0A0F25;} + .d2-2569152134 .fill-N2{fill:#676C7E;} + .d2-2569152134 .fill-N3{fill:#9499AB;} + .d2-2569152134 .fill-N4{fill:#CFD2DD;} + .d2-2569152134 .fill-N5{fill:#DEE1EB;} + .d2-2569152134 .fill-N6{fill:#EEF1F8;} + .d2-2569152134 .fill-N7{fill:#FFFFFF;} + .d2-2569152134 .fill-B1{fill:#0D32B2;} + .d2-2569152134 .fill-B2{fill:#0D32B2;} + .d2-2569152134 .fill-B3{fill:#E3E9FD;} + .d2-2569152134 .fill-B4{fill:#E3E9FD;} + .d2-2569152134 .fill-B5{fill:#EDF0FD;} + .d2-2569152134 .fill-B6{fill:#F7F8FE;} + .d2-2569152134 .fill-AA2{fill:#4A6FF3;} + .d2-2569152134 .fill-AA4{fill:#EDF0FD;} + .d2-2569152134 .fill-AA5{fill:#F7F8FE;} + .d2-2569152134 .fill-AB4{fill:#EDF0FD;} + .d2-2569152134 .fill-AB5{fill:#F7F8FE;} + .d2-2569152134 .stroke-N1{stroke:#0A0F25;} + .d2-2569152134 .stroke-N2{stroke:#676C7E;} + .d2-2569152134 .stroke-N3{stroke:#9499AB;} + .d2-2569152134 .stroke-N4{stroke:#CFD2DD;} + .d2-2569152134 .stroke-N5{stroke:#DEE1EB;} + .d2-2569152134 .stroke-N6{stroke:#EEF1F8;} + .d2-2569152134 .stroke-N7{stroke:#FFFFFF;} + .d2-2569152134 .stroke-B1{stroke:#0D32B2;} + .d2-2569152134 .stroke-B2{stroke:#0D32B2;} + .d2-2569152134 .stroke-B3{stroke:#E3E9FD;} + .d2-2569152134 .stroke-B4{stroke:#E3E9FD;} + .d2-2569152134 .stroke-B5{stroke:#EDF0FD;} + .d2-2569152134 .stroke-B6{stroke:#F7F8FE;} + .d2-2569152134 .stroke-AA2{stroke:#4A6FF3;} + .d2-2569152134 .stroke-AA4{stroke:#EDF0FD;} + .d2-2569152134 .stroke-AA5{stroke:#F7F8FE;} + .d2-2569152134 .stroke-AB4{stroke:#EDF0FD;} + .d2-2569152134 .stroke-AB5{stroke:#F7F8FE;} + .d2-2569152134 .background-color-N1{background-color:#0A0F25;} + .d2-2569152134 .background-color-N2{background-color:#676C7E;} + .d2-2569152134 .background-color-N3{background-color:#9499AB;} + .d2-2569152134 .background-color-N4{background-color:#CFD2DD;} + .d2-2569152134 .background-color-N5{background-color:#DEE1EB;} + .d2-2569152134 .background-color-N6{background-color:#EEF1F8;} + .d2-2569152134 .background-color-N7{background-color:#FFFFFF;} + .d2-2569152134 .background-color-B1{background-color:#0D32B2;} + .d2-2569152134 .background-color-B2{background-color:#0D32B2;} + .d2-2569152134 .background-color-B3{background-color:#E3E9FD;} + .d2-2569152134 .background-color-B4{background-color:#E3E9FD;} + .d2-2569152134 .background-color-B5{background-color:#EDF0FD;} + .d2-2569152134 .background-color-B6{background-color:#F7F8FE;} + .d2-2569152134 .background-color-AA2{background-color:#4A6FF3;} + .d2-2569152134 .background-color-AA4{background-color:#EDF0FD;} + .d2-2569152134 .background-color-AA5{background-color:#F7F8FE;} + .d2-2569152134 .background-color-AB4{background-color:#EDF0FD;} + .d2-2569152134 .background-color-AB5{background-color:#F7F8FE;} + .d2-2569152134 .color-N1{color:#0A0F25;} + .d2-2569152134 .color-N2{color:#676C7E;} + .d2-2569152134 .color-N3{color:#9499AB;} + .d2-2569152134 .color-N4{color:#CFD2DD;} + .d2-2569152134 .color-N5{color:#DEE1EB;} + .d2-2569152134 .color-N6{color:#EEF1F8;} + .d2-2569152134 .color-N7{color:#FFFFFF;} + .d2-2569152134 .color-B1{color:#0D32B2;} + .d2-2569152134 .color-B2{color:#0D32B2;} + .d2-2569152134 .color-B3{color:#E3E9FD;} + .d2-2569152134 .color-B4{color:#E3E9FD;} + .d2-2569152134 .color-B5{color:#EDF0FD;} + .d2-2569152134 .color-B6{color:#F7F8FE;} + .d2-2569152134 .color-AA2{color:#4A6FF3;} + .d2-2569152134 .color-AA4{color:#EDF0FD;} + .d2-2569152134 .color-AA5{color:#F7F8FE;} + .d2-2569152134 .color-AB4{color:#EDF0FD;} + .d2-2569152134 .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}]]>mainrootxyzxyz diff --git a/e2etests/testdata/regression/root-container/elk/sketch.exp.svg b/e2etests/testdata/regression/root-container/elk/sketch.exp.svg index 5f27873af..1c251aaca 100644 --- a/e2etests/testdata/regression/root-container/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -mainrootxyzxyz + .d2-16415280 .fill-N1{fill:#0A0F25;} + .d2-16415280 .fill-N2{fill:#676C7E;} + .d2-16415280 .fill-N3{fill:#9499AB;} + .d2-16415280 .fill-N4{fill:#CFD2DD;} + .d2-16415280 .fill-N5{fill:#DEE1EB;} + .d2-16415280 .fill-N6{fill:#EEF1F8;} + .d2-16415280 .fill-N7{fill:#FFFFFF;} + .d2-16415280 .fill-B1{fill:#0D32B2;} + .d2-16415280 .fill-B2{fill:#0D32B2;} + .d2-16415280 .fill-B3{fill:#E3E9FD;} + .d2-16415280 .fill-B4{fill:#E3E9FD;} + .d2-16415280 .fill-B5{fill:#EDF0FD;} + .d2-16415280 .fill-B6{fill:#F7F8FE;} + .d2-16415280 .fill-AA2{fill:#4A6FF3;} + .d2-16415280 .fill-AA4{fill:#EDF0FD;} + .d2-16415280 .fill-AA5{fill:#F7F8FE;} + .d2-16415280 .fill-AB4{fill:#EDF0FD;} + .d2-16415280 .fill-AB5{fill:#F7F8FE;} + .d2-16415280 .stroke-N1{stroke:#0A0F25;} + .d2-16415280 .stroke-N2{stroke:#676C7E;} + .d2-16415280 .stroke-N3{stroke:#9499AB;} + .d2-16415280 .stroke-N4{stroke:#CFD2DD;} + .d2-16415280 .stroke-N5{stroke:#DEE1EB;} + .d2-16415280 .stroke-N6{stroke:#EEF1F8;} + .d2-16415280 .stroke-N7{stroke:#FFFFFF;} + .d2-16415280 .stroke-B1{stroke:#0D32B2;} + .d2-16415280 .stroke-B2{stroke:#0D32B2;} + .d2-16415280 .stroke-B3{stroke:#E3E9FD;} + .d2-16415280 .stroke-B4{stroke:#E3E9FD;} + .d2-16415280 .stroke-B5{stroke:#EDF0FD;} + .d2-16415280 .stroke-B6{stroke:#F7F8FE;} + .d2-16415280 .stroke-AA2{stroke:#4A6FF3;} + .d2-16415280 .stroke-AA4{stroke:#EDF0FD;} + .d2-16415280 .stroke-AA5{stroke:#F7F8FE;} + .d2-16415280 .stroke-AB4{stroke:#EDF0FD;} + .d2-16415280 .stroke-AB5{stroke:#F7F8FE;} + .d2-16415280 .background-color-N1{background-color:#0A0F25;} + .d2-16415280 .background-color-N2{background-color:#676C7E;} + .d2-16415280 .background-color-N3{background-color:#9499AB;} + .d2-16415280 .background-color-N4{background-color:#CFD2DD;} + .d2-16415280 .background-color-N5{background-color:#DEE1EB;} + .d2-16415280 .background-color-N6{background-color:#EEF1F8;} + .d2-16415280 .background-color-N7{background-color:#FFFFFF;} + .d2-16415280 .background-color-B1{background-color:#0D32B2;} + .d2-16415280 .background-color-B2{background-color:#0D32B2;} + .d2-16415280 .background-color-B3{background-color:#E3E9FD;} + .d2-16415280 .background-color-B4{background-color:#E3E9FD;} + .d2-16415280 .background-color-B5{background-color:#EDF0FD;} + .d2-16415280 .background-color-B6{background-color:#F7F8FE;} + .d2-16415280 .background-color-AA2{background-color:#4A6FF3;} + .d2-16415280 .background-color-AA4{background-color:#EDF0FD;} + .d2-16415280 .background-color-AA5{background-color:#F7F8FE;} + .d2-16415280 .background-color-AB4{background-color:#EDF0FD;} + .d2-16415280 .background-color-AB5{background-color:#F7F8FE;} + .d2-16415280 .color-N1{color:#0A0F25;} + .d2-16415280 .color-N2{color:#676C7E;} + .d2-16415280 .color-N3{color:#9499AB;} + .d2-16415280 .color-N4{color:#CFD2DD;} + .d2-16415280 .color-N5{color:#DEE1EB;} + .d2-16415280 .color-N6{color:#EEF1F8;} + .d2-16415280 .color-N7{color:#FFFFFF;} + .d2-16415280 .color-B1{color:#0D32B2;} + .d2-16415280 .color-B2{color:#0D32B2;} + .d2-16415280 .color-B3{color:#E3E9FD;} + .d2-16415280 .color-B4{color:#E3E9FD;} + .d2-16415280 .color-B5{color:#EDF0FD;} + .d2-16415280 .color-B6{color:#F7F8FE;} + .d2-16415280 .color-AA2{color:#4A6FF3;} + .d2-16415280 .color-AA4{color:#EDF0FD;} + .d2-16415280 .color-AA5{color:#F7F8FE;} + .d2-16415280 .color-AB4{color:#EDF0FD;} + .d2-16415280 .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}]]>mainrootxyzxyz 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 fd90cb89a..cc55984c8 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,9 +1,9 @@ -ab04:20,11:20loop through each table start_time = datetime.datetime.now + .d2-1255857598 .fill-N1{fill:#0A0F25;} + .d2-1255857598 .fill-N2{fill:#676C7E;} + .d2-1255857598 .fill-N3{fill:#9499AB;} + .d2-1255857598 .fill-N4{fill:#CFD2DD;} + .d2-1255857598 .fill-N5{fill:#DEE1EB;} + .d2-1255857598 .fill-N6{fill:#EEF1F8;} + .d2-1255857598 .fill-N7{fill:#FFFFFF;} + .d2-1255857598 .fill-B1{fill:#0D32B2;} + .d2-1255857598 .fill-B2{fill:#0D32B2;} + .d2-1255857598 .fill-B3{fill:#E3E9FD;} + .d2-1255857598 .fill-B4{fill:#E3E9FD;} + .d2-1255857598 .fill-B5{fill:#EDF0FD;} + .d2-1255857598 .fill-B6{fill:#F7F8FE;} + .d2-1255857598 .fill-AA2{fill:#4A6FF3;} + .d2-1255857598 .fill-AA4{fill:#EDF0FD;} + .d2-1255857598 .fill-AA5{fill:#F7F8FE;} + .d2-1255857598 .fill-AB4{fill:#EDF0FD;} + .d2-1255857598 .fill-AB5{fill:#F7F8FE;} + .d2-1255857598 .stroke-N1{stroke:#0A0F25;} + .d2-1255857598 .stroke-N2{stroke:#676C7E;} + .d2-1255857598 .stroke-N3{stroke:#9499AB;} + .d2-1255857598 .stroke-N4{stroke:#CFD2DD;} + .d2-1255857598 .stroke-N5{stroke:#DEE1EB;} + .d2-1255857598 .stroke-N6{stroke:#EEF1F8;} + .d2-1255857598 .stroke-N7{stroke:#FFFFFF;} + .d2-1255857598 .stroke-B1{stroke:#0D32B2;} + .d2-1255857598 .stroke-B2{stroke:#0D32B2;} + .d2-1255857598 .stroke-B3{stroke:#E3E9FD;} + .d2-1255857598 .stroke-B4{stroke:#E3E9FD;} + .d2-1255857598 .stroke-B5{stroke:#EDF0FD;} + .d2-1255857598 .stroke-B6{stroke:#F7F8FE;} + .d2-1255857598 .stroke-AA2{stroke:#4A6FF3;} + .d2-1255857598 .stroke-AA4{stroke:#EDF0FD;} + .d2-1255857598 .stroke-AA5{stroke:#F7F8FE;} + .d2-1255857598 .stroke-AB4{stroke:#EDF0FD;} + .d2-1255857598 .stroke-AB5{stroke:#F7F8FE;} + .d2-1255857598 .background-color-N1{background-color:#0A0F25;} + .d2-1255857598 .background-color-N2{background-color:#676C7E;} + .d2-1255857598 .background-color-N3{background-color:#9499AB;} + .d2-1255857598 .background-color-N4{background-color:#CFD2DD;} + .d2-1255857598 .background-color-N5{background-color:#DEE1EB;} + .d2-1255857598 .background-color-N6{background-color:#EEF1F8;} + .d2-1255857598 .background-color-N7{background-color:#FFFFFF;} + .d2-1255857598 .background-color-B1{background-color:#0D32B2;} + .d2-1255857598 .background-color-B2{background-color:#0D32B2;} + .d2-1255857598 .background-color-B3{background-color:#E3E9FD;} + .d2-1255857598 .background-color-B4{background-color:#E3E9FD;} + .d2-1255857598 .background-color-B5{background-color:#EDF0FD;} + .d2-1255857598 .background-color-B6{background-color:#F7F8FE;} + .d2-1255857598 .background-color-AA2{background-color:#4A6FF3;} + .d2-1255857598 .background-color-AA4{background-color:#EDF0FD;} + .d2-1255857598 .background-color-AA5{background-color:#F7F8FE;} + .d2-1255857598 .background-color-AB4{background-color:#EDF0FD;} + .d2-1255857598 .background-color-AB5{background-color:#F7F8FE;} + .d2-1255857598 .color-N1{color:#0A0F25;} + .d2-1255857598 .color-N2{color:#676C7E;} + .d2-1255857598 .color-N3{color:#9499AB;} + .d2-1255857598 .color-N4{color:#CFD2DD;} + .d2-1255857598 .color-N5{color:#DEE1EB;} + .d2-1255857598 .color-N6{color:#EEF1F8;} + .d2-1255857598 .color-N7{color:#FFFFFF;} + .d2-1255857598 .color-B1{color:#0D32B2;} + .d2-1255857598 .color-B2{color:#0D32B2;} + .d2-1255857598 .color-B3{color:#E3E9FD;} + .d2-1255857598 .color-B4{color:#E3E9FD;} + .d2-1255857598 .color-B5{color:#EDF0FD;} + .d2-1255857598 .color-B6{color:#F7F8FE;} + .d2-1255857598 .color-AA2{color:#4A6FF3;} + .d2-1255857598 .color-AA4{color:#EDF0FD;} + .d2-1255857598 .color-AA5{color:#F7F8FE;} + .d2-1255857598 .color-AB4{color:#EDF0FD;} + .d2-1255857598 .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}]]>ab04:20,11:20loop through each table start_time = datetime.datetime.now 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 fd90cb89a..cc55984c8 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,9 +1,9 @@ -ab04:20,11:20loop through each table start_time = datetime.datetime.now + .d2-1255857598 .fill-N1{fill:#0A0F25;} + .d2-1255857598 .fill-N2{fill:#676C7E;} + .d2-1255857598 .fill-N3{fill:#9499AB;} + .d2-1255857598 .fill-N4{fill:#CFD2DD;} + .d2-1255857598 .fill-N5{fill:#DEE1EB;} + .d2-1255857598 .fill-N6{fill:#EEF1F8;} + .d2-1255857598 .fill-N7{fill:#FFFFFF;} + .d2-1255857598 .fill-B1{fill:#0D32B2;} + .d2-1255857598 .fill-B2{fill:#0D32B2;} + .d2-1255857598 .fill-B3{fill:#E3E9FD;} + .d2-1255857598 .fill-B4{fill:#E3E9FD;} + .d2-1255857598 .fill-B5{fill:#EDF0FD;} + .d2-1255857598 .fill-B6{fill:#F7F8FE;} + .d2-1255857598 .fill-AA2{fill:#4A6FF3;} + .d2-1255857598 .fill-AA4{fill:#EDF0FD;} + .d2-1255857598 .fill-AA5{fill:#F7F8FE;} + .d2-1255857598 .fill-AB4{fill:#EDF0FD;} + .d2-1255857598 .fill-AB5{fill:#F7F8FE;} + .d2-1255857598 .stroke-N1{stroke:#0A0F25;} + .d2-1255857598 .stroke-N2{stroke:#676C7E;} + .d2-1255857598 .stroke-N3{stroke:#9499AB;} + .d2-1255857598 .stroke-N4{stroke:#CFD2DD;} + .d2-1255857598 .stroke-N5{stroke:#DEE1EB;} + .d2-1255857598 .stroke-N6{stroke:#EEF1F8;} + .d2-1255857598 .stroke-N7{stroke:#FFFFFF;} + .d2-1255857598 .stroke-B1{stroke:#0D32B2;} + .d2-1255857598 .stroke-B2{stroke:#0D32B2;} + .d2-1255857598 .stroke-B3{stroke:#E3E9FD;} + .d2-1255857598 .stroke-B4{stroke:#E3E9FD;} + .d2-1255857598 .stroke-B5{stroke:#EDF0FD;} + .d2-1255857598 .stroke-B6{stroke:#F7F8FE;} + .d2-1255857598 .stroke-AA2{stroke:#4A6FF3;} + .d2-1255857598 .stroke-AA4{stroke:#EDF0FD;} + .d2-1255857598 .stroke-AA5{stroke:#F7F8FE;} + .d2-1255857598 .stroke-AB4{stroke:#EDF0FD;} + .d2-1255857598 .stroke-AB5{stroke:#F7F8FE;} + .d2-1255857598 .background-color-N1{background-color:#0A0F25;} + .d2-1255857598 .background-color-N2{background-color:#676C7E;} + .d2-1255857598 .background-color-N3{background-color:#9499AB;} + .d2-1255857598 .background-color-N4{background-color:#CFD2DD;} + .d2-1255857598 .background-color-N5{background-color:#DEE1EB;} + .d2-1255857598 .background-color-N6{background-color:#EEF1F8;} + .d2-1255857598 .background-color-N7{background-color:#FFFFFF;} + .d2-1255857598 .background-color-B1{background-color:#0D32B2;} + .d2-1255857598 .background-color-B2{background-color:#0D32B2;} + .d2-1255857598 .background-color-B3{background-color:#E3E9FD;} + .d2-1255857598 .background-color-B4{background-color:#E3E9FD;} + .d2-1255857598 .background-color-B5{background-color:#EDF0FD;} + .d2-1255857598 .background-color-B6{background-color:#F7F8FE;} + .d2-1255857598 .background-color-AA2{background-color:#4A6FF3;} + .d2-1255857598 .background-color-AA4{background-color:#EDF0FD;} + .d2-1255857598 .background-color-AA5{background-color:#F7F8FE;} + .d2-1255857598 .background-color-AB4{background-color:#EDF0FD;} + .d2-1255857598 .background-color-AB5{background-color:#F7F8FE;} + .d2-1255857598 .color-N1{color:#0A0F25;} + .d2-1255857598 .color-N2{color:#676C7E;} + .d2-1255857598 .color-N3{color:#9499AB;} + .d2-1255857598 .color-N4{color:#CFD2DD;} + .d2-1255857598 .color-N5{color:#DEE1EB;} + .d2-1255857598 .color-N6{color:#EEF1F8;} + .d2-1255857598 .color-N7{color:#FFFFFF;} + .d2-1255857598 .color-B1{color:#0D32B2;} + .d2-1255857598 .color-B2{color:#0D32B2;} + .d2-1255857598 .color-B3{color:#E3E9FD;} + .d2-1255857598 .color-B4{color:#E3E9FD;} + .d2-1255857598 .color-B5{color:#EDF0FD;} + .d2-1255857598 .color-B6{color:#F7F8FE;} + .d2-1255857598 .color-AA2{color:#4A6FF3;} + .d2-1255857598 .color-AA4{color:#EDF0FD;} + .d2-1255857598 .color-AA5{color:#F7F8FE;} + .d2-1255857598 .color-AB4{color:#EDF0FD;} + .d2-1255857598 .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}]]>ab04:20,11:20loop through each table start_time = datetime.datetime.now 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 6a19f2993..3f1e4a1e6 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,9 +1,9 @@ -foofoobarabcd + .d2-3416172057 .fill-N1{fill:#0A0F25;} + .d2-3416172057 .fill-N2{fill:#676C7E;} + .d2-3416172057 .fill-N3{fill:#9499AB;} + .d2-3416172057 .fill-N4{fill:#CFD2DD;} + .d2-3416172057 .fill-N5{fill:#DEE1EB;} + .d2-3416172057 .fill-N6{fill:#EEF1F8;} + .d2-3416172057 .fill-N7{fill:#FFFFFF;} + .d2-3416172057 .fill-B1{fill:#0D32B2;} + .d2-3416172057 .fill-B2{fill:#0D32B2;} + .d2-3416172057 .fill-B3{fill:#E3E9FD;} + .d2-3416172057 .fill-B4{fill:#E3E9FD;} + .d2-3416172057 .fill-B5{fill:#EDF0FD;} + .d2-3416172057 .fill-B6{fill:#F7F8FE;} + .d2-3416172057 .fill-AA2{fill:#4A6FF3;} + .d2-3416172057 .fill-AA4{fill:#EDF0FD;} + .d2-3416172057 .fill-AA5{fill:#F7F8FE;} + .d2-3416172057 .fill-AB4{fill:#EDF0FD;} + .d2-3416172057 .fill-AB5{fill:#F7F8FE;} + .d2-3416172057 .stroke-N1{stroke:#0A0F25;} + .d2-3416172057 .stroke-N2{stroke:#676C7E;} + .d2-3416172057 .stroke-N3{stroke:#9499AB;} + .d2-3416172057 .stroke-N4{stroke:#CFD2DD;} + .d2-3416172057 .stroke-N5{stroke:#DEE1EB;} + .d2-3416172057 .stroke-N6{stroke:#EEF1F8;} + .d2-3416172057 .stroke-N7{stroke:#FFFFFF;} + .d2-3416172057 .stroke-B1{stroke:#0D32B2;} + .d2-3416172057 .stroke-B2{stroke:#0D32B2;} + .d2-3416172057 .stroke-B3{stroke:#E3E9FD;} + .d2-3416172057 .stroke-B4{stroke:#E3E9FD;} + .d2-3416172057 .stroke-B5{stroke:#EDF0FD;} + .d2-3416172057 .stroke-B6{stroke:#F7F8FE;} + .d2-3416172057 .stroke-AA2{stroke:#4A6FF3;} + .d2-3416172057 .stroke-AA4{stroke:#EDF0FD;} + .d2-3416172057 .stroke-AA5{stroke:#F7F8FE;} + .d2-3416172057 .stroke-AB4{stroke:#EDF0FD;} + .d2-3416172057 .stroke-AB5{stroke:#F7F8FE;} + .d2-3416172057 .background-color-N1{background-color:#0A0F25;} + .d2-3416172057 .background-color-N2{background-color:#676C7E;} + .d2-3416172057 .background-color-N3{background-color:#9499AB;} + .d2-3416172057 .background-color-N4{background-color:#CFD2DD;} + .d2-3416172057 .background-color-N5{background-color:#DEE1EB;} + .d2-3416172057 .background-color-N6{background-color:#EEF1F8;} + .d2-3416172057 .background-color-N7{background-color:#FFFFFF;} + .d2-3416172057 .background-color-B1{background-color:#0D32B2;} + .d2-3416172057 .background-color-B2{background-color:#0D32B2;} + .d2-3416172057 .background-color-B3{background-color:#E3E9FD;} + .d2-3416172057 .background-color-B4{background-color:#E3E9FD;} + .d2-3416172057 .background-color-B5{background-color:#EDF0FD;} + .d2-3416172057 .background-color-B6{background-color:#F7F8FE;} + .d2-3416172057 .background-color-AA2{background-color:#4A6FF3;} + .d2-3416172057 .background-color-AA4{background-color:#EDF0FD;} + .d2-3416172057 .background-color-AA5{background-color:#F7F8FE;} + .d2-3416172057 .background-color-AB4{background-color:#EDF0FD;} + .d2-3416172057 .background-color-AB5{background-color:#F7F8FE;} + .d2-3416172057 .color-N1{color:#0A0F25;} + .d2-3416172057 .color-N2{color:#676C7E;} + .d2-3416172057 .color-N3{color:#9499AB;} + .d2-3416172057 .color-N4{color:#CFD2DD;} + .d2-3416172057 .color-N5{color:#DEE1EB;} + .d2-3416172057 .color-N6{color:#EEF1F8;} + .d2-3416172057 .color-N7{color:#FFFFFF;} + .d2-3416172057 .color-B1{color:#0D32B2;} + .d2-3416172057 .color-B2{color:#0D32B2;} + .d2-3416172057 .color-B3{color:#E3E9FD;} + .d2-3416172057 .color-B4{color:#E3E9FD;} + .d2-3416172057 .color-B5{color:#EDF0FD;} + .d2-3416172057 .color-B6{color:#F7F8FE;} + .d2-3416172057 .color-AA2{color:#4A6FF3;} + .d2-3416172057 .color-AA4{color:#EDF0FD;} + .d2-3416172057 .color-AA5{color:#F7F8FE;} + .d2-3416172057 .color-AB4{color:#EDF0FD;} + .d2-3416172057 .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}]]>foofoobarabcd 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 e20bd55a3..c240340f5 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,9 +1,9 @@ -foofoobarabcd + .d2-3438069034 .fill-N1{fill:#0A0F25;} + .d2-3438069034 .fill-N2{fill:#676C7E;} + .d2-3438069034 .fill-N3{fill:#9499AB;} + .d2-3438069034 .fill-N4{fill:#CFD2DD;} + .d2-3438069034 .fill-N5{fill:#DEE1EB;} + .d2-3438069034 .fill-N6{fill:#EEF1F8;} + .d2-3438069034 .fill-N7{fill:#FFFFFF;} + .d2-3438069034 .fill-B1{fill:#0D32B2;} + .d2-3438069034 .fill-B2{fill:#0D32B2;} + .d2-3438069034 .fill-B3{fill:#E3E9FD;} + .d2-3438069034 .fill-B4{fill:#E3E9FD;} + .d2-3438069034 .fill-B5{fill:#EDF0FD;} + .d2-3438069034 .fill-B6{fill:#F7F8FE;} + .d2-3438069034 .fill-AA2{fill:#4A6FF3;} + .d2-3438069034 .fill-AA4{fill:#EDF0FD;} + .d2-3438069034 .fill-AA5{fill:#F7F8FE;} + .d2-3438069034 .fill-AB4{fill:#EDF0FD;} + .d2-3438069034 .fill-AB5{fill:#F7F8FE;} + .d2-3438069034 .stroke-N1{stroke:#0A0F25;} + .d2-3438069034 .stroke-N2{stroke:#676C7E;} + .d2-3438069034 .stroke-N3{stroke:#9499AB;} + .d2-3438069034 .stroke-N4{stroke:#CFD2DD;} + .d2-3438069034 .stroke-N5{stroke:#DEE1EB;} + .d2-3438069034 .stroke-N6{stroke:#EEF1F8;} + .d2-3438069034 .stroke-N7{stroke:#FFFFFF;} + .d2-3438069034 .stroke-B1{stroke:#0D32B2;} + .d2-3438069034 .stroke-B2{stroke:#0D32B2;} + .d2-3438069034 .stroke-B3{stroke:#E3E9FD;} + .d2-3438069034 .stroke-B4{stroke:#E3E9FD;} + .d2-3438069034 .stroke-B5{stroke:#EDF0FD;} + .d2-3438069034 .stroke-B6{stroke:#F7F8FE;} + .d2-3438069034 .stroke-AA2{stroke:#4A6FF3;} + .d2-3438069034 .stroke-AA4{stroke:#EDF0FD;} + .d2-3438069034 .stroke-AA5{stroke:#F7F8FE;} + .d2-3438069034 .stroke-AB4{stroke:#EDF0FD;} + .d2-3438069034 .stroke-AB5{stroke:#F7F8FE;} + .d2-3438069034 .background-color-N1{background-color:#0A0F25;} + .d2-3438069034 .background-color-N2{background-color:#676C7E;} + .d2-3438069034 .background-color-N3{background-color:#9499AB;} + .d2-3438069034 .background-color-N4{background-color:#CFD2DD;} + .d2-3438069034 .background-color-N5{background-color:#DEE1EB;} + .d2-3438069034 .background-color-N6{background-color:#EEF1F8;} + .d2-3438069034 .background-color-N7{background-color:#FFFFFF;} + .d2-3438069034 .background-color-B1{background-color:#0D32B2;} + .d2-3438069034 .background-color-B2{background-color:#0D32B2;} + .d2-3438069034 .background-color-B3{background-color:#E3E9FD;} + .d2-3438069034 .background-color-B4{background-color:#E3E9FD;} + .d2-3438069034 .background-color-B5{background-color:#EDF0FD;} + .d2-3438069034 .background-color-B6{background-color:#F7F8FE;} + .d2-3438069034 .background-color-AA2{background-color:#4A6FF3;} + .d2-3438069034 .background-color-AA4{background-color:#EDF0FD;} + .d2-3438069034 .background-color-AA5{background-color:#F7F8FE;} + .d2-3438069034 .background-color-AB4{background-color:#EDF0FD;} + .d2-3438069034 .background-color-AB5{background-color:#F7F8FE;} + .d2-3438069034 .color-N1{color:#0A0F25;} + .d2-3438069034 .color-N2{color:#676C7E;} + .d2-3438069034 .color-N3{color:#9499AB;} + .d2-3438069034 .color-N4{color:#CFD2DD;} + .d2-3438069034 .color-N5{color:#DEE1EB;} + .d2-3438069034 .color-N6{color:#EEF1F8;} + .d2-3438069034 .color-N7{color:#FFFFFF;} + .d2-3438069034 .color-B1{color:#0D32B2;} + .d2-3438069034 .color-B2{color:#0D32B2;} + .d2-3438069034 .color-B3{color:#E3E9FD;} + .d2-3438069034 .color-B4{color:#E3E9FD;} + .d2-3438069034 .color-B5{color:#EDF0FD;} + .d2-3438069034 .color-B6{color:#F7F8FE;} + .d2-3438069034 .color-AA2{color:#4A6FF3;} + .d2-3438069034 .color-AA4{color:#EDF0FD;} + .d2-3438069034 .color-AA5{color:#F7F8FE;} + .d2-3438069034 .color-AB4{color:#EDF0FD;} + .d2-3438069034 .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}]]>foofoobarabcd 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 18851eb4b..094337716 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,9 +1,9 @@ -AB + .d2-3122002250 .fill-N1{fill:#0A0F25;} + .d2-3122002250 .fill-N2{fill:#676C7E;} + .d2-3122002250 .fill-N3{fill:#9499AB;} + .d2-3122002250 .fill-N4{fill:#CFD2DD;} + .d2-3122002250 .fill-N5{fill:#DEE1EB;} + .d2-3122002250 .fill-N6{fill:#EEF1F8;} + .d2-3122002250 .fill-N7{fill:#FFFFFF;} + .d2-3122002250 .fill-B1{fill:#0D32B2;} + .d2-3122002250 .fill-B2{fill:#0D32B2;} + .d2-3122002250 .fill-B3{fill:#E3E9FD;} + .d2-3122002250 .fill-B4{fill:#E3E9FD;} + .d2-3122002250 .fill-B5{fill:#EDF0FD;} + .d2-3122002250 .fill-B6{fill:#F7F8FE;} + .d2-3122002250 .fill-AA2{fill:#4A6FF3;} + .d2-3122002250 .fill-AA4{fill:#EDF0FD;} + .d2-3122002250 .fill-AA5{fill:#F7F8FE;} + .d2-3122002250 .fill-AB4{fill:#EDF0FD;} + .d2-3122002250 .fill-AB5{fill:#F7F8FE;} + .d2-3122002250 .stroke-N1{stroke:#0A0F25;} + .d2-3122002250 .stroke-N2{stroke:#676C7E;} + .d2-3122002250 .stroke-N3{stroke:#9499AB;} + .d2-3122002250 .stroke-N4{stroke:#CFD2DD;} + .d2-3122002250 .stroke-N5{stroke:#DEE1EB;} + .d2-3122002250 .stroke-N6{stroke:#EEF1F8;} + .d2-3122002250 .stroke-N7{stroke:#FFFFFF;} + .d2-3122002250 .stroke-B1{stroke:#0D32B2;} + .d2-3122002250 .stroke-B2{stroke:#0D32B2;} + .d2-3122002250 .stroke-B3{stroke:#E3E9FD;} + .d2-3122002250 .stroke-B4{stroke:#E3E9FD;} + .d2-3122002250 .stroke-B5{stroke:#EDF0FD;} + .d2-3122002250 .stroke-B6{stroke:#F7F8FE;} + .d2-3122002250 .stroke-AA2{stroke:#4A6FF3;} + .d2-3122002250 .stroke-AA4{stroke:#EDF0FD;} + .d2-3122002250 .stroke-AA5{stroke:#F7F8FE;} + .d2-3122002250 .stroke-AB4{stroke:#EDF0FD;} + .d2-3122002250 .stroke-AB5{stroke:#F7F8FE;} + .d2-3122002250 .background-color-N1{background-color:#0A0F25;} + .d2-3122002250 .background-color-N2{background-color:#676C7E;} + .d2-3122002250 .background-color-N3{background-color:#9499AB;} + .d2-3122002250 .background-color-N4{background-color:#CFD2DD;} + .d2-3122002250 .background-color-N5{background-color:#DEE1EB;} + .d2-3122002250 .background-color-N6{background-color:#EEF1F8;} + .d2-3122002250 .background-color-N7{background-color:#FFFFFF;} + .d2-3122002250 .background-color-B1{background-color:#0D32B2;} + .d2-3122002250 .background-color-B2{background-color:#0D32B2;} + .d2-3122002250 .background-color-B3{background-color:#E3E9FD;} + .d2-3122002250 .background-color-B4{background-color:#E3E9FD;} + .d2-3122002250 .background-color-B5{background-color:#EDF0FD;} + .d2-3122002250 .background-color-B6{background-color:#F7F8FE;} + .d2-3122002250 .background-color-AA2{background-color:#4A6FF3;} + .d2-3122002250 .background-color-AA4{background-color:#EDF0FD;} + .d2-3122002250 .background-color-AA5{background-color:#F7F8FE;} + .d2-3122002250 .background-color-AB4{background-color:#EDF0FD;} + .d2-3122002250 .background-color-AB5{background-color:#F7F8FE;} + .d2-3122002250 .color-N1{color:#0A0F25;} + .d2-3122002250 .color-N2{color:#676C7E;} + .d2-3122002250 .color-N3{color:#9499AB;} + .d2-3122002250 .color-N4{color:#CFD2DD;} + .d2-3122002250 .color-N5{color:#DEE1EB;} + .d2-3122002250 .color-N6{color:#EEF1F8;} + .d2-3122002250 .color-N7{color:#FFFFFF;} + .d2-3122002250 .color-B1{color:#0D32B2;} + .d2-3122002250 .color-B2{color:#0D32B2;} + .d2-3122002250 .color-B3{color:#E3E9FD;} + .d2-3122002250 .color-B4{color:#E3E9FD;} + .d2-3122002250 .color-B5{color:#EDF0FD;} + .d2-3122002250 .color-B6{color:#F7F8FE;} + .d2-3122002250 .color-AA2{color:#4A6FF3;} + .d2-3122002250 .color-AA4{color:#EDF0FD;} + .d2-3122002250 .color-AA5{color:#F7F8FE;} + .d2-3122002250 .color-AB4{color:#EDF0FD;} + .d2-3122002250 .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}]]>AB 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 18851eb4b..094337716 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,9 +1,9 @@ -AB + .d2-3122002250 .fill-N1{fill:#0A0F25;} + .d2-3122002250 .fill-N2{fill:#676C7E;} + .d2-3122002250 .fill-N3{fill:#9499AB;} + .d2-3122002250 .fill-N4{fill:#CFD2DD;} + .d2-3122002250 .fill-N5{fill:#DEE1EB;} + .d2-3122002250 .fill-N6{fill:#EEF1F8;} + .d2-3122002250 .fill-N7{fill:#FFFFFF;} + .d2-3122002250 .fill-B1{fill:#0D32B2;} + .d2-3122002250 .fill-B2{fill:#0D32B2;} + .d2-3122002250 .fill-B3{fill:#E3E9FD;} + .d2-3122002250 .fill-B4{fill:#E3E9FD;} + .d2-3122002250 .fill-B5{fill:#EDF0FD;} + .d2-3122002250 .fill-B6{fill:#F7F8FE;} + .d2-3122002250 .fill-AA2{fill:#4A6FF3;} + .d2-3122002250 .fill-AA4{fill:#EDF0FD;} + .d2-3122002250 .fill-AA5{fill:#F7F8FE;} + .d2-3122002250 .fill-AB4{fill:#EDF0FD;} + .d2-3122002250 .fill-AB5{fill:#F7F8FE;} + .d2-3122002250 .stroke-N1{stroke:#0A0F25;} + .d2-3122002250 .stroke-N2{stroke:#676C7E;} + .d2-3122002250 .stroke-N3{stroke:#9499AB;} + .d2-3122002250 .stroke-N4{stroke:#CFD2DD;} + .d2-3122002250 .stroke-N5{stroke:#DEE1EB;} + .d2-3122002250 .stroke-N6{stroke:#EEF1F8;} + .d2-3122002250 .stroke-N7{stroke:#FFFFFF;} + .d2-3122002250 .stroke-B1{stroke:#0D32B2;} + .d2-3122002250 .stroke-B2{stroke:#0D32B2;} + .d2-3122002250 .stroke-B3{stroke:#E3E9FD;} + .d2-3122002250 .stroke-B4{stroke:#E3E9FD;} + .d2-3122002250 .stroke-B5{stroke:#EDF0FD;} + .d2-3122002250 .stroke-B6{stroke:#F7F8FE;} + .d2-3122002250 .stroke-AA2{stroke:#4A6FF3;} + .d2-3122002250 .stroke-AA4{stroke:#EDF0FD;} + .d2-3122002250 .stroke-AA5{stroke:#F7F8FE;} + .d2-3122002250 .stroke-AB4{stroke:#EDF0FD;} + .d2-3122002250 .stroke-AB5{stroke:#F7F8FE;} + .d2-3122002250 .background-color-N1{background-color:#0A0F25;} + .d2-3122002250 .background-color-N2{background-color:#676C7E;} + .d2-3122002250 .background-color-N3{background-color:#9499AB;} + .d2-3122002250 .background-color-N4{background-color:#CFD2DD;} + .d2-3122002250 .background-color-N5{background-color:#DEE1EB;} + .d2-3122002250 .background-color-N6{background-color:#EEF1F8;} + .d2-3122002250 .background-color-N7{background-color:#FFFFFF;} + .d2-3122002250 .background-color-B1{background-color:#0D32B2;} + .d2-3122002250 .background-color-B2{background-color:#0D32B2;} + .d2-3122002250 .background-color-B3{background-color:#E3E9FD;} + .d2-3122002250 .background-color-B4{background-color:#E3E9FD;} + .d2-3122002250 .background-color-B5{background-color:#EDF0FD;} + .d2-3122002250 .background-color-B6{background-color:#F7F8FE;} + .d2-3122002250 .background-color-AA2{background-color:#4A6FF3;} + .d2-3122002250 .background-color-AA4{background-color:#EDF0FD;} + .d2-3122002250 .background-color-AA5{background-color:#F7F8FE;} + .d2-3122002250 .background-color-AB4{background-color:#EDF0FD;} + .d2-3122002250 .background-color-AB5{background-color:#F7F8FE;} + .d2-3122002250 .color-N1{color:#0A0F25;} + .d2-3122002250 .color-N2{color:#676C7E;} + .d2-3122002250 .color-N3{color:#9499AB;} + .d2-3122002250 .color-N4{color:#CFD2DD;} + .d2-3122002250 .color-N5{color:#DEE1EB;} + .d2-3122002250 .color-N6{color:#EEF1F8;} + .d2-3122002250 .color-N7{color:#FFFFFF;} + .d2-3122002250 .color-B1{color:#0D32B2;} + .d2-3122002250 .color-B2{color:#0D32B2;} + .d2-3122002250 .color-B3{color:#E3E9FD;} + .d2-3122002250 .color-B4{color:#E3E9FD;} + .d2-3122002250 .color-B5{color:#EDF0FD;} + .d2-3122002250 .color-B6{color:#F7F8FE;} + .d2-3122002250 .color-AA2{color:#4A6FF3;} + .d2-3122002250 .color-AA4{color:#EDF0FD;} + .d2-3122002250 .color-AA5{color:#F7F8FE;} + .d2-3122002250 .color-AB4{color:#EDF0FD;} + .d2-3122002250 .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}]]>AB 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 7f8a4ff16..84a60e63c 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,9 +1,9 @@ -ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + .d2-2009261675 .fill-N1{fill:#0A0F25;} + .d2-2009261675 .fill-N2{fill:#676C7E;} + .d2-2009261675 .fill-N3{fill:#9499AB;} + .d2-2009261675 .fill-N4{fill:#CFD2DD;} + .d2-2009261675 .fill-N5{fill:#DEE1EB;} + .d2-2009261675 .fill-N6{fill:#EEF1F8;} + .d2-2009261675 .fill-N7{fill:#FFFFFF;} + .d2-2009261675 .fill-B1{fill:#0D32B2;} + .d2-2009261675 .fill-B2{fill:#0D32B2;} + .d2-2009261675 .fill-B3{fill:#E3E9FD;} + .d2-2009261675 .fill-B4{fill:#E3E9FD;} + .d2-2009261675 .fill-B5{fill:#EDF0FD;} + .d2-2009261675 .fill-B6{fill:#F7F8FE;} + .d2-2009261675 .fill-AA2{fill:#4A6FF3;} + .d2-2009261675 .fill-AA4{fill:#EDF0FD;} + .d2-2009261675 .fill-AA5{fill:#F7F8FE;} + .d2-2009261675 .fill-AB4{fill:#EDF0FD;} + .d2-2009261675 .fill-AB5{fill:#F7F8FE;} + .d2-2009261675 .stroke-N1{stroke:#0A0F25;} + .d2-2009261675 .stroke-N2{stroke:#676C7E;} + .d2-2009261675 .stroke-N3{stroke:#9499AB;} + .d2-2009261675 .stroke-N4{stroke:#CFD2DD;} + .d2-2009261675 .stroke-N5{stroke:#DEE1EB;} + .d2-2009261675 .stroke-N6{stroke:#EEF1F8;} + .d2-2009261675 .stroke-N7{stroke:#FFFFFF;} + .d2-2009261675 .stroke-B1{stroke:#0D32B2;} + .d2-2009261675 .stroke-B2{stroke:#0D32B2;} + .d2-2009261675 .stroke-B3{stroke:#E3E9FD;} + .d2-2009261675 .stroke-B4{stroke:#E3E9FD;} + .d2-2009261675 .stroke-B5{stroke:#EDF0FD;} + .d2-2009261675 .stroke-B6{stroke:#F7F8FE;} + .d2-2009261675 .stroke-AA2{stroke:#4A6FF3;} + .d2-2009261675 .stroke-AA4{stroke:#EDF0FD;} + .d2-2009261675 .stroke-AA5{stroke:#F7F8FE;} + .d2-2009261675 .stroke-AB4{stroke:#EDF0FD;} + .d2-2009261675 .stroke-AB5{stroke:#F7F8FE;} + .d2-2009261675 .background-color-N1{background-color:#0A0F25;} + .d2-2009261675 .background-color-N2{background-color:#676C7E;} + .d2-2009261675 .background-color-N3{background-color:#9499AB;} + .d2-2009261675 .background-color-N4{background-color:#CFD2DD;} + .d2-2009261675 .background-color-N5{background-color:#DEE1EB;} + .d2-2009261675 .background-color-N6{background-color:#EEF1F8;} + .d2-2009261675 .background-color-N7{background-color:#FFFFFF;} + .d2-2009261675 .background-color-B1{background-color:#0D32B2;} + .d2-2009261675 .background-color-B2{background-color:#0D32B2;} + .d2-2009261675 .background-color-B3{background-color:#E3E9FD;} + .d2-2009261675 .background-color-B4{background-color:#E3E9FD;} + .d2-2009261675 .background-color-B5{background-color:#EDF0FD;} + .d2-2009261675 .background-color-B6{background-color:#F7F8FE;} + .d2-2009261675 .background-color-AA2{background-color:#4A6FF3;} + .d2-2009261675 .background-color-AA4{background-color:#EDF0FD;} + .d2-2009261675 .background-color-AA5{background-color:#F7F8FE;} + .d2-2009261675 .background-color-AB4{background-color:#EDF0FD;} + .d2-2009261675 .background-color-AB5{background-color:#F7F8FE;} + .d2-2009261675 .color-N1{color:#0A0F25;} + .d2-2009261675 .color-N2{color:#676C7E;} + .d2-2009261675 .color-N3{color:#9499AB;} + .d2-2009261675 .color-N4{color:#CFD2DD;} + .d2-2009261675 .color-N5{color:#DEE1EB;} + .d2-2009261675 .color-N6{color:#EEF1F8;} + .d2-2009261675 .color-N7{color:#FFFFFF;} + .d2-2009261675 .color-B1{color:#0D32B2;} + .d2-2009261675 .color-B2{color:#0D32B2;} + .d2-2009261675 .color-B3{color:#E3E9FD;} + .d2-2009261675 .color-B4{color:#E3E9FD;} + .d2-2009261675 .color-B5{color:#EDF0FD;} + .d2-2009261675 .color-B6{color:#F7F8FE;} + .d2-2009261675 .color-AA2{color:#4A6FF3;} + .d2-2009261675 .color-AA4{color:#EDF0FD;} + .d2-2009261675 .color-AA5{color:#F7F8FE;} + .d2-2009261675 .color-AB4{color:#EDF0FD;} + .d2-2009261675 .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}]]>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 7f8a4ff16..84a60e63c 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,9 +1,9 @@ -ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + .d2-2009261675 .fill-N1{fill:#0A0F25;} + .d2-2009261675 .fill-N2{fill:#676C7E;} + .d2-2009261675 .fill-N3{fill:#9499AB;} + .d2-2009261675 .fill-N4{fill:#CFD2DD;} + .d2-2009261675 .fill-N5{fill:#DEE1EB;} + .d2-2009261675 .fill-N6{fill:#EEF1F8;} + .d2-2009261675 .fill-N7{fill:#FFFFFF;} + .d2-2009261675 .fill-B1{fill:#0D32B2;} + .d2-2009261675 .fill-B2{fill:#0D32B2;} + .d2-2009261675 .fill-B3{fill:#E3E9FD;} + .d2-2009261675 .fill-B4{fill:#E3E9FD;} + .d2-2009261675 .fill-B5{fill:#EDF0FD;} + .d2-2009261675 .fill-B6{fill:#F7F8FE;} + .d2-2009261675 .fill-AA2{fill:#4A6FF3;} + .d2-2009261675 .fill-AA4{fill:#EDF0FD;} + .d2-2009261675 .fill-AA5{fill:#F7F8FE;} + .d2-2009261675 .fill-AB4{fill:#EDF0FD;} + .d2-2009261675 .fill-AB5{fill:#F7F8FE;} + .d2-2009261675 .stroke-N1{stroke:#0A0F25;} + .d2-2009261675 .stroke-N2{stroke:#676C7E;} + .d2-2009261675 .stroke-N3{stroke:#9499AB;} + .d2-2009261675 .stroke-N4{stroke:#CFD2DD;} + .d2-2009261675 .stroke-N5{stroke:#DEE1EB;} + .d2-2009261675 .stroke-N6{stroke:#EEF1F8;} + .d2-2009261675 .stroke-N7{stroke:#FFFFFF;} + .d2-2009261675 .stroke-B1{stroke:#0D32B2;} + .d2-2009261675 .stroke-B2{stroke:#0D32B2;} + .d2-2009261675 .stroke-B3{stroke:#E3E9FD;} + .d2-2009261675 .stroke-B4{stroke:#E3E9FD;} + .d2-2009261675 .stroke-B5{stroke:#EDF0FD;} + .d2-2009261675 .stroke-B6{stroke:#F7F8FE;} + .d2-2009261675 .stroke-AA2{stroke:#4A6FF3;} + .d2-2009261675 .stroke-AA4{stroke:#EDF0FD;} + .d2-2009261675 .stroke-AA5{stroke:#F7F8FE;} + .d2-2009261675 .stroke-AB4{stroke:#EDF0FD;} + .d2-2009261675 .stroke-AB5{stroke:#F7F8FE;} + .d2-2009261675 .background-color-N1{background-color:#0A0F25;} + .d2-2009261675 .background-color-N2{background-color:#676C7E;} + .d2-2009261675 .background-color-N3{background-color:#9499AB;} + .d2-2009261675 .background-color-N4{background-color:#CFD2DD;} + .d2-2009261675 .background-color-N5{background-color:#DEE1EB;} + .d2-2009261675 .background-color-N6{background-color:#EEF1F8;} + .d2-2009261675 .background-color-N7{background-color:#FFFFFF;} + .d2-2009261675 .background-color-B1{background-color:#0D32B2;} + .d2-2009261675 .background-color-B2{background-color:#0D32B2;} + .d2-2009261675 .background-color-B3{background-color:#E3E9FD;} + .d2-2009261675 .background-color-B4{background-color:#E3E9FD;} + .d2-2009261675 .background-color-B5{background-color:#EDF0FD;} + .d2-2009261675 .background-color-B6{background-color:#F7F8FE;} + .d2-2009261675 .background-color-AA2{background-color:#4A6FF3;} + .d2-2009261675 .background-color-AA4{background-color:#EDF0FD;} + .d2-2009261675 .background-color-AA5{background-color:#F7F8FE;} + .d2-2009261675 .background-color-AB4{background-color:#EDF0FD;} + .d2-2009261675 .background-color-AB5{background-color:#F7F8FE;} + .d2-2009261675 .color-N1{color:#0A0F25;} + .d2-2009261675 .color-N2{color:#676C7E;} + .d2-2009261675 .color-N3{color:#9499AB;} + .d2-2009261675 .color-N4{color:#CFD2DD;} + .d2-2009261675 .color-N5{color:#DEE1EB;} + .d2-2009261675 .color-N6{color:#EEF1F8;} + .d2-2009261675 .color-N7{color:#FFFFFF;} + .d2-2009261675 .color-B1{color:#0D32B2;} + .d2-2009261675 .color-B2{color:#0D32B2;} + .d2-2009261675 .color-B3{color:#E3E9FD;} + .d2-2009261675 .color-B4{color:#E3E9FD;} + .d2-2009261675 .color-B5{color:#EDF0FD;} + .d2-2009261675 .color-B6{color:#F7F8FE;} + .d2-2009261675 .color-AA2{color:#4A6FF3;} + .d2-2009261675 .color-AA4{color:#EDF0FD;} + .d2-2009261675 .color-AA5{color:#F7F8FE;} + .d2-2009261675 .color-AB4{color:#EDF0FD;} + .d2-2009261675 .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}]]>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 5e3f46b03..06a769a1c 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,9 +1,9 @@ -b + .d2-3310224674 .fill-N1{fill:#0A0F25;} + .d2-3310224674 .fill-N2{fill:#676C7E;} + .d2-3310224674 .fill-N3{fill:#9499AB;} + .d2-3310224674 .fill-N4{fill:#CFD2DD;} + .d2-3310224674 .fill-N5{fill:#DEE1EB;} + .d2-3310224674 .fill-N6{fill:#EEF1F8;} + .d2-3310224674 .fill-N7{fill:#FFFFFF;} + .d2-3310224674 .fill-B1{fill:#0D32B2;} + .d2-3310224674 .fill-B2{fill:#0D32B2;} + .d2-3310224674 .fill-B3{fill:#E3E9FD;} + .d2-3310224674 .fill-B4{fill:#E3E9FD;} + .d2-3310224674 .fill-B5{fill:#EDF0FD;} + .d2-3310224674 .fill-B6{fill:#F7F8FE;} + .d2-3310224674 .fill-AA2{fill:#4A6FF3;} + .d2-3310224674 .fill-AA4{fill:#EDF0FD;} + .d2-3310224674 .fill-AA5{fill:#F7F8FE;} + .d2-3310224674 .fill-AB4{fill:#EDF0FD;} + .d2-3310224674 .fill-AB5{fill:#F7F8FE;} + .d2-3310224674 .stroke-N1{stroke:#0A0F25;} + .d2-3310224674 .stroke-N2{stroke:#676C7E;} + .d2-3310224674 .stroke-N3{stroke:#9499AB;} + .d2-3310224674 .stroke-N4{stroke:#CFD2DD;} + .d2-3310224674 .stroke-N5{stroke:#DEE1EB;} + .d2-3310224674 .stroke-N6{stroke:#EEF1F8;} + .d2-3310224674 .stroke-N7{stroke:#FFFFFF;} + .d2-3310224674 .stroke-B1{stroke:#0D32B2;} + .d2-3310224674 .stroke-B2{stroke:#0D32B2;} + .d2-3310224674 .stroke-B3{stroke:#E3E9FD;} + .d2-3310224674 .stroke-B4{stroke:#E3E9FD;} + .d2-3310224674 .stroke-B5{stroke:#EDF0FD;} + .d2-3310224674 .stroke-B6{stroke:#F7F8FE;} + .d2-3310224674 .stroke-AA2{stroke:#4A6FF3;} + .d2-3310224674 .stroke-AA4{stroke:#EDF0FD;} + .d2-3310224674 .stroke-AA5{stroke:#F7F8FE;} + .d2-3310224674 .stroke-AB4{stroke:#EDF0FD;} + .d2-3310224674 .stroke-AB5{stroke:#F7F8FE;} + .d2-3310224674 .background-color-N1{background-color:#0A0F25;} + .d2-3310224674 .background-color-N2{background-color:#676C7E;} + .d2-3310224674 .background-color-N3{background-color:#9499AB;} + .d2-3310224674 .background-color-N4{background-color:#CFD2DD;} + .d2-3310224674 .background-color-N5{background-color:#DEE1EB;} + .d2-3310224674 .background-color-N6{background-color:#EEF1F8;} + .d2-3310224674 .background-color-N7{background-color:#FFFFFF;} + .d2-3310224674 .background-color-B1{background-color:#0D32B2;} + .d2-3310224674 .background-color-B2{background-color:#0D32B2;} + .d2-3310224674 .background-color-B3{background-color:#E3E9FD;} + .d2-3310224674 .background-color-B4{background-color:#E3E9FD;} + .d2-3310224674 .background-color-B5{background-color:#EDF0FD;} + .d2-3310224674 .background-color-B6{background-color:#F7F8FE;} + .d2-3310224674 .background-color-AA2{background-color:#4A6FF3;} + .d2-3310224674 .background-color-AA4{background-color:#EDF0FD;} + .d2-3310224674 .background-color-AA5{background-color:#F7F8FE;} + .d2-3310224674 .background-color-AB4{background-color:#EDF0FD;} + .d2-3310224674 .background-color-AB5{background-color:#F7F8FE;} + .d2-3310224674 .color-N1{color:#0A0F25;} + .d2-3310224674 .color-N2{color:#676C7E;} + .d2-3310224674 .color-N3{color:#9499AB;} + .d2-3310224674 .color-N4{color:#CFD2DD;} + .d2-3310224674 .color-N5{color:#DEE1EB;} + .d2-3310224674 .color-N6{color:#EEF1F8;} + .d2-3310224674 .color-N7{color:#FFFFFF;} + .d2-3310224674 .color-B1{color:#0D32B2;} + .d2-3310224674 .color-B2{color:#0D32B2;} + .d2-3310224674 .color-B3{color:#E3E9FD;} + .d2-3310224674 .color-B4{color:#E3E9FD;} + .d2-3310224674 .color-B5{color:#EDF0FD;} + .d2-3310224674 .color-B6{color:#F7F8FE;} + .d2-3310224674 .color-AA2{color:#4A6FF3;} + .d2-3310224674 .color-AA4{color:#EDF0FD;} + .d2-3310224674 .color-AA5{color:#F7F8FE;} + .d2-3310224674 .color-AB4{color:#EDF0FD;} + .d2-3310224674 .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}]]>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 5e3f46b03..06a769a1c 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,9 +1,9 @@ -b + .d2-3310224674 .fill-N1{fill:#0A0F25;} + .d2-3310224674 .fill-N2{fill:#676C7E;} + .d2-3310224674 .fill-N3{fill:#9499AB;} + .d2-3310224674 .fill-N4{fill:#CFD2DD;} + .d2-3310224674 .fill-N5{fill:#DEE1EB;} + .d2-3310224674 .fill-N6{fill:#EEF1F8;} + .d2-3310224674 .fill-N7{fill:#FFFFFF;} + .d2-3310224674 .fill-B1{fill:#0D32B2;} + .d2-3310224674 .fill-B2{fill:#0D32B2;} + .d2-3310224674 .fill-B3{fill:#E3E9FD;} + .d2-3310224674 .fill-B4{fill:#E3E9FD;} + .d2-3310224674 .fill-B5{fill:#EDF0FD;} + .d2-3310224674 .fill-B6{fill:#F7F8FE;} + .d2-3310224674 .fill-AA2{fill:#4A6FF3;} + .d2-3310224674 .fill-AA4{fill:#EDF0FD;} + .d2-3310224674 .fill-AA5{fill:#F7F8FE;} + .d2-3310224674 .fill-AB4{fill:#EDF0FD;} + .d2-3310224674 .fill-AB5{fill:#F7F8FE;} + .d2-3310224674 .stroke-N1{stroke:#0A0F25;} + .d2-3310224674 .stroke-N2{stroke:#676C7E;} + .d2-3310224674 .stroke-N3{stroke:#9499AB;} + .d2-3310224674 .stroke-N4{stroke:#CFD2DD;} + .d2-3310224674 .stroke-N5{stroke:#DEE1EB;} + .d2-3310224674 .stroke-N6{stroke:#EEF1F8;} + .d2-3310224674 .stroke-N7{stroke:#FFFFFF;} + .d2-3310224674 .stroke-B1{stroke:#0D32B2;} + .d2-3310224674 .stroke-B2{stroke:#0D32B2;} + .d2-3310224674 .stroke-B3{stroke:#E3E9FD;} + .d2-3310224674 .stroke-B4{stroke:#E3E9FD;} + .d2-3310224674 .stroke-B5{stroke:#EDF0FD;} + .d2-3310224674 .stroke-B6{stroke:#F7F8FE;} + .d2-3310224674 .stroke-AA2{stroke:#4A6FF3;} + .d2-3310224674 .stroke-AA4{stroke:#EDF0FD;} + .d2-3310224674 .stroke-AA5{stroke:#F7F8FE;} + .d2-3310224674 .stroke-AB4{stroke:#EDF0FD;} + .d2-3310224674 .stroke-AB5{stroke:#F7F8FE;} + .d2-3310224674 .background-color-N1{background-color:#0A0F25;} + .d2-3310224674 .background-color-N2{background-color:#676C7E;} + .d2-3310224674 .background-color-N3{background-color:#9499AB;} + .d2-3310224674 .background-color-N4{background-color:#CFD2DD;} + .d2-3310224674 .background-color-N5{background-color:#DEE1EB;} + .d2-3310224674 .background-color-N6{background-color:#EEF1F8;} + .d2-3310224674 .background-color-N7{background-color:#FFFFFF;} + .d2-3310224674 .background-color-B1{background-color:#0D32B2;} + .d2-3310224674 .background-color-B2{background-color:#0D32B2;} + .d2-3310224674 .background-color-B3{background-color:#E3E9FD;} + .d2-3310224674 .background-color-B4{background-color:#E3E9FD;} + .d2-3310224674 .background-color-B5{background-color:#EDF0FD;} + .d2-3310224674 .background-color-B6{background-color:#F7F8FE;} + .d2-3310224674 .background-color-AA2{background-color:#4A6FF3;} + .d2-3310224674 .background-color-AA4{background-color:#EDF0FD;} + .d2-3310224674 .background-color-AA5{background-color:#F7F8FE;} + .d2-3310224674 .background-color-AB4{background-color:#EDF0FD;} + .d2-3310224674 .background-color-AB5{background-color:#F7F8FE;} + .d2-3310224674 .color-N1{color:#0A0F25;} + .d2-3310224674 .color-N2{color:#676C7E;} + .d2-3310224674 .color-N3{color:#9499AB;} + .d2-3310224674 .color-N4{color:#CFD2DD;} + .d2-3310224674 .color-N5{color:#DEE1EB;} + .d2-3310224674 .color-N6{color:#EEF1F8;} + .d2-3310224674 .color-N7{color:#FFFFFF;} + .d2-3310224674 .color-B1{color:#0D32B2;} + .d2-3310224674 .color-B2{color:#0D32B2;} + .d2-3310224674 .color-B3{color:#E3E9FD;} + .d2-3310224674 .color-B4{color:#E3E9FD;} + .d2-3310224674 .color-B5{color:#EDF0FD;} + .d2-3310224674 .color-B6{color:#F7F8FE;} + .d2-3310224674 .color-AA2{color:#4A6FF3;} + .d2-3310224674 .color-AA4{color:#EDF0FD;} + .d2-3310224674 .color-AA5{color:#F7F8FE;} + .d2-3310224674 .color-AB4{color:#EDF0FD;} + .d2-3310224674 .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}]]>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 8ef5b0dd4..af5f5401c 100644 --- a/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/slow_grid/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----------------- + .d2-1489606637 .fill-N1{fill:#0A0F25;} + .d2-1489606637 .fill-N2{fill:#676C7E;} + .d2-1489606637 .fill-N3{fill:#9499AB;} + .d2-1489606637 .fill-N4{fill:#CFD2DD;} + .d2-1489606637 .fill-N5{fill:#DEE1EB;} + .d2-1489606637 .fill-N6{fill:#EEF1F8;} + .d2-1489606637 .fill-N7{fill:#FFFFFF;} + .d2-1489606637 .fill-B1{fill:#0D32B2;} + .d2-1489606637 .fill-B2{fill:#0D32B2;} + .d2-1489606637 .fill-B3{fill:#E3E9FD;} + .d2-1489606637 .fill-B4{fill:#E3E9FD;} + .d2-1489606637 .fill-B5{fill:#EDF0FD;} + .d2-1489606637 .fill-B6{fill:#F7F8FE;} + .d2-1489606637 .fill-AA2{fill:#4A6FF3;} + .d2-1489606637 .fill-AA4{fill:#EDF0FD;} + .d2-1489606637 .fill-AA5{fill:#F7F8FE;} + .d2-1489606637 .fill-AB4{fill:#EDF0FD;} + .d2-1489606637 .fill-AB5{fill:#F7F8FE;} + .d2-1489606637 .stroke-N1{stroke:#0A0F25;} + .d2-1489606637 .stroke-N2{stroke:#676C7E;} + .d2-1489606637 .stroke-N3{stroke:#9499AB;} + .d2-1489606637 .stroke-N4{stroke:#CFD2DD;} + .d2-1489606637 .stroke-N5{stroke:#DEE1EB;} + .d2-1489606637 .stroke-N6{stroke:#EEF1F8;} + .d2-1489606637 .stroke-N7{stroke:#FFFFFF;} + .d2-1489606637 .stroke-B1{stroke:#0D32B2;} + .d2-1489606637 .stroke-B2{stroke:#0D32B2;} + .d2-1489606637 .stroke-B3{stroke:#E3E9FD;} + .d2-1489606637 .stroke-B4{stroke:#E3E9FD;} + .d2-1489606637 .stroke-B5{stroke:#EDF0FD;} + .d2-1489606637 .stroke-B6{stroke:#F7F8FE;} + .d2-1489606637 .stroke-AA2{stroke:#4A6FF3;} + .d2-1489606637 .stroke-AA4{stroke:#EDF0FD;} + .d2-1489606637 .stroke-AA5{stroke:#F7F8FE;} + .d2-1489606637 .stroke-AB4{stroke:#EDF0FD;} + .d2-1489606637 .stroke-AB5{stroke:#F7F8FE;} + .d2-1489606637 .background-color-N1{background-color:#0A0F25;} + .d2-1489606637 .background-color-N2{background-color:#676C7E;} + .d2-1489606637 .background-color-N3{background-color:#9499AB;} + .d2-1489606637 .background-color-N4{background-color:#CFD2DD;} + .d2-1489606637 .background-color-N5{background-color:#DEE1EB;} + .d2-1489606637 .background-color-N6{background-color:#EEF1F8;} + .d2-1489606637 .background-color-N7{background-color:#FFFFFF;} + .d2-1489606637 .background-color-B1{background-color:#0D32B2;} + .d2-1489606637 .background-color-B2{background-color:#0D32B2;} + .d2-1489606637 .background-color-B3{background-color:#E3E9FD;} + .d2-1489606637 .background-color-B4{background-color:#E3E9FD;} + .d2-1489606637 .background-color-B5{background-color:#EDF0FD;} + .d2-1489606637 .background-color-B6{background-color:#F7F8FE;} + .d2-1489606637 .background-color-AA2{background-color:#4A6FF3;} + .d2-1489606637 .background-color-AA4{background-color:#EDF0FD;} + .d2-1489606637 .background-color-AA5{background-color:#F7F8FE;} + .d2-1489606637 .background-color-AB4{background-color:#EDF0FD;} + .d2-1489606637 .background-color-AB5{background-color:#F7F8FE;} + .d2-1489606637 .color-N1{color:#0A0F25;} + .d2-1489606637 .color-N2{color:#676C7E;} + .d2-1489606637 .color-N3{color:#9499AB;} + .d2-1489606637 .color-N4{color:#CFD2DD;} + .d2-1489606637 .color-N5{color:#DEE1EB;} + .d2-1489606637 .color-N6{color:#EEF1F8;} + .d2-1489606637 .color-N7{color:#FFFFFF;} + .d2-1489606637 .color-B1{color:#0D32B2;} + .d2-1489606637 .color-B2{color:#0D32B2;} + .d2-1489606637 .color-B3{color:#E3E9FD;} + .d2-1489606637 .color-B4{color:#E3E9FD;} + .d2-1489606637 .color-B5{color:#EDF0FD;} + .d2-1489606637 .color-B6{color:#F7F8FE;} + .d2-1489606637 .color-AA2{color:#4A6FF3;} + .d2-1489606637 .color-AA4{color:#EDF0FD;} + .d2-1489606637 .color-AA5{color:#F7F8FE;} + .d2-1489606637 .color-AB4{color:#EDF0FD;} + .d2-1489606637 .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----------------- \ No newline at end of file diff --git a/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg b/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg index 8ef5b0dd4..af5f5401c 100644 --- a/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/slow_grid/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----------------- + .d2-1489606637 .fill-N1{fill:#0A0F25;} + .d2-1489606637 .fill-N2{fill:#676C7E;} + .d2-1489606637 .fill-N3{fill:#9499AB;} + .d2-1489606637 .fill-N4{fill:#CFD2DD;} + .d2-1489606637 .fill-N5{fill:#DEE1EB;} + .d2-1489606637 .fill-N6{fill:#EEF1F8;} + .d2-1489606637 .fill-N7{fill:#FFFFFF;} + .d2-1489606637 .fill-B1{fill:#0D32B2;} + .d2-1489606637 .fill-B2{fill:#0D32B2;} + .d2-1489606637 .fill-B3{fill:#E3E9FD;} + .d2-1489606637 .fill-B4{fill:#E3E9FD;} + .d2-1489606637 .fill-B5{fill:#EDF0FD;} + .d2-1489606637 .fill-B6{fill:#F7F8FE;} + .d2-1489606637 .fill-AA2{fill:#4A6FF3;} + .d2-1489606637 .fill-AA4{fill:#EDF0FD;} + .d2-1489606637 .fill-AA5{fill:#F7F8FE;} + .d2-1489606637 .fill-AB4{fill:#EDF0FD;} + .d2-1489606637 .fill-AB5{fill:#F7F8FE;} + .d2-1489606637 .stroke-N1{stroke:#0A0F25;} + .d2-1489606637 .stroke-N2{stroke:#676C7E;} + .d2-1489606637 .stroke-N3{stroke:#9499AB;} + .d2-1489606637 .stroke-N4{stroke:#CFD2DD;} + .d2-1489606637 .stroke-N5{stroke:#DEE1EB;} + .d2-1489606637 .stroke-N6{stroke:#EEF1F8;} + .d2-1489606637 .stroke-N7{stroke:#FFFFFF;} + .d2-1489606637 .stroke-B1{stroke:#0D32B2;} + .d2-1489606637 .stroke-B2{stroke:#0D32B2;} + .d2-1489606637 .stroke-B3{stroke:#E3E9FD;} + .d2-1489606637 .stroke-B4{stroke:#E3E9FD;} + .d2-1489606637 .stroke-B5{stroke:#EDF0FD;} + .d2-1489606637 .stroke-B6{stroke:#F7F8FE;} + .d2-1489606637 .stroke-AA2{stroke:#4A6FF3;} + .d2-1489606637 .stroke-AA4{stroke:#EDF0FD;} + .d2-1489606637 .stroke-AA5{stroke:#F7F8FE;} + .d2-1489606637 .stroke-AB4{stroke:#EDF0FD;} + .d2-1489606637 .stroke-AB5{stroke:#F7F8FE;} + .d2-1489606637 .background-color-N1{background-color:#0A0F25;} + .d2-1489606637 .background-color-N2{background-color:#676C7E;} + .d2-1489606637 .background-color-N3{background-color:#9499AB;} + .d2-1489606637 .background-color-N4{background-color:#CFD2DD;} + .d2-1489606637 .background-color-N5{background-color:#DEE1EB;} + .d2-1489606637 .background-color-N6{background-color:#EEF1F8;} + .d2-1489606637 .background-color-N7{background-color:#FFFFFF;} + .d2-1489606637 .background-color-B1{background-color:#0D32B2;} + .d2-1489606637 .background-color-B2{background-color:#0D32B2;} + .d2-1489606637 .background-color-B3{background-color:#E3E9FD;} + .d2-1489606637 .background-color-B4{background-color:#E3E9FD;} + .d2-1489606637 .background-color-B5{background-color:#EDF0FD;} + .d2-1489606637 .background-color-B6{background-color:#F7F8FE;} + .d2-1489606637 .background-color-AA2{background-color:#4A6FF3;} + .d2-1489606637 .background-color-AA4{background-color:#EDF0FD;} + .d2-1489606637 .background-color-AA5{background-color:#F7F8FE;} + .d2-1489606637 .background-color-AB4{background-color:#EDF0FD;} + .d2-1489606637 .background-color-AB5{background-color:#F7F8FE;} + .d2-1489606637 .color-N1{color:#0A0F25;} + .d2-1489606637 .color-N2{color:#676C7E;} + .d2-1489606637 .color-N3{color:#9499AB;} + .d2-1489606637 .color-N4{color:#CFD2DD;} + .d2-1489606637 .color-N5{color:#DEE1EB;} + .d2-1489606637 .color-N6{color:#EEF1F8;} + .d2-1489606637 .color-N7{color:#FFFFFF;} + .d2-1489606637 .color-B1{color:#0D32B2;} + .d2-1489606637 .color-B2{color:#0D32B2;} + .d2-1489606637 .color-B3{color:#E3E9FD;} + .d2-1489606637 .color-B4{color:#E3E9FD;} + .d2-1489606637 .color-B5{color:#EDF0FD;} + .d2-1489606637 .color-B6{color:#F7F8FE;} + .d2-1489606637 .color-AA2{color:#4A6FF3;} + .d2-1489606637 .color-AA4{color:#EDF0FD;} + .d2-1489606637 .color-AA5{color:#F7F8FE;} + .d2-1489606637 .color-AB4{color:#EDF0FD;} + .d2-1489606637 .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----------------- \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg index ccb69fdea..b66e24de0 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-165564842 .fill-N1{fill:#0A0F25;} + .d2-165564842 .fill-N2{fill:#676C7E;} + .d2-165564842 .fill-N3{fill:#9499AB;} + .d2-165564842 .fill-N4{fill:#CFD2DD;} + .d2-165564842 .fill-N5{fill:#DEE1EB;} + .d2-165564842 .fill-N6{fill:#EEF1F8;} + .d2-165564842 .fill-N7{fill:#FFFFFF;} + .d2-165564842 .fill-B1{fill:#0D32B2;} + .d2-165564842 .fill-B2{fill:#0D32B2;} + .d2-165564842 .fill-B3{fill:#E3E9FD;} + .d2-165564842 .fill-B4{fill:#E3E9FD;} + .d2-165564842 .fill-B5{fill:#EDF0FD;} + .d2-165564842 .fill-B6{fill:#F7F8FE;} + .d2-165564842 .fill-AA2{fill:#4A6FF3;} + .d2-165564842 .fill-AA4{fill:#EDF0FD;} + .d2-165564842 .fill-AA5{fill:#F7F8FE;} + .d2-165564842 .fill-AB4{fill:#EDF0FD;} + .d2-165564842 .fill-AB5{fill:#F7F8FE;} + .d2-165564842 .stroke-N1{stroke:#0A0F25;} + .d2-165564842 .stroke-N2{stroke:#676C7E;} + .d2-165564842 .stroke-N3{stroke:#9499AB;} + .d2-165564842 .stroke-N4{stroke:#CFD2DD;} + .d2-165564842 .stroke-N5{stroke:#DEE1EB;} + .d2-165564842 .stroke-N6{stroke:#EEF1F8;} + .d2-165564842 .stroke-N7{stroke:#FFFFFF;} + .d2-165564842 .stroke-B1{stroke:#0D32B2;} + .d2-165564842 .stroke-B2{stroke:#0D32B2;} + .d2-165564842 .stroke-B3{stroke:#E3E9FD;} + .d2-165564842 .stroke-B4{stroke:#E3E9FD;} + .d2-165564842 .stroke-B5{stroke:#EDF0FD;} + .d2-165564842 .stroke-B6{stroke:#F7F8FE;} + .d2-165564842 .stroke-AA2{stroke:#4A6FF3;} + .d2-165564842 .stroke-AA4{stroke:#EDF0FD;} + .d2-165564842 .stroke-AA5{stroke:#F7F8FE;} + .d2-165564842 .stroke-AB4{stroke:#EDF0FD;} + .d2-165564842 .stroke-AB5{stroke:#F7F8FE;} + .d2-165564842 .background-color-N1{background-color:#0A0F25;} + .d2-165564842 .background-color-N2{background-color:#676C7E;} + .d2-165564842 .background-color-N3{background-color:#9499AB;} + .d2-165564842 .background-color-N4{background-color:#CFD2DD;} + .d2-165564842 .background-color-N5{background-color:#DEE1EB;} + .d2-165564842 .background-color-N6{background-color:#EEF1F8;} + .d2-165564842 .background-color-N7{background-color:#FFFFFF;} + .d2-165564842 .background-color-B1{background-color:#0D32B2;} + .d2-165564842 .background-color-B2{background-color:#0D32B2;} + .d2-165564842 .background-color-B3{background-color:#E3E9FD;} + .d2-165564842 .background-color-B4{background-color:#E3E9FD;} + .d2-165564842 .background-color-B5{background-color:#EDF0FD;} + .d2-165564842 .background-color-B6{background-color:#F7F8FE;} + .d2-165564842 .background-color-AA2{background-color:#4A6FF3;} + .d2-165564842 .background-color-AA4{background-color:#EDF0FD;} + .d2-165564842 .background-color-AA5{background-color:#F7F8FE;} + .d2-165564842 .background-color-AB4{background-color:#EDF0FD;} + .d2-165564842 .background-color-AB5{background-color:#F7F8FE;} + .d2-165564842 .color-N1{color:#0A0F25;} + .d2-165564842 .color-N2{color:#676C7E;} + .d2-165564842 .color-N3{color:#9499AB;} + .d2-165564842 .color-N4{color:#CFD2DD;} + .d2-165564842 .color-N5{color:#DEE1EB;} + .d2-165564842 .color-N6{color:#EEF1F8;} + .d2-165564842 .color-N7{color:#FFFFFF;} + .d2-165564842 .color-B1{color:#0D32B2;} + .d2-165564842 .color-B2{color:#0D32B2;} + .d2-165564842 .color-B3{color:#E3E9FD;} + .d2-165564842 .color-B4{color:#E3E9FD;} + .d2-165564842 .color-B5{color:#EDF0FD;} + .d2-165564842 .color-B6{color:#F7F8FE;} + .d2-165564842 .color-AA2{color:#4A6FF3;} + .d2-165564842 .color-AA4{color:#EDF0FD;} + .d2-165564842 .color-AA5{color:#F7F8FE;} + .d2-165564842 .color-AB4{color:#EDF0FD;} + .d2-165564842 .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/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg index 5feee97c1..5a380041f 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-2228684100 .fill-N1{fill:#0A0F25;} + .d2-2228684100 .fill-N2{fill:#676C7E;} + .d2-2228684100 .fill-N3{fill:#9499AB;} + .d2-2228684100 .fill-N4{fill:#CFD2DD;} + .d2-2228684100 .fill-N5{fill:#DEE1EB;} + .d2-2228684100 .fill-N6{fill:#EEF1F8;} + .d2-2228684100 .fill-N7{fill:#FFFFFF;} + .d2-2228684100 .fill-B1{fill:#0D32B2;} + .d2-2228684100 .fill-B2{fill:#0D32B2;} + .d2-2228684100 .fill-B3{fill:#E3E9FD;} + .d2-2228684100 .fill-B4{fill:#E3E9FD;} + .d2-2228684100 .fill-B5{fill:#EDF0FD;} + .d2-2228684100 .fill-B6{fill:#F7F8FE;} + .d2-2228684100 .fill-AA2{fill:#4A6FF3;} + .d2-2228684100 .fill-AA4{fill:#EDF0FD;} + .d2-2228684100 .fill-AA5{fill:#F7F8FE;} + .d2-2228684100 .fill-AB4{fill:#EDF0FD;} + .d2-2228684100 .fill-AB5{fill:#F7F8FE;} + .d2-2228684100 .stroke-N1{stroke:#0A0F25;} + .d2-2228684100 .stroke-N2{stroke:#676C7E;} + .d2-2228684100 .stroke-N3{stroke:#9499AB;} + .d2-2228684100 .stroke-N4{stroke:#CFD2DD;} + .d2-2228684100 .stroke-N5{stroke:#DEE1EB;} + .d2-2228684100 .stroke-N6{stroke:#EEF1F8;} + .d2-2228684100 .stroke-N7{stroke:#FFFFFF;} + .d2-2228684100 .stroke-B1{stroke:#0D32B2;} + .d2-2228684100 .stroke-B2{stroke:#0D32B2;} + .d2-2228684100 .stroke-B3{stroke:#E3E9FD;} + .d2-2228684100 .stroke-B4{stroke:#E3E9FD;} + .d2-2228684100 .stroke-B5{stroke:#EDF0FD;} + .d2-2228684100 .stroke-B6{stroke:#F7F8FE;} + .d2-2228684100 .stroke-AA2{stroke:#4A6FF3;} + .d2-2228684100 .stroke-AA4{stroke:#EDF0FD;} + .d2-2228684100 .stroke-AA5{stroke:#F7F8FE;} + .d2-2228684100 .stroke-AB4{stroke:#EDF0FD;} + .d2-2228684100 .stroke-AB5{stroke:#F7F8FE;} + .d2-2228684100 .background-color-N1{background-color:#0A0F25;} + .d2-2228684100 .background-color-N2{background-color:#676C7E;} + .d2-2228684100 .background-color-N3{background-color:#9499AB;} + .d2-2228684100 .background-color-N4{background-color:#CFD2DD;} + .d2-2228684100 .background-color-N5{background-color:#DEE1EB;} + .d2-2228684100 .background-color-N6{background-color:#EEF1F8;} + .d2-2228684100 .background-color-N7{background-color:#FFFFFF;} + .d2-2228684100 .background-color-B1{background-color:#0D32B2;} + .d2-2228684100 .background-color-B2{background-color:#0D32B2;} + .d2-2228684100 .background-color-B3{background-color:#E3E9FD;} + .d2-2228684100 .background-color-B4{background-color:#E3E9FD;} + .d2-2228684100 .background-color-B5{background-color:#EDF0FD;} + .d2-2228684100 .background-color-B6{background-color:#F7F8FE;} + .d2-2228684100 .background-color-AA2{background-color:#4A6FF3;} + .d2-2228684100 .background-color-AA4{background-color:#EDF0FD;} + .d2-2228684100 .background-color-AA5{background-color:#F7F8FE;} + .d2-2228684100 .background-color-AB4{background-color:#EDF0FD;} + .d2-2228684100 .background-color-AB5{background-color:#F7F8FE;} + .d2-2228684100 .color-N1{color:#0A0F25;} + .d2-2228684100 .color-N2{color:#676C7E;} + .d2-2228684100 .color-N3{color:#9499AB;} + .d2-2228684100 .color-N4{color:#CFD2DD;} + .d2-2228684100 .color-N5{color:#DEE1EB;} + .d2-2228684100 .color-N6{color:#EEF1F8;} + .d2-2228684100 .color-N7{color:#FFFFFF;} + .d2-2228684100 .color-B1{color:#0D32B2;} + .d2-2228684100 .color-B2{color:#0D32B2;} + .d2-2228684100 .color-B3{color:#E3E9FD;} + .d2-2228684100 .color-B4{color:#E3E9FD;} + .d2-2228684100 .color-B5{color:#EDF0FD;} + .d2-2228684100 .color-B6{color:#F7F8FE;} + .d2-2228684100 .color-AA2{color:#4A6FF3;} + .d2-2228684100 .color-AA4{color:#EDF0FD;} + .d2-2228684100 .color-AA5{color:#F7F8FE;} + .d2-2228684100 .color-AB4{color:#EDF0FD;} + .d2-2228684100 .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 1a9bc88c1..18bf91df9 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,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-3101729912 .fill-N1{fill:#0A0F25;} + .d2-3101729912 .fill-N2{fill:#676C7E;} + .d2-3101729912 .fill-N3{fill:#9499AB;} + .d2-3101729912 .fill-N4{fill:#CFD2DD;} + .d2-3101729912 .fill-N5{fill:#DEE1EB;} + .d2-3101729912 .fill-N6{fill:#EEF1F8;} + .d2-3101729912 .fill-N7{fill:#FFFFFF;} + .d2-3101729912 .fill-B1{fill:#0D32B2;} + .d2-3101729912 .fill-B2{fill:#0D32B2;} + .d2-3101729912 .fill-B3{fill:#E3E9FD;} + .d2-3101729912 .fill-B4{fill:#E3E9FD;} + .d2-3101729912 .fill-B5{fill:#EDF0FD;} + .d2-3101729912 .fill-B6{fill:#F7F8FE;} + .d2-3101729912 .fill-AA2{fill:#4A6FF3;} + .d2-3101729912 .fill-AA4{fill:#EDF0FD;} + .d2-3101729912 .fill-AA5{fill:#F7F8FE;} + .d2-3101729912 .fill-AB4{fill:#EDF0FD;} + .d2-3101729912 .fill-AB5{fill:#F7F8FE;} + .d2-3101729912 .stroke-N1{stroke:#0A0F25;} + .d2-3101729912 .stroke-N2{stroke:#676C7E;} + .d2-3101729912 .stroke-N3{stroke:#9499AB;} + .d2-3101729912 .stroke-N4{stroke:#CFD2DD;} + .d2-3101729912 .stroke-N5{stroke:#DEE1EB;} + .d2-3101729912 .stroke-N6{stroke:#EEF1F8;} + .d2-3101729912 .stroke-N7{stroke:#FFFFFF;} + .d2-3101729912 .stroke-B1{stroke:#0D32B2;} + .d2-3101729912 .stroke-B2{stroke:#0D32B2;} + .d2-3101729912 .stroke-B3{stroke:#E3E9FD;} + .d2-3101729912 .stroke-B4{stroke:#E3E9FD;} + .d2-3101729912 .stroke-B5{stroke:#EDF0FD;} + .d2-3101729912 .stroke-B6{stroke:#F7F8FE;} + .d2-3101729912 .stroke-AA2{stroke:#4A6FF3;} + .d2-3101729912 .stroke-AA4{stroke:#EDF0FD;} + .d2-3101729912 .stroke-AA5{stroke:#F7F8FE;} + .d2-3101729912 .stroke-AB4{stroke:#EDF0FD;} + .d2-3101729912 .stroke-AB5{stroke:#F7F8FE;} + .d2-3101729912 .background-color-N1{background-color:#0A0F25;} + .d2-3101729912 .background-color-N2{background-color:#676C7E;} + .d2-3101729912 .background-color-N3{background-color:#9499AB;} + .d2-3101729912 .background-color-N4{background-color:#CFD2DD;} + .d2-3101729912 .background-color-N5{background-color:#DEE1EB;} + .d2-3101729912 .background-color-N6{background-color:#EEF1F8;} + .d2-3101729912 .background-color-N7{background-color:#FFFFFF;} + .d2-3101729912 .background-color-B1{background-color:#0D32B2;} + .d2-3101729912 .background-color-B2{background-color:#0D32B2;} + .d2-3101729912 .background-color-B3{background-color:#E3E9FD;} + .d2-3101729912 .background-color-B4{background-color:#E3E9FD;} + .d2-3101729912 .background-color-B5{background-color:#EDF0FD;} + .d2-3101729912 .background-color-B6{background-color:#F7F8FE;} + .d2-3101729912 .background-color-AA2{background-color:#4A6FF3;} + .d2-3101729912 .background-color-AA4{background-color:#EDF0FD;} + .d2-3101729912 .background-color-AA5{background-color:#F7F8FE;} + .d2-3101729912 .background-color-AB4{background-color:#EDF0FD;} + .d2-3101729912 .background-color-AB5{background-color:#F7F8FE;} + .d2-3101729912 .color-N1{color:#0A0F25;} + .d2-3101729912 .color-N2{color:#676C7E;} + .d2-3101729912 .color-N3{color:#9499AB;} + .d2-3101729912 .color-N4{color:#CFD2DD;} + .d2-3101729912 .color-N5{color:#DEE1EB;} + .d2-3101729912 .color-N6{color:#EEF1F8;} + .d2-3101729912 .color-N7{color:#FFFFFF;} + .d2-3101729912 .color-B1{color:#0D32B2;} + .d2-3101729912 .color-B2{color:#0D32B2;} + .d2-3101729912 .color-B3{color:#E3E9FD;} + .d2-3101729912 .color-B4{color:#E3E9FD;} + .d2-3101729912 .color-B5{color:#EDF0FD;} + .d2-3101729912 .color-B6{color:#F7F8FE;} + .d2-3101729912 .color-AA2{color:#4A6FF3;} + .d2-3101729912 .color-AA4{color:#EDF0FD;} + .d2-3101729912 .color-AA5{color:#F7F8FE;} + .d2-3101729912 .color-AB4{color:#EDF0FD;} + .d2-3101729912 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc 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 6e7ec87bf..48631a24b 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,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-607531947 .fill-N1{fill:#0A0F25;} + .d2-607531947 .fill-N2{fill:#676C7E;} + .d2-607531947 .fill-N3{fill:#9499AB;} + .d2-607531947 .fill-N4{fill:#CFD2DD;} + .d2-607531947 .fill-N5{fill:#DEE1EB;} + .d2-607531947 .fill-N6{fill:#EEF1F8;} + .d2-607531947 .fill-N7{fill:#FFFFFF;} + .d2-607531947 .fill-B1{fill:#0D32B2;} + .d2-607531947 .fill-B2{fill:#0D32B2;} + .d2-607531947 .fill-B3{fill:#E3E9FD;} + .d2-607531947 .fill-B4{fill:#E3E9FD;} + .d2-607531947 .fill-B5{fill:#EDF0FD;} + .d2-607531947 .fill-B6{fill:#F7F8FE;} + .d2-607531947 .fill-AA2{fill:#4A6FF3;} + .d2-607531947 .fill-AA4{fill:#EDF0FD;} + .d2-607531947 .fill-AA5{fill:#F7F8FE;} + .d2-607531947 .fill-AB4{fill:#EDF0FD;} + .d2-607531947 .fill-AB5{fill:#F7F8FE;} + .d2-607531947 .stroke-N1{stroke:#0A0F25;} + .d2-607531947 .stroke-N2{stroke:#676C7E;} + .d2-607531947 .stroke-N3{stroke:#9499AB;} + .d2-607531947 .stroke-N4{stroke:#CFD2DD;} + .d2-607531947 .stroke-N5{stroke:#DEE1EB;} + .d2-607531947 .stroke-N6{stroke:#EEF1F8;} + .d2-607531947 .stroke-N7{stroke:#FFFFFF;} + .d2-607531947 .stroke-B1{stroke:#0D32B2;} + .d2-607531947 .stroke-B2{stroke:#0D32B2;} + .d2-607531947 .stroke-B3{stroke:#E3E9FD;} + .d2-607531947 .stroke-B4{stroke:#E3E9FD;} + .d2-607531947 .stroke-B5{stroke:#EDF0FD;} + .d2-607531947 .stroke-B6{stroke:#F7F8FE;} + .d2-607531947 .stroke-AA2{stroke:#4A6FF3;} + .d2-607531947 .stroke-AA4{stroke:#EDF0FD;} + .d2-607531947 .stroke-AA5{stroke:#F7F8FE;} + .d2-607531947 .stroke-AB4{stroke:#EDF0FD;} + .d2-607531947 .stroke-AB5{stroke:#F7F8FE;} + .d2-607531947 .background-color-N1{background-color:#0A0F25;} + .d2-607531947 .background-color-N2{background-color:#676C7E;} + .d2-607531947 .background-color-N3{background-color:#9499AB;} + .d2-607531947 .background-color-N4{background-color:#CFD2DD;} + .d2-607531947 .background-color-N5{background-color:#DEE1EB;} + .d2-607531947 .background-color-N6{background-color:#EEF1F8;} + .d2-607531947 .background-color-N7{background-color:#FFFFFF;} + .d2-607531947 .background-color-B1{background-color:#0D32B2;} + .d2-607531947 .background-color-B2{background-color:#0D32B2;} + .d2-607531947 .background-color-B3{background-color:#E3E9FD;} + .d2-607531947 .background-color-B4{background-color:#E3E9FD;} + .d2-607531947 .background-color-B5{background-color:#EDF0FD;} + .d2-607531947 .background-color-B6{background-color:#F7F8FE;} + .d2-607531947 .background-color-AA2{background-color:#4A6FF3;} + .d2-607531947 .background-color-AA4{background-color:#EDF0FD;} + .d2-607531947 .background-color-AA5{background-color:#F7F8FE;} + .d2-607531947 .background-color-AB4{background-color:#EDF0FD;} + .d2-607531947 .background-color-AB5{background-color:#F7F8FE;} + .d2-607531947 .color-N1{color:#0A0F25;} + .d2-607531947 .color-N2{color:#676C7E;} + .d2-607531947 .color-N3{color:#9499AB;} + .d2-607531947 .color-N4{color:#CFD2DD;} + .d2-607531947 .color-N5{color:#DEE1EB;} + .d2-607531947 .color-N6{color:#EEF1F8;} + .d2-607531947 .color-N7{color:#FFFFFF;} + .d2-607531947 .color-B1{color:#0D32B2;} + .d2-607531947 .color-B2{color:#0D32B2;} + .d2-607531947 .color-B3{color:#E3E9FD;} + .d2-607531947 .color-B4{color:#E3E9FD;} + .d2-607531947 .color-B5{color:#EDF0FD;} + .d2-607531947 .color-B6{color:#F7F8FE;} + .d2-607531947 .color-AA2{color:#4A6FF3;} + .d2-607531947 .color-AA4{color:#EDF0FD;} + .d2-607531947 .color-AA5{color:#F7F8FE;} + .d2-607531947 .color-AB4{color:#EDF0FD;} + .d2-607531947 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index c5c310a4a..33754aad7 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
      @@ -842,7 +842,7 @@
    • Staging
    • Dispatch to Site
    -
    InstallationSupport +InstallationSupport diff --git a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg index af38cb1be..17ae95cfa 100644 --- a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
      @@ -842,7 +842,7 @@
    • Staging
    • Dispatch to Site
    -
    InstallationSupport +InstallationSupport diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg index 0fdc6964a..9c509227e 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-1198633229 .fill-N1{fill:#0A0F25;} + .d2-1198633229 .fill-N2{fill:#676C7E;} + .d2-1198633229 .fill-N3{fill:#9499AB;} + .d2-1198633229 .fill-N4{fill:#CFD2DD;} + .d2-1198633229 .fill-N5{fill:#DEE1EB;} + .d2-1198633229 .fill-N6{fill:#EEF1F8;} + .d2-1198633229 .fill-N7{fill:#FFFFFF;} + .d2-1198633229 .fill-B1{fill:#0D32B2;} + .d2-1198633229 .fill-B2{fill:#0D32B2;} + .d2-1198633229 .fill-B3{fill:#E3E9FD;} + .d2-1198633229 .fill-B4{fill:#E3E9FD;} + .d2-1198633229 .fill-B5{fill:#EDF0FD;} + .d2-1198633229 .fill-B6{fill:#F7F8FE;} + .d2-1198633229 .fill-AA2{fill:#4A6FF3;} + .d2-1198633229 .fill-AA4{fill:#EDF0FD;} + .d2-1198633229 .fill-AA5{fill:#F7F8FE;} + .d2-1198633229 .fill-AB4{fill:#EDF0FD;} + .d2-1198633229 .fill-AB5{fill:#F7F8FE;} + .d2-1198633229 .stroke-N1{stroke:#0A0F25;} + .d2-1198633229 .stroke-N2{stroke:#676C7E;} + .d2-1198633229 .stroke-N3{stroke:#9499AB;} + .d2-1198633229 .stroke-N4{stroke:#CFD2DD;} + .d2-1198633229 .stroke-N5{stroke:#DEE1EB;} + .d2-1198633229 .stroke-N6{stroke:#EEF1F8;} + .d2-1198633229 .stroke-N7{stroke:#FFFFFF;} + .d2-1198633229 .stroke-B1{stroke:#0D32B2;} + .d2-1198633229 .stroke-B2{stroke:#0D32B2;} + .d2-1198633229 .stroke-B3{stroke:#E3E9FD;} + .d2-1198633229 .stroke-B4{stroke:#E3E9FD;} + .d2-1198633229 .stroke-B5{stroke:#EDF0FD;} + .d2-1198633229 .stroke-B6{stroke:#F7F8FE;} + .d2-1198633229 .stroke-AA2{stroke:#4A6FF3;} + .d2-1198633229 .stroke-AA4{stroke:#EDF0FD;} + .d2-1198633229 .stroke-AA5{stroke:#F7F8FE;} + .d2-1198633229 .stroke-AB4{stroke:#EDF0FD;} + .d2-1198633229 .stroke-AB5{stroke:#F7F8FE;} + .d2-1198633229 .background-color-N1{background-color:#0A0F25;} + .d2-1198633229 .background-color-N2{background-color:#676C7E;} + .d2-1198633229 .background-color-N3{background-color:#9499AB;} + .d2-1198633229 .background-color-N4{background-color:#CFD2DD;} + .d2-1198633229 .background-color-N5{background-color:#DEE1EB;} + .d2-1198633229 .background-color-N6{background-color:#EEF1F8;} + .d2-1198633229 .background-color-N7{background-color:#FFFFFF;} + .d2-1198633229 .background-color-B1{background-color:#0D32B2;} + .d2-1198633229 .background-color-B2{background-color:#0D32B2;} + .d2-1198633229 .background-color-B3{background-color:#E3E9FD;} + .d2-1198633229 .background-color-B4{background-color:#E3E9FD;} + .d2-1198633229 .background-color-B5{background-color:#EDF0FD;} + .d2-1198633229 .background-color-B6{background-color:#F7F8FE;} + .d2-1198633229 .background-color-AA2{background-color:#4A6FF3;} + .d2-1198633229 .background-color-AA4{background-color:#EDF0FD;} + .d2-1198633229 .background-color-AA5{background-color:#F7F8FE;} + .d2-1198633229 .background-color-AB4{background-color:#EDF0FD;} + .d2-1198633229 .background-color-AB5{background-color:#F7F8FE;} + .d2-1198633229 .color-N1{color:#0A0F25;} + .d2-1198633229 .color-N2{color:#676C7E;} + .d2-1198633229 .color-N3{color:#9499AB;} + .d2-1198633229 .color-N4{color:#CFD2DD;} + .d2-1198633229 .color-N5{color:#DEE1EB;} + .d2-1198633229 .color-N6{color:#EEF1F8;} + .d2-1198633229 .color-N7{color:#FFFFFF;} + .d2-1198633229 .color-B1{color:#0D32B2;} + .d2-1198633229 .color-B2{color:#0D32B2;} + .d2-1198633229 .color-B3{color:#E3E9FD;} + .d2-1198633229 .color-B4{color:#E3E9FD;} + .d2-1198633229 .color-B5{color:#EDF0FD;} + .d2-1198633229 .color-B6{color:#F7F8FE;} + .d2-1198633229 .color-AA2{color:#4A6FF3;} + .d2-1198633229 .color-AA4{color:#EDF0FD;} + .d2-1198633229 .color-AA5{color:#F7F8FE;} + .d2-1198633229 .color-AB4{color:#EDF0FD;} + .d2-1198633229 .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/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg index d89bee51a..6ac1e733c 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-2237614131 .fill-N1{fill:#0A0F25;} + .d2-2237614131 .fill-N2{fill:#676C7E;} + .d2-2237614131 .fill-N3{fill:#9499AB;} + .d2-2237614131 .fill-N4{fill:#CFD2DD;} + .d2-2237614131 .fill-N5{fill:#DEE1EB;} + .d2-2237614131 .fill-N6{fill:#EEF1F8;} + .d2-2237614131 .fill-N7{fill:#FFFFFF;} + .d2-2237614131 .fill-B1{fill:#0D32B2;} + .d2-2237614131 .fill-B2{fill:#0D32B2;} + .d2-2237614131 .fill-B3{fill:#E3E9FD;} + .d2-2237614131 .fill-B4{fill:#E3E9FD;} + .d2-2237614131 .fill-B5{fill:#EDF0FD;} + .d2-2237614131 .fill-B6{fill:#F7F8FE;} + .d2-2237614131 .fill-AA2{fill:#4A6FF3;} + .d2-2237614131 .fill-AA4{fill:#EDF0FD;} + .d2-2237614131 .fill-AA5{fill:#F7F8FE;} + .d2-2237614131 .fill-AB4{fill:#EDF0FD;} + .d2-2237614131 .fill-AB5{fill:#F7F8FE;} + .d2-2237614131 .stroke-N1{stroke:#0A0F25;} + .d2-2237614131 .stroke-N2{stroke:#676C7E;} + .d2-2237614131 .stroke-N3{stroke:#9499AB;} + .d2-2237614131 .stroke-N4{stroke:#CFD2DD;} + .d2-2237614131 .stroke-N5{stroke:#DEE1EB;} + .d2-2237614131 .stroke-N6{stroke:#EEF1F8;} + .d2-2237614131 .stroke-N7{stroke:#FFFFFF;} + .d2-2237614131 .stroke-B1{stroke:#0D32B2;} + .d2-2237614131 .stroke-B2{stroke:#0D32B2;} + .d2-2237614131 .stroke-B3{stroke:#E3E9FD;} + .d2-2237614131 .stroke-B4{stroke:#E3E9FD;} + .d2-2237614131 .stroke-B5{stroke:#EDF0FD;} + .d2-2237614131 .stroke-B6{stroke:#F7F8FE;} + .d2-2237614131 .stroke-AA2{stroke:#4A6FF3;} + .d2-2237614131 .stroke-AA4{stroke:#EDF0FD;} + .d2-2237614131 .stroke-AA5{stroke:#F7F8FE;} + .d2-2237614131 .stroke-AB4{stroke:#EDF0FD;} + .d2-2237614131 .stroke-AB5{stroke:#F7F8FE;} + .d2-2237614131 .background-color-N1{background-color:#0A0F25;} + .d2-2237614131 .background-color-N2{background-color:#676C7E;} + .d2-2237614131 .background-color-N3{background-color:#9499AB;} + .d2-2237614131 .background-color-N4{background-color:#CFD2DD;} + .d2-2237614131 .background-color-N5{background-color:#DEE1EB;} + .d2-2237614131 .background-color-N6{background-color:#EEF1F8;} + .d2-2237614131 .background-color-N7{background-color:#FFFFFF;} + .d2-2237614131 .background-color-B1{background-color:#0D32B2;} + .d2-2237614131 .background-color-B2{background-color:#0D32B2;} + .d2-2237614131 .background-color-B3{background-color:#E3E9FD;} + .d2-2237614131 .background-color-B4{background-color:#E3E9FD;} + .d2-2237614131 .background-color-B5{background-color:#EDF0FD;} + .d2-2237614131 .background-color-B6{background-color:#F7F8FE;} + .d2-2237614131 .background-color-AA2{background-color:#4A6FF3;} + .d2-2237614131 .background-color-AA4{background-color:#EDF0FD;} + .d2-2237614131 .background-color-AA5{background-color:#F7F8FE;} + .d2-2237614131 .background-color-AB4{background-color:#EDF0FD;} + .d2-2237614131 .background-color-AB5{background-color:#F7F8FE;} + .d2-2237614131 .color-N1{color:#0A0F25;} + .d2-2237614131 .color-N2{color:#676C7E;} + .d2-2237614131 .color-N3{color:#9499AB;} + .d2-2237614131 .color-N4{color:#CFD2DD;} + .d2-2237614131 .color-N5{color:#DEE1EB;} + .d2-2237614131 .color-N6{color:#EEF1F8;} + .d2-2237614131 .color-N7{color:#FFFFFF;} + .d2-2237614131 .color-B1{color:#0D32B2;} + .d2-2237614131 .color-B2{color:#0D32B2;} + .d2-2237614131 .color-B3{color:#E3E9FD;} + .d2-2237614131 .color-B4{color:#E3E9FD;} + .d2-2237614131 .color-B5{color:#EDF0FD;} + .d2-2237614131 .color-B6{color:#F7F8FE;} + .d2-2237614131 .color-AA2{color:#4A6FF3;} + .d2-2237614131 .color-AA4{color:#EDF0FD;} + .d2-2237614131 .color-AA5{color:#F7F8FE;} + .d2-2237614131 .color-AB4{color:#EDF0FD;} + .d2-2237614131 .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 6e0a950d5..30a96c32b 100644 --- a/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-32146059 .fill-N1{fill:#0A0F25;} + .d2-32146059 .fill-N2{fill:#676C7E;} + .d2-32146059 .fill-N3{fill:#9499AB;} + .d2-32146059 .fill-N4{fill:#CFD2DD;} + .d2-32146059 .fill-N5{fill:#DEE1EB;} + .d2-32146059 .fill-N6{fill:#EEF1F8;} + .d2-32146059 .fill-N7{fill:#FFFFFF;} + .d2-32146059 .fill-B1{fill:#0D32B2;} + .d2-32146059 .fill-B2{fill:#0D32B2;} + .d2-32146059 .fill-B3{fill:#E3E9FD;} + .d2-32146059 .fill-B4{fill:#E3E9FD;} + .d2-32146059 .fill-B5{fill:#EDF0FD;} + .d2-32146059 .fill-B6{fill:#F7F8FE;} + .d2-32146059 .fill-AA2{fill:#4A6FF3;} + .d2-32146059 .fill-AA4{fill:#EDF0FD;} + .d2-32146059 .fill-AA5{fill:#F7F8FE;} + .d2-32146059 .fill-AB4{fill:#EDF0FD;} + .d2-32146059 .fill-AB5{fill:#F7F8FE;} + .d2-32146059 .stroke-N1{stroke:#0A0F25;} + .d2-32146059 .stroke-N2{stroke:#676C7E;} + .d2-32146059 .stroke-N3{stroke:#9499AB;} + .d2-32146059 .stroke-N4{stroke:#CFD2DD;} + .d2-32146059 .stroke-N5{stroke:#DEE1EB;} + .d2-32146059 .stroke-N6{stroke:#EEF1F8;} + .d2-32146059 .stroke-N7{stroke:#FFFFFF;} + .d2-32146059 .stroke-B1{stroke:#0D32B2;} + .d2-32146059 .stroke-B2{stroke:#0D32B2;} + .d2-32146059 .stroke-B3{stroke:#E3E9FD;} + .d2-32146059 .stroke-B4{stroke:#E3E9FD;} + .d2-32146059 .stroke-B5{stroke:#EDF0FD;} + .d2-32146059 .stroke-B6{stroke:#F7F8FE;} + .d2-32146059 .stroke-AA2{stroke:#4A6FF3;} + .d2-32146059 .stroke-AA4{stroke:#EDF0FD;} + .d2-32146059 .stroke-AA5{stroke:#F7F8FE;} + .d2-32146059 .stroke-AB4{stroke:#EDF0FD;} + .d2-32146059 .stroke-AB5{stroke:#F7F8FE;} + .d2-32146059 .background-color-N1{background-color:#0A0F25;} + .d2-32146059 .background-color-N2{background-color:#676C7E;} + .d2-32146059 .background-color-N3{background-color:#9499AB;} + .d2-32146059 .background-color-N4{background-color:#CFD2DD;} + .d2-32146059 .background-color-N5{background-color:#DEE1EB;} + .d2-32146059 .background-color-N6{background-color:#EEF1F8;} + .d2-32146059 .background-color-N7{background-color:#FFFFFF;} + .d2-32146059 .background-color-B1{background-color:#0D32B2;} + .d2-32146059 .background-color-B2{background-color:#0D32B2;} + .d2-32146059 .background-color-B3{background-color:#E3E9FD;} + .d2-32146059 .background-color-B4{background-color:#E3E9FD;} + .d2-32146059 .background-color-B5{background-color:#EDF0FD;} + .d2-32146059 .background-color-B6{background-color:#F7F8FE;} + .d2-32146059 .background-color-AA2{background-color:#4A6FF3;} + .d2-32146059 .background-color-AA4{background-color:#EDF0FD;} + .d2-32146059 .background-color-AA5{background-color:#F7F8FE;} + .d2-32146059 .background-color-AB4{background-color:#EDF0FD;} + .d2-32146059 .background-color-AB5{background-color:#F7F8FE;} + .d2-32146059 .color-N1{color:#0A0F25;} + .d2-32146059 .color-N2{color:#676C7E;} + .d2-32146059 .color-N3{color:#9499AB;} + .d2-32146059 .color-N4{color:#CFD2DD;} + .d2-32146059 .color-N5{color:#DEE1EB;} + .d2-32146059 .color-N6{color:#EEF1F8;} + .d2-32146059 .color-N7{color:#FFFFFF;} + .d2-32146059 .color-B1{color:#0D32B2;} + .d2-32146059 .color-B2{color:#0D32B2;} + .d2-32146059 .color-B3{color:#E3E9FD;} + .d2-32146059 .color-B4{color:#E3E9FD;} + .d2-32146059 .color-B5{color:#EDF0FD;} + .d2-32146059 .color-B6{color:#F7F8FE;} + .d2-32146059 .color-AA2{color:#4A6FF3;} + .d2-32146059 .color-AA4{color:#EDF0FD;} + .d2-32146059 .color-AA5{color:#F7F8FE;} + .d2-32146059 .color-AB4{color:#EDF0FD;} + .d2-32146059 .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}]]>we all livein a LightSteelBluesubmarine diff --git a/e2etests/testdata/root/border-radius/elk/sketch.exp.svg b/e2etests/testdata/root/border-radius/elk/sketch.exp.svg index 401a9a902..2454ae3f3 100644 --- a/e2etests/testdata/root/border-radius/elk/sketch.exp.svg +++ b/e2etests/testdata/root/border-radius/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-1121852226 .fill-N1{fill:#0A0F25;} + .d2-1121852226 .fill-N2{fill:#676C7E;} + .d2-1121852226 .fill-N3{fill:#9499AB;} + .d2-1121852226 .fill-N4{fill:#CFD2DD;} + .d2-1121852226 .fill-N5{fill:#DEE1EB;} + .d2-1121852226 .fill-N6{fill:#EEF1F8;} + .d2-1121852226 .fill-N7{fill:#FFFFFF;} + .d2-1121852226 .fill-B1{fill:#0D32B2;} + .d2-1121852226 .fill-B2{fill:#0D32B2;} + .d2-1121852226 .fill-B3{fill:#E3E9FD;} + .d2-1121852226 .fill-B4{fill:#E3E9FD;} + .d2-1121852226 .fill-B5{fill:#EDF0FD;} + .d2-1121852226 .fill-B6{fill:#F7F8FE;} + .d2-1121852226 .fill-AA2{fill:#4A6FF3;} + .d2-1121852226 .fill-AA4{fill:#EDF0FD;} + .d2-1121852226 .fill-AA5{fill:#F7F8FE;} + .d2-1121852226 .fill-AB4{fill:#EDF0FD;} + .d2-1121852226 .fill-AB5{fill:#F7F8FE;} + .d2-1121852226 .stroke-N1{stroke:#0A0F25;} + .d2-1121852226 .stroke-N2{stroke:#676C7E;} + .d2-1121852226 .stroke-N3{stroke:#9499AB;} + .d2-1121852226 .stroke-N4{stroke:#CFD2DD;} + .d2-1121852226 .stroke-N5{stroke:#DEE1EB;} + .d2-1121852226 .stroke-N6{stroke:#EEF1F8;} + .d2-1121852226 .stroke-N7{stroke:#FFFFFF;} + .d2-1121852226 .stroke-B1{stroke:#0D32B2;} + .d2-1121852226 .stroke-B2{stroke:#0D32B2;} + .d2-1121852226 .stroke-B3{stroke:#E3E9FD;} + .d2-1121852226 .stroke-B4{stroke:#E3E9FD;} + .d2-1121852226 .stroke-B5{stroke:#EDF0FD;} + .d2-1121852226 .stroke-B6{stroke:#F7F8FE;} + .d2-1121852226 .stroke-AA2{stroke:#4A6FF3;} + .d2-1121852226 .stroke-AA4{stroke:#EDF0FD;} + .d2-1121852226 .stroke-AA5{stroke:#F7F8FE;} + .d2-1121852226 .stroke-AB4{stroke:#EDF0FD;} + .d2-1121852226 .stroke-AB5{stroke:#F7F8FE;} + .d2-1121852226 .background-color-N1{background-color:#0A0F25;} + .d2-1121852226 .background-color-N2{background-color:#676C7E;} + .d2-1121852226 .background-color-N3{background-color:#9499AB;} + .d2-1121852226 .background-color-N4{background-color:#CFD2DD;} + .d2-1121852226 .background-color-N5{background-color:#DEE1EB;} + .d2-1121852226 .background-color-N6{background-color:#EEF1F8;} + .d2-1121852226 .background-color-N7{background-color:#FFFFFF;} + .d2-1121852226 .background-color-B1{background-color:#0D32B2;} + .d2-1121852226 .background-color-B2{background-color:#0D32B2;} + .d2-1121852226 .background-color-B3{background-color:#E3E9FD;} + .d2-1121852226 .background-color-B4{background-color:#E3E9FD;} + .d2-1121852226 .background-color-B5{background-color:#EDF0FD;} + .d2-1121852226 .background-color-B6{background-color:#F7F8FE;} + .d2-1121852226 .background-color-AA2{background-color:#4A6FF3;} + .d2-1121852226 .background-color-AA4{background-color:#EDF0FD;} + .d2-1121852226 .background-color-AA5{background-color:#F7F8FE;} + .d2-1121852226 .background-color-AB4{background-color:#EDF0FD;} + .d2-1121852226 .background-color-AB5{background-color:#F7F8FE;} + .d2-1121852226 .color-N1{color:#0A0F25;} + .d2-1121852226 .color-N2{color:#676C7E;} + .d2-1121852226 .color-N3{color:#9499AB;} + .d2-1121852226 .color-N4{color:#CFD2DD;} + .d2-1121852226 .color-N5{color:#DEE1EB;} + .d2-1121852226 .color-N6{color:#EEF1F8;} + .d2-1121852226 .color-N7{color:#FFFFFF;} + .d2-1121852226 .color-B1{color:#0D32B2;} + .d2-1121852226 .color-B2{color:#0D32B2;} + .d2-1121852226 .color-B3{color:#E3E9FD;} + .d2-1121852226 .color-B4{color:#E3E9FD;} + .d2-1121852226 .color-B5{color:#EDF0FD;} + .d2-1121852226 .color-B6{color:#F7F8FE;} + .d2-1121852226 .color-AA2{color:#4A6FF3;} + .d2-1121852226 .color-AA4{color:#EDF0FD;} + .d2-1121852226 .color-AA5{color:#F7F8FE;} + .d2-1121852226 .color-AB4{color:#EDF0FD;} + .d2-1121852226 .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}]]>we all livein a LightSteelBluesubmarine diff --git a/e2etests/testdata/root/double-border/dagre/sketch.exp.svg b/e2etests/testdata/root/double-border/dagre/sketch.exp.svg index 747eb6e31..8d03fddc2 100644 --- a/e2etests/testdata/root/double-border/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/double-border/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-1459342231 .fill-N1{fill:#0A0F25;} + .d2-1459342231 .fill-N2{fill:#676C7E;} + .d2-1459342231 .fill-N3{fill:#9499AB;} + .d2-1459342231 .fill-N4{fill:#CFD2DD;} + .d2-1459342231 .fill-N5{fill:#DEE1EB;} + .d2-1459342231 .fill-N6{fill:#EEF1F8;} + .d2-1459342231 .fill-N7{fill:#FFFFFF;} + .d2-1459342231 .fill-B1{fill:#0D32B2;} + .d2-1459342231 .fill-B2{fill:#0D32B2;} + .d2-1459342231 .fill-B3{fill:#E3E9FD;} + .d2-1459342231 .fill-B4{fill:#E3E9FD;} + .d2-1459342231 .fill-B5{fill:#EDF0FD;} + .d2-1459342231 .fill-B6{fill:#F7F8FE;} + .d2-1459342231 .fill-AA2{fill:#4A6FF3;} + .d2-1459342231 .fill-AA4{fill:#EDF0FD;} + .d2-1459342231 .fill-AA5{fill:#F7F8FE;} + .d2-1459342231 .fill-AB4{fill:#EDF0FD;} + .d2-1459342231 .fill-AB5{fill:#F7F8FE;} + .d2-1459342231 .stroke-N1{stroke:#0A0F25;} + .d2-1459342231 .stroke-N2{stroke:#676C7E;} + .d2-1459342231 .stroke-N3{stroke:#9499AB;} + .d2-1459342231 .stroke-N4{stroke:#CFD2DD;} + .d2-1459342231 .stroke-N5{stroke:#DEE1EB;} + .d2-1459342231 .stroke-N6{stroke:#EEF1F8;} + .d2-1459342231 .stroke-N7{stroke:#FFFFFF;} + .d2-1459342231 .stroke-B1{stroke:#0D32B2;} + .d2-1459342231 .stroke-B2{stroke:#0D32B2;} + .d2-1459342231 .stroke-B3{stroke:#E3E9FD;} + .d2-1459342231 .stroke-B4{stroke:#E3E9FD;} + .d2-1459342231 .stroke-B5{stroke:#EDF0FD;} + .d2-1459342231 .stroke-B6{stroke:#F7F8FE;} + .d2-1459342231 .stroke-AA2{stroke:#4A6FF3;} + .d2-1459342231 .stroke-AA4{stroke:#EDF0FD;} + .d2-1459342231 .stroke-AA5{stroke:#F7F8FE;} + .d2-1459342231 .stroke-AB4{stroke:#EDF0FD;} + .d2-1459342231 .stroke-AB5{stroke:#F7F8FE;} + .d2-1459342231 .background-color-N1{background-color:#0A0F25;} + .d2-1459342231 .background-color-N2{background-color:#676C7E;} + .d2-1459342231 .background-color-N3{background-color:#9499AB;} + .d2-1459342231 .background-color-N4{background-color:#CFD2DD;} + .d2-1459342231 .background-color-N5{background-color:#DEE1EB;} + .d2-1459342231 .background-color-N6{background-color:#EEF1F8;} + .d2-1459342231 .background-color-N7{background-color:#FFFFFF;} + .d2-1459342231 .background-color-B1{background-color:#0D32B2;} + .d2-1459342231 .background-color-B2{background-color:#0D32B2;} + .d2-1459342231 .background-color-B3{background-color:#E3E9FD;} + .d2-1459342231 .background-color-B4{background-color:#E3E9FD;} + .d2-1459342231 .background-color-B5{background-color:#EDF0FD;} + .d2-1459342231 .background-color-B6{background-color:#F7F8FE;} + .d2-1459342231 .background-color-AA2{background-color:#4A6FF3;} + .d2-1459342231 .background-color-AA4{background-color:#EDF0FD;} + .d2-1459342231 .background-color-AA5{background-color:#F7F8FE;} + .d2-1459342231 .background-color-AB4{background-color:#EDF0FD;} + .d2-1459342231 .background-color-AB5{background-color:#F7F8FE;} + .d2-1459342231 .color-N1{color:#0A0F25;} + .d2-1459342231 .color-N2{color:#676C7E;} + .d2-1459342231 .color-N3{color:#9499AB;} + .d2-1459342231 .color-N4{color:#CFD2DD;} + .d2-1459342231 .color-N5{color:#DEE1EB;} + .d2-1459342231 .color-N6{color:#EEF1F8;} + .d2-1459342231 .color-N7{color:#FFFFFF;} + .d2-1459342231 .color-B1{color:#0D32B2;} + .d2-1459342231 .color-B2{color:#0D32B2;} + .d2-1459342231 .color-B3{color:#E3E9FD;} + .d2-1459342231 .color-B4{color:#E3E9FD;} + .d2-1459342231 .color-B5{color:#EDF0FD;} + .d2-1459342231 .color-B6{color:#F7F8FE;} + .d2-1459342231 .color-AA2{color:#4A6FF3;} + .d2-1459342231 .color-AA4{color:#EDF0FD;} + .d2-1459342231 .color-AA5{color:#F7F8FE;} + .d2-1459342231 .color-AB4{color:#EDF0FD;} + .d2-1459342231 .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}]]>we all livein a LightSteelBluesubmarine diff --git a/e2etests/testdata/root/double-border/elk/sketch.exp.svg b/e2etests/testdata/root/double-border/elk/sketch.exp.svg index a438e1d4a..6fece6f76 100644 --- a/e2etests/testdata/root/double-border/elk/sketch.exp.svg +++ b/e2etests/testdata/root/double-border/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-3587663802 .fill-N1{fill:#0A0F25;} + .d2-3587663802 .fill-N2{fill:#676C7E;} + .d2-3587663802 .fill-N3{fill:#9499AB;} + .d2-3587663802 .fill-N4{fill:#CFD2DD;} + .d2-3587663802 .fill-N5{fill:#DEE1EB;} + .d2-3587663802 .fill-N6{fill:#EEF1F8;} + .d2-3587663802 .fill-N7{fill:#FFFFFF;} + .d2-3587663802 .fill-B1{fill:#0D32B2;} + .d2-3587663802 .fill-B2{fill:#0D32B2;} + .d2-3587663802 .fill-B3{fill:#E3E9FD;} + .d2-3587663802 .fill-B4{fill:#E3E9FD;} + .d2-3587663802 .fill-B5{fill:#EDF0FD;} + .d2-3587663802 .fill-B6{fill:#F7F8FE;} + .d2-3587663802 .fill-AA2{fill:#4A6FF3;} + .d2-3587663802 .fill-AA4{fill:#EDF0FD;} + .d2-3587663802 .fill-AA5{fill:#F7F8FE;} + .d2-3587663802 .fill-AB4{fill:#EDF0FD;} + .d2-3587663802 .fill-AB5{fill:#F7F8FE;} + .d2-3587663802 .stroke-N1{stroke:#0A0F25;} + .d2-3587663802 .stroke-N2{stroke:#676C7E;} + .d2-3587663802 .stroke-N3{stroke:#9499AB;} + .d2-3587663802 .stroke-N4{stroke:#CFD2DD;} + .d2-3587663802 .stroke-N5{stroke:#DEE1EB;} + .d2-3587663802 .stroke-N6{stroke:#EEF1F8;} + .d2-3587663802 .stroke-N7{stroke:#FFFFFF;} + .d2-3587663802 .stroke-B1{stroke:#0D32B2;} + .d2-3587663802 .stroke-B2{stroke:#0D32B2;} + .d2-3587663802 .stroke-B3{stroke:#E3E9FD;} + .d2-3587663802 .stroke-B4{stroke:#E3E9FD;} + .d2-3587663802 .stroke-B5{stroke:#EDF0FD;} + .d2-3587663802 .stroke-B6{stroke:#F7F8FE;} + .d2-3587663802 .stroke-AA2{stroke:#4A6FF3;} + .d2-3587663802 .stroke-AA4{stroke:#EDF0FD;} + .d2-3587663802 .stroke-AA5{stroke:#F7F8FE;} + .d2-3587663802 .stroke-AB4{stroke:#EDF0FD;} + .d2-3587663802 .stroke-AB5{stroke:#F7F8FE;} + .d2-3587663802 .background-color-N1{background-color:#0A0F25;} + .d2-3587663802 .background-color-N2{background-color:#676C7E;} + .d2-3587663802 .background-color-N3{background-color:#9499AB;} + .d2-3587663802 .background-color-N4{background-color:#CFD2DD;} + .d2-3587663802 .background-color-N5{background-color:#DEE1EB;} + .d2-3587663802 .background-color-N6{background-color:#EEF1F8;} + .d2-3587663802 .background-color-N7{background-color:#FFFFFF;} + .d2-3587663802 .background-color-B1{background-color:#0D32B2;} + .d2-3587663802 .background-color-B2{background-color:#0D32B2;} + .d2-3587663802 .background-color-B3{background-color:#E3E9FD;} + .d2-3587663802 .background-color-B4{background-color:#E3E9FD;} + .d2-3587663802 .background-color-B5{background-color:#EDF0FD;} + .d2-3587663802 .background-color-B6{background-color:#F7F8FE;} + .d2-3587663802 .background-color-AA2{background-color:#4A6FF3;} + .d2-3587663802 .background-color-AA4{background-color:#EDF0FD;} + .d2-3587663802 .background-color-AA5{background-color:#F7F8FE;} + .d2-3587663802 .background-color-AB4{background-color:#EDF0FD;} + .d2-3587663802 .background-color-AB5{background-color:#F7F8FE;} + .d2-3587663802 .color-N1{color:#0A0F25;} + .d2-3587663802 .color-N2{color:#676C7E;} + .d2-3587663802 .color-N3{color:#9499AB;} + .d2-3587663802 .color-N4{color:#CFD2DD;} + .d2-3587663802 .color-N5{color:#DEE1EB;} + .d2-3587663802 .color-N6{color:#EEF1F8;} + .d2-3587663802 .color-N7{color:#FFFFFF;} + .d2-3587663802 .color-B1{color:#0D32B2;} + .d2-3587663802 .color-B2{color:#0D32B2;} + .d2-3587663802 .color-B3{color:#E3E9FD;} + .d2-3587663802 .color-B4{color:#E3E9FD;} + .d2-3587663802 .color-B5{color:#EDF0FD;} + .d2-3587663802 .color-B6{color:#F7F8FE;} + .d2-3587663802 .color-AA2{color:#4A6FF3;} + .d2-3587663802 .color-AA4{color:#EDF0FD;} + .d2-3587663802 .color-AA5{color:#F7F8FE;} + .d2-3587663802 .color-AB4{color:#EDF0FD;} + .d2-3587663802 .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}]]>we all livein a LightSteelBluesubmarine 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 f7d381a76..23af019ef 100644 --- a/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-1612328283 .fill-N1{fill:#0A0F25;} + .d2-1612328283 .fill-N2{fill:#676C7E;} + .d2-1612328283 .fill-N3{fill:#9499AB;} + .d2-1612328283 .fill-N4{fill:#CFD2DD;} + .d2-1612328283 .fill-N5{fill:#DEE1EB;} + .d2-1612328283 .fill-N6{fill:#EEF1F8;} + .d2-1612328283 .fill-N7{fill:#FFFFFF;} + .d2-1612328283 .fill-B1{fill:#0D32B2;} + .d2-1612328283 .fill-B2{fill:#0D32B2;} + .d2-1612328283 .fill-B3{fill:#E3E9FD;} + .d2-1612328283 .fill-B4{fill:#E3E9FD;} + .d2-1612328283 .fill-B5{fill:#EDF0FD;} + .d2-1612328283 .fill-B6{fill:#F7F8FE;} + .d2-1612328283 .fill-AA2{fill:#4A6FF3;} + .d2-1612328283 .fill-AA4{fill:#EDF0FD;} + .d2-1612328283 .fill-AA5{fill:#F7F8FE;} + .d2-1612328283 .fill-AB4{fill:#EDF0FD;} + .d2-1612328283 .fill-AB5{fill:#F7F8FE;} + .d2-1612328283 .stroke-N1{stroke:#0A0F25;} + .d2-1612328283 .stroke-N2{stroke:#676C7E;} + .d2-1612328283 .stroke-N3{stroke:#9499AB;} + .d2-1612328283 .stroke-N4{stroke:#CFD2DD;} + .d2-1612328283 .stroke-N5{stroke:#DEE1EB;} + .d2-1612328283 .stroke-N6{stroke:#EEF1F8;} + .d2-1612328283 .stroke-N7{stroke:#FFFFFF;} + .d2-1612328283 .stroke-B1{stroke:#0D32B2;} + .d2-1612328283 .stroke-B2{stroke:#0D32B2;} + .d2-1612328283 .stroke-B3{stroke:#E3E9FD;} + .d2-1612328283 .stroke-B4{stroke:#E3E9FD;} + .d2-1612328283 .stroke-B5{stroke:#EDF0FD;} + .d2-1612328283 .stroke-B6{stroke:#F7F8FE;} + .d2-1612328283 .stroke-AA2{stroke:#4A6FF3;} + .d2-1612328283 .stroke-AA4{stroke:#EDF0FD;} + .d2-1612328283 .stroke-AA5{stroke:#F7F8FE;} + .d2-1612328283 .stroke-AB4{stroke:#EDF0FD;} + .d2-1612328283 .stroke-AB5{stroke:#F7F8FE;} + .d2-1612328283 .background-color-N1{background-color:#0A0F25;} + .d2-1612328283 .background-color-N2{background-color:#676C7E;} + .d2-1612328283 .background-color-N3{background-color:#9499AB;} + .d2-1612328283 .background-color-N4{background-color:#CFD2DD;} + .d2-1612328283 .background-color-N5{background-color:#DEE1EB;} + .d2-1612328283 .background-color-N6{background-color:#EEF1F8;} + .d2-1612328283 .background-color-N7{background-color:#FFFFFF;} + .d2-1612328283 .background-color-B1{background-color:#0D32B2;} + .d2-1612328283 .background-color-B2{background-color:#0D32B2;} + .d2-1612328283 .background-color-B3{background-color:#E3E9FD;} + .d2-1612328283 .background-color-B4{background-color:#E3E9FD;} + .d2-1612328283 .background-color-B5{background-color:#EDF0FD;} + .d2-1612328283 .background-color-B6{background-color:#F7F8FE;} + .d2-1612328283 .background-color-AA2{background-color:#4A6FF3;} + .d2-1612328283 .background-color-AA4{background-color:#EDF0FD;} + .d2-1612328283 .background-color-AA5{background-color:#F7F8FE;} + .d2-1612328283 .background-color-AB4{background-color:#EDF0FD;} + .d2-1612328283 .background-color-AB5{background-color:#F7F8FE;} + .d2-1612328283 .color-N1{color:#0A0F25;} + .d2-1612328283 .color-N2{color:#676C7E;} + .d2-1612328283 .color-N3{color:#9499AB;} + .d2-1612328283 .color-N4{color:#CFD2DD;} + .d2-1612328283 .color-N5{color:#DEE1EB;} + .d2-1612328283 .color-N6{color:#EEF1F8;} + .d2-1612328283 .color-N7{color:#FFFFFF;} + .d2-1612328283 .color-B1{color:#0D32B2;} + .d2-1612328283 .color-B2{color:#0D32B2;} + .d2-1612328283 .color-B3{color:#E3E9FD;} + .d2-1612328283 .color-B4{color:#E3E9FD;} + .d2-1612328283 .color-B5{color:#EDF0FD;} + .d2-1612328283 .color-B6{color:#F7F8FE;} + .d2-1612328283 .color-AA2{color:#4A6FF3;} + .d2-1612328283 .color-AA4{color:#EDF0FD;} + .d2-1612328283 .color-AA5{color:#F7F8FE;} + .d2-1612328283 .color-AB4{color:#EDF0FD;} + .d2-1612328283 .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}]]>we all livein a LightSteelBluesubmarine 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 aa173985b..397d88b7f 100644 --- a/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg +++ b/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-3378002600 .fill-N1{fill:#0A0F25;} + .d2-3378002600 .fill-N2{fill:#676C7E;} + .d2-3378002600 .fill-N3{fill:#9499AB;} + .d2-3378002600 .fill-N4{fill:#CFD2DD;} + .d2-3378002600 .fill-N5{fill:#DEE1EB;} + .d2-3378002600 .fill-N6{fill:#EEF1F8;} + .d2-3378002600 .fill-N7{fill:#FFFFFF;} + .d2-3378002600 .fill-B1{fill:#0D32B2;} + .d2-3378002600 .fill-B2{fill:#0D32B2;} + .d2-3378002600 .fill-B3{fill:#E3E9FD;} + .d2-3378002600 .fill-B4{fill:#E3E9FD;} + .d2-3378002600 .fill-B5{fill:#EDF0FD;} + .d2-3378002600 .fill-B6{fill:#F7F8FE;} + .d2-3378002600 .fill-AA2{fill:#4A6FF3;} + .d2-3378002600 .fill-AA4{fill:#EDF0FD;} + .d2-3378002600 .fill-AA5{fill:#F7F8FE;} + .d2-3378002600 .fill-AB4{fill:#EDF0FD;} + .d2-3378002600 .fill-AB5{fill:#F7F8FE;} + .d2-3378002600 .stroke-N1{stroke:#0A0F25;} + .d2-3378002600 .stroke-N2{stroke:#676C7E;} + .d2-3378002600 .stroke-N3{stroke:#9499AB;} + .d2-3378002600 .stroke-N4{stroke:#CFD2DD;} + .d2-3378002600 .stroke-N5{stroke:#DEE1EB;} + .d2-3378002600 .stroke-N6{stroke:#EEF1F8;} + .d2-3378002600 .stroke-N7{stroke:#FFFFFF;} + .d2-3378002600 .stroke-B1{stroke:#0D32B2;} + .d2-3378002600 .stroke-B2{stroke:#0D32B2;} + .d2-3378002600 .stroke-B3{stroke:#E3E9FD;} + .d2-3378002600 .stroke-B4{stroke:#E3E9FD;} + .d2-3378002600 .stroke-B5{stroke:#EDF0FD;} + .d2-3378002600 .stroke-B6{stroke:#F7F8FE;} + .d2-3378002600 .stroke-AA2{stroke:#4A6FF3;} + .d2-3378002600 .stroke-AA4{stroke:#EDF0FD;} + .d2-3378002600 .stroke-AA5{stroke:#F7F8FE;} + .d2-3378002600 .stroke-AB4{stroke:#EDF0FD;} + .d2-3378002600 .stroke-AB5{stroke:#F7F8FE;} + .d2-3378002600 .background-color-N1{background-color:#0A0F25;} + .d2-3378002600 .background-color-N2{background-color:#676C7E;} + .d2-3378002600 .background-color-N3{background-color:#9499AB;} + .d2-3378002600 .background-color-N4{background-color:#CFD2DD;} + .d2-3378002600 .background-color-N5{background-color:#DEE1EB;} + .d2-3378002600 .background-color-N6{background-color:#EEF1F8;} + .d2-3378002600 .background-color-N7{background-color:#FFFFFF;} + .d2-3378002600 .background-color-B1{background-color:#0D32B2;} + .d2-3378002600 .background-color-B2{background-color:#0D32B2;} + .d2-3378002600 .background-color-B3{background-color:#E3E9FD;} + .d2-3378002600 .background-color-B4{background-color:#E3E9FD;} + .d2-3378002600 .background-color-B5{background-color:#EDF0FD;} + .d2-3378002600 .background-color-B6{background-color:#F7F8FE;} + .d2-3378002600 .background-color-AA2{background-color:#4A6FF3;} + .d2-3378002600 .background-color-AA4{background-color:#EDF0FD;} + .d2-3378002600 .background-color-AA5{background-color:#F7F8FE;} + .d2-3378002600 .background-color-AB4{background-color:#EDF0FD;} + .d2-3378002600 .background-color-AB5{background-color:#F7F8FE;} + .d2-3378002600 .color-N1{color:#0A0F25;} + .d2-3378002600 .color-N2{color:#676C7E;} + .d2-3378002600 .color-N3{color:#9499AB;} + .d2-3378002600 .color-N4{color:#CFD2DD;} + .d2-3378002600 .color-N5{color:#DEE1EB;} + .d2-3378002600 .color-N6{color:#EEF1F8;} + .d2-3378002600 .color-N7{color:#FFFFFF;} + .d2-3378002600 .color-B1{color:#0D32B2;} + .d2-3378002600 .color-B2{color:#0D32B2;} + .d2-3378002600 .color-B3{color:#E3E9FD;} + .d2-3378002600 .color-B4{color:#E3E9FD;} + .d2-3378002600 .color-B5{color:#EDF0FD;} + .d2-3378002600 .color-B6{color:#F7F8FE;} + .d2-3378002600 .color-AA2{color:#4A6FF3;} + .d2-3378002600 .color-AA4{color:#EDF0FD;} + .d2-3378002600 .color-AA5{color:#F7F8FE;} + .d2-3378002600 .color-AB4{color:#EDF0FD;} + .d2-3378002600 .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}]]>we all livein a LightSteelBluesubmarine diff --git a/e2etests/testdata/root/fill/dagre/sketch.exp.svg b/e2etests/testdata/root/fill/dagre/sketch.exp.svg index 40d729698..8be7e6d5b 100644 --- a/e2etests/testdata/root/fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/fill/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-2413215483 .fill-N1{fill:#0A0F25;} + .d2-2413215483 .fill-N2{fill:#676C7E;} + .d2-2413215483 .fill-N3{fill:#9499AB;} + .d2-2413215483 .fill-N4{fill:#CFD2DD;} + .d2-2413215483 .fill-N5{fill:#DEE1EB;} + .d2-2413215483 .fill-N6{fill:#EEF1F8;} + .d2-2413215483 .fill-N7{fill:#FFFFFF;} + .d2-2413215483 .fill-B1{fill:#0D32B2;} + .d2-2413215483 .fill-B2{fill:#0D32B2;} + .d2-2413215483 .fill-B3{fill:#E3E9FD;} + .d2-2413215483 .fill-B4{fill:#E3E9FD;} + .d2-2413215483 .fill-B5{fill:#EDF0FD;} + .d2-2413215483 .fill-B6{fill:#F7F8FE;} + .d2-2413215483 .fill-AA2{fill:#4A6FF3;} + .d2-2413215483 .fill-AA4{fill:#EDF0FD;} + .d2-2413215483 .fill-AA5{fill:#F7F8FE;} + .d2-2413215483 .fill-AB4{fill:#EDF0FD;} + .d2-2413215483 .fill-AB5{fill:#F7F8FE;} + .d2-2413215483 .stroke-N1{stroke:#0A0F25;} + .d2-2413215483 .stroke-N2{stroke:#676C7E;} + .d2-2413215483 .stroke-N3{stroke:#9499AB;} + .d2-2413215483 .stroke-N4{stroke:#CFD2DD;} + .d2-2413215483 .stroke-N5{stroke:#DEE1EB;} + .d2-2413215483 .stroke-N6{stroke:#EEF1F8;} + .d2-2413215483 .stroke-N7{stroke:#FFFFFF;} + .d2-2413215483 .stroke-B1{stroke:#0D32B2;} + .d2-2413215483 .stroke-B2{stroke:#0D32B2;} + .d2-2413215483 .stroke-B3{stroke:#E3E9FD;} + .d2-2413215483 .stroke-B4{stroke:#E3E9FD;} + .d2-2413215483 .stroke-B5{stroke:#EDF0FD;} + .d2-2413215483 .stroke-B6{stroke:#F7F8FE;} + .d2-2413215483 .stroke-AA2{stroke:#4A6FF3;} + .d2-2413215483 .stroke-AA4{stroke:#EDF0FD;} + .d2-2413215483 .stroke-AA5{stroke:#F7F8FE;} + .d2-2413215483 .stroke-AB4{stroke:#EDF0FD;} + .d2-2413215483 .stroke-AB5{stroke:#F7F8FE;} + .d2-2413215483 .background-color-N1{background-color:#0A0F25;} + .d2-2413215483 .background-color-N2{background-color:#676C7E;} + .d2-2413215483 .background-color-N3{background-color:#9499AB;} + .d2-2413215483 .background-color-N4{background-color:#CFD2DD;} + .d2-2413215483 .background-color-N5{background-color:#DEE1EB;} + .d2-2413215483 .background-color-N6{background-color:#EEF1F8;} + .d2-2413215483 .background-color-N7{background-color:#FFFFFF;} + .d2-2413215483 .background-color-B1{background-color:#0D32B2;} + .d2-2413215483 .background-color-B2{background-color:#0D32B2;} + .d2-2413215483 .background-color-B3{background-color:#E3E9FD;} + .d2-2413215483 .background-color-B4{background-color:#E3E9FD;} + .d2-2413215483 .background-color-B5{background-color:#EDF0FD;} + .d2-2413215483 .background-color-B6{background-color:#F7F8FE;} + .d2-2413215483 .background-color-AA2{background-color:#4A6FF3;} + .d2-2413215483 .background-color-AA4{background-color:#EDF0FD;} + .d2-2413215483 .background-color-AA5{background-color:#F7F8FE;} + .d2-2413215483 .background-color-AB4{background-color:#EDF0FD;} + .d2-2413215483 .background-color-AB5{background-color:#F7F8FE;} + .d2-2413215483 .color-N1{color:#0A0F25;} + .d2-2413215483 .color-N2{color:#676C7E;} + .d2-2413215483 .color-N3{color:#9499AB;} + .d2-2413215483 .color-N4{color:#CFD2DD;} + .d2-2413215483 .color-N5{color:#DEE1EB;} + .d2-2413215483 .color-N6{color:#EEF1F8;} + .d2-2413215483 .color-N7{color:#FFFFFF;} + .d2-2413215483 .color-B1{color:#0D32B2;} + .d2-2413215483 .color-B2{color:#0D32B2;} + .d2-2413215483 .color-B3{color:#E3E9FD;} + .d2-2413215483 .color-B4{color:#E3E9FD;} + .d2-2413215483 .color-B5{color:#EDF0FD;} + .d2-2413215483 .color-B6{color:#F7F8FE;} + .d2-2413215483 .color-AA2{color:#4A6FF3;} + .d2-2413215483 .color-AA4{color:#EDF0FD;} + .d2-2413215483 .color-AA5{color:#F7F8FE;} + .d2-2413215483 .color-AB4{color:#EDF0FD;} + .d2-2413215483 .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}]]>we all livein a LightSteelBluesubmarine diff --git a/e2etests/testdata/root/fill/elk/sketch.exp.svg b/e2etests/testdata/root/fill/elk/sketch.exp.svg index 3b3449074..35a2299b1 100644 --- a/e2etests/testdata/root/fill/elk/sketch.exp.svg +++ b/e2etests/testdata/root/fill/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-2211990978 .fill-N1{fill:#0A0F25;} + .d2-2211990978 .fill-N2{fill:#676C7E;} + .d2-2211990978 .fill-N3{fill:#9499AB;} + .d2-2211990978 .fill-N4{fill:#CFD2DD;} + .d2-2211990978 .fill-N5{fill:#DEE1EB;} + .d2-2211990978 .fill-N6{fill:#EEF1F8;} + .d2-2211990978 .fill-N7{fill:#FFFFFF;} + .d2-2211990978 .fill-B1{fill:#0D32B2;} + .d2-2211990978 .fill-B2{fill:#0D32B2;} + .d2-2211990978 .fill-B3{fill:#E3E9FD;} + .d2-2211990978 .fill-B4{fill:#E3E9FD;} + .d2-2211990978 .fill-B5{fill:#EDF0FD;} + .d2-2211990978 .fill-B6{fill:#F7F8FE;} + .d2-2211990978 .fill-AA2{fill:#4A6FF3;} + .d2-2211990978 .fill-AA4{fill:#EDF0FD;} + .d2-2211990978 .fill-AA5{fill:#F7F8FE;} + .d2-2211990978 .fill-AB4{fill:#EDF0FD;} + .d2-2211990978 .fill-AB5{fill:#F7F8FE;} + .d2-2211990978 .stroke-N1{stroke:#0A0F25;} + .d2-2211990978 .stroke-N2{stroke:#676C7E;} + .d2-2211990978 .stroke-N3{stroke:#9499AB;} + .d2-2211990978 .stroke-N4{stroke:#CFD2DD;} + .d2-2211990978 .stroke-N5{stroke:#DEE1EB;} + .d2-2211990978 .stroke-N6{stroke:#EEF1F8;} + .d2-2211990978 .stroke-N7{stroke:#FFFFFF;} + .d2-2211990978 .stroke-B1{stroke:#0D32B2;} + .d2-2211990978 .stroke-B2{stroke:#0D32B2;} + .d2-2211990978 .stroke-B3{stroke:#E3E9FD;} + .d2-2211990978 .stroke-B4{stroke:#E3E9FD;} + .d2-2211990978 .stroke-B5{stroke:#EDF0FD;} + .d2-2211990978 .stroke-B6{stroke:#F7F8FE;} + .d2-2211990978 .stroke-AA2{stroke:#4A6FF3;} + .d2-2211990978 .stroke-AA4{stroke:#EDF0FD;} + .d2-2211990978 .stroke-AA5{stroke:#F7F8FE;} + .d2-2211990978 .stroke-AB4{stroke:#EDF0FD;} + .d2-2211990978 .stroke-AB5{stroke:#F7F8FE;} + .d2-2211990978 .background-color-N1{background-color:#0A0F25;} + .d2-2211990978 .background-color-N2{background-color:#676C7E;} + .d2-2211990978 .background-color-N3{background-color:#9499AB;} + .d2-2211990978 .background-color-N4{background-color:#CFD2DD;} + .d2-2211990978 .background-color-N5{background-color:#DEE1EB;} + .d2-2211990978 .background-color-N6{background-color:#EEF1F8;} + .d2-2211990978 .background-color-N7{background-color:#FFFFFF;} + .d2-2211990978 .background-color-B1{background-color:#0D32B2;} + .d2-2211990978 .background-color-B2{background-color:#0D32B2;} + .d2-2211990978 .background-color-B3{background-color:#E3E9FD;} + .d2-2211990978 .background-color-B4{background-color:#E3E9FD;} + .d2-2211990978 .background-color-B5{background-color:#EDF0FD;} + .d2-2211990978 .background-color-B6{background-color:#F7F8FE;} + .d2-2211990978 .background-color-AA2{background-color:#4A6FF3;} + .d2-2211990978 .background-color-AA4{background-color:#EDF0FD;} + .d2-2211990978 .background-color-AA5{background-color:#F7F8FE;} + .d2-2211990978 .background-color-AB4{background-color:#EDF0FD;} + .d2-2211990978 .background-color-AB5{background-color:#F7F8FE;} + .d2-2211990978 .color-N1{color:#0A0F25;} + .d2-2211990978 .color-N2{color:#676C7E;} + .d2-2211990978 .color-N3{color:#9499AB;} + .d2-2211990978 .color-N4{color:#CFD2DD;} + .d2-2211990978 .color-N5{color:#DEE1EB;} + .d2-2211990978 .color-N6{color:#EEF1F8;} + .d2-2211990978 .color-N7{color:#FFFFFF;} + .d2-2211990978 .color-B1{color:#0D32B2;} + .d2-2211990978 .color-B2{color:#0D32B2;} + .d2-2211990978 .color-B3{color:#E3E9FD;} + .d2-2211990978 .color-B4{color:#E3E9FD;} + .d2-2211990978 .color-B5{color:#EDF0FD;} + .d2-2211990978 .color-B6{color:#F7F8FE;} + .d2-2211990978 .color-AA2{color:#4A6FF3;} + .d2-2211990978 .color-AA4{color:#EDF0FD;} + .d2-2211990978 .color-AA5{color:#F7F8FE;} + .d2-2211990978 .color-AB4{color:#EDF0FD;} + .d2-2211990978 .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}]]>we all livein a LightSteelBluesubmarine diff --git a/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg b/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg index 36e91fa63..135d5d677 100644 --- a/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-3787287132 .fill-N1{fill:#0A0F25;} + .d2-3787287132 .fill-N2{fill:#676C7E;} + .d2-3787287132 .fill-N3{fill:#9499AB;} + .d2-3787287132 .fill-N4{fill:#CFD2DD;} + .d2-3787287132 .fill-N5{fill:#DEE1EB;} + .d2-3787287132 .fill-N6{fill:#EEF1F8;} + .d2-3787287132 .fill-N7{fill:#FFFFFF;} + .d2-3787287132 .fill-B1{fill:#0D32B2;} + .d2-3787287132 .fill-B2{fill:#0D32B2;} + .d2-3787287132 .fill-B3{fill:#E3E9FD;} + .d2-3787287132 .fill-B4{fill:#E3E9FD;} + .d2-3787287132 .fill-B5{fill:#EDF0FD;} + .d2-3787287132 .fill-B6{fill:#F7F8FE;} + .d2-3787287132 .fill-AA2{fill:#4A6FF3;} + .d2-3787287132 .fill-AA4{fill:#EDF0FD;} + .d2-3787287132 .fill-AA5{fill:#F7F8FE;} + .d2-3787287132 .fill-AB4{fill:#EDF0FD;} + .d2-3787287132 .fill-AB5{fill:#F7F8FE;} + .d2-3787287132 .stroke-N1{stroke:#0A0F25;} + .d2-3787287132 .stroke-N2{stroke:#676C7E;} + .d2-3787287132 .stroke-N3{stroke:#9499AB;} + .d2-3787287132 .stroke-N4{stroke:#CFD2DD;} + .d2-3787287132 .stroke-N5{stroke:#DEE1EB;} + .d2-3787287132 .stroke-N6{stroke:#EEF1F8;} + .d2-3787287132 .stroke-N7{stroke:#FFFFFF;} + .d2-3787287132 .stroke-B1{stroke:#0D32B2;} + .d2-3787287132 .stroke-B2{stroke:#0D32B2;} + .d2-3787287132 .stroke-B3{stroke:#E3E9FD;} + .d2-3787287132 .stroke-B4{stroke:#E3E9FD;} + .d2-3787287132 .stroke-B5{stroke:#EDF0FD;} + .d2-3787287132 .stroke-B6{stroke:#F7F8FE;} + .d2-3787287132 .stroke-AA2{stroke:#4A6FF3;} + .d2-3787287132 .stroke-AA4{stroke:#EDF0FD;} + .d2-3787287132 .stroke-AA5{stroke:#F7F8FE;} + .d2-3787287132 .stroke-AB4{stroke:#EDF0FD;} + .d2-3787287132 .stroke-AB5{stroke:#F7F8FE;} + .d2-3787287132 .background-color-N1{background-color:#0A0F25;} + .d2-3787287132 .background-color-N2{background-color:#676C7E;} + .d2-3787287132 .background-color-N3{background-color:#9499AB;} + .d2-3787287132 .background-color-N4{background-color:#CFD2DD;} + .d2-3787287132 .background-color-N5{background-color:#DEE1EB;} + .d2-3787287132 .background-color-N6{background-color:#EEF1F8;} + .d2-3787287132 .background-color-N7{background-color:#FFFFFF;} + .d2-3787287132 .background-color-B1{background-color:#0D32B2;} + .d2-3787287132 .background-color-B2{background-color:#0D32B2;} + .d2-3787287132 .background-color-B3{background-color:#E3E9FD;} + .d2-3787287132 .background-color-B4{background-color:#E3E9FD;} + .d2-3787287132 .background-color-B5{background-color:#EDF0FD;} + .d2-3787287132 .background-color-B6{background-color:#F7F8FE;} + .d2-3787287132 .background-color-AA2{background-color:#4A6FF3;} + .d2-3787287132 .background-color-AA4{background-color:#EDF0FD;} + .d2-3787287132 .background-color-AA5{background-color:#F7F8FE;} + .d2-3787287132 .background-color-AB4{background-color:#EDF0FD;} + .d2-3787287132 .background-color-AB5{background-color:#F7F8FE;} + .d2-3787287132 .color-N1{color:#0A0F25;} + .d2-3787287132 .color-N2{color:#676C7E;} + .d2-3787287132 .color-N3{color:#9499AB;} + .d2-3787287132 .color-N4{color:#CFD2DD;} + .d2-3787287132 .color-N5{color:#DEE1EB;} + .d2-3787287132 .color-N6{color:#EEF1F8;} + .d2-3787287132 .color-N7{color:#FFFFFF;} + .d2-3787287132 .color-B1{color:#0D32B2;} + .d2-3787287132 .color-B2{color:#0D32B2;} + .d2-3787287132 .color-B3{color:#E3E9FD;} + .d2-3787287132 .color-B4{color:#E3E9FD;} + .d2-3787287132 .color-B5{color:#EDF0FD;} + .d2-3787287132 .color-B6{color:#F7F8FE;} + .d2-3787287132 .color-AA2{color:#4A6FF3;} + .d2-3787287132 .color-AA4{color:#EDF0FD;} + .d2-3787287132 .color-AA5{color:#F7F8FE;} + .d2-3787287132 .color-AB4{color:#EDF0FD;} + .d2-3787287132 .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}]]>we all livein a LightSteelBluesubmarine diff --git a/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg b/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg index cf116df77..2ea4dd0df 100644 --- a/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-3257499383 .fill-N1{fill:#0A0F25;} + .d2-3257499383 .fill-N2{fill:#676C7E;} + .d2-3257499383 .fill-N3{fill:#9499AB;} + .d2-3257499383 .fill-N4{fill:#CFD2DD;} + .d2-3257499383 .fill-N5{fill:#DEE1EB;} + .d2-3257499383 .fill-N6{fill:#EEF1F8;} + .d2-3257499383 .fill-N7{fill:#FFFFFF;} + .d2-3257499383 .fill-B1{fill:#0D32B2;} + .d2-3257499383 .fill-B2{fill:#0D32B2;} + .d2-3257499383 .fill-B3{fill:#E3E9FD;} + .d2-3257499383 .fill-B4{fill:#E3E9FD;} + .d2-3257499383 .fill-B5{fill:#EDF0FD;} + .d2-3257499383 .fill-B6{fill:#F7F8FE;} + .d2-3257499383 .fill-AA2{fill:#4A6FF3;} + .d2-3257499383 .fill-AA4{fill:#EDF0FD;} + .d2-3257499383 .fill-AA5{fill:#F7F8FE;} + .d2-3257499383 .fill-AB4{fill:#EDF0FD;} + .d2-3257499383 .fill-AB5{fill:#F7F8FE;} + .d2-3257499383 .stroke-N1{stroke:#0A0F25;} + .d2-3257499383 .stroke-N2{stroke:#676C7E;} + .d2-3257499383 .stroke-N3{stroke:#9499AB;} + .d2-3257499383 .stroke-N4{stroke:#CFD2DD;} + .d2-3257499383 .stroke-N5{stroke:#DEE1EB;} + .d2-3257499383 .stroke-N6{stroke:#EEF1F8;} + .d2-3257499383 .stroke-N7{stroke:#FFFFFF;} + .d2-3257499383 .stroke-B1{stroke:#0D32B2;} + .d2-3257499383 .stroke-B2{stroke:#0D32B2;} + .d2-3257499383 .stroke-B3{stroke:#E3E9FD;} + .d2-3257499383 .stroke-B4{stroke:#E3E9FD;} + .d2-3257499383 .stroke-B5{stroke:#EDF0FD;} + .d2-3257499383 .stroke-B6{stroke:#F7F8FE;} + .d2-3257499383 .stroke-AA2{stroke:#4A6FF3;} + .d2-3257499383 .stroke-AA4{stroke:#EDF0FD;} + .d2-3257499383 .stroke-AA5{stroke:#F7F8FE;} + .d2-3257499383 .stroke-AB4{stroke:#EDF0FD;} + .d2-3257499383 .stroke-AB5{stroke:#F7F8FE;} + .d2-3257499383 .background-color-N1{background-color:#0A0F25;} + .d2-3257499383 .background-color-N2{background-color:#676C7E;} + .d2-3257499383 .background-color-N3{background-color:#9499AB;} + .d2-3257499383 .background-color-N4{background-color:#CFD2DD;} + .d2-3257499383 .background-color-N5{background-color:#DEE1EB;} + .d2-3257499383 .background-color-N6{background-color:#EEF1F8;} + .d2-3257499383 .background-color-N7{background-color:#FFFFFF;} + .d2-3257499383 .background-color-B1{background-color:#0D32B2;} + .d2-3257499383 .background-color-B2{background-color:#0D32B2;} + .d2-3257499383 .background-color-B3{background-color:#E3E9FD;} + .d2-3257499383 .background-color-B4{background-color:#E3E9FD;} + .d2-3257499383 .background-color-B5{background-color:#EDF0FD;} + .d2-3257499383 .background-color-B6{background-color:#F7F8FE;} + .d2-3257499383 .background-color-AA2{background-color:#4A6FF3;} + .d2-3257499383 .background-color-AA4{background-color:#EDF0FD;} + .d2-3257499383 .background-color-AA5{background-color:#F7F8FE;} + .d2-3257499383 .background-color-AB4{background-color:#EDF0FD;} + .d2-3257499383 .background-color-AB5{background-color:#F7F8FE;} + .d2-3257499383 .color-N1{color:#0A0F25;} + .d2-3257499383 .color-N2{color:#676C7E;} + .d2-3257499383 .color-N3{color:#9499AB;} + .d2-3257499383 .color-N4{color:#CFD2DD;} + .d2-3257499383 .color-N5{color:#DEE1EB;} + .d2-3257499383 .color-N6{color:#EEF1F8;} + .d2-3257499383 .color-N7{color:#FFFFFF;} + .d2-3257499383 .color-B1{color:#0D32B2;} + .d2-3257499383 .color-B2{color:#0D32B2;} + .d2-3257499383 .color-B3{color:#E3E9FD;} + .d2-3257499383 .color-B4{color:#E3E9FD;} + .d2-3257499383 .color-B5{color:#EDF0FD;} + .d2-3257499383 .color-B6{color:#F7F8FE;} + .d2-3257499383 .color-AA2{color:#4A6FF3;} + .d2-3257499383 .color-AA4{color:#EDF0FD;} + .d2-3257499383 .color-AA5{color:#F7F8FE;} + .d2-3257499383 .color-AB4{color:#EDF0FD;} + .d2-3257499383 .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}]]>we all livein a LightSteelBluesubmarine 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 59cda0e57..5a25ca450 100644 --- a/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-2828179473 .fill-N1{fill:#0A0F25;} + .d2-2828179473 .fill-N2{fill:#676C7E;} + .d2-2828179473 .fill-N3{fill:#9499AB;} + .d2-2828179473 .fill-N4{fill:#CFD2DD;} + .d2-2828179473 .fill-N5{fill:#DEE1EB;} + .d2-2828179473 .fill-N6{fill:#EEF1F8;} + .d2-2828179473 .fill-N7{fill:#FFFFFF;} + .d2-2828179473 .fill-B1{fill:#0D32B2;} + .d2-2828179473 .fill-B2{fill:#0D32B2;} + .d2-2828179473 .fill-B3{fill:#E3E9FD;} + .d2-2828179473 .fill-B4{fill:#E3E9FD;} + .d2-2828179473 .fill-B5{fill:#EDF0FD;} + .d2-2828179473 .fill-B6{fill:#F7F8FE;} + .d2-2828179473 .fill-AA2{fill:#4A6FF3;} + .d2-2828179473 .fill-AA4{fill:#EDF0FD;} + .d2-2828179473 .fill-AA5{fill:#F7F8FE;} + .d2-2828179473 .fill-AB4{fill:#EDF0FD;} + .d2-2828179473 .fill-AB5{fill:#F7F8FE;} + .d2-2828179473 .stroke-N1{stroke:#0A0F25;} + .d2-2828179473 .stroke-N2{stroke:#676C7E;} + .d2-2828179473 .stroke-N3{stroke:#9499AB;} + .d2-2828179473 .stroke-N4{stroke:#CFD2DD;} + .d2-2828179473 .stroke-N5{stroke:#DEE1EB;} + .d2-2828179473 .stroke-N6{stroke:#EEF1F8;} + .d2-2828179473 .stroke-N7{stroke:#FFFFFF;} + .d2-2828179473 .stroke-B1{stroke:#0D32B2;} + .d2-2828179473 .stroke-B2{stroke:#0D32B2;} + .d2-2828179473 .stroke-B3{stroke:#E3E9FD;} + .d2-2828179473 .stroke-B4{stroke:#E3E9FD;} + .d2-2828179473 .stroke-B5{stroke:#EDF0FD;} + .d2-2828179473 .stroke-B6{stroke:#F7F8FE;} + .d2-2828179473 .stroke-AA2{stroke:#4A6FF3;} + .d2-2828179473 .stroke-AA4{stroke:#EDF0FD;} + .d2-2828179473 .stroke-AA5{stroke:#F7F8FE;} + .d2-2828179473 .stroke-AB4{stroke:#EDF0FD;} + .d2-2828179473 .stroke-AB5{stroke:#F7F8FE;} + .d2-2828179473 .background-color-N1{background-color:#0A0F25;} + .d2-2828179473 .background-color-N2{background-color:#676C7E;} + .d2-2828179473 .background-color-N3{background-color:#9499AB;} + .d2-2828179473 .background-color-N4{background-color:#CFD2DD;} + .d2-2828179473 .background-color-N5{background-color:#DEE1EB;} + .d2-2828179473 .background-color-N6{background-color:#EEF1F8;} + .d2-2828179473 .background-color-N7{background-color:#FFFFFF;} + .d2-2828179473 .background-color-B1{background-color:#0D32B2;} + .d2-2828179473 .background-color-B2{background-color:#0D32B2;} + .d2-2828179473 .background-color-B3{background-color:#E3E9FD;} + .d2-2828179473 .background-color-B4{background-color:#E3E9FD;} + .d2-2828179473 .background-color-B5{background-color:#EDF0FD;} + .d2-2828179473 .background-color-B6{background-color:#F7F8FE;} + .d2-2828179473 .background-color-AA2{background-color:#4A6FF3;} + .d2-2828179473 .background-color-AA4{background-color:#EDF0FD;} + .d2-2828179473 .background-color-AA5{background-color:#F7F8FE;} + .d2-2828179473 .background-color-AB4{background-color:#EDF0FD;} + .d2-2828179473 .background-color-AB5{background-color:#F7F8FE;} + .d2-2828179473 .color-N1{color:#0A0F25;} + .d2-2828179473 .color-N2{color:#676C7E;} + .d2-2828179473 .color-N3{color:#9499AB;} + .d2-2828179473 .color-N4{color:#CFD2DD;} + .d2-2828179473 .color-N5{color:#DEE1EB;} + .d2-2828179473 .color-N6{color:#EEF1F8;} + .d2-2828179473 .color-N7{color:#FFFFFF;} + .d2-2828179473 .color-B1{color:#0D32B2;} + .d2-2828179473 .color-B2{color:#0D32B2;} + .d2-2828179473 .color-B3{color:#E3E9FD;} + .d2-2828179473 .color-B4{color:#E3E9FD;} + .d2-2828179473 .color-B5{color:#EDF0FD;} + .d2-2828179473 .color-B6{color:#F7F8FE;} + .d2-2828179473 .color-AA2{color:#4A6FF3;} + .d2-2828179473 .color-AA4{color:#EDF0FD;} + .d2-2828179473 .color-AA5{color:#F7F8FE;} + .d2-2828179473 .color-AB4{color:#EDF0FD;} + .d2-2828179473 .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}]]>we all livein a LightSteelBluesubmarine 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 53360b885..861707fe9 100644 --- a/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-2123823294 .fill-N1{fill:#0A0F25;} + .d2-2123823294 .fill-N2{fill:#676C7E;} + .d2-2123823294 .fill-N3{fill:#9499AB;} + .d2-2123823294 .fill-N4{fill:#CFD2DD;} + .d2-2123823294 .fill-N5{fill:#DEE1EB;} + .d2-2123823294 .fill-N6{fill:#EEF1F8;} + .d2-2123823294 .fill-N7{fill:#FFFFFF;} + .d2-2123823294 .fill-B1{fill:#0D32B2;} + .d2-2123823294 .fill-B2{fill:#0D32B2;} + .d2-2123823294 .fill-B3{fill:#E3E9FD;} + .d2-2123823294 .fill-B4{fill:#E3E9FD;} + .d2-2123823294 .fill-B5{fill:#EDF0FD;} + .d2-2123823294 .fill-B6{fill:#F7F8FE;} + .d2-2123823294 .fill-AA2{fill:#4A6FF3;} + .d2-2123823294 .fill-AA4{fill:#EDF0FD;} + .d2-2123823294 .fill-AA5{fill:#F7F8FE;} + .d2-2123823294 .fill-AB4{fill:#EDF0FD;} + .d2-2123823294 .fill-AB5{fill:#F7F8FE;} + .d2-2123823294 .stroke-N1{stroke:#0A0F25;} + .d2-2123823294 .stroke-N2{stroke:#676C7E;} + .d2-2123823294 .stroke-N3{stroke:#9499AB;} + .d2-2123823294 .stroke-N4{stroke:#CFD2DD;} + .d2-2123823294 .stroke-N5{stroke:#DEE1EB;} + .d2-2123823294 .stroke-N6{stroke:#EEF1F8;} + .d2-2123823294 .stroke-N7{stroke:#FFFFFF;} + .d2-2123823294 .stroke-B1{stroke:#0D32B2;} + .d2-2123823294 .stroke-B2{stroke:#0D32B2;} + .d2-2123823294 .stroke-B3{stroke:#E3E9FD;} + .d2-2123823294 .stroke-B4{stroke:#E3E9FD;} + .d2-2123823294 .stroke-B5{stroke:#EDF0FD;} + .d2-2123823294 .stroke-B6{stroke:#F7F8FE;} + .d2-2123823294 .stroke-AA2{stroke:#4A6FF3;} + .d2-2123823294 .stroke-AA4{stroke:#EDF0FD;} + .d2-2123823294 .stroke-AA5{stroke:#F7F8FE;} + .d2-2123823294 .stroke-AB4{stroke:#EDF0FD;} + .d2-2123823294 .stroke-AB5{stroke:#F7F8FE;} + .d2-2123823294 .background-color-N1{background-color:#0A0F25;} + .d2-2123823294 .background-color-N2{background-color:#676C7E;} + .d2-2123823294 .background-color-N3{background-color:#9499AB;} + .d2-2123823294 .background-color-N4{background-color:#CFD2DD;} + .d2-2123823294 .background-color-N5{background-color:#DEE1EB;} + .d2-2123823294 .background-color-N6{background-color:#EEF1F8;} + .d2-2123823294 .background-color-N7{background-color:#FFFFFF;} + .d2-2123823294 .background-color-B1{background-color:#0D32B2;} + .d2-2123823294 .background-color-B2{background-color:#0D32B2;} + .d2-2123823294 .background-color-B3{background-color:#E3E9FD;} + .d2-2123823294 .background-color-B4{background-color:#E3E9FD;} + .d2-2123823294 .background-color-B5{background-color:#EDF0FD;} + .d2-2123823294 .background-color-B6{background-color:#F7F8FE;} + .d2-2123823294 .background-color-AA2{background-color:#4A6FF3;} + .d2-2123823294 .background-color-AA4{background-color:#EDF0FD;} + .d2-2123823294 .background-color-AA5{background-color:#F7F8FE;} + .d2-2123823294 .background-color-AB4{background-color:#EDF0FD;} + .d2-2123823294 .background-color-AB5{background-color:#F7F8FE;} + .d2-2123823294 .color-N1{color:#0A0F25;} + .d2-2123823294 .color-N2{color:#676C7E;} + .d2-2123823294 .color-N3{color:#9499AB;} + .d2-2123823294 .color-N4{color:#CFD2DD;} + .d2-2123823294 .color-N5{color:#DEE1EB;} + .d2-2123823294 .color-N6{color:#EEF1F8;} + .d2-2123823294 .color-N7{color:#FFFFFF;} + .d2-2123823294 .color-B1{color:#0D32B2;} + .d2-2123823294 .color-B2{color:#0D32B2;} + .d2-2123823294 .color-B3{color:#E3E9FD;} + .d2-2123823294 .color-B4{color:#E3E9FD;} + .d2-2123823294 .color-B5{color:#EDF0FD;} + .d2-2123823294 .color-B6{color:#F7F8FE;} + .d2-2123823294 .color-AA2{color:#4A6FF3;} + .d2-2123823294 .color-AA4{color:#EDF0FD;} + .d2-2123823294 .color-AA5{color:#F7F8FE;} + .d2-2123823294 .color-AB4{color:#EDF0FD;} + .d2-2123823294 .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}]]>we all livein a LightSteelBluesubmarine diff --git a/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg b/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg index 3e24b92a4..fa0c82632 100644 --- a/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-1310064342 .fill-N1{fill:#0A0F25;} + .d2-1310064342 .fill-N2{fill:#676C7E;} + .d2-1310064342 .fill-N3{fill:#9499AB;} + .d2-1310064342 .fill-N4{fill:#CFD2DD;} + .d2-1310064342 .fill-N5{fill:#DEE1EB;} + .d2-1310064342 .fill-N6{fill:#EEF1F8;} + .d2-1310064342 .fill-N7{fill:#FFFFFF;} + .d2-1310064342 .fill-B1{fill:#0D32B2;} + .d2-1310064342 .fill-B2{fill:#0D32B2;} + .d2-1310064342 .fill-B3{fill:#E3E9FD;} + .d2-1310064342 .fill-B4{fill:#E3E9FD;} + .d2-1310064342 .fill-B5{fill:#EDF0FD;} + .d2-1310064342 .fill-B6{fill:#F7F8FE;} + .d2-1310064342 .fill-AA2{fill:#4A6FF3;} + .d2-1310064342 .fill-AA4{fill:#EDF0FD;} + .d2-1310064342 .fill-AA5{fill:#F7F8FE;} + .d2-1310064342 .fill-AB4{fill:#EDF0FD;} + .d2-1310064342 .fill-AB5{fill:#F7F8FE;} + .d2-1310064342 .stroke-N1{stroke:#0A0F25;} + .d2-1310064342 .stroke-N2{stroke:#676C7E;} + .d2-1310064342 .stroke-N3{stroke:#9499AB;} + .d2-1310064342 .stroke-N4{stroke:#CFD2DD;} + .d2-1310064342 .stroke-N5{stroke:#DEE1EB;} + .d2-1310064342 .stroke-N6{stroke:#EEF1F8;} + .d2-1310064342 .stroke-N7{stroke:#FFFFFF;} + .d2-1310064342 .stroke-B1{stroke:#0D32B2;} + .d2-1310064342 .stroke-B2{stroke:#0D32B2;} + .d2-1310064342 .stroke-B3{stroke:#E3E9FD;} + .d2-1310064342 .stroke-B4{stroke:#E3E9FD;} + .d2-1310064342 .stroke-B5{stroke:#EDF0FD;} + .d2-1310064342 .stroke-B6{stroke:#F7F8FE;} + .d2-1310064342 .stroke-AA2{stroke:#4A6FF3;} + .d2-1310064342 .stroke-AA4{stroke:#EDF0FD;} + .d2-1310064342 .stroke-AA5{stroke:#F7F8FE;} + .d2-1310064342 .stroke-AB4{stroke:#EDF0FD;} + .d2-1310064342 .stroke-AB5{stroke:#F7F8FE;} + .d2-1310064342 .background-color-N1{background-color:#0A0F25;} + .d2-1310064342 .background-color-N2{background-color:#676C7E;} + .d2-1310064342 .background-color-N3{background-color:#9499AB;} + .d2-1310064342 .background-color-N4{background-color:#CFD2DD;} + .d2-1310064342 .background-color-N5{background-color:#DEE1EB;} + .d2-1310064342 .background-color-N6{background-color:#EEF1F8;} + .d2-1310064342 .background-color-N7{background-color:#FFFFFF;} + .d2-1310064342 .background-color-B1{background-color:#0D32B2;} + .d2-1310064342 .background-color-B2{background-color:#0D32B2;} + .d2-1310064342 .background-color-B3{background-color:#E3E9FD;} + .d2-1310064342 .background-color-B4{background-color:#E3E9FD;} + .d2-1310064342 .background-color-B5{background-color:#EDF0FD;} + .d2-1310064342 .background-color-B6{background-color:#F7F8FE;} + .d2-1310064342 .background-color-AA2{background-color:#4A6FF3;} + .d2-1310064342 .background-color-AA4{background-color:#EDF0FD;} + .d2-1310064342 .background-color-AA5{background-color:#F7F8FE;} + .d2-1310064342 .background-color-AB4{background-color:#EDF0FD;} + .d2-1310064342 .background-color-AB5{background-color:#F7F8FE;} + .d2-1310064342 .color-N1{color:#0A0F25;} + .d2-1310064342 .color-N2{color:#676C7E;} + .d2-1310064342 .color-N3{color:#9499AB;} + .d2-1310064342 .color-N4{color:#CFD2DD;} + .d2-1310064342 .color-N5{color:#DEE1EB;} + .d2-1310064342 .color-N6{color:#EEF1F8;} + .d2-1310064342 .color-N7{color:#FFFFFF;} + .d2-1310064342 .color-B1{color:#0D32B2;} + .d2-1310064342 .color-B2{color:#0D32B2;} + .d2-1310064342 .color-B3{color:#E3E9FD;} + .d2-1310064342 .color-B4{color:#E3E9FD;} + .d2-1310064342 .color-B5{color:#EDF0FD;} + .d2-1310064342 .color-B6{color:#F7F8FE;} + .d2-1310064342 .color-AA2{color:#4A6FF3;} + .d2-1310064342 .color-AA4{color:#EDF0FD;} + .d2-1310064342 .color-AA5{color:#F7F8FE;} + .d2-1310064342 .color-AB4{color:#EDF0FD;} + .d2-1310064342 .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}]]>we all livein a LightSteelBluesubmarine diff --git a/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg b/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg index 2d12e1b81..513ec0521 100644 --- a/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-878234073 .fill-N1{fill:#0A0F25;} + .d2-878234073 .fill-N2{fill:#676C7E;} + .d2-878234073 .fill-N3{fill:#9499AB;} + .d2-878234073 .fill-N4{fill:#CFD2DD;} + .d2-878234073 .fill-N5{fill:#DEE1EB;} + .d2-878234073 .fill-N6{fill:#EEF1F8;} + .d2-878234073 .fill-N7{fill:#FFFFFF;} + .d2-878234073 .fill-B1{fill:#0D32B2;} + .d2-878234073 .fill-B2{fill:#0D32B2;} + .d2-878234073 .fill-B3{fill:#E3E9FD;} + .d2-878234073 .fill-B4{fill:#E3E9FD;} + .d2-878234073 .fill-B5{fill:#EDF0FD;} + .d2-878234073 .fill-B6{fill:#F7F8FE;} + .d2-878234073 .fill-AA2{fill:#4A6FF3;} + .d2-878234073 .fill-AA4{fill:#EDF0FD;} + .d2-878234073 .fill-AA5{fill:#F7F8FE;} + .d2-878234073 .fill-AB4{fill:#EDF0FD;} + .d2-878234073 .fill-AB5{fill:#F7F8FE;} + .d2-878234073 .stroke-N1{stroke:#0A0F25;} + .d2-878234073 .stroke-N2{stroke:#676C7E;} + .d2-878234073 .stroke-N3{stroke:#9499AB;} + .d2-878234073 .stroke-N4{stroke:#CFD2DD;} + .d2-878234073 .stroke-N5{stroke:#DEE1EB;} + .d2-878234073 .stroke-N6{stroke:#EEF1F8;} + .d2-878234073 .stroke-N7{stroke:#FFFFFF;} + .d2-878234073 .stroke-B1{stroke:#0D32B2;} + .d2-878234073 .stroke-B2{stroke:#0D32B2;} + .d2-878234073 .stroke-B3{stroke:#E3E9FD;} + .d2-878234073 .stroke-B4{stroke:#E3E9FD;} + .d2-878234073 .stroke-B5{stroke:#EDF0FD;} + .d2-878234073 .stroke-B6{stroke:#F7F8FE;} + .d2-878234073 .stroke-AA2{stroke:#4A6FF3;} + .d2-878234073 .stroke-AA4{stroke:#EDF0FD;} + .d2-878234073 .stroke-AA5{stroke:#F7F8FE;} + .d2-878234073 .stroke-AB4{stroke:#EDF0FD;} + .d2-878234073 .stroke-AB5{stroke:#F7F8FE;} + .d2-878234073 .background-color-N1{background-color:#0A0F25;} + .d2-878234073 .background-color-N2{background-color:#676C7E;} + .d2-878234073 .background-color-N3{background-color:#9499AB;} + .d2-878234073 .background-color-N4{background-color:#CFD2DD;} + .d2-878234073 .background-color-N5{background-color:#DEE1EB;} + .d2-878234073 .background-color-N6{background-color:#EEF1F8;} + .d2-878234073 .background-color-N7{background-color:#FFFFFF;} + .d2-878234073 .background-color-B1{background-color:#0D32B2;} + .d2-878234073 .background-color-B2{background-color:#0D32B2;} + .d2-878234073 .background-color-B3{background-color:#E3E9FD;} + .d2-878234073 .background-color-B4{background-color:#E3E9FD;} + .d2-878234073 .background-color-B5{background-color:#EDF0FD;} + .d2-878234073 .background-color-B6{background-color:#F7F8FE;} + .d2-878234073 .background-color-AA2{background-color:#4A6FF3;} + .d2-878234073 .background-color-AA4{background-color:#EDF0FD;} + .d2-878234073 .background-color-AA5{background-color:#F7F8FE;} + .d2-878234073 .background-color-AB4{background-color:#EDF0FD;} + .d2-878234073 .background-color-AB5{background-color:#F7F8FE;} + .d2-878234073 .color-N1{color:#0A0F25;} + .d2-878234073 .color-N2{color:#676C7E;} + .d2-878234073 .color-N3{color:#9499AB;} + .d2-878234073 .color-N4{color:#CFD2DD;} + .d2-878234073 .color-N5{color:#DEE1EB;} + .d2-878234073 .color-N6{color:#EEF1F8;} + .d2-878234073 .color-N7{color:#FFFFFF;} + .d2-878234073 .color-B1{color:#0D32B2;} + .d2-878234073 .color-B2{color:#0D32B2;} + .d2-878234073 .color-B3{color:#E3E9FD;} + .d2-878234073 .color-B4{color:#E3E9FD;} + .d2-878234073 .color-B5{color:#EDF0FD;} + .d2-878234073 .color-B6{color:#F7F8FE;} + .d2-878234073 .color-AA2{color:#4A6FF3;} + .d2-878234073 .color-AA4{color:#EDF0FD;} + .d2-878234073 .color-AA5{color:#F7F8FE;} + .d2-878234073 .color-AB4{color:#EDF0FD;} + .d2-878234073 .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}]]>we all livein a LightSteelBluesubmarine 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 be3147c75..db3198ac0 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-3782402987 .fill-N1{fill:#0A0F25;} + .d2-3782402987 .fill-N2{fill:#676C7E;} + .d2-3782402987 .fill-N3{fill:#9499AB;} + .d2-3782402987 .fill-N4{fill:#CFD2DD;} + .d2-3782402987 .fill-N5{fill:#DEE1EB;} + .d2-3782402987 .fill-N6{fill:#EEF1F8;} + .d2-3782402987 .fill-N7{fill:#FFFFFF;} + .d2-3782402987 .fill-B1{fill:#0D32B2;} + .d2-3782402987 .fill-B2{fill:#0D32B2;} + .d2-3782402987 .fill-B3{fill:#E3E9FD;} + .d2-3782402987 .fill-B4{fill:#E3E9FD;} + .d2-3782402987 .fill-B5{fill:#EDF0FD;} + .d2-3782402987 .fill-B6{fill:#F7F8FE;} + .d2-3782402987 .fill-AA2{fill:#4A6FF3;} + .d2-3782402987 .fill-AA4{fill:#EDF0FD;} + .d2-3782402987 .fill-AA5{fill:#F7F8FE;} + .d2-3782402987 .fill-AB4{fill:#EDF0FD;} + .d2-3782402987 .fill-AB5{fill:#F7F8FE;} + .d2-3782402987 .stroke-N1{stroke:#0A0F25;} + .d2-3782402987 .stroke-N2{stroke:#676C7E;} + .d2-3782402987 .stroke-N3{stroke:#9499AB;} + .d2-3782402987 .stroke-N4{stroke:#CFD2DD;} + .d2-3782402987 .stroke-N5{stroke:#DEE1EB;} + .d2-3782402987 .stroke-N6{stroke:#EEF1F8;} + .d2-3782402987 .stroke-N7{stroke:#FFFFFF;} + .d2-3782402987 .stroke-B1{stroke:#0D32B2;} + .d2-3782402987 .stroke-B2{stroke:#0D32B2;} + .d2-3782402987 .stroke-B3{stroke:#E3E9FD;} + .d2-3782402987 .stroke-B4{stroke:#E3E9FD;} + .d2-3782402987 .stroke-B5{stroke:#EDF0FD;} + .d2-3782402987 .stroke-B6{stroke:#F7F8FE;} + .d2-3782402987 .stroke-AA2{stroke:#4A6FF3;} + .d2-3782402987 .stroke-AA4{stroke:#EDF0FD;} + .d2-3782402987 .stroke-AA5{stroke:#F7F8FE;} + .d2-3782402987 .stroke-AB4{stroke:#EDF0FD;} + .d2-3782402987 .stroke-AB5{stroke:#F7F8FE;} + .d2-3782402987 .background-color-N1{background-color:#0A0F25;} + .d2-3782402987 .background-color-N2{background-color:#676C7E;} + .d2-3782402987 .background-color-N3{background-color:#9499AB;} + .d2-3782402987 .background-color-N4{background-color:#CFD2DD;} + .d2-3782402987 .background-color-N5{background-color:#DEE1EB;} + .d2-3782402987 .background-color-N6{background-color:#EEF1F8;} + .d2-3782402987 .background-color-N7{background-color:#FFFFFF;} + .d2-3782402987 .background-color-B1{background-color:#0D32B2;} + .d2-3782402987 .background-color-B2{background-color:#0D32B2;} + .d2-3782402987 .background-color-B3{background-color:#E3E9FD;} + .d2-3782402987 .background-color-B4{background-color:#E3E9FD;} + .d2-3782402987 .background-color-B5{background-color:#EDF0FD;} + .d2-3782402987 .background-color-B6{background-color:#F7F8FE;} + .d2-3782402987 .background-color-AA2{background-color:#4A6FF3;} + .d2-3782402987 .background-color-AA4{background-color:#EDF0FD;} + .d2-3782402987 .background-color-AA5{background-color:#F7F8FE;} + .d2-3782402987 .background-color-AB4{background-color:#EDF0FD;} + .d2-3782402987 .background-color-AB5{background-color:#F7F8FE;} + .d2-3782402987 .color-N1{color:#0A0F25;} + .d2-3782402987 .color-N2{color:#676C7E;} + .d2-3782402987 .color-N3{color:#9499AB;} + .d2-3782402987 .color-N4{color:#CFD2DD;} + .d2-3782402987 .color-N5{color:#DEE1EB;} + .d2-3782402987 .color-N6{color:#EEF1F8;} + .d2-3782402987 .color-N7{color:#FFFFFF;} + .d2-3782402987 .color-B1{color:#0D32B2;} + .d2-3782402987 .color-B2{color:#0D32B2;} + .d2-3782402987 .color-B3{color:#E3E9FD;} + .d2-3782402987 .color-B4{color:#E3E9FD;} + .d2-3782402987 .color-B5{color:#EDF0FD;} + .d2-3782402987 .color-B6{color:#F7F8FE;} + .d2-3782402987 .color-AA2{color:#4A6FF3;} + .d2-3782402987 .color-AA4{color:#EDF0FD;} + .d2-3782402987 .color-AA5{color:#F7F8FE;} + .d2-3782402987 .color-AB4{color:#EDF0FD;} + .d2-3782402987 .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}]]>abc 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 34c746258..0bd8810c5 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-300178533 .fill-N1{fill:#0A0F25;} + .d2-300178533 .fill-N2{fill:#676C7E;} + .d2-300178533 .fill-N3{fill:#9499AB;} + .d2-300178533 .fill-N4{fill:#CFD2DD;} + .d2-300178533 .fill-N5{fill:#DEE1EB;} + .d2-300178533 .fill-N6{fill:#EEF1F8;} + .d2-300178533 .fill-N7{fill:#FFFFFF;} + .d2-300178533 .fill-B1{fill:#0D32B2;} + .d2-300178533 .fill-B2{fill:#0D32B2;} + .d2-300178533 .fill-B3{fill:#E3E9FD;} + .d2-300178533 .fill-B4{fill:#E3E9FD;} + .d2-300178533 .fill-B5{fill:#EDF0FD;} + .d2-300178533 .fill-B6{fill:#F7F8FE;} + .d2-300178533 .fill-AA2{fill:#4A6FF3;} + .d2-300178533 .fill-AA4{fill:#EDF0FD;} + .d2-300178533 .fill-AA5{fill:#F7F8FE;} + .d2-300178533 .fill-AB4{fill:#EDF0FD;} + .d2-300178533 .fill-AB5{fill:#F7F8FE;} + .d2-300178533 .stroke-N1{stroke:#0A0F25;} + .d2-300178533 .stroke-N2{stroke:#676C7E;} + .d2-300178533 .stroke-N3{stroke:#9499AB;} + .d2-300178533 .stroke-N4{stroke:#CFD2DD;} + .d2-300178533 .stroke-N5{stroke:#DEE1EB;} + .d2-300178533 .stroke-N6{stroke:#EEF1F8;} + .d2-300178533 .stroke-N7{stroke:#FFFFFF;} + .d2-300178533 .stroke-B1{stroke:#0D32B2;} + .d2-300178533 .stroke-B2{stroke:#0D32B2;} + .d2-300178533 .stroke-B3{stroke:#E3E9FD;} + .d2-300178533 .stroke-B4{stroke:#E3E9FD;} + .d2-300178533 .stroke-B5{stroke:#EDF0FD;} + .d2-300178533 .stroke-B6{stroke:#F7F8FE;} + .d2-300178533 .stroke-AA2{stroke:#4A6FF3;} + .d2-300178533 .stroke-AA4{stroke:#EDF0FD;} + .d2-300178533 .stroke-AA5{stroke:#F7F8FE;} + .d2-300178533 .stroke-AB4{stroke:#EDF0FD;} + .d2-300178533 .stroke-AB5{stroke:#F7F8FE;} + .d2-300178533 .background-color-N1{background-color:#0A0F25;} + .d2-300178533 .background-color-N2{background-color:#676C7E;} + .d2-300178533 .background-color-N3{background-color:#9499AB;} + .d2-300178533 .background-color-N4{background-color:#CFD2DD;} + .d2-300178533 .background-color-N5{background-color:#DEE1EB;} + .d2-300178533 .background-color-N6{background-color:#EEF1F8;} + .d2-300178533 .background-color-N7{background-color:#FFFFFF;} + .d2-300178533 .background-color-B1{background-color:#0D32B2;} + .d2-300178533 .background-color-B2{background-color:#0D32B2;} + .d2-300178533 .background-color-B3{background-color:#E3E9FD;} + .d2-300178533 .background-color-B4{background-color:#E3E9FD;} + .d2-300178533 .background-color-B5{background-color:#EDF0FD;} + .d2-300178533 .background-color-B6{background-color:#F7F8FE;} + .d2-300178533 .background-color-AA2{background-color:#4A6FF3;} + .d2-300178533 .background-color-AA4{background-color:#EDF0FD;} + .d2-300178533 .background-color-AA5{background-color:#F7F8FE;} + .d2-300178533 .background-color-AB4{background-color:#EDF0FD;} + .d2-300178533 .background-color-AB5{background-color:#F7F8FE;} + .d2-300178533 .color-N1{color:#0A0F25;} + .d2-300178533 .color-N2{color:#676C7E;} + .d2-300178533 .color-N3{color:#9499AB;} + .d2-300178533 .color-N4{color:#CFD2DD;} + .d2-300178533 .color-N5{color:#DEE1EB;} + .d2-300178533 .color-N6{color:#EEF1F8;} + .d2-300178533 .color-N7{color:#FFFFFF;} + .d2-300178533 .color-B1{color:#0D32B2;} + .d2-300178533 .color-B2{color:#0D32B2;} + .d2-300178533 .color-B3{color:#E3E9FD;} + .d2-300178533 .color-B4{color:#E3E9FD;} + .d2-300178533 .color-B5{color:#EDF0FD;} + .d2-300178533 .color-B6{color:#F7F8FE;} + .d2-300178533 .color-AA2{color:#4A6FF3;} + .d2-300178533 .color-AA4{color:#EDF0FD;} + .d2-300178533 .color-AA5{color:#F7F8FE;} + .d2-300178533 .color-AB4{color:#EDF0FD;} + .d2-300178533 .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}]]>abc diff --git a/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg b/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg index e6c49be0b..9477f95fe 100644 --- a/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-3922440645 .fill-N1{fill:#0A0F25;} + .d2-3922440645 .fill-N2{fill:#676C7E;} + .d2-3922440645 .fill-N3{fill:#9499AB;} + .d2-3922440645 .fill-N4{fill:#CFD2DD;} + .d2-3922440645 .fill-N5{fill:#DEE1EB;} + .d2-3922440645 .fill-N6{fill:#EEF1F8;} + .d2-3922440645 .fill-N7{fill:#FFFFFF;} + .d2-3922440645 .fill-B1{fill:#0D32B2;} + .d2-3922440645 .fill-B2{fill:#0D32B2;} + .d2-3922440645 .fill-B3{fill:#E3E9FD;} + .d2-3922440645 .fill-B4{fill:#E3E9FD;} + .d2-3922440645 .fill-B5{fill:#EDF0FD;} + .d2-3922440645 .fill-B6{fill:#F7F8FE;} + .d2-3922440645 .fill-AA2{fill:#4A6FF3;} + .d2-3922440645 .fill-AA4{fill:#EDF0FD;} + .d2-3922440645 .fill-AA5{fill:#F7F8FE;} + .d2-3922440645 .fill-AB4{fill:#EDF0FD;} + .d2-3922440645 .fill-AB5{fill:#F7F8FE;} + .d2-3922440645 .stroke-N1{stroke:#0A0F25;} + .d2-3922440645 .stroke-N2{stroke:#676C7E;} + .d2-3922440645 .stroke-N3{stroke:#9499AB;} + .d2-3922440645 .stroke-N4{stroke:#CFD2DD;} + .d2-3922440645 .stroke-N5{stroke:#DEE1EB;} + .d2-3922440645 .stroke-N6{stroke:#EEF1F8;} + .d2-3922440645 .stroke-N7{stroke:#FFFFFF;} + .d2-3922440645 .stroke-B1{stroke:#0D32B2;} + .d2-3922440645 .stroke-B2{stroke:#0D32B2;} + .d2-3922440645 .stroke-B3{stroke:#E3E9FD;} + .d2-3922440645 .stroke-B4{stroke:#E3E9FD;} + .d2-3922440645 .stroke-B5{stroke:#EDF0FD;} + .d2-3922440645 .stroke-B6{stroke:#F7F8FE;} + .d2-3922440645 .stroke-AA2{stroke:#4A6FF3;} + .d2-3922440645 .stroke-AA4{stroke:#EDF0FD;} + .d2-3922440645 .stroke-AA5{stroke:#F7F8FE;} + .d2-3922440645 .stroke-AB4{stroke:#EDF0FD;} + .d2-3922440645 .stroke-AB5{stroke:#F7F8FE;} + .d2-3922440645 .background-color-N1{background-color:#0A0F25;} + .d2-3922440645 .background-color-N2{background-color:#676C7E;} + .d2-3922440645 .background-color-N3{background-color:#9499AB;} + .d2-3922440645 .background-color-N4{background-color:#CFD2DD;} + .d2-3922440645 .background-color-N5{background-color:#DEE1EB;} + .d2-3922440645 .background-color-N6{background-color:#EEF1F8;} + .d2-3922440645 .background-color-N7{background-color:#FFFFFF;} + .d2-3922440645 .background-color-B1{background-color:#0D32B2;} + .d2-3922440645 .background-color-B2{background-color:#0D32B2;} + .d2-3922440645 .background-color-B3{background-color:#E3E9FD;} + .d2-3922440645 .background-color-B4{background-color:#E3E9FD;} + .d2-3922440645 .background-color-B5{background-color:#EDF0FD;} + .d2-3922440645 .background-color-B6{background-color:#F7F8FE;} + .d2-3922440645 .background-color-AA2{background-color:#4A6FF3;} + .d2-3922440645 .background-color-AA4{background-color:#EDF0FD;} + .d2-3922440645 .background-color-AA5{background-color:#F7F8FE;} + .d2-3922440645 .background-color-AB4{background-color:#EDF0FD;} + .d2-3922440645 .background-color-AB5{background-color:#F7F8FE;} + .d2-3922440645 .color-N1{color:#0A0F25;} + .d2-3922440645 .color-N2{color:#676C7E;} + .d2-3922440645 .color-N3{color:#9499AB;} + .d2-3922440645 .color-N4{color:#CFD2DD;} + .d2-3922440645 .color-N5{color:#DEE1EB;} + .d2-3922440645 .color-N6{color:#EEF1F8;} + .d2-3922440645 .color-N7{color:#FFFFFF;} + .d2-3922440645 .color-B1{color:#0D32B2;} + .d2-3922440645 .color-B2{color:#0D32B2;} + .d2-3922440645 .color-B3{color:#E3E9FD;} + .d2-3922440645 .color-B4{color:#E3E9FD;} + .d2-3922440645 .color-B5{color:#EDF0FD;} + .d2-3922440645 .color-B6{color:#F7F8FE;} + .d2-3922440645 .color-AA2{color:#4A6FF3;} + .d2-3922440645 .color-AA4{color:#EDF0FD;} + .d2-3922440645 .color-AA5{color:#F7F8FE;} + .d2-3922440645 .color-AB4{color:#EDF0FD;} + .d2-3922440645 .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}]]>ab diff --git a/e2etests/testdata/sanity/basic/elk/sketch.exp.svg b/e2etests/testdata/sanity/basic/elk/sketch.exp.svg index ee92a7163..d8e971c2c 100644 --- a/e2etests/testdata/sanity/basic/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/basic/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-2281223062 .fill-N1{fill:#0A0F25;} + .d2-2281223062 .fill-N2{fill:#676C7E;} + .d2-2281223062 .fill-N3{fill:#9499AB;} + .d2-2281223062 .fill-N4{fill:#CFD2DD;} + .d2-2281223062 .fill-N5{fill:#DEE1EB;} + .d2-2281223062 .fill-N6{fill:#EEF1F8;} + .d2-2281223062 .fill-N7{fill:#FFFFFF;} + .d2-2281223062 .fill-B1{fill:#0D32B2;} + .d2-2281223062 .fill-B2{fill:#0D32B2;} + .d2-2281223062 .fill-B3{fill:#E3E9FD;} + .d2-2281223062 .fill-B4{fill:#E3E9FD;} + .d2-2281223062 .fill-B5{fill:#EDF0FD;} + .d2-2281223062 .fill-B6{fill:#F7F8FE;} + .d2-2281223062 .fill-AA2{fill:#4A6FF3;} + .d2-2281223062 .fill-AA4{fill:#EDF0FD;} + .d2-2281223062 .fill-AA5{fill:#F7F8FE;} + .d2-2281223062 .fill-AB4{fill:#EDF0FD;} + .d2-2281223062 .fill-AB5{fill:#F7F8FE;} + .d2-2281223062 .stroke-N1{stroke:#0A0F25;} + .d2-2281223062 .stroke-N2{stroke:#676C7E;} + .d2-2281223062 .stroke-N3{stroke:#9499AB;} + .d2-2281223062 .stroke-N4{stroke:#CFD2DD;} + .d2-2281223062 .stroke-N5{stroke:#DEE1EB;} + .d2-2281223062 .stroke-N6{stroke:#EEF1F8;} + .d2-2281223062 .stroke-N7{stroke:#FFFFFF;} + .d2-2281223062 .stroke-B1{stroke:#0D32B2;} + .d2-2281223062 .stroke-B2{stroke:#0D32B2;} + .d2-2281223062 .stroke-B3{stroke:#E3E9FD;} + .d2-2281223062 .stroke-B4{stroke:#E3E9FD;} + .d2-2281223062 .stroke-B5{stroke:#EDF0FD;} + .d2-2281223062 .stroke-B6{stroke:#F7F8FE;} + .d2-2281223062 .stroke-AA2{stroke:#4A6FF3;} + .d2-2281223062 .stroke-AA4{stroke:#EDF0FD;} + .d2-2281223062 .stroke-AA5{stroke:#F7F8FE;} + .d2-2281223062 .stroke-AB4{stroke:#EDF0FD;} + .d2-2281223062 .stroke-AB5{stroke:#F7F8FE;} + .d2-2281223062 .background-color-N1{background-color:#0A0F25;} + .d2-2281223062 .background-color-N2{background-color:#676C7E;} + .d2-2281223062 .background-color-N3{background-color:#9499AB;} + .d2-2281223062 .background-color-N4{background-color:#CFD2DD;} + .d2-2281223062 .background-color-N5{background-color:#DEE1EB;} + .d2-2281223062 .background-color-N6{background-color:#EEF1F8;} + .d2-2281223062 .background-color-N7{background-color:#FFFFFF;} + .d2-2281223062 .background-color-B1{background-color:#0D32B2;} + .d2-2281223062 .background-color-B2{background-color:#0D32B2;} + .d2-2281223062 .background-color-B3{background-color:#E3E9FD;} + .d2-2281223062 .background-color-B4{background-color:#E3E9FD;} + .d2-2281223062 .background-color-B5{background-color:#EDF0FD;} + .d2-2281223062 .background-color-B6{background-color:#F7F8FE;} + .d2-2281223062 .background-color-AA2{background-color:#4A6FF3;} + .d2-2281223062 .background-color-AA4{background-color:#EDF0FD;} + .d2-2281223062 .background-color-AA5{background-color:#F7F8FE;} + .d2-2281223062 .background-color-AB4{background-color:#EDF0FD;} + .d2-2281223062 .background-color-AB5{background-color:#F7F8FE;} + .d2-2281223062 .color-N1{color:#0A0F25;} + .d2-2281223062 .color-N2{color:#676C7E;} + .d2-2281223062 .color-N3{color:#9499AB;} + .d2-2281223062 .color-N4{color:#CFD2DD;} + .d2-2281223062 .color-N5{color:#DEE1EB;} + .d2-2281223062 .color-N6{color:#EEF1F8;} + .d2-2281223062 .color-N7{color:#FFFFFF;} + .d2-2281223062 .color-B1{color:#0D32B2;} + .d2-2281223062 .color-B2{color:#0D32B2;} + .d2-2281223062 .color-B3{color:#E3E9FD;} + .d2-2281223062 .color-B4{color:#E3E9FD;} + .d2-2281223062 .color-B5{color:#EDF0FD;} + .d2-2281223062 .color-B6{color:#F7F8FE;} + .d2-2281223062 .color-AA2{color:#4A6FF3;} + .d2-2281223062 .color-AA4{color:#EDF0FD;} + .d2-2281223062 .color-AA5{color:#F7F8FE;} + .d2-2281223062 .color-AB4{color:#EDF0FD;} + .d2-2281223062 .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}]]>ab 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 cd3f63d5b..392f9bd30 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbd + .d2-3033909617 .fill-N1{fill:#0A0F25;} + .d2-3033909617 .fill-N2{fill:#676C7E;} + .d2-3033909617 .fill-N3{fill:#9499AB;} + .d2-3033909617 .fill-N4{fill:#CFD2DD;} + .d2-3033909617 .fill-N5{fill:#DEE1EB;} + .d2-3033909617 .fill-N6{fill:#EEF1F8;} + .d2-3033909617 .fill-N7{fill:#FFFFFF;} + .d2-3033909617 .fill-B1{fill:#0D32B2;} + .d2-3033909617 .fill-B2{fill:#0D32B2;} + .d2-3033909617 .fill-B3{fill:#E3E9FD;} + .d2-3033909617 .fill-B4{fill:#E3E9FD;} + .d2-3033909617 .fill-B5{fill:#EDF0FD;} + .d2-3033909617 .fill-B6{fill:#F7F8FE;} + .d2-3033909617 .fill-AA2{fill:#4A6FF3;} + .d2-3033909617 .fill-AA4{fill:#EDF0FD;} + .d2-3033909617 .fill-AA5{fill:#F7F8FE;} + .d2-3033909617 .fill-AB4{fill:#EDF0FD;} + .d2-3033909617 .fill-AB5{fill:#F7F8FE;} + .d2-3033909617 .stroke-N1{stroke:#0A0F25;} + .d2-3033909617 .stroke-N2{stroke:#676C7E;} + .d2-3033909617 .stroke-N3{stroke:#9499AB;} + .d2-3033909617 .stroke-N4{stroke:#CFD2DD;} + .d2-3033909617 .stroke-N5{stroke:#DEE1EB;} + .d2-3033909617 .stroke-N6{stroke:#EEF1F8;} + .d2-3033909617 .stroke-N7{stroke:#FFFFFF;} + .d2-3033909617 .stroke-B1{stroke:#0D32B2;} + .d2-3033909617 .stroke-B2{stroke:#0D32B2;} + .d2-3033909617 .stroke-B3{stroke:#E3E9FD;} + .d2-3033909617 .stroke-B4{stroke:#E3E9FD;} + .d2-3033909617 .stroke-B5{stroke:#EDF0FD;} + .d2-3033909617 .stroke-B6{stroke:#F7F8FE;} + .d2-3033909617 .stroke-AA2{stroke:#4A6FF3;} + .d2-3033909617 .stroke-AA4{stroke:#EDF0FD;} + .d2-3033909617 .stroke-AA5{stroke:#F7F8FE;} + .d2-3033909617 .stroke-AB4{stroke:#EDF0FD;} + .d2-3033909617 .stroke-AB5{stroke:#F7F8FE;} + .d2-3033909617 .background-color-N1{background-color:#0A0F25;} + .d2-3033909617 .background-color-N2{background-color:#676C7E;} + .d2-3033909617 .background-color-N3{background-color:#9499AB;} + .d2-3033909617 .background-color-N4{background-color:#CFD2DD;} + .d2-3033909617 .background-color-N5{background-color:#DEE1EB;} + .d2-3033909617 .background-color-N6{background-color:#EEF1F8;} + .d2-3033909617 .background-color-N7{background-color:#FFFFFF;} + .d2-3033909617 .background-color-B1{background-color:#0D32B2;} + .d2-3033909617 .background-color-B2{background-color:#0D32B2;} + .d2-3033909617 .background-color-B3{background-color:#E3E9FD;} + .d2-3033909617 .background-color-B4{background-color:#E3E9FD;} + .d2-3033909617 .background-color-B5{background-color:#EDF0FD;} + .d2-3033909617 .background-color-B6{background-color:#F7F8FE;} + .d2-3033909617 .background-color-AA2{background-color:#4A6FF3;} + .d2-3033909617 .background-color-AA4{background-color:#EDF0FD;} + .d2-3033909617 .background-color-AA5{background-color:#F7F8FE;} + .d2-3033909617 .background-color-AB4{background-color:#EDF0FD;} + .d2-3033909617 .background-color-AB5{background-color:#F7F8FE;} + .d2-3033909617 .color-N1{color:#0A0F25;} + .d2-3033909617 .color-N2{color:#676C7E;} + .d2-3033909617 .color-N3{color:#9499AB;} + .d2-3033909617 .color-N4{color:#CFD2DD;} + .d2-3033909617 .color-N5{color:#DEE1EB;} + .d2-3033909617 .color-N6{color:#EEF1F8;} + .d2-3033909617 .color-N7{color:#FFFFFF;} + .d2-3033909617 .color-B1{color:#0D32B2;} + .d2-3033909617 .color-B2{color:#0D32B2;} + .d2-3033909617 .color-B3{color:#E3E9FD;} + .d2-3033909617 .color-B4{color:#E3E9FD;} + .d2-3033909617 .color-B5{color:#EDF0FD;} + .d2-3033909617 .color-B6{color:#F7F8FE;} + .d2-3033909617 .color-AA2{color:#4A6FF3;} + .d2-3033909617 .color-AA4{color:#EDF0FD;} + .d2-3033909617 .color-AA5{color:#F7F8FE;} + .d2-3033909617 .color-AB4{color:#EDF0FD;} + .d2-3033909617 .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}]]>acbd 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 b5c931077..f7b197f9c 100644 --- a/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbd + .d2-916026630 .fill-N1{fill:#0A0F25;} + .d2-916026630 .fill-N2{fill:#676C7E;} + .d2-916026630 .fill-N3{fill:#9499AB;} + .d2-916026630 .fill-N4{fill:#CFD2DD;} + .d2-916026630 .fill-N5{fill:#DEE1EB;} + .d2-916026630 .fill-N6{fill:#EEF1F8;} + .d2-916026630 .fill-N7{fill:#FFFFFF;} + .d2-916026630 .fill-B1{fill:#0D32B2;} + .d2-916026630 .fill-B2{fill:#0D32B2;} + .d2-916026630 .fill-B3{fill:#E3E9FD;} + .d2-916026630 .fill-B4{fill:#E3E9FD;} + .d2-916026630 .fill-B5{fill:#EDF0FD;} + .d2-916026630 .fill-B6{fill:#F7F8FE;} + .d2-916026630 .fill-AA2{fill:#4A6FF3;} + .d2-916026630 .fill-AA4{fill:#EDF0FD;} + .d2-916026630 .fill-AA5{fill:#F7F8FE;} + .d2-916026630 .fill-AB4{fill:#EDF0FD;} + .d2-916026630 .fill-AB5{fill:#F7F8FE;} + .d2-916026630 .stroke-N1{stroke:#0A0F25;} + .d2-916026630 .stroke-N2{stroke:#676C7E;} + .d2-916026630 .stroke-N3{stroke:#9499AB;} + .d2-916026630 .stroke-N4{stroke:#CFD2DD;} + .d2-916026630 .stroke-N5{stroke:#DEE1EB;} + .d2-916026630 .stroke-N6{stroke:#EEF1F8;} + .d2-916026630 .stroke-N7{stroke:#FFFFFF;} + .d2-916026630 .stroke-B1{stroke:#0D32B2;} + .d2-916026630 .stroke-B2{stroke:#0D32B2;} + .d2-916026630 .stroke-B3{stroke:#E3E9FD;} + .d2-916026630 .stroke-B4{stroke:#E3E9FD;} + .d2-916026630 .stroke-B5{stroke:#EDF0FD;} + .d2-916026630 .stroke-B6{stroke:#F7F8FE;} + .d2-916026630 .stroke-AA2{stroke:#4A6FF3;} + .d2-916026630 .stroke-AA4{stroke:#EDF0FD;} + .d2-916026630 .stroke-AA5{stroke:#F7F8FE;} + .d2-916026630 .stroke-AB4{stroke:#EDF0FD;} + .d2-916026630 .stroke-AB5{stroke:#F7F8FE;} + .d2-916026630 .background-color-N1{background-color:#0A0F25;} + .d2-916026630 .background-color-N2{background-color:#676C7E;} + .d2-916026630 .background-color-N3{background-color:#9499AB;} + .d2-916026630 .background-color-N4{background-color:#CFD2DD;} + .d2-916026630 .background-color-N5{background-color:#DEE1EB;} + .d2-916026630 .background-color-N6{background-color:#EEF1F8;} + .d2-916026630 .background-color-N7{background-color:#FFFFFF;} + .d2-916026630 .background-color-B1{background-color:#0D32B2;} + .d2-916026630 .background-color-B2{background-color:#0D32B2;} + .d2-916026630 .background-color-B3{background-color:#E3E9FD;} + .d2-916026630 .background-color-B4{background-color:#E3E9FD;} + .d2-916026630 .background-color-B5{background-color:#EDF0FD;} + .d2-916026630 .background-color-B6{background-color:#F7F8FE;} + .d2-916026630 .background-color-AA2{background-color:#4A6FF3;} + .d2-916026630 .background-color-AA4{background-color:#EDF0FD;} + .d2-916026630 .background-color-AA5{background-color:#F7F8FE;} + .d2-916026630 .background-color-AB4{background-color:#EDF0FD;} + .d2-916026630 .background-color-AB5{background-color:#F7F8FE;} + .d2-916026630 .color-N1{color:#0A0F25;} + .d2-916026630 .color-N2{color:#676C7E;} + .d2-916026630 .color-N3{color:#9499AB;} + .d2-916026630 .color-N4{color:#CFD2DD;} + .d2-916026630 .color-N5{color:#DEE1EB;} + .d2-916026630 .color-N6{color:#EEF1F8;} + .d2-916026630 .color-N7{color:#FFFFFF;} + .d2-916026630 .color-B1{color:#0D32B2;} + .d2-916026630 .color-B2{color:#0D32B2;} + .d2-916026630 .color-B3{color:#E3E9FD;} + .d2-916026630 .color-B4{color:#E3E9FD;} + .d2-916026630 .color-B5{color:#EDF0FD;} + .d2-916026630 .color-B6{color:#F7F8FE;} + .d2-916026630 .color-AA2{color:#4A6FF3;} + .d2-916026630 .color-AA4{color:#EDF0FD;} + .d2-916026630 .color-AA5{color:#F7F8FE;} + .d2-916026630 .color-AB4{color:#EDF0FD;} + .d2-916026630 .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}]]>acbd diff --git a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg index b5a04fdd3..9e5440f5c 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-1787500422 .fill-N1{fill:#0A0F25;} + .d2-1787500422 .fill-N2{fill:#676C7E;} + .d2-1787500422 .fill-N3{fill:#9499AB;} + .d2-1787500422 .fill-N4{fill:#CFD2DD;} + .d2-1787500422 .fill-N5{fill:#DEE1EB;} + .d2-1787500422 .fill-N6{fill:#EEF1F8;} + .d2-1787500422 .fill-N7{fill:#FFFFFF;} + .d2-1787500422 .fill-B1{fill:#0D32B2;} + .d2-1787500422 .fill-B2{fill:#0D32B2;} + .d2-1787500422 .fill-B3{fill:#E3E9FD;} + .d2-1787500422 .fill-B4{fill:#E3E9FD;} + .d2-1787500422 .fill-B5{fill:#EDF0FD;} + .d2-1787500422 .fill-B6{fill:#F7F8FE;} + .d2-1787500422 .fill-AA2{fill:#4A6FF3;} + .d2-1787500422 .fill-AA4{fill:#EDF0FD;} + .d2-1787500422 .fill-AA5{fill:#F7F8FE;} + .d2-1787500422 .fill-AB4{fill:#EDF0FD;} + .d2-1787500422 .fill-AB5{fill:#F7F8FE;} + .d2-1787500422 .stroke-N1{stroke:#0A0F25;} + .d2-1787500422 .stroke-N2{stroke:#676C7E;} + .d2-1787500422 .stroke-N3{stroke:#9499AB;} + .d2-1787500422 .stroke-N4{stroke:#CFD2DD;} + .d2-1787500422 .stroke-N5{stroke:#DEE1EB;} + .d2-1787500422 .stroke-N6{stroke:#EEF1F8;} + .d2-1787500422 .stroke-N7{stroke:#FFFFFF;} + .d2-1787500422 .stroke-B1{stroke:#0D32B2;} + .d2-1787500422 .stroke-B2{stroke:#0D32B2;} + .d2-1787500422 .stroke-B3{stroke:#E3E9FD;} + .d2-1787500422 .stroke-B4{stroke:#E3E9FD;} + .d2-1787500422 .stroke-B5{stroke:#EDF0FD;} + .d2-1787500422 .stroke-B6{stroke:#F7F8FE;} + .d2-1787500422 .stroke-AA2{stroke:#4A6FF3;} + .d2-1787500422 .stroke-AA4{stroke:#EDF0FD;} + .d2-1787500422 .stroke-AA5{stroke:#F7F8FE;} + .d2-1787500422 .stroke-AB4{stroke:#EDF0FD;} + .d2-1787500422 .stroke-AB5{stroke:#F7F8FE;} + .d2-1787500422 .background-color-N1{background-color:#0A0F25;} + .d2-1787500422 .background-color-N2{background-color:#676C7E;} + .d2-1787500422 .background-color-N3{background-color:#9499AB;} + .d2-1787500422 .background-color-N4{background-color:#CFD2DD;} + .d2-1787500422 .background-color-N5{background-color:#DEE1EB;} + .d2-1787500422 .background-color-N6{background-color:#EEF1F8;} + .d2-1787500422 .background-color-N7{background-color:#FFFFFF;} + .d2-1787500422 .background-color-B1{background-color:#0D32B2;} + .d2-1787500422 .background-color-B2{background-color:#0D32B2;} + .d2-1787500422 .background-color-B3{background-color:#E3E9FD;} + .d2-1787500422 .background-color-B4{background-color:#E3E9FD;} + .d2-1787500422 .background-color-B5{background-color:#EDF0FD;} + .d2-1787500422 .background-color-B6{background-color:#F7F8FE;} + .d2-1787500422 .background-color-AA2{background-color:#4A6FF3;} + .d2-1787500422 .background-color-AA4{background-color:#EDF0FD;} + .d2-1787500422 .background-color-AA5{background-color:#F7F8FE;} + .d2-1787500422 .background-color-AB4{background-color:#EDF0FD;} + .d2-1787500422 .background-color-AB5{background-color:#F7F8FE;} + .d2-1787500422 .color-N1{color:#0A0F25;} + .d2-1787500422 .color-N2{color:#676C7E;} + .d2-1787500422 .color-N3{color:#9499AB;} + .d2-1787500422 .color-N4{color:#CFD2DD;} + .d2-1787500422 .color-N5{color:#DEE1EB;} + .d2-1787500422 .color-N6{color:#EEF1F8;} + .d2-1787500422 .color-N7{color:#FFFFFF;} + .d2-1787500422 .color-B1{color:#0D32B2;} + .d2-1787500422 .color-B2{color:#0D32B2;} + .d2-1787500422 .color-B3{color:#E3E9FD;} + .d2-1787500422 .color-B4{color:#E3E9FD;} + .d2-1787500422 .color-B5{color:#EDF0FD;} + .d2-1787500422 .color-B6{color:#F7F8FE;} + .d2-1787500422 .color-AA2{color:#4A6FF3;} + .d2-1787500422 .color-AA4{color:#EDF0FD;} + .d2-1787500422 .color-AA5{color:#F7F8FE;} + .d2-1787500422 .color-AB4{color:#EDF0FD;} + .d2-1787500422 .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}]]>ab hello diff --git a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg index 46939868d..d4e148d9e 100644 --- a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-3569052263 .fill-N1{fill:#0A0F25;} + .d2-3569052263 .fill-N2{fill:#676C7E;} + .d2-3569052263 .fill-N3{fill:#9499AB;} + .d2-3569052263 .fill-N4{fill:#CFD2DD;} + .d2-3569052263 .fill-N5{fill:#DEE1EB;} + .d2-3569052263 .fill-N6{fill:#EEF1F8;} + .d2-3569052263 .fill-N7{fill:#FFFFFF;} + .d2-3569052263 .fill-B1{fill:#0D32B2;} + .d2-3569052263 .fill-B2{fill:#0D32B2;} + .d2-3569052263 .fill-B3{fill:#E3E9FD;} + .d2-3569052263 .fill-B4{fill:#E3E9FD;} + .d2-3569052263 .fill-B5{fill:#EDF0FD;} + .d2-3569052263 .fill-B6{fill:#F7F8FE;} + .d2-3569052263 .fill-AA2{fill:#4A6FF3;} + .d2-3569052263 .fill-AA4{fill:#EDF0FD;} + .d2-3569052263 .fill-AA5{fill:#F7F8FE;} + .d2-3569052263 .fill-AB4{fill:#EDF0FD;} + .d2-3569052263 .fill-AB5{fill:#F7F8FE;} + .d2-3569052263 .stroke-N1{stroke:#0A0F25;} + .d2-3569052263 .stroke-N2{stroke:#676C7E;} + .d2-3569052263 .stroke-N3{stroke:#9499AB;} + .d2-3569052263 .stroke-N4{stroke:#CFD2DD;} + .d2-3569052263 .stroke-N5{stroke:#DEE1EB;} + .d2-3569052263 .stroke-N6{stroke:#EEF1F8;} + .d2-3569052263 .stroke-N7{stroke:#FFFFFF;} + .d2-3569052263 .stroke-B1{stroke:#0D32B2;} + .d2-3569052263 .stroke-B2{stroke:#0D32B2;} + .d2-3569052263 .stroke-B3{stroke:#E3E9FD;} + .d2-3569052263 .stroke-B4{stroke:#E3E9FD;} + .d2-3569052263 .stroke-B5{stroke:#EDF0FD;} + .d2-3569052263 .stroke-B6{stroke:#F7F8FE;} + .d2-3569052263 .stroke-AA2{stroke:#4A6FF3;} + .d2-3569052263 .stroke-AA4{stroke:#EDF0FD;} + .d2-3569052263 .stroke-AA5{stroke:#F7F8FE;} + .d2-3569052263 .stroke-AB4{stroke:#EDF0FD;} + .d2-3569052263 .stroke-AB5{stroke:#F7F8FE;} + .d2-3569052263 .background-color-N1{background-color:#0A0F25;} + .d2-3569052263 .background-color-N2{background-color:#676C7E;} + .d2-3569052263 .background-color-N3{background-color:#9499AB;} + .d2-3569052263 .background-color-N4{background-color:#CFD2DD;} + .d2-3569052263 .background-color-N5{background-color:#DEE1EB;} + .d2-3569052263 .background-color-N6{background-color:#EEF1F8;} + .d2-3569052263 .background-color-N7{background-color:#FFFFFF;} + .d2-3569052263 .background-color-B1{background-color:#0D32B2;} + .d2-3569052263 .background-color-B2{background-color:#0D32B2;} + .d2-3569052263 .background-color-B3{background-color:#E3E9FD;} + .d2-3569052263 .background-color-B4{background-color:#E3E9FD;} + .d2-3569052263 .background-color-B5{background-color:#EDF0FD;} + .d2-3569052263 .background-color-B6{background-color:#F7F8FE;} + .d2-3569052263 .background-color-AA2{background-color:#4A6FF3;} + .d2-3569052263 .background-color-AA4{background-color:#EDF0FD;} + .d2-3569052263 .background-color-AA5{background-color:#F7F8FE;} + .d2-3569052263 .background-color-AB4{background-color:#EDF0FD;} + .d2-3569052263 .background-color-AB5{background-color:#F7F8FE;} + .d2-3569052263 .color-N1{color:#0A0F25;} + .d2-3569052263 .color-N2{color:#676C7E;} + .d2-3569052263 .color-N3{color:#9499AB;} + .d2-3569052263 .color-N4{color:#CFD2DD;} + .d2-3569052263 .color-N5{color:#DEE1EB;} + .d2-3569052263 .color-N6{color:#EEF1F8;} + .d2-3569052263 .color-N7{color:#FFFFFF;} + .d2-3569052263 .color-B1{color:#0D32B2;} + .d2-3569052263 .color-B2{color:#0D32B2;} + .d2-3569052263 .color-B3{color:#E3E9FD;} + .d2-3569052263 .color-B4{color:#E3E9FD;} + .d2-3569052263 .color-B5{color:#EDF0FD;} + .d2-3569052263 .color-B6{color:#F7F8FE;} + .d2-3569052263 .color-AA2{color:#4A6FF3;} + .d2-3569052263 .color-AA4{color:#EDF0FD;} + .d2-3569052263 .color-AA5{color:#F7F8FE;} + .d2-3569052263 .color-AB4{color:#EDF0FD;} + .d2-3569052263 .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}]]>ab hello diff --git a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg index 19d8c4fc6..d46c12ef2 100644 --- a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg @@ -11,75 +11,75 @@ opacity: 0.5; } - .d2-121760133 .fill-N1{fill:#0A0F25;} - .d2-121760133 .fill-N2{fill:#676C7E;} - .d2-121760133 .fill-N3{fill:#9499AB;} - .d2-121760133 .fill-N4{fill:#CFD2DD;} - .d2-121760133 .fill-N5{fill:#DEE1EB;} - .d2-121760133 .fill-N6{fill:#EEF1F8;} - .d2-121760133 .fill-N7{fill:#FFFFFF;} - .d2-121760133 .fill-B1{fill:#0D32B2;} - .d2-121760133 .fill-B2{fill:#0D32B2;} - .d2-121760133 .fill-B3{fill:#E3E9FD;} - .d2-121760133 .fill-B4{fill:#E3E9FD;} - .d2-121760133 .fill-B5{fill:#EDF0FD;} - .d2-121760133 .fill-B6{fill:#F7F8FE;} - .d2-121760133 .fill-AA2{fill:#4A6FF3;} - .d2-121760133 .fill-AA4{fill:#EDF0FD;} - .d2-121760133 .fill-AA5{fill:#F7F8FE;} - .d2-121760133 .fill-AB4{fill:#EDF0FD;} - .d2-121760133 .fill-AB5{fill:#F7F8FE;} - .d2-121760133 .stroke-N1{stroke:#0A0F25;} - .d2-121760133 .stroke-N2{stroke:#676C7E;} - .d2-121760133 .stroke-N3{stroke:#9499AB;} - .d2-121760133 .stroke-N4{stroke:#CFD2DD;} - .d2-121760133 .stroke-N5{stroke:#DEE1EB;} - .d2-121760133 .stroke-N6{stroke:#EEF1F8;} - .d2-121760133 .stroke-N7{stroke:#FFFFFF;} - .d2-121760133 .stroke-B1{stroke:#0D32B2;} - .d2-121760133 .stroke-B2{stroke:#0D32B2;} - .d2-121760133 .stroke-B3{stroke:#E3E9FD;} - .d2-121760133 .stroke-B4{stroke:#E3E9FD;} - .d2-121760133 .stroke-B5{stroke:#EDF0FD;} - .d2-121760133 .stroke-B6{stroke:#F7F8FE;} - .d2-121760133 .stroke-AA2{stroke:#4A6FF3;} - .d2-121760133 .stroke-AA4{stroke:#EDF0FD;} - .d2-121760133 .stroke-AA5{stroke:#F7F8FE;} - .d2-121760133 .stroke-AB4{stroke:#EDF0FD;} - .d2-121760133 .stroke-AB5{stroke:#F7F8FE;} - .d2-121760133 .background-color-N1{background-color:#0A0F25;} - .d2-121760133 .background-color-N2{background-color:#676C7E;} - .d2-121760133 .background-color-N3{background-color:#9499AB;} - .d2-121760133 .background-color-N4{background-color:#CFD2DD;} - .d2-121760133 .background-color-N5{background-color:#DEE1EB;} - .d2-121760133 .background-color-N6{background-color:#EEF1F8;} - .d2-121760133 .background-color-N7{background-color:#FFFFFF;} - .d2-121760133 .background-color-B1{background-color:#0D32B2;} - .d2-121760133 .background-color-B2{background-color:#0D32B2;} - .d2-121760133 .background-color-B3{background-color:#E3E9FD;} - .d2-121760133 .background-color-B4{background-color:#E3E9FD;} - .d2-121760133 .background-color-B5{background-color:#EDF0FD;} - .d2-121760133 .background-color-B6{background-color:#F7F8FE;} - .d2-121760133 .background-color-AA2{background-color:#4A6FF3;} - .d2-121760133 .background-color-AA4{background-color:#EDF0FD;} - .d2-121760133 .background-color-AA5{background-color:#F7F8FE;} - .d2-121760133 .background-color-AB4{background-color:#EDF0FD;} - .d2-121760133 .background-color-AB5{background-color:#F7F8FE;} - .d2-121760133 .color-N1{color:#0A0F25;} - .d2-121760133 .color-N2{color:#676C7E;} - .d2-121760133 .color-N3{color:#9499AB;} - .d2-121760133 .color-N4{color:#CFD2DD;} - .d2-121760133 .color-N5{color:#DEE1EB;} - .d2-121760133 .color-N6{color:#EEF1F8;} - .d2-121760133 .color-N7{color:#FFFFFF;} - .d2-121760133 .color-B1{color:#0D32B2;} - .d2-121760133 .color-B2{color:#0D32B2;} - .d2-121760133 .color-B3{color:#E3E9FD;} - .d2-121760133 .color-B4{color:#E3E9FD;} - .d2-121760133 .color-B5{color:#EDF0FD;} - .d2-121760133 .color-B6{color:#F7F8FE;} - .d2-121760133 .color-AA2{color:#4A6FF3;} - .d2-121760133 .color-AA4{color:#EDF0FD;} - .d2-121760133 .color-AA5{color:#F7F8FE;} - .d2-121760133 .color-AB4{color:#EDF0FD;} - .d2-121760133 .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}]]> \ No newline at end of file + .d2-2501080991 .fill-N1{fill:#0A0F25;} + .d2-2501080991 .fill-N2{fill:#676C7E;} + .d2-2501080991 .fill-N3{fill:#9499AB;} + .d2-2501080991 .fill-N4{fill:#CFD2DD;} + .d2-2501080991 .fill-N5{fill:#DEE1EB;} + .d2-2501080991 .fill-N6{fill:#EEF1F8;} + .d2-2501080991 .fill-N7{fill:#FFFFFF;} + .d2-2501080991 .fill-B1{fill:#0D32B2;} + .d2-2501080991 .fill-B2{fill:#0D32B2;} + .d2-2501080991 .fill-B3{fill:#E3E9FD;} + .d2-2501080991 .fill-B4{fill:#E3E9FD;} + .d2-2501080991 .fill-B5{fill:#EDF0FD;} + .d2-2501080991 .fill-B6{fill:#F7F8FE;} + .d2-2501080991 .fill-AA2{fill:#4A6FF3;} + .d2-2501080991 .fill-AA4{fill:#EDF0FD;} + .d2-2501080991 .fill-AA5{fill:#F7F8FE;} + .d2-2501080991 .fill-AB4{fill:#EDF0FD;} + .d2-2501080991 .fill-AB5{fill:#F7F8FE;} + .d2-2501080991 .stroke-N1{stroke:#0A0F25;} + .d2-2501080991 .stroke-N2{stroke:#676C7E;} + .d2-2501080991 .stroke-N3{stroke:#9499AB;} + .d2-2501080991 .stroke-N4{stroke:#CFD2DD;} + .d2-2501080991 .stroke-N5{stroke:#DEE1EB;} + .d2-2501080991 .stroke-N6{stroke:#EEF1F8;} + .d2-2501080991 .stroke-N7{stroke:#FFFFFF;} + .d2-2501080991 .stroke-B1{stroke:#0D32B2;} + .d2-2501080991 .stroke-B2{stroke:#0D32B2;} + .d2-2501080991 .stroke-B3{stroke:#E3E9FD;} + .d2-2501080991 .stroke-B4{stroke:#E3E9FD;} + .d2-2501080991 .stroke-B5{stroke:#EDF0FD;} + .d2-2501080991 .stroke-B6{stroke:#F7F8FE;} + .d2-2501080991 .stroke-AA2{stroke:#4A6FF3;} + .d2-2501080991 .stroke-AA4{stroke:#EDF0FD;} + .d2-2501080991 .stroke-AA5{stroke:#F7F8FE;} + .d2-2501080991 .stroke-AB4{stroke:#EDF0FD;} + .d2-2501080991 .stroke-AB5{stroke:#F7F8FE;} + .d2-2501080991 .background-color-N1{background-color:#0A0F25;} + .d2-2501080991 .background-color-N2{background-color:#676C7E;} + .d2-2501080991 .background-color-N3{background-color:#9499AB;} + .d2-2501080991 .background-color-N4{background-color:#CFD2DD;} + .d2-2501080991 .background-color-N5{background-color:#DEE1EB;} + .d2-2501080991 .background-color-N6{background-color:#EEF1F8;} + .d2-2501080991 .background-color-N7{background-color:#FFFFFF;} + .d2-2501080991 .background-color-B1{background-color:#0D32B2;} + .d2-2501080991 .background-color-B2{background-color:#0D32B2;} + .d2-2501080991 .background-color-B3{background-color:#E3E9FD;} + .d2-2501080991 .background-color-B4{background-color:#E3E9FD;} + .d2-2501080991 .background-color-B5{background-color:#EDF0FD;} + .d2-2501080991 .background-color-B6{background-color:#F7F8FE;} + .d2-2501080991 .background-color-AA2{background-color:#4A6FF3;} + .d2-2501080991 .background-color-AA4{background-color:#EDF0FD;} + .d2-2501080991 .background-color-AA5{background-color:#F7F8FE;} + .d2-2501080991 .background-color-AB4{background-color:#EDF0FD;} + .d2-2501080991 .background-color-AB5{background-color:#F7F8FE;} + .d2-2501080991 .color-N1{color:#0A0F25;} + .d2-2501080991 .color-N2{color:#676C7E;} + .d2-2501080991 .color-N3{color:#9499AB;} + .d2-2501080991 .color-N4{color:#CFD2DD;} + .d2-2501080991 .color-N5{color:#DEE1EB;} + .d2-2501080991 .color-N6{color:#EEF1F8;} + .d2-2501080991 .color-N7{color:#FFFFFF;} + .d2-2501080991 .color-B1{color:#0D32B2;} + .d2-2501080991 .color-B2{color:#0D32B2;} + .d2-2501080991 .color-B3{color:#E3E9FD;} + .d2-2501080991 .color-B4{color:#E3E9FD;} + .d2-2501080991 .color-B5{color:#EDF0FD;} + .d2-2501080991 .color-B6{color:#F7F8FE;} + .d2-2501080991 .color-AA2{color:#4A6FF3;} + .d2-2501080991 .color-AA4{color:#EDF0FD;} + .d2-2501080991 .color-AA5{color:#F7F8FE;} + .d2-2501080991 .color-AB4{color:#EDF0FD;} + .d2-2501080991 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg index 19d8c4fc6..d46c12ef2 100644 --- a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg @@ -11,75 +11,75 @@ opacity: 0.5; } - .d2-121760133 .fill-N1{fill:#0A0F25;} - .d2-121760133 .fill-N2{fill:#676C7E;} - .d2-121760133 .fill-N3{fill:#9499AB;} - .d2-121760133 .fill-N4{fill:#CFD2DD;} - .d2-121760133 .fill-N5{fill:#DEE1EB;} - .d2-121760133 .fill-N6{fill:#EEF1F8;} - .d2-121760133 .fill-N7{fill:#FFFFFF;} - .d2-121760133 .fill-B1{fill:#0D32B2;} - .d2-121760133 .fill-B2{fill:#0D32B2;} - .d2-121760133 .fill-B3{fill:#E3E9FD;} - .d2-121760133 .fill-B4{fill:#E3E9FD;} - .d2-121760133 .fill-B5{fill:#EDF0FD;} - .d2-121760133 .fill-B6{fill:#F7F8FE;} - .d2-121760133 .fill-AA2{fill:#4A6FF3;} - .d2-121760133 .fill-AA4{fill:#EDF0FD;} - .d2-121760133 .fill-AA5{fill:#F7F8FE;} - .d2-121760133 .fill-AB4{fill:#EDF0FD;} - .d2-121760133 .fill-AB5{fill:#F7F8FE;} - .d2-121760133 .stroke-N1{stroke:#0A0F25;} - .d2-121760133 .stroke-N2{stroke:#676C7E;} - .d2-121760133 .stroke-N3{stroke:#9499AB;} - .d2-121760133 .stroke-N4{stroke:#CFD2DD;} - .d2-121760133 .stroke-N5{stroke:#DEE1EB;} - .d2-121760133 .stroke-N6{stroke:#EEF1F8;} - .d2-121760133 .stroke-N7{stroke:#FFFFFF;} - .d2-121760133 .stroke-B1{stroke:#0D32B2;} - .d2-121760133 .stroke-B2{stroke:#0D32B2;} - .d2-121760133 .stroke-B3{stroke:#E3E9FD;} - .d2-121760133 .stroke-B4{stroke:#E3E9FD;} - .d2-121760133 .stroke-B5{stroke:#EDF0FD;} - .d2-121760133 .stroke-B6{stroke:#F7F8FE;} - .d2-121760133 .stroke-AA2{stroke:#4A6FF3;} - .d2-121760133 .stroke-AA4{stroke:#EDF0FD;} - .d2-121760133 .stroke-AA5{stroke:#F7F8FE;} - .d2-121760133 .stroke-AB4{stroke:#EDF0FD;} - .d2-121760133 .stroke-AB5{stroke:#F7F8FE;} - .d2-121760133 .background-color-N1{background-color:#0A0F25;} - .d2-121760133 .background-color-N2{background-color:#676C7E;} - .d2-121760133 .background-color-N3{background-color:#9499AB;} - .d2-121760133 .background-color-N4{background-color:#CFD2DD;} - .d2-121760133 .background-color-N5{background-color:#DEE1EB;} - .d2-121760133 .background-color-N6{background-color:#EEF1F8;} - .d2-121760133 .background-color-N7{background-color:#FFFFFF;} - .d2-121760133 .background-color-B1{background-color:#0D32B2;} - .d2-121760133 .background-color-B2{background-color:#0D32B2;} - .d2-121760133 .background-color-B3{background-color:#E3E9FD;} - .d2-121760133 .background-color-B4{background-color:#E3E9FD;} - .d2-121760133 .background-color-B5{background-color:#EDF0FD;} - .d2-121760133 .background-color-B6{background-color:#F7F8FE;} - .d2-121760133 .background-color-AA2{background-color:#4A6FF3;} - .d2-121760133 .background-color-AA4{background-color:#EDF0FD;} - .d2-121760133 .background-color-AA5{background-color:#F7F8FE;} - .d2-121760133 .background-color-AB4{background-color:#EDF0FD;} - .d2-121760133 .background-color-AB5{background-color:#F7F8FE;} - .d2-121760133 .color-N1{color:#0A0F25;} - .d2-121760133 .color-N2{color:#676C7E;} - .d2-121760133 .color-N3{color:#9499AB;} - .d2-121760133 .color-N4{color:#CFD2DD;} - .d2-121760133 .color-N5{color:#DEE1EB;} - .d2-121760133 .color-N6{color:#EEF1F8;} - .d2-121760133 .color-N7{color:#FFFFFF;} - .d2-121760133 .color-B1{color:#0D32B2;} - .d2-121760133 .color-B2{color:#0D32B2;} - .d2-121760133 .color-B3{color:#E3E9FD;} - .d2-121760133 .color-B4{color:#E3E9FD;} - .d2-121760133 .color-B5{color:#EDF0FD;} - .d2-121760133 .color-B6{color:#F7F8FE;} - .d2-121760133 .color-AA2{color:#4A6FF3;} - .d2-121760133 .color-AA4{color:#EDF0FD;} - .d2-121760133 .color-AA5{color:#F7F8FE;} - .d2-121760133 .color-AB4{color:#EDF0FD;} - .d2-121760133 .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}]]> \ No newline at end of file + .d2-2501080991 .fill-N1{fill:#0A0F25;} + .d2-2501080991 .fill-N2{fill:#676C7E;} + .d2-2501080991 .fill-N3{fill:#9499AB;} + .d2-2501080991 .fill-N4{fill:#CFD2DD;} + .d2-2501080991 .fill-N5{fill:#DEE1EB;} + .d2-2501080991 .fill-N6{fill:#EEF1F8;} + .d2-2501080991 .fill-N7{fill:#FFFFFF;} + .d2-2501080991 .fill-B1{fill:#0D32B2;} + .d2-2501080991 .fill-B2{fill:#0D32B2;} + .d2-2501080991 .fill-B3{fill:#E3E9FD;} + .d2-2501080991 .fill-B4{fill:#E3E9FD;} + .d2-2501080991 .fill-B5{fill:#EDF0FD;} + .d2-2501080991 .fill-B6{fill:#F7F8FE;} + .d2-2501080991 .fill-AA2{fill:#4A6FF3;} + .d2-2501080991 .fill-AA4{fill:#EDF0FD;} + .d2-2501080991 .fill-AA5{fill:#F7F8FE;} + .d2-2501080991 .fill-AB4{fill:#EDF0FD;} + .d2-2501080991 .fill-AB5{fill:#F7F8FE;} + .d2-2501080991 .stroke-N1{stroke:#0A0F25;} + .d2-2501080991 .stroke-N2{stroke:#676C7E;} + .d2-2501080991 .stroke-N3{stroke:#9499AB;} + .d2-2501080991 .stroke-N4{stroke:#CFD2DD;} + .d2-2501080991 .stroke-N5{stroke:#DEE1EB;} + .d2-2501080991 .stroke-N6{stroke:#EEF1F8;} + .d2-2501080991 .stroke-N7{stroke:#FFFFFF;} + .d2-2501080991 .stroke-B1{stroke:#0D32B2;} + .d2-2501080991 .stroke-B2{stroke:#0D32B2;} + .d2-2501080991 .stroke-B3{stroke:#E3E9FD;} + .d2-2501080991 .stroke-B4{stroke:#E3E9FD;} + .d2-2501080991 .stroke-B5{stroke:#EDF0FD;} + .d2-2501080991 .stroke-B6{stroke:#F7F8FE;} + .d2-2501080991 .stroke-AA2{stroke:#4A6FF3;} + .d2-2501080991 .stroke-AA4{stroke:#EDF0FD;} + .d2-2501080991 .stroke-AA5{stroke:#F7F8FE;} + .d2-2501080991 .stroke-AB4{stroke:#EDF0FD;} + .d2-2501080991 .stroke-AB5{stroke:#F7F8FE;} + .d2-2501080991 .background-color-N1{background-color:#0A0F25;} + .d2-2501080991 .background-color-N2{background-color:#676C7E;} + .d2-2501080991 .background-color-N3{background-color:#9499AB;} + .d2-2501080991 .background-color-N4{background-color:#CFD2DD;} + .d2-2501080991 .background-color-N5{background-color:#DEE1EB;} + .d2-2501080991 .background-color-N6{background-color:#EEF1F8;} + .d2-2501080991 .background-color-N7{background-color:#FFFFFF;} + .d2-2501080991 .background-color-B1{background-color:#0D32B2;} + .d2-2501080991 .background-color-B2{background-color:#0D32B2;} + .d2-2501080991 .background-color-B3{background-color:#E3E9FD;} + .d2-2501080991 .background-color-B4{background-color:#E3E9FD;} + .d2-2501080991 .background-color-B5{background-color:#EDF0FD;} + .d2-2501080991 .background-color-B6{background-color:#F7F8FE;} + .d2-2501080991 .background-color-AA2{background-color:#4A6FF3;} + .d2-2501080991 .background-color-AA4{background-color:#EDF0FD;} + .d2-2501080991 .background-color-AA5{background-color:#F7F8FE;} + .d2-2501080991 .background-color-AB4{background-color:#EDF0FD;} + .d2-2501080991 .background-color-AB5{background-color:#F7F8FE;} + .d2-2501080991 .color-N1{color:#0A0F25;} + .d2-2501080991 .color-N2{color:#676C7E;} + .d2-2501080991 .color-N3{color:#9499AB;} + .d2-2501080991 .color-N4{color:#CFD2DD;} + .d2-2501080991 .color-N5{color:#DEE1EB;} + .d2-2501080991 .color-N6{color:#EEF1F8;} + .d2-2501080991 .color-N7{color:#FFFFFF;} + .d2-2501080991 .color-B1{color:#0D32B2;} + .d2-2501080991 .color-B2{color:#0D32B2;} + .d2-2501080991 .color-B3{color:#E3E9FD;} + .d2-2501080991 .color-B4{color:#E3E9FD;} + .d2-2501080991 .color-B5{color:#EDF0FD;} + .d2-2501080991 .color-B6{color:#F7F8FE;} + .d2-2501080991 .color-AA2{color:#4A6FF3;} + .d2-2501080991 .color-AA4{color:#EDF0FD;} + .d2-2501080991 .color-AA5{color:#F7F8FE;} + .d2-2501080991 .color-AB4{color:#EDF0FD;} + .d2-2501080991 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg index 2f3170ca0..4b3bfe472 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3331526961 .fill-N1{fill:#0A0F25;} + .d2-3331526961 .fill-N2{fill:#676C7E;} + .d2-3331526961 .fill-N3{fill:#9499AB;} + .d2-3331526961 .fill-N4{fill:#CFD2DD;} + .d2-3331526961 .fill-N5{fill:#DEE1EB;} + .d2-3331526961 .fill-N6{fill:#EEF1F8;} + .d2-3331526961 .fill-N7{fill:#FFFFFF;} + .d2-3331526961 .fill-B1{fill:#0D32B2;} + .d2-3331526961 .fill-B2{fill:#0D32B2;} + .d2-3331526961 .fill-B3{fill:#E3E9FD;} + .d2-3331526961 .fill-B4{fill:#E3E9FD;} + .d2-3331526961 .fill-B5{fill:#EDF0FD;} + .d2-3331526961 .fill-B6{fill:#F7F8FE;} + .d2-3331526961 .fill-AA2{fill:#4A6FF3;} + .d2-3331526961 .fill-AA4{fill:#EDF0FD;} + .d2-3331526961 .fill-AA5{fill:#F7F8FE;} + .d2-3331526961 .fill-AB4{fill:#EDF0FD;} + .d2-3331526961 .fill-AB5{fill:#F7F8FE;} + .d2-3331526961 .stroke-N1{stroke:#0A0F25;} + .d2-3331526961 .stroke-N2{stroke:#676C7E;} + .d2-3331526961 .stroke-N3{stroke:#9499AB;} + .d2-3331526961 .stroke-N4{stroke:#CFD2DD;} + .d2-3331526961 .stroke-N5{stroke:#DEE1EB;} + .d2-3331526961 .stroke-N6{stroke:#EEF1F8;} + .d2-3331526961 .stroke-N7{stroke:#FFFFFF;} + .d2-3331526961 .stroke-B1{stroke:#0D32B2;} + .d2-3331526961 .stroke-B2{stroke:#0D32B2;} + .d2-3331526961 .stroke-B3{stroke:#E3E9FD;} + .d2-3331526961 .stroke-B4{stroke:#E3E9FD;} + .d2-3331526961 .stroke-B5{stroke:#EDF0FD;} + .d2-3331526961 .stroke-B6{stroke:#F7F8FE;} + .d2-3331526961 .stroke-AA2{stroke:#4A6FF3;} + .d2-3331526961 .stroke-AA4{stroke:#EDF0FD;} + .d2-3331526961 .stroke-AA5{stroke:#F7F8FE;} + .d2-3331526961 .stroke-AB4{stroke:#EDF0FD;} + .d2-3331526961 .stroke-AB5{stroke:#F7F8FE;} + .d2-3331526961 .background-color-N1{background-color:#0A0F25;} + .d2-3331526961 .background-color-N2{background-color:#676C7E;} + .d2-3331526961 .background-color-N3{background-color:#9499AB;} + .d2-3331526961 .background-color-N4{background-color:#CFD2DD;} + .d2-3331526961 .background-color-N5{background-color:#DEE1EB;} + .d2-3331526961 .background-color-N6{background-color:#EEF1F8;} + .d2-3331526961 .background-color-N7{background-color:#FFFFFF;} + .d2-3331526961 .background-color-B1{background-color:#0D32B2;} + .d2-3331526961 .background-color-B2{background-color:#0D32B2;} + .d2-3331526961 .background-color-B3{background-color:#E3E9FD;} + .d2-3331526961 .background-color-B4{background-color:#E3E9FD;} + .d2-3331526961 .background-color-B5{background-color:#EDF0FD;} + .d2-3331526961 .background-color-B6{background-color:#F7F8FE;} + .d2-3331526961 .background-color-AA2{background-color:#4A6FF3;} + .d2-3331526961 .background-color-AA4{background-color:#EDF0FD;} + .d2-3331526961 .background-color-AA5{background-color:#F7F8FE;} + .d2-3331526961 .background-color-AB4{background-color:#EDF0FD;} + .d2-3331526961 .background-color-AB5{background-color:#F7F8FE;} + .d2-3331526961 .color-N1{color:#0A0F25;} + .d2-3331526961 .color-N2{color:#676C7E;} + .d2-3331526961 .color-N3{color:#9499AB;} + .d2-3331526961 .color-N4{color:#CFD2DD;} + .d2-3331526961 .color-N5{color:#DEE1EB;} + .d2-3331526961 .color-N6{color:#EEF1F8;} + .d2-3331526961 .color-N7{color:#FFFFFF;} + .d2-3331526961 .color-B1{color:#0D32B2;} + .d2-3331526961 .color-B2{color:#0D32B2;} + .d2-3331526961 .color-B3{color:#E3E9FD;} + .d2-3331526961 .color-B4{color:#E3E9FD;} + .d2-3331526961 .color-B5{color:#EDF0FD;} + .d2-3331526961 .color-B6{color:#F7F8FE;} + .d2-3331526961 .color-AA2{color:#4A6FF3;} + .d2-3331526961 .color-AA4{color:#EDF0FD;} + .d2-3331526961 .color-AA5{color:#F7F8FE;} + .d2-3331526961 .color-AB4{color:#EDF0FD;} + .d2-3331526961 .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}]]> hexagon rect -square +square diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg index a4579961e..42264ac12 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3318436500 .fill-N1{fill:#0A0F25;} + .d2-3318436500 .fill-N2{fill:#676C7E;} + .d2-3318436500 .fill-N3{fill:#9499AB;} + .d2-3318436500 .fill-N4{fill:#CFD2DD;} + .d2-3318436500 .fill-N5{fill:#DEE1EB;} + .d2-3318436500 .fill-N6{fill:#EEF1F8;} + .d2-3318436500 .fill-N7{fill:#FFFFFF;} + .d2-3318436500 .fill-B1{fill:#0D32B2;} + .d2-3318436500 .fill-B2{fill:#0D32B2;} + .d2-3318436500 .fill-B3{fill:#E3E9FD;} + .d2-3318436500 .fill-B4{fill:#E3E9FD;} + .d2-3318436500 .fill-B5{fill:#EDF0FD;} + .d2-3318436500 .fill-B6{fill:#F7F8FE;} + .d2-3318436500 .fill-AA2{fill:#4A6FF3;} + .d2-3318436500 .fill-AA4{fill:#EDF0FD;} + .d2-3318436500 .fill-AA5{fill:#F7F8FE;} + .d2-3318436500 .fill-AB4{fill:#EDF0FD;} + .d2-3318436500 .fill-AB5{fill:#F7F8FE;} + .d2-3318436500 .stroke-N1{stroke:#0A0F25;} + .d2-3318436500 .stroke-N2{stroke:#676C7E;} + .d2-3318436500 .stroke-N3{stroke:#9499AB;} + .d2-3318436500 .stroke-N4{stroke:#CFD2DD;} + .d2-3318436500 .stroke-N5{stroke:#DEE1EB;} + .d2-3318436500 .stroke-N6{stroke:#EEF1F8;} + .d2-3318436500 .stroke-N7{stroke:#FFFFFF;} + .d2-3318436500 .stroke-B1{stroke:#0D32B2;} + .d2-3318436500 .stroke-B2{stroke:#0D32B2;} + .d2-3318436500 .stroke-B3{stroke:#E3E9FD;} + .d2-3318436500 .stroke-B4{stroke:#E3E9FD;} + .d2-3318436500 .stroke-B5{stroke:#EDF0FD;} + .d2-3318436500 .stroke-B6{stroke:#F7F8FE;} + .d2-3318436500 .stroke-AA2{stroke:#4A6FF3;} + .d2-3318436500 .stroke-AA4{stroke:#EDF0FD;} + .d2-3318436500 .stroke-AA5{stroke:#F7F8FE;} + .d2-3318436500 .stroke-AB4{stroke:#EDF0FD;} + .d2-3318436500 .stroke-AB5{stroke:#F7F8FE;} + .d2-3318436500 .background-color-N1{background-color:#0A0F25;} + .d2-3318436500 .background-color-N2{background-color:#676C7E;} + .d2-3318436500 .background-color-N3{background-color:#9499AB;} + .d2-3318436500 .background-color-N4{background-color:#CFD2DD;} + .d2-3318436500 .background-color-N5{background-color:#DEE1EB;} + .d2-3318436500 .background-color-N6{background-color:#EEF1F8;} + .d2-3318436500 .background-color-N7{background-color:#FFFFFF;} + .d2-3318436500 .background-color-B1{background-color:#0D32B2;} + .d2-3318436500 .background-color-B2{background-color:#0D32B2;} + .d2-3318436500 .background-color-B3{background-color:#E3E9FD;} + .d2-3318436500 .background-color-B4{background-color:#E3E9FD;} + .d2-3318436500 .background-color-B5{background-color:#EDF0FD;} + .d2-3318436500 .background-color-B6{background-color:#F7F8FE;} + .d2-3318436500 .background-color-AA2{background-color:#4A6FF3;} + .d2-3318436500 .background-color-AA4{background-color:#EDF0FD;} + .d2-3318436500 .background-color-AA5{background-color:#F7F8FE;} + .d2-3318436500 .background-color-AB4{background-color:#EDF0FD;} + .d2-3318436500 .background-color-AB5{background-color:#F7F8FE;} + .d2-3318436500 .color-N1{color:#0A0F25;} + .d2-3318436500 .color-N2{color:#676C7E;} + .d2-3318436500 .color-N3{color:#9499AB;} + .d2-3318436500 .color-N4{color:#CFD2DD;} + .d2-3318436500 .color-N5{color:#DEE1EB;} + .d2-3318436500 .color-N6{color:#EEF1F8;} + .d2-3318436500 .color-N7{color:#FFFFFF;} + .d2-3318436500 .color-B1{color:#0D32B2;} + .d2-3318436500 .color-B2{color:#0D32B2;} + .d2-3318436500 .color-B3{color:#E3E9FD;} + .d2-3318436500 .color-B4{color:#E3E9FD;} + .d2-3318436500 .color-B5{color:#EDF0FD;} + .d2-3318436500 .color-B6{color:#F7F8FE;} + .d2-3318436500 .color-AA2{color:#4A6FF3;} + .d2-3318436500 .color-AA4{color:#EDF0FD;} + .d2-3318436500 .color-AA5{color:#F7F8FE;} + .d2-3318436500 .color-AB4{color:#EDF0FD;} + .d2-3318436500 .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}]]> hexagon rect -square +square diff --git a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg index 0fbf5a6e7..5bc3cd846 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-1506512843 .fill-N1{fill:#0A0F25;} + .d2-1506512843 .fill-N2{fill:#676C7E;} + .d2-1506512843 .fill-N3{fill:#9499AB;} + .d2-1506512843 .fill-N4{fill:#CFD2DD;} + .d2-1506512843 .fill-N5{fill:#DEE1EB;} + .d2-1506512843 .fill-N6{fill:#EEF1F8;} + .d2-1506512843 .fill-N7{fill:#FFFFFF;} + .d2-1506512843 .fill-B1{fill:#0D32B2;} + .d2-1506512843 .fill-B2{fill:#0D32B2;} + .d2-1506512843 .fill-B3{fill:#E3E9FD;} + .d2-1506512843 .fill-B4{fill:#E3E9FD;} + .d2-1506512843 .fill-B5{fill:#EDF0FD;} + .d2-1506512843 .fill-B6{fill:#F7F8FE;} + .d2-1506512843 .fill-AA2{fill:#4A6FF3;} + .d2-1506512843 .fill-AA4{fill:#EDF0FD;} + .d2-1506512843 .fill-AA5{fill:#F7F8FE;} + .d2-1506512843 .fill-AB4{fill:#EDF0FD;} + .d2-1506512843 .fill-AB5{fill:#F7F8FE;} + .d2-1506512843 .stroke-N1{stroke:#0A0F25;} + .d2-1506512843 .stroke-N2{stroke:#676C7E;} + .d2-1506512843 .stroke-N3{stroke:#9499AB;} + .d2-1506512843 .stroke-N4{stroke:#CFD2DD;} + .d2-1506512843 .stroke-N5{stroke:#DEE1EB;} + .d2-1506512843 .stroke-N6{stroke:#EEF1F8;} + .d2-1506512843 .stroke-N7{stroke:#FFFFFF;} + .d2-1506512843 .stroke-B1{stroke:#0D32B2;} + .d2-1506512843 .stroke-B2{stroke:#0D32B2;} + .d2-1506512843 .stroke-B3{stroke:#E3E9FD;} + .d2-1506512843 .stroke-B4{stroke:#E3E9FD;} + .d2-1506512843 .stroke-B5{stroke:#EDF0FD;} + .d2-1506512843 .stroke-B6{stroke:#F7F8FE;} + .d2-1506512843 .stroke-AA2{stroke:#4A6FF3;} + .d2-1506512843 .stroke-AA4{stroke:#EDF0FD;} + .d2-1506512843 .stroke-AA5{stroke:#F7F8FE;} + .d2-1506512843 .stroke-AB4{stroke:#EDF0FD;} + .d2-1506512843 .stroke-AB5{stroke:#F7F8FE;} + .d2-1506512843 .background-color-N1{background-color:#0A0F25;} + .d2-1506512843 .background-color-N2{background-color:#676C7E;} + .d2-1506512843 .background-color-N3{background-color:#9499AB;} + .d2-1506512843 .background-color-N4{background-color:#CFD2DD;} + .d2-1506512843 .background-color-N5{background-color:#DEE1EB;} + .d2-1506512843 .background-color-N6{background-color:#EEF1F8;} + .d2-1506512843 .background-color-N7{background-color:#FFFFFF;} + .d2-1506512843 .background-color-B1{background-color:#0D32B2;} + .d2-1506512843 .background-color-B2{background-color:#0D32B2;} + .d2-1506512843 .background-color-B3{background-color:#E3E9FD;} + .d2-1506512843 .background-color-B4{background-color:#E3E9FD;} + .d2-1506512843 .background-color-B5{background-color:#EDF0FD;} + .d2-1506512843 .background-color-B6{background-color:#F7F8FE;} + .d2-1506512843 .background-color-AA2{background-color:#4A6FF3;} + .d2-1506512843 .background-color-AA4{background-color:#EDF0FD;} + .d2-1506512843 .background-color-AA5{background-color:#F7F8FE;} + .d2-1506512843 .background-color-AB4{background-color:#EDF0FD;} + .d2-1506512843 .background-color-AB5{background-color:#F7F8FE;} + .d2-1506512843 .color-N1{color:#0A0F25;} + .d2-1506512843 .color-N2{color:#676C7E;} + .d2-1506512843 .color-N3{color:#9499AB;} + .d2-1506512843 .color-N4{color:#CFD2DD;} + .d2-1506512843 .color-N5{color:#DEE1EB;} + .d2-1506512843 .color-N6{color:#EEF1F8;} + .d2-1506512843 .color-N7{color:#FFFFFF;} + .d2-1506512843 .color-B1{color:#0D32B2;} + .d2-1506512843 .color-B2{color:#0D32B2;} + .d2-1506512843 .color-B3{color:#E3E9FD;} + .d2-1506512843 .color-B4{color:#E3E9FD;} + .d2-1506512843 .color-B5{color:#EDF0FD;} + .d2-1506512843 .color-B6{color:#F7F8FE;} + .d2-1506512843 .color-AA2{color:#4A6FF3;} + .d2-1506512843 .color-AA4{color:#EDF0FD;} + .d2-1506512843 .color-AA5{color:#F7F8FE;} + .d2-1506512843 .color-AB4{color:#EDF0FD;} + .d2-1506512843 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg index 0a868e59e..125739c62 100644 --- a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-1873698316 .fill-N1{fill:#0A0F25;} + .d2-1873698316 .fill-N2{fill:#676C7E;} + .d2-1873698316 .fill-N3{fill:#9499AB;} + .d2-1873698316 .fill-N4{fill:#CFD2DD;} + .d2-1873698316 .fill-N5{fill:#DEE1EB;} + .d2-1873698316 .fill-N6{fill:#EEF1F8;} + .d2-1873698316 .fill-N7{fill:#FFFFFF;} + .d2-1873698316 .fill-B1{fill:#0D32B2;} + .d2-1873698316 .fill-B2{fill:#0D32B2;} + .d2-1873698316 .fill-B3{fill:#E3E9FD;} + .d2-1873698316 .fill-B4{fill:#E3E9FD;} + .d2-1873698316 .fill-B5{fill:#EDF0FD;} + .d2-1873698316 .fill-B6{fill:#F7F8FE;} + .d2-1873698316 .fill-AA2{fill:#4A6FF3;} + .d2-1873698316 .fill-AA4{fill:#EDF0FD;} + .d2-1873698316 .fill-AA5{fill:#F7F8FE;} + .d2-1873698316 .fill-AB4{fill:#EDF0FD;} + .d2-1873698316 .fill-AB5{fill:#F7F8FE;} + .d2-1873698316 .stroke-N1{stroke:#0A0F25;} + .d2-1873698316 .stroke-N2{stroke:#676C7E;} + .d2-1873698316 .stroke-N3{stroke:#9499AB;} + .d2-1873698316 .stroke-N4{stroke:#CFD2DD;} + .d2-1873698316 .stroke-N5{stroke:#DEE1EB;} + .d2-1873698316 .stroke-N6{stroke:#EEF1F8;} + .d2-1873698316 .stroke-N7{stroke:#FFFFFF;} + .d2-1873698316 .stroke-B1{stroke:#0D32B2;} + .d2-1873698316 .stroke-B2{stroke:#0D32B2;} + .d2-1873698316 .stroke-B3{stroke:#E3E9FD;} + .d2-1873698316 .stroke-B4{stroke:#E3E9FD;} + .d2-1873698316 .stroke-B5{stroke:#EDF0FD;} + .d2-1873698316 .stroke-B6{stroke:#F7F8FE;} + .d2-1873698316 .stroke-AA2{stroke:#4A6FF3;} + .d2-1873698316 .stroke-AA4{stroke:#EDF0FD;} + .d2-1873698316 .stroke-AA5{stroke:#F7F8FE;} + .d2-1873698316 .stroke-AB4{stroke:#EDF0FD;} + .d2-1873698316 .stroke-AB5{stroke:#F7F8FE;} + .d2-1873698316 .background-color-N1{background-color:#0A0F25;} + .d2-1873698316 .background-color-N2{background-color:#676C7E;} + .d2-1873698316 .background-color-N3{background-color:#9499AB;} + .d2-1873698316 .background-color-N4{background-color:#CFD2DD;} + .d2-1873698316 .background-color-N5{background-color:#DEE1EB;} + .d2-1873698316 .background-color-N6{background-color:#EEF1F8;} + .d2-1873698316 .background-color-N7{background-color:#FFFFFF;} + .d2-1873698316 .background-color-B1{background-color:#0D32B2;} + .d2-1873698316 .background-color-B2{background-color:#0D32B2;} + .d2-1873698316 .background-color-B3{background-color:#E3E9FD;} + .d2-1873698316 .background-color-B4{background-color:#E3E9FD;} + .d2-1873698316 .background-color-B5{background-color:#EDF0FD;} + .d2-1873698316 .background-color-B6{background-color:#F7F8FE;} + .d2-1873698316 .background-color-AA2{background-color:#4A6FF3;} + .d2-1873698316 .background-color-AA4{background-color:#EDF0FD;} + .d2-1873698316 .background-color-AA5{background-color:#F7F8FE;} + .d2-1873698316 .background-color-AB4{background-color:#EDF0FD;} + .d2-1873698316 .background-color-AB5{background-color:#F7F8FE;} + .d2-1873698316 .color-N1{color:#0A0F25;} + .d2-1873698316 .color-N2{color:#676C7E;} + .d2-1873698316 .color-N3{color:#9499AB;} + .d2-1873698316 .color-N4{color:#CFD2DD;} + .d2-1873698316 .color-N5{color:#DEE1EB;} + .d2-1873698316 .color-N6{color:#EEF1F8;} + .d2-1873698316 .color-N7{color:#FFFFFF;} + .d2-1873698316 .color-B1{color:#0D32B2;} + .d2-1873698316 .color-B2{color:#0D32B2;} + .d2-1873698316 .color-B3{color:#E3E9FD;} + .d2-1873698316 .color-B4{color:#E3E9FD;} + .d2-1873698316 .color-B5{color:#EDF0FD;} + .d2-1873698316 .color-B6{color:#F7F8FE;} + .d2-1873698316 .color-AA2{color:#4A6FF3;} + .d2-1873698316 .color-AA4{color:#EDF0FD;} + .d2-1873698316 .color-AA5{color:#F7F8FE;} + .d2-1873698316 .color-AB4{color:#EDF0FD;} + .d2-1873698316 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg index 6713c8442..75067a0af 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample + .d2-52549176 .fill-N1{fill:#0A0F25;} + .d2-52549176 .fill-N2{fill:#676C7E;} + .d2-52549176 .fill-N3{fill:#9499AB;} + .d2-52549176 .fill-N4{fill:#CFD2DD;} + .d2-52549176 .fill-N5{fill:#DEE1EB;} + .d2-52549176 .fill-N6{fill:#EEF1F8;} + .d2-52549176 .fill-N7{fill:#FFFFFF;} + .d2-52549176 .fill-B1{fill:#0D32B2;} + .d2-52549176 .fill-B2{fill:#0D32B2;} + .d2-52549176 .fill-B3{fill:#E3E9FD;} + .d2-52549176 .fill-B4{fill:#E3E9FD;} + .d2-52549176 .fill-B5{fill:#EDF0FD;} + .d2-52549176 .fill-B6{fill:#F7F8FE;} + .d2-52549176 .fill-AA2{fill:#4A6FF3;} + .d2-52549176 .fill-AA4{fill:#EDF0FD;} + .d2-52549176 .fill-AA5{fill:#F7F8FE;} + .d2-52549176 .fill-AB4{fill:#EDF0FD;} + .d2-52549176 .fill-AB5{fill:#F7F8FE;} + .d2-52549176 .stroke-N1{stroke:#0A0F25;} + .d2-52549176 .stroke-N2{stroke:#676C7E;} + .d2-52549176 .stroke-N3{stroke:#9499AB;} + .d2-52549176 .stroke-N4{stroke:#CFD2DD;} + .d2-52549176 .stroke-N5{stroke:#DEE1EB;} + .d2-52549176 .stroke-N6{stroke:#EEF1F8;} + .d2-52549176 .stroke-N7{stroke:#FFFFFF;} + .d2-52549176 .stroke-B1{stroke:#0D32B2;} + .d2-52549176 .stroke-B2{stroke:#0D32B2;} + .d2-52549176 .stroke-B3{stroke:#E3E9FD;} + .d2-52549176 .stroke-B4{stroke:#E3E9FD;} + .d2-52549176 .stroke-B5{stroke:#EDF0FD;} + .d2-52549176 .stroke-B6{stroke:#F7F8FE;} + .d2-52549176 .stroke-AA2{stroke:#4A6FF3;} + .d2-52549176 .stroke-AA4{stroke:#EDF0FD;} + .d2-52549176 .stroke-AA5{stroke:#F7F8FE;} + .d2-52549176 .stroke-AB4{stroke:#EDF0FD;} + .d2-52549176 .stroke-AB5{stroke:#F7F8FE;} + .d2-52549176 .background-color-N1{background-color:#0A0F25;} + .d2-52549176 .background-color-N2{background-color:#676C7E;} + .d2-52549176 .background-color-N3{background-color:#9499AB;} + .d2-52549176 .background-color-N4{background-color:#CFD2DD;} + .d2-52549176 .background-color-N5{background-color:#DEE1EB;} + .d2-52549176 .background-color-N6{background-color:#EEF1F8;} + .d2-52549176 .background-color-N7{background-color:#FFFFFF;} + .d2-52549176 .background-color-B1{background-color:#0D32B2;} + .d2-52549176 .background-color-B2{background-color:#0D32B2;} + .d2-52549176 .background-color-B3{background-color:#E3E9FD;} + .d2-52549176 .background-color-B4{background-color:#E3E9FD;} + .d2-52549176 .background-color-B5{background-color:#EDF0FD;} + .d2-52549176 .background-color-B6{background-color:#F7F8FE;} + .d2-52549176 .background-color-AA2{background-color:#4A6FF3;} + .d2-52549176 .background-color-AA4{background-color:#EDF0FD;} + .d2-52549176 .background-color-AA5{background-color:#F7F8FE;} + .d2-52549176 .background-color-AB4{background-color:#EDF0FD;} + .d2-52549176 .background-color-AB5{background-color:#F7F8FE;} + .d2-52549176 .color-N1{color:#0A0F25;} + .d2-52549176 .color-N2{color:#676C7E;} + .d2-52549176 .color-N3{color:#9499AB;} + .d2-52549176 .color-N4{color:#CFD2DD;} + .d2-52549176 .color-N5{color:#DEE1EB;} + .d2-52549176 .color-N6{color:#EEF1F8;} + .d2-52549176 .color-N7{color:#FFFFFF;} + .d2-52549176 .color-B1{color:#0D32B2;} + .d2-52549176 .color-B2{color:#0D32B2;} + .d2-52549176 .color-B3{color:#E3E9FD;} + .d2-52549176 .color-B4{color:#E3E9FD;} + .d2-52549176 .color-B5{color:#EDF0FD;} + .d2-52549176 .color-B6{color:#F7F8FE;} + .d2-52549176 .color-AA2{color:#4A6FF3;} + .d2-52549176 .color-AA4{color:#EDF0FD;} + .d2-52549176 .color-AA5{color:#F7F8FE;} + .d2-52549176 .color-AB4{color:#EDF0FD;} + .d2-52549176 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -949,7 +949,7 @@ - + diff --git a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg index 5dcb2ffd9..369b905e1 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample + .d2-2695291193 .fill-N1{fill:#0A0F25;} + .d2-2695291193 .fill-N2{fill:#676C7E;} + .d2-2695291193 .fill-N3{fill:#9499AB;} + .d2-2695291193 .fill-N4{fill:#CFD2DD;} + .d2-2695291193 .fill-N5{fill:#DEE1EB;} + .d2-2695291193 .fill-N6{fill:#EEF1F8;} + .d2-2695291193 .fill-N7{fill:#FFFFFF;} + .d2-2695291193 .fill-B1{fill:#0D32B2;} + .d2-2695291193 .fill-B2{fill:#0D32B2;} + .d2-2695291193 .fill-B3{fill:#E3E9FD;} + .d2-2695291193 .fill-B4{fill:#E3E9FD;} + .d2-2695291193 .fill-B5{fill:#EDF0FD;} + .d2-2695291193 .fill-B6{fill:#F7F8FE;} + .d2-2695291193 .fill-AA2{fill:#4A6FF3;} + .d2-2695291193 .fill-AA4{fill:#EDF0FD;} + .d2-2695291193 .fill-AA5{fill:#F7F8FE;} + .d2-2695291193 .fill-AB4{fill:#EDF0FD;} + .d2-2695291193 .fill-AB5{fill:#F7F8FE;} + .d2-2695291193 .stroke-N1{stroke:#0A0F25;} + .d2-2695291193 .stroke-N2{stroke:#676C7E;} + .d2-2695291193 .stroke-N3{stroke:#9499AB;} + .d2-2695291193 .stroke-N4{stroke:#CFD2DD;} + .d2-2695291193 .stroke-N5{stroke:#DEE1EB;} + .d2-2695291193 .stroke-N6{stroke:#EEF1F8;} + .d2-2695291193 .stroke-N7{stroke:#FFFFFF;} + .d2-2695291193 .stroke-B1{stroke:#0D32B2;} + .d2-2695291193 .stroke-B2{stroke:#0D32B2;} + .d2-2695291193 .stroke-B3{stroke:#E3E9FD;} + .d2-2695291193 .stroke-B4{stroke:#E3E9FD;} + .d2-2695291193 .stroke-B5{stroke:#EDF0FD;} + .d2-2695291193 .stroke-B6{stroke:#F7F8FE;} + .d2-2695291193 .stroke-AA2{stroke:#4A6FF3;} + .d2-2695291193 .stroke-AA4{stroke:#EDF0FD;} + .d2-2695291193 .stroke-AA5{stroke:#F7F8FE;} + .d2-2695291193 .stroke-AB4{stroke:#EDF0FD;} + .d2-2695291193 .stroke-AB5{stroke:#F7F8FE;} + .d2-2695291193 .background-color-N1{background-color:#0A0F25;} + .d2-2695291193 .background-color-N2{background-color:#676C7E;} + .d2-2695291193 .background-color-N3{background-color:#9499AB;} + .d2-2695291193 .background-color-N4{background-color:#CFD2DD;} + .d2-2695291193 .background-color-N5{background-color:#DEE1EB;} + .d2-2695291193 .background-color-N6{background-color:#EEF1F8;} + .d2-2695291193 .background-color-N7{background-color:#FFFFFF;} + .d2-2695291193 .background-color-B1{background-color:#0D32B2;} + .d2-2695291193 .background-color-B2{background-color:#0D32B2;} + .d2-2695291193 .background-color-B3{background-color:#E3E9FD;} + .d2-2695291193 .background-color-B4{background-color:#E3E9FD;} + .d2-2695291193 .background-color-B5{background-color:#EDF0FD;} + .d2-2695291193 .background-color-B6{background-color:#F7F8FE;} + .d2-2695291193 .background-color-AA2{background-color:#4A6FF3;} + .d2-2695291193 .background-color-AA4{background-color:#EDF0FD;} + .d2-2695291193 .background-color-AA5{background-color:#F7F8FE;} + .d2-2695291193 .background-color-AB4{background-color:#EDF0FD;} + .d2-2695291193 .background-color-AB5{background-color:#F7F8FE;} + .d2-2695291193 .color-N1{color:#0A0F25;} + .d2-2695291193 .color-N2{color:#676C7E;} + .d2-2695291193 .color-N3{color:#9499AB;} + .d2-2695291193 .color-N4{color:#CFD2DD;} + .d2-2695291193 .color-N5{color:#DEE1EB;} + .d2-2695291193 .color-N6{color:#EEF1F8;} + .d2-2695291193 .color-N7{color:#FFFFFF;} + .d2-2695291193 .color-B1{color:#0D32B2;} + .d2-2695291193 .color-B2{color:#0D32B2;} + .d2-2695291193 .color-B3{color:#E3E9FD;} + .d2-2695291193 .color-B4{color:#E3E9FD;} + .d2-2695291193 .color-B5{color:#EDF0FD;} + .d2-2695291193 .color-B6{color:#F7F8FE;} + .d2-2695291193 .color-AA2{color:#4A6FF3;} + .d2-2695291193 .color-AA4{color:#EDF0FD;} + .d2-2695291193 .color-AA5{color:#F7F8FE;} + .d2-2695291193 .color-AB4{color:#EDF0FD;} + .d2-2695291193 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -949,7 +949,7 @@ - + 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 752a62518..c501a1519 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-1545250783 .fill-N1{fill:#0A0F25;} + .d2-1545250783 .fill-N2{fill:#676C7E;} + .d2-1545250783 .fill-N3{fill:#9499AB;} + .d2-1545250783 .fill-N4{fill:#CFD2DD;} + .d2-1545250783 .fill-N5{fill:#DEE1EB;} + .d2-1545250783 .fill-N6{fill:#EEF1F8;} + .d2-1545250783 .fill-N7{fill:#FFFFFF;} + .d2-1545250783 .fill-B1{fill:#0D32B2;} + .d2-1545250783 .fill-B2{fill:#0D32B2;} + .d2-1545250783 .fill-B3{fill:#E3E9FD;} + .d2-1545250783 .fill-B4{fill:#E3E9FD;} + .d2-1545250783 .fill-B5{fill:#EDF0FD;} + .d2-1545250783 .fill-B6{fill:#F7F8FE;} + .d2-1545250783 .fill-AA2{fill:#4A6FF3;} + .d2-1545250783 .fill-AA4{fill:#EDF0FD;} + .d2-1545250783 .fill-AA5{fill:#F7F8FE;} + .d2-1545250783 .fill-AB4{fill:#EDF0FD;} + .d2-1545250783 .fill-AB5{fill:#F7F8FE;} + .d2-1545250783 .stroke-N1{stroke:#0A0F25;} + .d2-1545250783 .stroke-N2{stroke:#676C7E;} + .d2-1545250783 .stroke-N3{stroke:#9499AB;} + .d2-1545250783 .stroke-N4{stroke:#CFD2DD;} + .d2-1545250783 .stroke-N5{stroke:#DEE1EB;} + .d2-1545250783 .stroke-N6{stroke:#EEF1F8;} + .d2-1545250783 .stroke-N7{stroke:#FFFFFF;} + .d2-1545250783 .stroke-B1{stroke:#0D32B2;} + .d2-1545250783 .stroke-B2{stroke:#0D32B2;} + .d2-1545250783 .stroke-B3{stroke:#E3E9FD;} + .d2-1545250783 .stroke-B4{stroke:#E3E9FD;} + .d2-1545250783 .stroke-B5{stroke:#EDF0FD;} + .d2-1545250783 .stroke-B6{stroke:#F7F8FE;} + .d2-1545250783 .stroke-AA2{stroke:#4A6FF3;} + .d2-1545250783 .stroke-AA4{stroke:#EDF0FD;} + .d2-1545250783 .stroke-AA5{stroke:#F7F8FE;} + .d2-1545250783 .stroke-AB4{stroke:#EDF0FD;} + .d2-1545250783 .stroke-AB5{stroke:#F7F8FE;} + .d2-1545250783 .background-color-N1{background-color:#0A0F25;} + .d2-1545250783 .background-color-N2{background-color:#676C7E;} + .d2-1545250783 .background-color-N3{background-color:#9499AB;} + .d2-1545250783 .background-color-N4{background-color:#CFD2DD;} + .d2-1545250783 .background-color-N5{background-color:#DEE1EB;} + .d2-1545250783 .background-color-N6{background-color:#EEF1F8;} + .d2-1545250783 .background-color-N7{background-color:#FFFFFF;} + .d2-1545250783 .background-color-B1{background-color:#0D32B2;} + .d2-1545250783 .background-color-B2{background-color:#0D32B2;} + .d2-1545250783 .background-color-B3{background-color:#E3E9FD;} + .d2-1545250783 .background-color-B4{background-color:#E3E9FD;} + .d2-1545250783 .background-color-B5{background-color:#EDF0FD;} + .d2-1545250783 .background-color-B6{background-color:#F7F8FE;} + .d2-1545250783 .background-color-AA2{background-color:#4A6FF3;} + .d2-1545250783 .background-color-AA4{background-color:#EDF0FD;} + .d2-1545250783 .background-color-AA5{background-color:#F7F8FE;} + .d2-1545250783 .background-color-AB4{background-color:#EDF0FD;} + .d2-1545250783 .background-color-AB5{background-color:#F7F8FE;} + .d2-1545250783 .color-N1{color:#0A0F25;} + .d2-1545250783 .color-N2{color:#676C7E;} + .d2-1545250783 .color-N3{color:#9499AB;} + .d2-1545250783 .color-N4{color:#CFD2DD;} + .d2-1545250783 .color-N5{color:#DEE1EB;} + .d2-1545250783 .color-N6{color:#EEF1F8;} + .d2-1545250783 .color-N7{color:#FFFFFF;} + .d2-1545250783 .color-B1{color:#0D32B2;} + .d2-1545250783 .color-B2{color:#0D32B2;} + .d2-1545250783 .color-B3{color:#E3E9FD;} + .d2-1545250783 .color-B4{color:#E3E9FD;} + .d2-1545250783 .color-B5{color:#EDF0FD;} + .d2-1545250783 .color-B6{color:#F7F8FE;} + .d2-1545250783 .color-AA2{color:#4A6FF3;} + .d2-1545250783 .color-AA4{color:#EDF0FD;} + .d2-1545250783 .color-AA5{color:#F7F8FE;} + .d2-1545250783 .color-AB4{color:#EDF0FD;} + .d2-1545250783 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud 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 a9778652b..09cec8eb2 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-1087937579 .fill-N1{fill:#0A0F25;} + .d2-1087937579 .fill-N2{fill:#676C7E;} + .d2-1087937579 .fill-N3{fill:#9499AB;} + .d2-1087937579 .fill-N4{fill:#CFD2DD;} + .d2-1087937579 .fill-N5{fill:#DEE1EB;} + .d2-1087937579 .fill-N6{fill:#EEF1F8;} + .d2-1087937579 .fill-N7{fill:#FFFFFF;} + .d2-1087937579 .fill-B1{fill:#0D32B2;} + .d2-1087937579 .fill-B2{fill:#0D32B2;} + .d2-1087937579 .fill-B3{fill:#E3E9FD;} + .d2-1087937579 .fill-B4{fill:#E3E9FD;} + .d2-1087937579 .fill-B5{fill:#EDF0FD;} + .d2-1087937579 .fill-B6{fill:#F7F8FE;} + .d2-1087937579 .fill-AA2{fill:#4A6FF3;} + .d2-1087937579 .fill-AA4{fill:#EDF0FD;} + .d2-1087937579 .fill-AA5{fill:#F7F8FE;} + .d2-1087937579 .fill-AB4{fill:#EDF0FD;} + .d2-1087937579 .fill-AB5{fill:#F7F8FE;} + .d2-1087937579 .stroke-N1{stroke:#0A0F25;} + .d2-1087937579 .stroke-N2{stroke:#676C7E;} + .d2-1087937579 .stroke-N3{stroke:#9499AB;} + .d2-1087937579 .stroke-N4{stroke:#CFD2DD;} + .d2-1087937579 .stroke-N5{stroke:#DEE1EB;} + .d2-1087937579 .stroke-N6{stroke:#EEF1F8;} + .d2-1087937579 .stroke-N7{stroke:#FFFFFF;} + .d2-1087937579 .stroke-B1{stroke:#0D32B2;} + .d2-1087937579 .stroke-B2{stroke:#0D32B2;} + .d2-1087937579 .stroke-B3{stroke:#E3E9FD;} + .d2-1087937579 .stroke-B4{stroke:#E3E9FD;} + .d2-1087937579 .stroke-B5{stroke:#EDF0FD;} + .d2-1087937579 .stroke-B6{stroke:#F7F8FE;} + .d2-1087937579 .stroke-AA2{stroke:#4A6FF3;} + .d2-1087937579 .stroke-AA4{stroke:#EDF0FD;} + .d2-1087937579 .stroke-AA5{stroke:#F7F8FE;} + .d2-1087937579 .stroke-AB4{stroke:#EDF0FD;} + .d2-1087937579 .stroke-AB5{stroke:#F7F8FE;} + .d2-1087937579 .background-color-N1{background-color:#0A0F25;} + .d2-1087937579 .background-color-N2{background-color:#676C7E;} + .d2-1087937579 .background-color-N3{background-color:#9499AB;} + .d2-1087937579 .background-color-N4{background-color:#CFD2DD;} + .d2-1087937579 .background-color-N5{background-color:#DEE1EB;} + .d2-1087937579 .background-color-N6{background-color:#EEF1F8;} + .d2-1087937579 .background-color-N7{background-color:#FFFFFF;} + .d2-1087937579 .background-color-B1{background-color:#0D32B2;} + .d2-1087937579 .background-color-B2{background-color:#0D32B2;} + .d2-1087937579 .background-color-B3{background-color:#E3E9FD;} + .d2-1087937579 .background-color-B4{background-color:#E3E9FD;} + .d2-1087937579 .background-color-B5{background-color:#EDF0FD;} + .d2-1087937579 .background-color-B6{background-color:#F7F8FE;} + .d2-1087937579 .background-color-AA2{background-color:#4A6FF3;} + .d2-1087937579 .background-color-AA4{background-color:#EDF0FD;} + .d2-1087937579 .background-color-AA5{background-color:#F7F8FE;} + .d2-1087937579 .background-color-AB4{background-color:#EDF0FD;} + .d2-1087937579 .background-color-AB5{background-color:#F7F8FE;} + .d2-1087937579 .color-N1{color:#0A0F25;} + .d2-1087937579 .color-N2{color:#676C7E;} + .d2-1087937579 .color-N3{color:#9499AB;} + .d2-1087937579 .color-N4{color:#CFD2DD;} + .d2-1087937579 .color-N5{color:#DEE1EB;} + .d2-1087937579 .color-N6{color:#EEF1F8;} + .d2-1087937579 .color-N7{color:#FFFFFF;} + .d2-1087937579 .color-B1{color:#0D32B2;} + .d2-1087937579 .color-B2{color:#0D32B2;} + .d2-1087937579 .color-B3{color:#E3E9FD;} + .d2-1087937579 .color-B4{color:#E3E9FD;} + .d2-1087937579 .color-B5{color:#EDF0FD;} + .d2-1087937579 .color-B6{color:#F7F8FE;} + .d2-1087937579 .color-AA2{color:#4A6FF3;} + .d2-1087937579 .color-AA4{color:#EDF0FD;} + .d2-1087937579 .color-AA5{color:#F7F8FE;} + .d2-1087937579 .color-AB4{color:#EDF0FD;} + .d2-1087937579 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud 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 d09522ad1..8f2ac6d61 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1103047328 .fill-N1{fill:#0A0F25;} + .d2-1103047328 .fill-N2{fill:#676C7E;} + .d2-1103047328 .fill-N3{fill:#9499AB;} + .d2-1103047328 .fill-N4{fill:#CFD2DD;} + .d2-1103047328 .fill-N5{fill:#DEE1EB;} + .d2-1103047328 .fill-N6{fill:#EEF1F8;} + .d2-1103047328 .fill-N7{fill:#FFFFFF;} + .d2-1103047328 .fill-B1{fill:#0D32B2;} + .d2-1103047328 .fill-B2{fill:#0D32B2;} + .d2-1103047328 .fill-B3{fill:#E3E9FD;} + .d2-1103047328 .fill-B4{fill:#E3E9FD;} + .d2-1103047328 .fill-B5{fill:#EDF0FD;} + .d2-1103047328 .fill-B6{fill:#F7F8FE;} + .d2-1103047328 .fill-AA2{fill:#4A6FF3;} + .d2-1103047328 .fill-AA4{fill:#EDF0FD;} + .d2-1103047328 .fill-AA5{fill:#F7F8FE;} + .d2-1103047328 .fill-AB4{fill:#EDF0FD;} + .d2-1103047328 .fill-AB5{fill:#F7F8FE;} + .d2-1103047328 .stroke-N1{stroke:#0A0F25;} + .d2-1103047328 .stroke-N2{stroke:#676C7E;} + .d2-1103047328 .stroke-N3{stroke:#9499AB;} + .d2-1103047328 .stroke-N4{stroke:#CFD2DD;} + .d2-1103047328 .stroke-N5{stroke:#DEE1EB;} + .d2-1103047328 .stroke-N6{stroke:#EEF1F8;} + .d2-1103047328 .stroke-N7{stroke:#FFFFFF;} + .d2-1103047328 .stroke-B1{stroke:#0D32B2;} + .d2-1103047328 .stroke-B2{stroke:#0D32B2;} + .d2-1103047328 .stroke-B3{stroke:#E3E9FD;} + .d2-1103047328 .stroke-B4{stroke:#E3E9FD;} + .d2-1103047328 .stroke-B5{stroke:#EDF0FD;} + .d2-1103047328 .stroke-B6{stroke:#F7F8FE;} + .d2-1103047328 .stroke-AA2{stroke:#4A6FF3;} + .d2-1103047328 .stroke-AA4{stroke:#EDF0FD;} + .d2-1103047328 .stroke-AA5{stroke:#F7F8FE;} + .d2-1103047328 .stroke-AB4{stroke:#EDF0FD;} + .d2-1103047328 .stroke-AB5{stroke:#F7F8FE;} + .d2-1103047328 .background-color-N1{background-color:#0A0F25;} + .d2-1103047328 .background-color-N2{background-color:#676C7E;} + .d2-1103047328 .background-color-N3{background-color:#9499AB;} + .d2-1103047328 .background-color-N4{background-color:#CFD2DD;} + .d2-1103047328 .background-color-N5{background-color:#DEE1EB;} + .d2-1103047328 .background-color-N6{background-color:#EEF1F8;} + .d2-1103047328 .background-color-N7{background-color:#FFFFFF;} + .d2-1103047328 .background-color-B1{background-color:#0D32B2;} + .d2-1103047328 .background-color-B2{background-color:#0D32B2;} + .d2-1103047328 .background-color-B3{background-color:#E3E9FD;} + .d2-1103047328 .background-color-B4{background-color:#E3E9FD;} + .d2-1103047328 .background-color-B5{background-color:#EDF0FD;} + .d2-1103047328 .background-color-B6{background-color:#F7F8FE;} + .d2-1103047328 .background-color-AA2{background-color:#4A6FF3;} + .d2-1103047328 .background-color-AA4{background-color:#EDF0FD;} + .d2-1103047328 .background-color-AA5{background-color:#F7F8FE;} + .d2-1103047328 .background-color-AB4{background-color:#EDF0FD;} + .d2-1103047328 .background-color-AB5{background-color:#F7F8FE;} + .d2-1103047328 .color-N1{color:#0A0F25;} + .d2-1103047328 .color-N2{color:#676C7E;} + .d2-1103047328 .color-N3{color:#9499AB;} + .d2-1103047328 .color-N4{color:#CFD2DD;} + .d2-1103047328 .color-N5{color:#DEE1EB;} + .d2-1103047328 .color-N6{color:#EEF1F8;} + .d2-1103047328 .color-N7{color:#FFFFFF;} + .d2-1103047328 .color-B1{color:#0D32B2;} + .d2-1103047328 .color-B2{color:#0D32B2;} + .d2-1103047328 .color-B3{color:#E3E9FD;} + .d2-1103047328 .color-B4{color:#E3E9FD;} + .d2-1103047328 .color-B5{color:#EDF0FD;} + .d2-1103047328 .color-B6{color:#F7F8FE;} + .d2-1103047328 .color-AA2{color:#4A6FF3;} + .d2-1103047328 .color-AA4{color:#EDF0FD;} + .d2-1103047328 .color-AA5{color:#F7F8FE;} + .d2-1103047328 .color-AB4{color:#EDF0FD;} + .d2-1103047328 .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 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg index 25f1d4c99..562719faa 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1603504585 .fill-N1{fill:#0A0F25;} + .d2-1603504585 .fill-N2{fill:#676C7E;} + .d2-1603504585 .fill-N3{fill:#9499AB;} + .d2-1603504585 .fill-N4{fill:#CFD2DD;} + .d2-1603504585 .fill-N5{fill:#DEE1EB;} + .d2-1603504585 .fill-N6{fill:#EEF1F8;} + .d2-1603504585 .fill-N7{fill:#FFFFFF;} + .d2-1603504585 .fill-B1{fill:#0D32B2;} + .d2-1603504585 .fill-B2{fill:#0D32B2;} + .d2-1603504585 .fill-B3{fill:#E3E9FD;} + .d2-1603504585 .fill-B4{fill:#E3E9FD;} + .d2-1603504585 .fill-B5{fill:#EDF0FD;} + .d2-1603504585 .fill-B6{fill:#F7F8FE;} + .d2-1603504585 .fill-AA2{fill:#4A6FF3;} + .d2-1603504585 .fill-AA4{fill:#EDF0FD;} + .d2-1603504585 .fill-AA5{fill:#F7F8FE;} + .d2-1603504585 .fill-AB4{fill:#EDF0FD;} + .d2-1603504585 .fill-AB5{fill:#F7F8FE;} + .d2-1603504585 .stroke-N1{stroke:#0A0F25;} + .d2-1603504585 .stroke-N2{stroke:#676C7E;} + .d2-1603504585 .stroke-N3{stroke:#9499AB;} + .d2-1603504585 .stroke-N4{stroke:#CFD2DD;} + .d2-1603504585 .stroke-N5{stroke:#DEE1EB;} + .d2-1603504585 .stroke-N6{stroke:#EEF1F8;} + .d2-1603504585 .stroke-N7{stroke:#FFFFFF;} + .d2-1603504585 .stroke-B1{stroke:#0D32B2;} + .d2-1603504585 .stroke-B2{stroke:#0D32B2;} + .d2-1603504585 .stroke-B3{stroke:#E3E9FD;} + .d2-1603504585 .stroke-B4{stroke:#E3E9FD;} + .d2-1603504585 .stroke-B5{stroke:#EDF0FD;} + .d2-1603504585 .stroke-B6{stroke:#F7F8FE;} + .d2-1603504585 .stroke-AA2{stroke:#4A6FF3;} + .d2-1603504585 .stroke-AA4{stroke:#EDF0FD;} + .d2-1603504585 .stroke-AA5{stroke:#F7F8FE;} + .d2-1603504585 .stroke-AB4{stroke:#EDF0FD;} + .d2-1603504585 .stroke-AB5{stroke:#F7F8FE;} + .d2-1603504585 .background-color-N1{background-color:#0A0F25;} + .d2-1603504585 .background-color-N2{background-color:#676C7E;} + .d2-1603504585 .background-color-N3{background-color:#9499AB;} + .d2-1603504585 .background-color-N4{background-color:#CFD2DD;} + .d2-1603504585 .background-color-N5{background-color:#DEE1EB;} + .d2-1603504585 .background-color-N6{background-color:#EEF1F8;} + .d2-1603504585 .background-color-N7{background-color:#FFFFFF;} + .d2-1603504585 .background-color-B1{background-color:#0D32B2;} + .d2-1603504585 .background-color-B2{background-color:#0D32B2;} + .d2-1603504585 .background-color-B3{background-color:#E3E9FD;} + .d2-1603504585 .background-color-B4{background-color:#E3E9FD;} + .d2-1603504585 .background-color-B5{background-color:#EDF0FD;} + .d2-1603504585 .background-color-B6{background-color:#F7F8FE;} + .d2-1603504585 .background-color-AA2{background-color:#4A6FF3;} + .d2-1603504585 .background-color-AA4{background-color:#EDF0FD;} + .d2-1603504585 .background-color-AA5{background-color:#F7F8FE;} + .d2-1603504585 .background-color-AB4{background-color:#EDF0FD;} + .d2-1603504585 .background-color-AB5{background-color:#F7F8FE;} + .d2-1603504585 .color-N1{color:#0A0F25;} + .d2-1603504585 .color-N2{color:#676C7E;} + .d2-1603504585 .color-N3{color:#9499AB;} + .d2-1603504585 .color-N4{color:#CFD2DD;} + .d2-1603504585 .color-N5{color:#DEE1EB;} + .d2-1603504585 .color-N6{color:#EEF1F8;} + .d2-1603504585 .color-N7{color:#FFFFFF;} + .d2-1603504585 .color-B1{color:#0D32B2;} + .d2-1603504585 .color-B2{color:#0D32B2;} + .d2-1603504585 .color-B3{color:#E3E9FD;} + .d2-1603504585 .color-B4{color:#E3E9FD;} + .d2-1603504585 .color-B5{color:#EDF0FD;} + .d2-1603504585 .color-B6{color:#F7F8FE;} + .d2-1603504585 .color-AA2{color:#4A6FF3;} + .d2-1603504585 .color-AA4{color:#EDF0FD;} + .d2-1603504585 .color-AA5{color:#F7F8FE;} + .d2-1603504585 .color-AB4{color:#EDF0FD;} + .d2-1603504585 .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 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/animated/dagre/sketch.exp.svg index a66043af7..162a308a3 100644 --- a/e2etests/testdata/stable/animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/animated/dagre/sketch.exp.svg @@ -1,22 +1,22 @@ -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear + .d2-3267239171 .fill-N1{fill:#0A0F25;} + .d2-3267239171 .fill-N2{fill:#676C7E;} + .d2-3267239171 .fill-N3{fill:#9499AB;} + .d2-3267239171 .fill-N4{fill:#CFD2DD;} + .d2-3267239171 .fill-N5{fill:#DEE1EB;} + .d2-3267239171 .fill-N6{fill:#EEF1F8;} + .d2-3267239171 .fill-N7{fill:#FFFFFF;} + .d2-3267239171 .fill-B1{fill:#0D32B2;} + .d2-3267239171 .fill-B2{fill:#0D32B2;} + .d2-3267239171 .fill-B3{fill:#E3E9FD;} + .d2-3267239171 .fill-B4{fill:#E3E9FD;} + .d2-3267239171 .fill-B5{fill:#EDF0FD;} + .d2-3267239171 .fill-B6{fill:#F7F8FE;} + .d2-3267239171 .fill-AA2{fill:#4A6FF3;} + .d2-3267239171 .fill-AA4{fill:#EDF0FD;} + .d2-3267239171 .fill-AA5{fill:#F7F8FE;} + .d2-3267239171 .fill-AB4{fill:#EDF0FD;} + .d2-3267239171 .fill-AB5{fill:#F7F8FE;} + .d2-3267239171 .stroke-N1{stroke:#0A0F25;} + .d2-3267239171 .stroke-N2{stroke:#676C7E;} + .d2-3267239171 .stroke-N3{stroke:#9499AB;} + .d2-3267239171 .stroke-N4{stroke:#CFD2DD;} + .d2-3267239171 .stroke-N5{stroke:#DEE1EB;} + .d2-3267239171 .stroke-N6{stroke:#EEF1F8;} + .d2-3267239171 .stroke-N7{stroke:#FFFFFF;} + .d2-3267239171 .stroke-B1{stroke:#0D32B2;} + .d2-3267239171 .stroke-B2{stroke:#0D32B2;} + .d2-3267239171 .stroke-B3{stroke:#E3E9FD;} + .d2-3267239171 .stroke-B4{stroke:#E3E9FD;} + .d2-3267239171 .stroke-B5{stroke:#EDF0FD;} + .d2-3267239171 .stroke-B6{stroke:#F7F8FE;} + .d2-3267239171 .stroke-AA2{stroke:#4A6FF3;} + .d2-3267239171 .stroke-AA4{stroke:#EDF0FD;} + .d2-3267239171 .stroke-AA5{stroke:#F7F8FE;} + .d2-3267239171 .stroke-AB4{stroke:#EDF0FD;} + .d2-3267239171 .stroke-AB5{stroke:#F7F8FE;} + .d2-3267239171 .background-color-N1{background-color:#0A0F25;} + .d2-3267239171 .background-color-N2{background-color:#676C7E;} + .d2-3267239171 .background-color-N3{background-color:#9499AB;} + .d2-3267239171 .background-color-N4{background-color:#CFD2DD;} + .d2-3267239171 .background-color-N5{background-color:#DEE1EB;} + .d2-3267239171 .background-color-N6{background-color:#EEF1F8;} + .d2-3267239171 .background-color-N7{background-color:#FFFFFF;} + .d2-3267239171 .background-color-B1{background-color:#0D32B2;} + .d2-3267239171 .background-color-B2{background-color:#0D32B2;} + .d2-3267239171 .background-color-B3{background-color:#E3E9FD;} + .d2-3267239171 .background-color-B4{background-color:#E3E9FD;} + .d2-3267239171 .background-color-B5{background-color:#EDF0FD;} + .d2-3267239171 .background-color-B6{background-color:#F7F8FE;} + .d2-3267239171 .background-color-AA2{background-color:#4A6FF3;} + .d2-3267239171 .background-color-AA4{background-color:#EDF0FD;} + .d2-3267239171 .background-color-AA5{background-color:#F7F8FE;} + .d2-3267239171 .background-color-AB4{background-color:#EDF0FD;} + .d2-3267239171 .background-color-AB5{background-color:#F7F8FE;} + .d2-3267239171 .color-N1{color:#0A0F25;} + .d2-3267239171 .color-N2{color:#676C7E;} + .d2-3267239171 .color-N3{color:#9499AB;} + .d2-3267239171 .color-N4{color:#CFD2DD;} + .d2-3267239171 .color-N5{color:#DEE1EB;} + .d2-3267239171 .color-N6{color:#EEF1F8;} + .d2-3267239171 .color-N7{color:#FFFFFF;} + .d2-3267239171 .color-B1{color:#0D32B2;} + .d2-3267239171 .color-B2{color:#0D32B2;} + .d2-3267239171 .color-B3{color:#E3E9FD;} + .d2-3267239171 .color-B4{color:#E3E9FD;} + .d2-3267239171 .color-B5{color:#EDF0FD;} + .d2-3267239171 .color-B6{color:#F7F8FE;} + .d2-3267239171 .color-AA2{color:#4A6FF3;} + .d2-3267239171 .color-AA4{color:#EDF0FD;} + .d2-3267239171 .color-AA5{color:#F7F8FE;} + .d2-3267239171 .color-AB4{color:#EDF0FD;} + .d2-3267239171 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear diff --git a/e2etests/testdata/stable/animated/elk/sketch.exp.svg b/e2etests/testdata/stable/animated/elk/sketch.exp.svg index e28b5aabe..a500d3233 100644 --- a/e2etests/testdata/stable/animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/animated/elk/sketch.exp.svg @@ -1,22 +1,22 @@ -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear + .d2-838869033 .fill-N1{fill:#0A0F25;} + .d2-838869033 .fill-N2{fill:#676C7E;} + .d2-838869033 .fill-N3{fill:#9499AB;} + .d2-838869033 .fill-N4{fill:#CFD2DD;} + .d2-838869033 .fill-N5{fill:#DEE1EB;} + .d2-838869033 .fill-N6{fill:#EEF1F8;} + .d2-838869033 .fill-N7{fill:#FFFFFF;} + .d2-838869033 .fill-B1{fill:#0D32B2;} + .d2-838869033 .fill-B2{fill:#0D32B2;} + .d2-838869033 .fill-B3{fill:#E3E9FD;} + .d2-838869033 .fill-B4{fill:#E3E9FD;} + .d2-838869033 .fill-B5{fill:#EDF0FD;} + .d2-838869033 .fill-B6{fill:#F7F8FE;} + .d2-838869033 .fill-AA2{fill:#4A6FF3;} + .d2-838869033 .fill-AA4{fill:#EDF0FD;} + .d2-838869033 .fill-AA5{fill:#F7F8FE;} + .d2-838869033 .fill-AB4{fill:#EDF0FD;} + .d2-838869033 .fill-AB5{fill:#F7F8FE;} + .d2-838869033 .stroke-N1{stroke:#0A0F25;} + .d2-838869033 .stroke-N2{stroke:#676C7E;} + .d2-838869033 .stroke-N3{stroke:#9499AB;} + .d2-838869033 .stroke-N4{stroke:#CFD2DD;} + .d2-838869033 .stroke-N5{stroke:#DEE1EB;} + .d2-838869033 .stroke-N6{stroke:#EEF1F8;} + .d2-838869033 .stroke-N7{stroke:#FFFFFF;} + .d2-838869033 .stroke-B1{stroke:#0D32B2;} + .d2-838869033 .stroke-B2{stroke:#0D32B2;} + .d2-838869033 .stroke-B3{stroke:#E3E9FD;} + .d2-838869033 .stroke-B4{stroke:#E3E9FD;} + .d2-838869033 .stroke-B5{stroke:#EDF0FD;} + .d2-838869033 .stroke-B6{stroke:#F7F8FE;} + .d2-838869033 .stroke-AA2{stroke:#4A6FF3;} + .d2-838869033 .stroke-AA4{stroke:#EDF0FD;} + .d2-838869033 .stroke-AA5{stroke:#F7F8FE;} + .d2-838869033 .stroke-AB4{stroke:#EDF0FD;} + .d2-838869033 .stroke-AB5{stroke:#F7F8FE;} + .d2-838869033 .background-color-N1{background-color:#0A0F25;} + .d2-838869033 .background-color-N2{background-color:#676C7E;} + .d2-838869033 .background-color-N3{background-color:#9499AB;} + .d2-838869033 .background-color-N4{background-color:#CFD2DD;} + .d2-838869033 .background-color-N5{background-color:#DEE1EB;} + .d2-838869033 .background-color-N6{background-color:#EEF1F8;} + .d2-838869033 .background-color-N7{background-color:#FFFFFF;} + .d2-838869033 .background-color-B1{background-color:#0D32B2;} + .d2-838869033 .background-color-B2{background-color:#0D32B2;} + .d2-838869033 .background-color-B3{background-color:#E3E9FD;} + .d2-838869033 .background-color-B4{background-color:#E3E9FD;} + .d2-838869033 .background-color-B5{background-color:#EDF0FD;} + .d2-838869033 .background-color-B6{background-color:#F7F8FE;} + .d2-838869033 .background-color-AA2{background-color:#4A6FF3;} + .d2-838869033 .background-color-AA4{background-color:#EDF0FD;} + .d2-838869033 .background-color-AA5{background-color:#F7F8FE;} + .d2-838869033 .background-color-AB4{background-color:#EDF0FD;} + .d2-838869033 .background-color-AB5{background-color:#F7F8FE;} + .d2-838869033 .color-N1{color:#0A0F25;} + .d2-838869033 .color-N2{color:#676C7E;} + .d2-838869033 .color-N3{color:#9499AB;} + .d2-838869033 .color-N4{color:#CFD2DD;} + .d2-838869033 .color-N5{color:#DEE1EB;} + .d2-838869033 .color-N6{color:#EEF1F8;} + .d2-838869033 .color-N7{color:#FFFFFF;} + .d2-838869033 .color-B1{color:#0D32B2;} + .d2-838869033 .color-B2{color:#0D32B2;} + .d2-838869033 .color-B3{color:#E3E9FD;} + .d2-838869033 .color-B4{color:#E3E9FD;} + .d2-838869033 .color-B5{color:#EDF0FD;} + .d2-838869033 .color-B6{color:#F7F8FE;} + .d2-838869033 .color-AA2{color:#4A6FF3;} + .d2-838869033 .color-AA4{color:#EDF0FD;} + .d2-838869033 .color-AA5{color:#F7F8FE;} + .d2-838869033 .color-AB4{color:#EDF0FD;} + .d2-838869033 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear diff --git a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg index 6ebc589d3..940d1b783 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-4042267253 .fill-N1{fill:#0A0F25;} + .d2-4042267253 .fill-N2{fill:#676C7E;} + .d2-4042267253 .fill-N3{fill:#9499AB;} + .d2-4042267253 .fill-N4{fill:#CFD2DD;} + .d2-4042267253 .fill-N5{fill:#DEE1EB;} + .d2-4042267253 .fill-N6{fill:#EEF1F8;} + .d2-4042267253 .fill-N7{fill:#FFFFFF;} + .d2-4042267253 .fill-B1{fill:#0D32B2;} + .d2-4042267253 .fill-B2{fill:#0D32B2;} + .d2-4042267253 .fill-B3{fill:#E3E9FD;} + .d2-4042267253 .fill-B4{fill:#E3E9FD;} + .d2-4042267253 .fill-B5{fill:#EDF0FD;} + .d2-4042267253 .fill-B6{fill:#F7F8FE;} + .d2-4042267253 .fill-AA2{fill:#4A6FF3;} + .d2-4042267253 .fill-AA4{fill:#EDF0FD;} + .d2-4042267253 .fill-AA5{fill:#F7F8FE;} + .d2-4042267253 .fill-AB4{fill:#EDF0FD;} + .d2-4042267253 .fill-AB5{fill:#F7F8FE;} + .d2-4042267253 .stroke-N1{stroke:#0A0F25;} + .d2-4042267253 .stroke-N2{stroke:#676C7E;} + .d2-4042267253 .stroke-N3{stroke:#9499AB;} + .d2-4042267253 .stroke-N4{stroke:#CFD2DD;} + .d2-4042267253 .stroke-N5{stroke:#DEE1EB;} + .d2-4042267253 .stroke-N6{stroke:#EEF1F8;} + .d2-4042267253 .stroke-N7{stroke:#FFFFFF;} + .d2-4042267253 .stroke-B1{stroke:#0D32B2;} + .d2-4042267253 .stroke-B2{stroke:#0D32B2;} + .d2-4042267253 .stroke-B3{stroke:#E3E9FD;} + .d2-4042267253 .stroke-B4{stroke:#E3E9FD;} + .d2-4042267253 .stroke-B5{stroke:#EDF0FD;} + .d2-4042267253 .stroke-B6{stroke:#F7F8FE;} + .d2-4042267253 .stroke-AA2{stroke:#4A6FF3;} + .d2-4042267253 .stroke-AA4{stroke:#EDF0FD;} + .d2-4042267253 .stroke-AA5{stroke:#F7F8FE;} + .d2-4042267253 .stroke-AB4{stroke:#EDF0FD;} + .d2-4042267253 .stroke-AB5{stroke:#F7F8FE;} + .d2-4042267253 .background-color-N1{background-color:#0A0F25;} + .d2-4042267253 .background-color-N2{background-color:#676C7E;} + .d2-4042267253 .background-color-N3{background-color:#9499AB;} + .d2-4042267253 .background-color-N4{background-color:#CFD2DD;} + .d2-4042267253 .background-color-N5{background-color:#DEE1EB;} + .d2-4042267253 .background-color-N6{background-color:#EEF1F8;} + .d2-4042267253 .background-color-N7{background-color:#FFFFFF;} + .d2-4042267253 .background-color-B1{background-color:#0D32B2;} + .d2-4042267253 .background-color-B2{background-color:#0D32B2;} + .d2-4042267253 .background-color-B3{background-color:#E3E9FD;} + .d2-4042267253 .background-color-B4{background-color:#E3E9FD;} + .d2-4042267253 .background-color-B5{background-color:#EDF0FD;} + .d2-4042267253 .background-color-B6{background-color:#F7F8FE;} + .d2-4042267253 .background-color-AA2{background-color:#4A6FF3;} + .d2-4042267253 .background-color-AA4{background-color:#EDF0FD;} + .d2-4042267253 .background-color-AA5{background-color:#F7F8FE;} + .d2-4042267253 .background-color-AB4{background-color:#EDF0FD;} + .d2-4042267253 .background-color-AB5{background-color:#F7F8FE;} + .d2-4042267253 .color-N1{color:#0A0F25;} + .d2-4042267253 .color-N2{color:#676C7E;} + .d2-4042267253 .color-N3{color:#9499AB;} + .d2-4042267253 .color-N4{color:#CFD2DD;} + .d2-4042267253 .color-N5{color:#DEE1EB;} + .d2-4042267253 .color-N6{color:#EEF1F8;} + .d2-4042267253 .color-N7{color:#FFFFFF;} + .d2-4042267253 .color-B1{color:#0D32B2;} + .d2-4042267253 .color-B2{color:#0D32B2;} + .d2-4042267253 .color-B3{color:#E3E9FD;} + .d2-4042267253 .color-B4{color:#E3E9FD;} + .d2-4042267253 .color-B5{color:#EDF0FD;} + .d2-4042267253 .color-B6{color:#F7F8FE;} + .d2-4042267253 .color-AA2{color:#4A6FF3;} + .d2-4042267253 .color-AA4{color:#EDF0FD;} + .d2-4042267253 .color-AA5{color:#F7F8FE;} + .d2-4042267253 .color-AB4{color:#EDF0FD;} + .d2-4042267253 .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 diff --git a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg index 960eb1656..c5b203b14 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-3383360239 .fill-N1{fill:#0A0F25;} + .d2-3383360239 .fill-N2{fill:#676C7E;} + .d2-3383360239 .fill-N3{fill:#9499AB;} + .d2-3383360239 .fill-N4{fill:#CFD2DD;} + .d2-3383360239 .fill-N5{fill:#DEE1EB;} + .d2-3383360239 .fill-N6{fill:#EEF1F8;} + .d2-3383360239 .fill-N7{fill:#FFFFFF;} + .d2-3383360239 .fill-B1{fill:#0D32B2;} + .d2-3383360239 .fill-B2{fill:#0D32B2;} + .d2-3383360239 .fill-B3{fill:#E3E9FD;} + .d2-3383360239 .fill-B4{fill:#E3E9FD;} + .d2-3383360239 .fill-B5{fill:#EDF0FD;} + .d2-3383360239 .fill-B6{fill:#F7F8FE;} + .d2-3383360239 .fill-AA2{fill:#4A6FF3;} + .d2-3383360239 .fill-AA4{fill:#EDF0FD;} + .d2-3383360239 .fill-AA5{fill:#F7F8FE;} + .d2-3383360239 .fill-AB4{fill:#EDF0FD;} + .d2-3383360239 .fill-AB5{fill:#F7F8FE;} + .d2-3383360239 .stroke-N1{stroke:#0A0F25;} + .d2-3383360239 .stroke-N2{stroke:#676C7E;} + .d2-3383360239 .stroke-N3{stroke:#9499AB;} + .d2-3383360239 .stroke-N4{stroke:#CFD2DD;} + .d2-3383360239 .stroke-N5{stroke:#DEE1EB;} + .d2-3383360239 .stroke-N6{stroke:#EEF1F8;} + .d2-3383360239 .stroke-N7{stroke:#FFFFFF;} + .d2-3383360239 .stroke-B1{stroke:#0D32B2;} + .d2-3383360239 .stroke-B2{stroke:#0D32B2;} + .d2-3383360239 .stroke-B3{stroke:#E3E9FD;} + .d2-3383360239 .stroke-B4{stroke:#E3E9FD;} + .d2-3383360239 .stroke-B5{stroke:#EDF0FD;} + .d2-3383360239 .stroke-B6{stroke:#F7F8FE;} + .d2-3383360239 .stroke-AA2{stroke:#4A6FF3;} + .d2-3383360239 .stroke-AA4{stroke:#EDF0FD;} + .d2-3383360239 .stroke-AA5{stroke:#F7F8FE;} + .d2-3383360239 .stroke-AB4{stroke:#EDF0FD;} + .d2-3383360239 .stroke-AB5{stroke:#F7F8FE;} + .d2-3383360239 .background-color-N1{background-color:#0A0F25;} + .d2-3383360239 .background-color-N2{background-color:#676C7E;} + .d2-3383360239 .background-color-N3{background-color:#9499AB;} + .d2-3383360239 .background-color-N4{background-color:#CFD2DD;} + .d2-3383360239 .background-color-N5{background-color:#DEE1EB;} + .d2-3383360239 .background-color-N6{background-color:#EEF1F8;} + .d2-3383360239 .background-color-N7{background-color:#FFFFFF;} + .d2-3383360239 .background-color-B1{background-color:#0D32B2;} + .d2-3383360239 .background-color-B2{background-color:#0D32B2;} + .d2-3383360239 .background-color-B3{background-color:#E3E9FD;} + .d2-3383360239 .background-color-B4{background-color:#E3E9FD;} + .d2-3383360239 .background-color-B5{background-color:#EDF0FD;} + .d2-3383360239 .background-color-B6{background-color:#F7F8FE;} + .d2-3383360239 .background-color-AA2{background-color:#4A6FF3;} + .d2-3383360239 .background-color-AA4{background-color:#EDF0FD;} + .d2-3383360239 .background-color-AA5{background-color:#F7F8FE;} + .d2-3383360239 .background-color-AB4{background-color:#EDF0FD;} + .d2-3383360239 .background-color-AB5{background-color:#F7F8FE;} + .d2-3383360239 .color-N1{color:#0A0F25;} + .d2-3383360239 .color-N2{color:#676C7E;} + .d2-3383360239 .color-N3{color:#9499AB;} + .d2-3383360239 .color-N4{color:#CFD2DD;} + .d2-3383360239 .color-N5{color:#DEE1EB;} + .d2-3383360239 .color-N6{color:#EEF1F8;} + .d2-3383360239 .color-N7{color:#FFFFFF;} + .d2-3383360239 .color-B1{color:#0D32B2;} + .d2-3383360239 .color-B2{color:#0D32B2;} + .d2-3383360239 .color-B3{color:#E3E9FD;} + .d2-3383360239 .color-B4{color:#E3E9FD;} + .d2-3383360239 .color-B5{color:#EDF0FD;} + .d2-3383360239 .color-B6{color:#F7F8FE;} + .d2-3383360239 .color-AA2{color:#4A6FF3;} + .d2-3383360239 .color-AA4{color:#EDF0FD;} + .d2-3383360239 .color-AA5{color:#F7F8FE;} + .d2-3383360239 .color-AB4{color:#EDF0FD;} + .d2-3383360239 .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 diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg index ab3f41981..f4ef4e9c2 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abc * + .d2-840500156 .fill-N1{fill:#0A0F25;} + .d2-840500156 .fill-N2{fill:#676C7E;} + .d2-840500156 .fill-N3{fill:#9499AB;} + .d2-840500156 .fill-N4{fill:#CFD2DD;} + .d2-840500156 .fill-N5{fill:#DEE1EB;} + .d2-840500156 .fill-N6{fill:#EEF1F8;} + .d2-840500156 .fill-N7{fill:#FFFFFF;} + .d2-840500156 .fill-B1{fill:#0D32B2;} + .d2-840500156 .fill-B2{fill:#0D32B2;} + .d2-840500156 .fill-B3{fill:#E3E9FD;} + .d2-840500156 .fill-B4{fill:#E3E9FD;} + .d2-840500156 .fill-B5{fill:#EDF0FD;} + .d2-840500156 .fill-B6{fill:#F7F8FE;} + .d2-840500156 .fill-AA2{fill:#4A6FF3;} + .d2-840500156 .fill-AA4{fill:#EDF0FD;} + .d2-840500156 .fill-AA5{fill:#F7F8FE;} + .d2-840500156 .fill-AB4{fill:#EDF0FD;} + .d2-840500156 .fill-AB5{fill:#F7F8FE;} + .d2-840500156 .stroke-N1{stroke:#0A0F25;} + .d2-840500156 .stroke-N2{stroke:#676C7E;} + .d2-840500156 .stroke-N3{stroke:#9499AB;} + .d2-840500156 .stroke-N4{stroke:#CFD2DD;} + .d2-840500156 .stroke-N5{stroke:#DEE1EB;} + .d2-840500156 .stroke-N6{stroke:#EEF1F8;} + .d2-840500156 .stroke-N7{stroke:#FFFFFF;} + .d2-840500156 .stroke-B1{stroke:#0D32B2;} + .d2-840500156 .stroke-B2{stroke:#0D32B2;} + .d2-840500156 .stroke-B3{stroke:#E3E9FD;} + .d2-840500156 .stroke-B4{stroke:#E3E9FD;} + .d2-840500156 .stroke-B5{stroke:#EDF0FD;} + .d2-840500156 .stroke-B6{stroke:#F7F8FE;} + .d2-840500156 .stroke-AA2{stroke:#4A6FF3;} + .d2-840500156 .stroke-AA4{stroke:#EDF0FD;} + .d2-840500156 .stroke-AA5{stroke:#F7F8FE;} + .d2-840500156 .stroke-AB4{stroke:#EDF0FD;} + .d2-840500156 .stroke-AB5{stroke:#F7F8FE;} + .d2-840500156 .background-color-N1{background-color:#0A0F25;} + .d2-840500156 .background-color-N2{background-color:#676C7E;} + .d2-840500156 .background-color-N3{background-color:#9499AB;} + .d2-840500156 .background-color-N4{background-color:#CFD2DD;} + .d2-840500156 .background-color-N5{background-color:#DEE1EB;} + .d2-840500156 .background-color-N6{background-color:#EEF1F8;} + .d2-840500156 .background-color-N7{background-color:#FFFFFF;} + .d2-840500156 .background-color-B1{background-color:#0D32B2;} + .d2-840500156 .background-color-B2{background-color:#0D32B2;} + .d2-840500156 .background-color-B3{background-color:#E3E9FD;} + .d2-840500156 .background-color-B4{background-color:#E3E9FD;} + .d2-840500156 .background-color-B5{background-color:#EDF0FD;} + .d2-840500156 .background-color-B6{background-color:#F7F8FE;} + .d2-840500156 .background-color-AA2{background-color:#4A6FF3;} + .d2-840500156 .background-color-AA4{background-color:#EDF0FD;} + .d2-840500156 .background-color-AA5{background-color:#F7F8FE;} + .d2-840500156 .background-color-AB4{background-color:#EDF0FD;} + .d2-840500156 .background-color-AB5{background-color:#F7F8FE;} + .d2-840500156 .color-N1{color:#0A0F25;} + .d2-840500156 .color-N2{color:#676C7E;} + .d2-840500156 .color-N3{color:#9499AB;} + .d2-840500156 .color-N4{color:#CFD2DD;} + .d2-840500156 .color-N5{color:#DEE1EB;} + .d2-840500156 .color-N6{color:#EEF1F8;} + .d2-840500156 .color-N7{color:#FFFFFF;} + .d2-840500156 .color-B1{color:#0D32B2;} + .d2-840500156 .color-B2{color:#0D32B2;} + .d2-840500156 .color-B3{color:#E3E9FD;} + .d2-840500156 .color-B4{color:#E3E9FD;} + .d2-840500156 .color-B5{color:#EDF0FD;} + .d2-840500156 .color-B6{color:#F7F8FE;} + .d2-840500156 .color-AA2{color:#4A6FF3;} + .d2-840500156 .color-AA4{color:#EDF0FD;} + .d2-840500156 .color-AA5{color:#F7F8FE;} + .d2-840500156 .color-AB4{color:#EDF0FD;} + .d2-840500156 .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}]]>abc * diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg index ef4b1c7da..2f77018bd 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abc * + .d2-490476208 .fill-N1{fill:#0A0F25;} + .d2-490476208 .fill-N2{fill:#676C7E;} + .d2-490476208 .fill-N3{fill:#9499AB;} + .d2-490476208 .fill-N4{fill:#CFD2DD;} + .d2-490476208 .fill-N5{fill:#DEE1EB;} + .d2-490476208 .fill-N6{fill:#EEF1F8;} + .d2-490476208 .fill-N7{fill:#FFFFFF;} + .d2-490476208 .fill-B1{fill:#0D32B2;} + .d2-490476208 .fill-B2{fill:#0D32B2;} + .d2-490476208 .fill-B3{fill:#E3E9FD;} + .d2-490476208 .fill-B4{fill:#E3E9FD;} + .d2-490476208 .fill-B5{fill:#EDF0FD;} + .d2-490476208 .fill-B6{fill:#F7F8FE;} + .d2-490476208 .fill-AA2{fill:#4A6FF3;} + .d2-490476208 .fill-AA4{fill:#EDF0FD;} + .d2-490476208 .fill-AA5{fill:#F7F8FE;} + .d2-490476208 .fill-AB4{fill:#EDF0FD;} + .d2-490476208 .fill-AB5{fill:#F7F8FE;} + .d2-490476208 .stroke-N1{stroke:#0A0F25;} + .d2-490476208 .stroke-N2{stroke:#676C7E;} + .d2-490476208 .stroke-N3{stroke:#9499AB;} + .d2-490476208 .stroke-N4{stroke:#CFD2DD;} + .d2-490476208 .stroke-N5{stroke:#DEE1EB;} + .d2-490476208 .stroke-N6{stroke:#EEF1F8;} + .d2-490476208 .stroke-N7{stroke:#FFFFFF;} + .d2-490476208 .stroke-B1{stroke:#0D32B2;} + .d2-490476208 .stroke-B2{stroke:#0D32B2;} + .d2-490476208 .stroke-B3{stroke:#E3E9FD;} + .d2-490476208 .stroke-B4{stroke:#E3E9FD;} + .d2-490476208 .stroke-B5{stroke:#EDF0FD;} + .d2-490476208 .stroke-B6{stroke:#F7F8FE;} + .d2-490476208 .stroke-AA2{stroke:#4A6FF3;} + .d2-490476208 .stroke-AA4{stroke:#EDF0FD;} + .d2-490476208 .stroke-AA5{stroke:#F7F8FE;} + .d2-490476208 .stroke-AB4{stroke:#EDF0FD;} + .d2-490476208 .stroke-AB5{stroke:#F7F8FE;} + .d2-490476208 .background-color-N1{background-color:#0A0F25;} + .d2-490476208 .background-color-N2{background-color:#676C7E;} + .d2-490476208 .background-color-N3{background-color:#9499AB;} + .d2-490476208 .background-color-N4{background-color:#CFD2DD;} + .d2-490476208 .background-color-N5{background-color:#DEE1EB;} + .d2-490476208 .background-color-N6{background-color:#EEF1F8;} + .d2-490476208 .background-color-N7{background-color:#FFFFFF;} + .d2-490476208 .background-color-B1{background-color:#0D32B2;} + .d2-490476208 .background-color-B2{background-color:#0D32B2;} + .d2-490476208 .background-color-B3{background-color:#E3E9FD;} + .d2-490476208 .background-color-B4{background-color:#E3E9FD;} + .d2-490476208 .background-color-B5{background-color:#EDF0FD;} + .d2-490476208 .background-color-B6{background-color:#F7F8FE;} + .d2-490476208 .background-color-AA2{background-color:#4A6FF3;} + .d2-490476208 .background-color-AA4{background-color:#EDF0FD;} + .d2-490476208 .background-color-AA5{background-color:#F7F8FE;} + .d2-490476208 .background-color-AB4{background-color:#EDF0FD;} + .d2-490476208 .background-color-AB5{background-color:#F7F8FE;} + .d2-490476208 .color-N1{color:#0A0F25;} + .d2-490476208 .color-N2{color:#676C7E;} + .d2-490476208 .color-N3{color:#9499AB;} + .d2-490476208 .color-N4{color:#CFD2DD;} + .d2-490476208 .color-N5{color:#DEE1EB;} + .d2-490476208 .color-N6{color:#EEF1F8;} + .d2-490476208 .color-N7{color:#FFFFFF;} + .d2-490476208 .color-B1{color:#0D32B2;} + .d2-490476208 .color-B2{color:#0D32B2;} + .d2-490476208 .color-B3{color:#E3E9FD;} + .d2-490476208 .color-B4{color:#E3E9FD;} + .d2-490476208 .color-B5{color:#EDF0FD;} + .d2-490476208 .color-B6{color:#F7F8FE;} + .d2-490476208 .color-AA2{color:#4A6FF3;} + .d2-490476208 .color-AA4{color:#EDF0FD;} + .d2-490476208 .color-AA5{color:#F7F8FE;} + .d2-490476208 .color-AB4{color:#EDF0FD;} + .d2-490476208 .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}]]>abc * diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg index 1788acb18..f7cc8b0bb 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab To err is human, to moo bovine1* + .d2-2318670067 .fill-N1{fill:#0A0F25;} + .d2-2318670067 .fill-N2{fill:#676C7E;} + .d2-2318670067 .fill-N3{fill:#9499AB;} + .d2-2318670067 .fill-N4{fill:#CFD2DD;} + .d2-2318670067 .fill-N5{fill:#DEE1EB;} + .d2-2318670067 .fill-N6{fill:#EEF1F8;} + .d2-2318670067 .fill-N7{fill:#FFFFFF;} + .d2-2318670067 .fill-B1{fill:#0D32B2;} + .d2-2318670067 .fill-B2{fill:#0D32B2;} + .d2-2318670067 .fill-B3{fill:#E3E9FD;} + .d2-2318670067 .fill-B4{fill:#E3E9FD;} + .d2-2318670067 .fill-B5{fill:#EDF0FD;} + .d2-2318670067 .fill-B6{fill:#F7F8FE;} + .d2-2318670067 .fill-AA2{fill:#4A6FF3;} + .d2-2318670067 .fill-AA4{fill:#EDF0FD;} + .d2-2318670067 .fill-AA5{fill:#F7F8FE;} + .d2-2318670067 .fill-AB4{fill:#EDF0FD;} + .d2-2318670067 .fill-AB5{fill:#F7F8FE;} + .d2-2318670067 .stroke-N1{stroke:#0A0F25;} + .d2-2318670067 .stroke-N2{stroke:#676C7E;} + .d2-2318670067 .stroke-N3{stroke:#9499AB;} + .d2-2318670067 .stroke-N4{stroke:#CFD2DD;} + .d2-2318670067 .stroke-N5{stroke:#DEE1EB;} + .d2-2318670067 .stroke-N6{stroke:#EEF1F8;} + .d2-2318670067 .stroke-N7{stroke:#FFFFFF;} + .d2-2318670067 .stroke-B1{stroke:#0D32B2;} + .d2-2318670067 .stroke-B2{stroke:#0D32B2;} + .d2-2318670067 .stroke-B3{stroke:#E3E9FD;} + .d2-2318670067 .stroke-B4{stroke:#E3E9FD;} + .d2-2318670067 .stroke-B5{stroke:#EDF0FD;} + .d2-2318670067 .stroke-B6{stroke:#F7F8FE;} + .d2-2318670067 .stroke-AA2{stroke:#4A6FF3;} + .d2-2318670067 .stroke-AA4{stroke:#EDF0FD;} + .d2-2318670067 .stroke-AA5{stroke:#F7F8FE;} + .d2-2318670067 .stroke-AB4{stroke:#EDF0FD;} + .d2-2318670067 .stroke-AB5{stroke:#F7F8FE;} + .d2-2318670067 .background-color-N1{background-color:#0A0F25;} + .d2-2318670067 .background-color-N2{background-color:#676C7E;} + .d2-2318670067 .background-color-N3{background-color:#9499AB;} + .d2-2318670067 .background-color-N4{background-color:#CFD2DD;} + .d2-2318670067 .background-color-N5{background-color:#DEE1EB;} + .d2-2318670067 .background-color-N6{background-color:#EEF1F8;} + .d2-2318670067 .background-color-N7{background-color:#FFFFFF;} + .d2-2318670067 .background-color-B1{background-color:#0D32B2;} + .d2-2318670067 .background-color-B2{background-color:#0D32B2;} + .d2-2318670067 .background-color-B3{background-color:#E3E9FD;} + .d2-2318670067 .background-color-B4{background-color:#E3E9FD;} + .d2-2318670067 .background-color-B5{background-color:#EDF0FD;} + .d2-2318670067 .background-color-B6{background-color:#F7F8FE;} + .d2-2318670067 .background-color-AA2{background-color:#4A6FF3;} + .d2-2318670067 .background-color-AA4{background-color:#EDF0FD;} + .d2-2318670067 .background-color-AA5{background-color:#F7F8FE;} + .d2-2318670067 .background-color-AB4{background-color:#EDF0FD;} + .d2-2318670067 .background-color-AB5{background-color:#F7F8FE;} + .d2-2318670067 .color-N1{color:#0A0F25;} + .d2-2318670067 .color-N2{color:#676C7E;} + .d2-2318670067 .color-N3{color:#9499AB;} + .d2-2318670067 .color-N4{color:#CFD2DD;} + .d2-2318670067 .color-N5{color:#DEE1EB;} + .d2-2318670067 .color-N6{color:#EEF1F8;} + .d2-2318670067 .color-N7{color:#FFFFFF;} + .d2-2318670067 .color-B1{color:#0D32B2;} + .d2-2318670067 .color-B2{color:#0D32B2;} + .d2-2318670067 .color-B3{color:#E3E9FD;} + .d2-2318670067 .color-B4{color:#E3E9FD;} + .d2-2318670067 .color-B5{color:#EDF0FD;} + .d2-2318670067 .color-B6{color:#F7F8FE;} + .d2-2318670067 .color-AA2{color:#4A6FF3;} + .d2-2318670067 .color-AA4{color:#EDF0FD;} + .d2-2318670067 .color-AA5{color:#F7F8FE;} + .d2-2318670067 .color-AB4{color:#EDF0FD;} + .d2-2318670067 .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}]]>ab To err is human, to moo bovine1* diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg index 23ba75712..93357f103 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab To err is human, to moo bovine1* + .d2-249188744 .fill-N1{fill:#0A0F25;} + .d2-249188744 .fill-N2{fill:#676C7E;} + .d2-249188744 .fill-N3{fill:#9499AB;} + .d2-249188744 .fill-N4{fill:#CFD2DD;} + .d2-249188744 .fill-N5{fill:#DEE1EB;} + .d2-249188744 .fill-N6{fill:#EEF1F8;} + .d2-249188744 .fill-N7{fill:#FFFFFF;} + .d2-249188744 .fill-B1{fill:#0D32B2;} + .d2-249188744 .fill-B2{fill:#0D32B2;} + .d2-249188744 .fill-B3{fill:#E3E9FD;} + .d2-249188744 .fill-B4{fill:#E3E9FD;} + .d2-249188744 .fill-B5{fill:#EDF0FD;} + .d2-249188744 .fill-B6{fill:#F7F8FE;} + .d2-249188744 .fill-AA2{fill:#4A6FF3;} + .d2-249188744 .fill-AA4{fill:#EDF0FD;} + .d2-249188744 .fill-AA5{fill:#F7F8FE;} + .d2-249188744 .fill-AB4{fill:#EDF0FD;} + .d2-249188744 .fill-AB5{fill:#F7F8FE;} + .d2-249188744 .stroke-N1{stroke:#0A0F25;} + .d2-249188744 .stroke-N2{stroke:#676C7E;} + .d2-249188744 .stroke-N3{stroke:#9499AB;} + .d2-249188744 .stroke-N4{stroke:#CFD2DD;} + .d2-249188744 .stroke-N5{stroke:#DEE1EB;} + .d2-249188744 .stroke-N6{stroke:#EEF1F8;} + .d2-249188744 .stroke-N7{stroke:#FFFFFF;} + .d2-249188744 .stroke-B1{stroke:#0D32B2;} + .d2-249188744 .stroke-B2{stroke:#0D32B2;} + .d2-249188744 .stroke-B3{stroke:#E3E9FD;} + .d2-249188744 .stroke-B4{stroke:#E3E9FD;} + .d2-249188744 .stroke-B5{stroke:#EDF0FD;} + .d2-249188744 .stroke-B6{stroke:#F7F8FE;} + .d2-249188744 .stroke-AA2{stroke:#4A6FF3;} + .d2-249188744 .stroke-AA4{stroke:#EDF0FD;} + .d2-249188744 .stroke-AA5{stroke:#F7F8FE;} + .d2-249188744 .stroke-AB4{stroke:#EDF0FD;} + .d2-249188744 .stroke-AB5{stroke:#F7F8FE;} + .d2-249188744 .background-color-N1{background-color:#0A0F25;} + .d2-249188744 .background-color-N2{background-color:#676C7E;} + .d2-249188744 .background-color-N3{background-color:#9499AB;} + .d2-249188744 .background-color-N4{background-color:#CFD2DD;} + .d2-249188744 .background-color-N5{background-color:#DEE1EB;} + .d2-249188744 .background-color-N6{background-color:#EEF1F8;} + .d2-249188744 .background-color-N7{background-color:#FFFFFF;} + .d2-249188744 .background-color-B1{background-color:#0D32B2;} + .d2-249188744 .background-color-B2{background-color:#0D32B2;} + .d2-249188744 .background-color-B3{background-color:#E3E9FD;} + .d2-249188744 .background-color-B4{background-color:#E3E9FD;} + .d2-249188744 .background-color-B5{background-color:#EDF0FD;} + .d2-249188744 .background-color-B6{background-color:#F7F8FE;} + .d2-249188744 .background-color-AA2{background-color:#4A6FF3;} + .d2-249188744 .background-color-AA4{background-color:#EDF0FD;} + .d2-249188744 .background-color-AA5{background-color:#F7F8FE;} + .d2-249188744 .background-color-AB4{background-color:#EDF0FD;} + .d2-249188744 .background-color-AB5{background-color:#F7F8FE;} + .d2-249188744 .color-N1{color:#0A0F25;} + .d2-249188744 .color-N2{color:#676C7E;} + .d2-249188744 .color-N3{color:#9499AB;} + .d2-249188744 .color-N4{color:#CFD2DD;} + .d2-249188744 .color-N5{color:#DEE1EB;} + .d2-249188744 .color-N6{color:#EEF1F8;} + .d2-249188744 .color-N7{color:#FFFFFF;} + .d2-249188744 .color-B1{color:#0D32B2;} + .d2-249188744 .color-B2{color:#0D32B2;} + .d2-249188744 .color-B3{color:#E3E9FD;} + .d2-249188744 .color-B4{color:#E3E9FD;} + .d2-249188744 .color-B5{color:#EDF0FD;} + .d2-249188744 .color-B6{color:#F7F8FE;} + .d2-249188744 .color-AA2{color:#4A6FF3;} + .d2-249188744 .color-AA4{color:#EDF0FD;} + .d2-249188744 .color-AA5{color:#F7F8FE;} + .d2-249188744 .color-AB4{color:#EDF0FD;} + .d2-249188744 .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}]]>ab To err is human, to moo bovine1* diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg index b15110c02..3b3bf5e81 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -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 + .d2-2315691330 .fill-N1{fill:#0A0F25;} + .d2-2315691330 .fill-N2{fill:#676C7E;} + .d2-2315691330 .fill-N3{fill:#9499AB;} + .d2-2315691330 .fill-N4{fill:#CFD2DD;} + .d2-2315691330 .fill-N5{fill:#DEE1EB;} + .d2-2315691330 .fill-N6{fill:#EEF1F8;} + .d2-2315691330 .fill-N7{fill:#FFFFFF;} + .d2-2315691330 .fill-B1{fill:#0D32B2;} + .d2-2315691330 .fill-B2{fill:#0D32B2;} + .d2-2315691330 .fill-B3{fill:#E3E9FD;} + .d2-2315691330 .fill-B4{fill:#E3E9FD;} + .d2-2315691330 .fill-B5{fill:#EDF0FD;} + .d2-2315691330 .fill-B6{fill:#F7F8FE;} + .d2-2315691330 .fill-AA2{fill:#4A6FF3;} + .d2-2315691330 .fill-AA4{fill:#EDF0FD;} + .d2-2315691330 .fill-AA5{fill:#F7F8FE;} + .d2-2315691330 .fill-AB4{fill:#EDF0FD;} + .d2-2315691330 .fill-AB5{fill:#F7F8FE;} + .d2-2315691330 .stroke-N1{stroke:#0A0F25;} + .d2-2315691330 .stroke-N2{stroke:#676C7E;} + .d2-2315691330 .stroke-N3{stroke:#9499AB;} + .d2-2315691330 .stroke-N4{stroke:#CFD2DD;} + .d2-2315691330 .stroke-N5{stroke:#DEE1EB;} + .d2-2315691330 .stroke-N6{stroke:#EEF1F8;} + .d2-2315691330 .stroke-N7{stroke:#FFFFFF;} + .d2-2315691330 .stroke-B1{stroke:#0D32B2;} + .d2-2315691330 .stroke-B2{stroke:#0D32B2;} + .d2-2315691330 .stroke-B3{stroke:#E3E9FD;} + .d2-2315691330 .stroke-B4{stroke:#E3E9FD;} + .d2-2315691330 .stroke-B5{stroke:#EDF0FD;} + .d2-2315691330 .stroke-B6{stroke:#F7F8FE;} + .d2-2315691330 .stroke-AA2{stroke:#4A6FF3;} + .d2-2315691330 .stroke-AA4{stroke:#EDF0FD;} + .d2-2315691330 .stroke-AA5{stroke:#F7F8FE;} + .d2-2315691330 .stroke-AB4{stroke:#EDF0FD;} + .d2-2315691330 .stroke-AB5{stroke:#F7F8FE;} + .d2-2315691330 .background-color-N1{background-color:#0A0F25;} + .d2-2315691330 .background-color-N2{background-color:#676C7E;} + .d2-2315691330 .background-color-N3{background-color:#9499AB;} + .d2-2315691330 .background-color-N4{background-color:#CFD2DD;} + .d2-2315691330 .background-color-N5{background-color:#DEE1EB;} + .d2-2315691330 .background-color-N6{background-color:#EEF1F8;} + .d2-2315691330 .background-color-N7{background-color:#FFFFFF;} + .d2-2315691330 .background-color-B1{background-color:#0D32B2;} + .d2-2315691330 .background-color-B2{background-color:#0D32B2;} + .d2-2315691330 .background-color-B3{background-color:#E3E9FD;} + .d2-2315691330 .background-color-B4{background-color:#E3E9FD;} + .d2-2315691330 .background-color-B5{background-color:#EDF0FD;} + .d2-2315691330 .background-color-B6{background-color:#F7F8FE;} + .d2-2315691330 .background-color-AA2{background-color:#4A6FF3;} + .d2-2315691330 .background-color-AA4{background-color:#EDF0FD;} + .d2-2315691330 .background-color-AA5{background-color:#F7F8FE;} + .d2-2315691330 .background-color-AB4{background-color:#EDF0FD;} + .d2-2315691330 .background-color-AB5{background-color:#F7F8FE;} + .d2-2315691330 .color-N1{color:#0A0F25;} + .d2-2315691330 .color-N2{color:#676C7E;} + .d2-2315691330 .color-N3{color:#9499AB;} + .d2-2315691330 .color-N4{color:#CFD2DD;} + .d2-2315691330 .color-N5{color:#DEE1EB;} + .d2-2315691330 .color-N6{color:#EEF1F8;} + .d2-2315691330 .color-N7{color:#FFFFFF;} + .d2-2315691330 .color-B1{color:#0D32B2;} + .d2-2315691330 .color-B2{color:#0D32B2;} + .d2-2315691330 .color-B3{color:#E3E9FD;} + .d2-2315691330 .color-B4{color:#E3E9FD;} + .d2-2315691330 .color-B5{color:#EDF0FD;} + .d2-2315691330 .color-B6{color:#F7F8FE;} + .d2-2315691330 .color-AA2{color:#4A6FF3;} + .d2-2315691330 .color-AA4{color:#EDF0FD;} + .d2-2315691330 .color-AA5{color:#F7F8FE;} + .d2-2315691330 .color-AB4{color:#EDF0FD;} + .d2-2315691330 .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}]]>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 370521a53..9152965a4 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -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 + .d2-3281968207 .fill-N1{fill:#0A0F25;} + .d2-3281968207 .fill-N2{fill:#676C7E;} + .d2-3281968207 .fill-N3{fill:#9499AB;} + .d2-3281968207 .fill-N4{fill:#CFD2DD;} + .d2-3281968207 .fill-N5{fill:#DEE1EB;} + .d2-3281968207 .fill-N6{fill:#EEF1F8;} + .d2-3281968207 .fill-N7{fill:#FFFFFF;} + .d2-3281968207 .fill-B1{fill:#0D32B2;} + .d2-3281968207 .fill-B2{fill:#0D32B2;} + .d2-3281968207 .fill-B3{fill:#E3E9FD;} + .d2-3281968207 .fill-B4{fill:#E3E9FD;} + .d2-3281968207 .fill-B5{fill:#EDF0FD;} + .d2-3281968207 .fill-B6{fill:#F7F8FE;} + .d2-3281968207 .fill-AA2{fill:#4A6FF3;} + .d2-3281968207 .fill-AA4{fill:#EDF0FD;} + .d2-3281968207 .fill-AA5{fill:#F7F8FE;} + .d2-3281968207 .fill-AB4{fill:#EDF0FD;} + .d2-3281968207 .fill-AB5{fill:#F7F8FE;} + .d2-3281968207 .stroke-N1{stroke:#0A0F25;} + .d2-3281968207 .stroke-N2{stroke:#676C7E;} + .d2-3281968207 .stroke-N3{stroke:#9499AB;} + .d2-3281968207 .stroke-N4{stroke:#CFD2DD;} + .d2-3281968207 .stroke-N5{stroke:#DEE1EB;} + .d2-3281968207 .stroke-N6{stroke:#EEF1F8;} + .d2-3281968207 .stroke-N7{stroke:#FFFFFF;} + .d2-3281968207 .stroke-B1{stroke:#0D32B2;} + .d2-3281968207 .stroke-B2{stroke:#0D32B2;} + .d2-3281968207 .stroke-B3{stroke:#E3E9FD;} + .d2-3281968207 .stroke-B4{stroke:#E3E9FD;} + .d2-3281968207 .stroke-B5{stroke:#EDF0FD;} + .d2-3281968207 .stroke-B6{stroke:#F7F8FE;} + .d2-3281968207 .stroke-AA2{stroke:#4A6FF3;} + .d2-3281968207 .stroke-AA4{stroke:#EDF0FD;} + .d2-3281968207 .stroke-AA5{stroke:#F7F8FE;} + .d2-3281968207 .stroke-AB4{stroke:#EDF0FD;} + .d2-3281968207 .stroke-AB5{stroke:#F7F8FE;} + .d2-3281968207 .background-color-N1{background-color:#0A0F25;} + .d2-3281968207 .background-color-N2{background-color:#676C7E;} + .d2-3281968207 .background-color-N3{background-color:#9499AB;} + .d2-3281968207 .background-color-N4{background-color:#CFD2DD;} + .d2-3281968207 .background-color-N5{background-color:#DEE1EB;} + .d2-3281968207 .background-color-N6{background-color:#EEF1F8;} + .d2-3281968207 .background-color-N7{background-color:#FFFFFF;} + .d2-3281968207 .background-color-B1{background-color:#0D32B2;} + .d2-3281968207 .background-color-B2{background-color:#0D32B2;} + .d2-3281968207 .background-color-B3{background-color:#E3E9FD;} + .d2-3281968207 .background-color-B4{background-color:#E3E9FD;} + .d2-3281968207 .background-color-B5{background-color:#EDF0FD;} + .d2-3281968207 .background-color-B6{background-color:#F7F8FE;} + .d2-3281968207 .background-color-AA2{background-color:#4A6FF3;} + .d2-3281968207 .background-color-AA4{background-color:#EDF0FD;} + .d2-3281968207 .background-color-AA5{background-color:#F7F8FE;} + .d2-3281968207 .background-color-AB4{background-color:#EDF0FD;} + .d2-3281968207 .background-color-AB5{background-color:#F7F8FE;} + .d2-3281968207 .color-N1{color:#0A0F25;} + .d2-3281968207 .color-N2{color:#676C7E;} + .d2-3281968207 .color-N3{color:#9499AB;} + .d2-3281968207 .color-N4{color:#CFD2DD;} + .d2-3281968207 .color-N5{color:#DEE1EB;} + .d2-3281968207 .color-N6{color:#EEF1F8;} + .d2-3281968207 .color-N7{color:#FFFFFF;} + .d2-3281968207 .color-B1{color:#0D32B2;} + .d2-3281968207 .color-B2{color:#0D32B2;} + .d2-3281968207 .color-B3{color:#E3E9FD;} + .d2-3281968207 .color-B4{color:#E3E9FD;} + .d2-3281968207 .color-B5{color:#EDF0FD;} + .d2-3281968207 .color-B6{color:#F7F8FE;} + .d2-3281968207 .color-AA2{color:#4A6FF3;} + .d2-3281968207 .color-AA4{color:#EDF0FD;} + .d2-3281968207 .color-AA5{color:#F7F8FE;} + .d2-3281968207 .color-AB4{color:#EDF0FD;} + .d2-3281968207 .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}]]>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/basic-tooltips/dagre/sketch.exp.svg b/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg index bdf230c06..468d02a4a 100644 --- a/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation + .d2-2257413360 .fill-N1{fill:#0A0F25;} + .d2-2257413360 .fill-N2{fill:#676C7E;} + .d2-2257413360 .fill-N3{fill:#9499AB;} + .d2-2257413360 .fill-N4{fill:#CFD2DD;} + .d2-2257413360 .fill-N5{fill:#DEE1EB;} + .d2-2257413360 .fill-N6{fill:#EEF1F8;} + .d2-2257413360 .fill-N7{fill:#FFFFFF;} + .d2-2257413360 .fill-B1{fill:#0D32B2;} + .d2-2257413360 .fill-B2{fill:#0D32B2;} + .d2-2257413360 .fill-B3{fill:#E3E9FD;} + .d2-2257413360 .fill-B4{fill:#E3E9FD;} + .d2-2257413360 .fill-B5{fill:#EDF0FD;} + .d2-2257413360 .fill-B6{fill:#F7F8FE;} + .d2-2257413360 .fill-AA2{fill:#4A6FF3;} + .d2-2257413360 .fill-AA4{fill:#EDF0FD;} + .d2-2257413360 .fill-AA5{fill:#F7F8FE;} + .d2-2257413360 .fill-AB4{fill:#EDF0FD;} + .d2-2257413360 .fill-AB5{fill:#F7F8FE;} + .d2-2257413360 .stroke-N1{stroke:#0A0F25;} + .d2-2257413360 .stroke-N2{stroke:#676C7E;} + .d2-2257413360 .stroke-N3{stroke:#9499AB;} + .d2-2257413360 .stroke-N4{stroke:#CFD2DD;} + .d2-2257413360 .stroke-N5{stroke:#DEE1EB;} + .d2-2257413360 .stroke-N6{stroke:#EEF1F8;} + .d2-2257413360 .stroke-N7{stroke:#FFFFFF;} + .d2-2257413360 .stroke-B1{stroke:#0D32B2;} + .d2-2257413360 .stroke-B2{stroke:#0D32B2;} + .d2-2257413360 .stroke-B3{stroke:#E3E9FD;} + .d2-2257413360 .stroke-B4{stroke:#E3E9FD;} + .d2-2257413360 .stroke-B5{stroke:#EDF0FD;} + .d2-2257413360 .stroke-B6{stroke:#F7F8FE;} + .d2-2257413360 .stroke-AA2{stroke:#4A6FF3;} + .d2-2257413360 .stroke-AA4{stroke:#EDF0FD;} + .d2-2257413360 .stroke-AA5{stroke:#F7F8FE;} + .d2-2257413360 .stroke-AB4{stroke:#EDF0FD;} + .d2-2257413360 .stroke-AB5{stroke:#F7F8FE;} + .d2-2257413360 .background-color-N1{background-color:#0A0F25;} + .d2-2257413360 .background-color-N2{background-color:#676C7E;} + .d2-2257413360 .background-color-N3{background-color:#9499AB;} + .d2-2257413360 .background-color-N4{background-color:#CFD2DD;} + .d2-2257413360 .background-color-N5{background-color:#DEE1EB;} + .d2-2257413360 .background-color-N6{background-color:#EEF1F8;} + .d2-2257413360 .background-color-N7{background-color:#FFFFFF;} + .d2-2257413360 .background-color-B1{background-color:#0D32B2;} + .d2-2257413360 .background-color-B2{background-color:#0D32B2;} + .d2-2257413360 .background-color-B3{background-color:#E3E9FD;} + .d2-2257413360 .background-color-B4{background-color:#E3E9FD;} + .d2-2257413360 .background-color-B5{background-color:#EDF0FD;} + .d2-2257413360 .background-color-B6{background-color:#F7F8FE;} + .d2-2257413360 .background-color-AA2{background-color:#4A6FF3;} + .d2-2257413360 .background-color-AA4{background-color:#EDF0FD;} + .d2-2257413360 .background-color-AA5{background-color:#F7F8FE;} + .d2-2257413360 .background-color-AB4{background-color:#EDF0FD;} + .d2-2257413360 .background-color-AB5{background-color:#F7F8FE;} + .d2-2257413360 .color-N1{color:#0A0F25;} + .d2-2257413360 .color-N2{color:#676C7E;} + .d2-2257413360 .color-N3{color:#9499AB;} + .d2-2257413360 .color-N4{color:#CFD2DD;} + .d2-2257413360 .color-N5{color:#DEE1EB;} + .d2-2257413360 .color-N6{color:#EEF1F8;} + .d2-2257413360 .color-N7{color:#FFFFFF;} + .d2-2257413360 .color-B1{color:#0D32B2;} + .d2-2257413360 .color-B2{color:#0D32B2;} + .d2-2257413360 .color-B3{color:#E3E9FD;} + .d2-2257413360 .color-B4{color:#E3E9FD;} + .d2-2257413360 .color-B5{color:#EDF0FD;} + .d2-2257413360 .color-B6{color:#F7F8FE;} + .d2-2257413360 .color-AA2{color:#4A6FF3;} + .d2-2257413360 .color-AA4{color:#EDF0FD;} + .d2-2257413360 .color-AA5{color:#F7F8FE;} + .d2-2257413360 .color-AB4{color:#EDF0FD;} + .d2-2257413360 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation @@ -118,7 +118,7 @@ - + diff --git a/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg b/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg index b76bf6bc1..a517eaa78 100644 --- a/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation + .d2-3493271700 .fill-N1{fill:#0A0F25;} + .d2-3493271700 .fill-N2{fill:#676C7E;} + .d2-3493271700 .fill-N3{fill:#9499AB;} + .d2-3493271700 .fill-N4{fill:#CFD2DD;} + .d2-3493271700 .fill-N5{fill:#DEE1EB;} + .d2-3493271700 .fill-N6{fill:#EEF1F8;} + .d2-3493271700 .fill-N7{fill:#FFFFFF;} + .d2-3493271700 .fill-B1{fill:#0D32B2;} + .d2-3493271700 .fill-B2{fill:#0D32B2;} + .d2-3493271700 .fill-B3{fill:#E3E9FD;} + .d2-3493271700 .fill-B4{fill:#E3E9FD;} + .d2-3493271700 .fill-B5{fill:#EDF0FD;} + .d2-3493271700 .fill-B6{fill:#F7F8FE;} + .d2-3493271700 .fill-AA2{fill:#4A6FF3;} + .d2-3493271700 .fill-AA4{fill:#EDF0FD;} + .d2-3493271700 .fill-AA5{fill:#F7F8FE;} + .d2-3493271700 .fill-AB4{fill:#EDF0FD;} + .d2-3493271700 .fill-AB5{fill:#F7F8FE;} + .d2-3493271700 .stroke-N1{stroke:#0A0F25;} + .d2-3493271700 .stroke-N2{stroke:#676C7E;} + .d2-3493271700 .stroke-N3{stroke:#9499AB;} + .d2-3493271700 .stroke-N4{stroke:#CFD2DD;} + .d2-3493271700 .stroke-N5{stroke:#DEE1EB;} + .d2-3493271700 .stroke-N6{stroke:#EEF1F8;} + .d2-3493271700 .stroke-N7{stroke:#FFFFFF;} + .d2-3493271700 .stroke-B1{stroke:#0D32B2;} + .d2-3493271700 .stroke-B2{stroke:#0D32B2;} + .d2-3493271700 .stroke-B3{stroke:#E3E9FD;} + .d2-3493271700 .stroke-B4{stroke:#E3E9FD;} + .d2-3493271700 .stroke-B5{stroke:#EDF0FD;} + .d2-3493271700 .stroke-B6{stroke:#F7F8FE;} + .d2-3493271700 .stroke-AA2{stroke:#4A6FF3;} + .d2-3493271700 .stroke-AA4{stroke:#EDF0FD;} + .d2-3493271700 .stroke-AA5{stroke:#F7F8FE;} + .d2-3493271700 .stroke-AB4{stroke:#EDF0FD;} + .d2-3493271700 .stroke-AB5{stroke:#F7F8FE;} + .d2-3493271700 .background-color-N1{background-color:#0A0F25;} + .d2-3493271700 .background-color-N2{background-color:#676C7E;} + .d2-3493271700 .background-color-N3{background-color:#9499AB;} + .d2-3493271700 .background-color-N4{background-color:#CFD2DD;} + .d2-3493271700 .background-color-N5{background-color:#DEE1EB;} + .d2-3493271700 .background-color-N6{background-color:#EEF1F8;} + .d2-3493271700 .background-color-N7{background-color:#FFFFFF;} + .d2-3493271700 .background-color-B1{background-color:#0D32B2;} + .d2-3493271700 .background-color-B2{background-color:#0D32B2;} + .d2-3493271700 .background-color-B3{background-color:#E3E9FD;} + .d2-3493271700 .background-color-B4{background-color:#E3E9FD;} + .d2-3493271700 .background-color-B5{background-color:#EDF0FD;} + .d2-3493271700 .background-color-B6{background-color:#F7F8FE;} + .d2-3493271700 .background-color-AA2{background-color:#4A6FF3;} + .d2-3493271700 .background-color-AA4{background-color:#EDF0FD;} + .d2-3493271700 .background-color-AA5{background-color:#F7F8FE;} + .d2-3493271700 .background-color-AB4{background-color:#EDF0FD;} + .d2-3493271700 .background-color-AB5{background-color:#F7F8FE;} + .d2-3493271700 .color-N1{color:#0A0F25;} + .d2-3493271700 .color-N2{color:#676C7E;} + .d2-3493271700 .color-N3{color:#9499AB;} + .d2-3493271700 .color-N4{color:#CFD2DD;} + .d2-3493271700 .color-N5{color:#DEE1EB;} + .d2-3493271700 .color-N6{color:#EEF1F8;} + .d2-3493271700 .color-N7{color:#FFFFFF;} + .d2-3493271700 .color-B1{color:#0D32B2;} + .d2-3493271700 .color-B2{color:#0D32B2;} + .d2-3493271700 .color-B3{color:#E3E9FD;} + .d2-3493271700 .color-B4{color:#E3E9FD;} + .d2-3493271700 .color-B5{color:#EDF0FD;} + .d2-3493271700 .color-B6{color:#F7F8FE;} + .d2-3493271700 .color-AA2{color:#4A6FF3;} + .d2-3493271700 .color-AA4{color:#EDF0FD;} + .d2-3493271700 .color-AA5{color:#F7F8FE;} + .d2-3493271700 .color-AB4{color:#EDF0FD;} + .d2-3493271700 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation @@ -118,7 +118,7 @@ - + diff --git a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg index e4f307d63..a31c66024 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmno + .d2-1843367973 .fill-N1{fill:#0A0F25;} + .d2-1843367973 .fill-N2{fill:#676C7E;} + .d2-1843367973 .fill-N3{fill:#9499AB;} + .d2-1843367973 .fill-N4{fill:#CFD2DD;} + .d2-1843367973 .fill-N5{fill:#DEE1EB;} + .d2-1843367973 .fill-N6{fill:#EEF1F8;} + .d2-1843367973 .fill-N7{fill:#FFFFFF;} + .d2-1843367973 .fill-B1{fill:#0D32B2;} + .d2-1843367973 .fill-B2{fill:#0D32B2;} + .d2-1843367973 .fill-B3{fill:#E3E9FD;} + .d2-1843367973 .fill-B4{fill:#E3E9FD;} + .d2-1843367973 .fill-B5{fill:#EDF0FD;} + .d2-1843367973 .fill-B6{fill:#F7F8FE;} + .d2-1843367973 .fill-AA2{fill:#4A6FF3;} + .d2-1843367973 .fill-AA4{fill:#EDF0FD;} + .d2-1843367973 .fill-AA5{fill:#F7F8FE;} + .d2-1843367973 .fill-AB4{fill:#EDF0FD;} + .d2-1843367973 .fill-AB5{fill:#F7F8FE;} + .d2-1843367973 .stroke-N1{stroke:#0A0F25;} + .d2-1843367973 .stroke-N2{stroke:#676C7E;} + .d2-1843367973 .stroke-N3{stroke:#9499AB;} + .d2-1843367973 .stroke-N4{stroke:#CFD2DD;} + .d2-1843367973 .stroke-N5{stroke:#DEE1EB;} + .d2-1843367973 .stroke-N6{stroke:#EEF1F8;} + .d2-1843367973 .stroke-N7{stroke:#FFFFFF;} + .d2-1843367973 .stroke-B1{stroke:#0D32B2;} + .d2-1843367973 .stroke-B2{stroke:#0D32B2;} + .d2-1843367973 .stroke-B3{stroke:#E3E9FD;} + .d2-1843367973 .stroke-B4{stroke:#E3E9FD;} + .d2-1843367973 .stroke-B5{stroke:#EDF0FD;} + .d2-1843367973 .stroke-B6{stroke:#F7F8FE;} + .d2-1843367973 .stroke-AA2{stroke:#4A6FF3;} + .d2-1843367973 .stroke-AA4{stroke:#EDF0FD;} + .d2-1843367973 .stroke-AA5{stroke:#F7F8FE;} + .d2-1843367973 .stroke-AB4{stroke:#EDF0FD;} + .d2-1843367973 .stroke-AB5{stroke:#F7F8FE;} + .d2-1843367973 .background-color-N1{background-color:#0A0F25;} + .d2-1843367973 .background-color-N2{background-color:#676C7E;} + .d2-1843367973 .background-color-N3{background-color:#9499AB;} + .d2-1843367973 .background-color-N4{background-color:#CFD2DD;} + .d2-1843367973 .background-color-N5{background-color:#DEE1EB;} + .d2-1843367973 .background-color-N6{background-color:#EEF1F8;} + .d2-1843367973 .background-color-N7{background-color:#FFFFFF;} + .d2-1843367973 .background-color-B1{background-color:#0D32B2;} + .d2-1843367973 .background-color-B2{background-color:#0D32B2;} + .d2-1843367973 .background-color-B3{background-color:#E3E9FD;} + .d2-1843367973 .background-color-B4{background-color:#E3E9FD;} + .d2-1843367973 .background-color-B5{background-color:#EDF0FD;} + .d2-1843367973 .background-color-B6{background-color:#F7F8FE;} + .d2-1843367973 .background-color-AA2{background-color:#4A6FF3;} + .d2-1843367973 .background-color-AA4{background-color:#EDF0FD;} + .d2-1843367973 .background-color-AA5{background-color:#F7F8FE;} + .d2-1843367973 .background-color-AB4{background-color:#EDF0FD;} + .d2-1843367973 .background-color-AB5{background-color:#F7F8FE;} + .d2-1843367973 .color-N1{color:#0A0F25;} + .d2-1843367973 .color-N2{color:#676C7E;} + .d2-1843367973 .color-N3{color:#9499AB;} + .d2-1843367973 .color-N4{color:#CFD2DD;} + .d2-1843367973 .color-N5{color:#DEE1EB;} + .d2-1843367973 .color-N6{color:#EEF1F8;} + .d2-1843367973 .color-N7{color:#FFFFFF;} + .d2-1843367973 .color-B1{color:#0D32B2;} + .d2-1843367973 .color-B2{color:#0D32B2;} + .d2-1843367973 .color-B3{color:#E3E9FD;} + .d2-1843367973 .color-B4{color:#E3E9FD;} + .d2-1843367973 .color-B5{color:#EDF0FD;} + .d2-1843367973 .color-B6{color:#F7F8FE;} + .d2-1843367973 .color-AA2{color:#4A6FF3;} + .d2-1843367973 .color-AA4{color:#EDF0FD;} + .d2-1843367973 .color-AA5{color:#F7F8FE;} + .d2-1843367973 .color-AB4{color:#EDF0FD;} + .d2-1843367973 .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}]]>abcdefghijklmno diff --git a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg index 51e2deebe..9db948eb2 100644 --- a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmno + .d2-1983139693 .fill-N1{fill:#0A0F25;} + .d2-1983139693 .fill-N2{fill:#676C7E;} + .d2-1983139693 .fill-N3{fill:#9499AB;} + .d2-1983139693 .fill-N4{fill:#CFD2DD;} + .d2-1983139693 .fill-N5{fill:#DEE1EB;} + .d2-1983139693 .fill-N6{fill:#EEF1F8;} + .d2-1983139693 .fill-N7{fill:#FFFFFF;} + .d2-1983139693 .fill-B1{fill:#0D32B2;} + .d2-1983139693 .fill-B2{fill:#0D32B2;} + .d2-1983139693 .fill-B3{fill:#E3E9FD;} + .d2-1983139693 .fill-B4{fill:#E3E9FD;} + .d2-1983139693 .fill-B5{fill:#EDF0FD;} + .d2-1983139693 .fill-B6{fill:#F7F8FE;} + .d2-1983139693 .fill-AA2{fill:#4A6FF3;} + .d2-1983139693 .fill-AA4{fill:#EDF0FD;} + .d2-1983139693 .fill-AA5{fill:#F7F8FE;} + .d2-1983139693 .fill-AB4{fill:#EDF0FD;} + .d2-1983139693 .fill-AB5{fill:#F7F8FE;} + .d2-1983139693 .stroke-N1{stroke:#0A0F25;} + .d2-1983139693 .stroke-N2{stroke:#676C7E;} + .d2-1983139693 .stroke-N3{stroke:#9499AB;} + .d2-1983139693 .stroke-N4{stroke:#CFD2DD;} + .d2-1983139693 .stroke-N5{stroke:#DEE1EB;} + .d2-1983139693 .stroke-N6{stroke:#EEF1F8;} + .d2-1983139693 .stroke-N7{stroke:#FFFFFF;} + .d2-1983139693 .stroke-B1{stroke:#0D32B2;} + .d2-1983139693 .stroke-B2{stroke:#0D32B2;} + .d2-1983139693 .stroke-B3{stroke:#E3E9FD;} + .d2-1983139693 .stroke-B4{stroke:#E3E9FD;} + .d2-1983139693 .stroke-B5{stroke:#EDF0FD;} + .d2-1983139693 .stroke-B6{stroke:#F7F8FE;} + .d2-1983139693 .stroke-AA2{stroke:#4A6FF3;} + .d2-1983139693 .stroke-AA4{stroke:#EDF0FD;} + .d2-1983139693 .stroke-AA5{stroke:#F7F8FE;} + .d2-1983139693 .stroke-AB4{stroke:#EDF0FD;} + .d2-1983139693 .stroke-AB5{stroke:#F7F8FE;} + .d2-1983139693 .background-color-N1{background-color:#0A0F25;} + .d2-1983139693 .background-color-N2{background-color:#676C7E;} + .d2-1983139693 .background-color-N3{background-color:#9499AB;} + .d2-1983139693 .background-color-N4{background-color:#CFD2DD;} + .d2-1983139693 .background-color-N5{background-color:#DEE1EB;} + .d2-1983139693 .background-color-N6{background-color:#EEF1F8;} + .d2-1983139693 .background-color-N7{background-color:#FFFFFF;} + .d2-1983139693 .background-color-B1{background-color:#0D32B2;} + .d2-1983139693 .background-color-B2{background-color:#0D32B2;} + .d2-1983139693 .background-color-B3{background-color:#E3E9FD;} + .d2-1983139693 .background-color-B4{background-color:#E3E9FD;} + .d2-1983139693 .background-color-B5{background-color:#EDF0FD;} + .d2-1983139693 .background-color-B6{background-color:#F7F8FE;} + .d2-1983139693 .background-color-AA2{background-color:#4A6FF3;} + .d2-1983139693 .background-color-AA4{background-color:#EDF0FD;} + .d2-1983139693 .background-color-AA5{background-color:#F7F8FE;} + .d2-1983139693 .background-color-AB4{background-color:#EDF0FD;} + .d2-1983139693 .background-color-AB5{background-color:#F7F8FE;} + .d2-1983139693 .color-N1{color:#0A0F25;} + .d2-1983139693 .color-N2{color:#676C7E;} + .d2-1983139693 .color-N3{color:#9499AB;} + .d2-1983139693 .color-N4{color:#CFD2DD;} + .d2-1983139693 .color-N5{color:#DEE1EB;} + .d2-1983139693 .color-N6{color:#EEF1F8;} + .d2-1983139693 .color-N7{color:#FFFFFF;} + .d2-1983139693 .color-B1{color:#0D32B2;} + .d2-1983139693 .color-B2{color:#0D32B2;} + .d2-1983139693 .color-B3{color:#E3E9FD;} + .d2-1983139693 .color-B4{color:#E3E9FD;} + .d2-1983139693 .color-B5{color:#EDF0FD;} + .d2-1983139693 .color-B6{color:#F7F8FE;} + .d2-1983139693 .color-AA2{color:#4A6FF3;} + .d2-1983139693 .color-AA4{color:#EDF0FD;} + .d2-1983139693 .color-AA5{color:#F7F8FE;} + .d2-1983139693 .color-AB4{color:#EDF0FD;} + .d2-1983139693 .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}]]>abcdefghijklmno diff --git a/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg b/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg index 32d85cc83..391565010 100644 --- a/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -not bold monobold mono + .d2-688610505 .fill-N1{fill:#0A0F25;} + .d2-688610505 .fill-N2{fill:#676C7E;} + .d2-688610505 .fill-N3{fill:#9499AB;} + .d2-688610505 .fill-N4{fill:#CFD2DD;} + .d2-688610505 .fill-N5{fill:#DEE1EB;} + .d2-688610505 .fill-N6{fill:#EEF1F8;} + .d2-688610505 .fill-N7{fill:#FFFFFF;} + .d2-688610505 .fill-B1{fill:#0D32B2;} + .d2-688610505 .fill-B2{fill:#0D32B2;} + .d2-688610505 .fill-B3{fill:#E3E9FD;} + .d2-688610505 .fill-B4{fill:#E3E9FD;} + .d2-688610505 .fill-B5{fill:#EDF0FD;} + .d2-688610505 .fill-B6{fill:#F7F8FE;} + .d2-688610505 .fill-AA2{fill:#4A6FF3;} + .d2-688610505 .fill-AA4{fill:#EDF0FD;} + .d2-688610505 .fill-AA5{fill:#F7F8FE;} + .d2-688610505 .fill-AB4{fill:#EDF0FD;} + .d2-688610505 .fill-AB5{fill:#F7F8FE;} + .d2-688610505 .stroke-N1{stroke:#0A0F25;} + .d2-688610505 .stroke-N2{stroke:#676C7E;} + .d2-688610505 .stroke-N3{stroke:#9499AB;} + .d2-688610505 .stroke-N4{stroke:#CFD2DD;} + .d2-688610505 .stroke-N5{stroke:#DEE1EB;} + .d2-688610505 .stroke-N6{stroke:#EEF1F8;} + .d2-688610505 .stroke-N7{stroke:#FFFFFF;} + .d2-688610505 .stroke-B1{stroke:#0D32B2;} + .d2-688610505 .stroke-B2{stroke:#0D32B2;} + .d2-688610505 .stroke-B3{stroke:#E3E9FD;} + .d2-688610505 .stroke-B4{stroke:#E3E9FD;} + .d2-688610505 .stroke-B5{stroke:#EDF0FD;} + .d2-688610505 .stroke-B6{stroke:#F7F8FE;} + .d2-688610505 .stroke-AA2{stroke:#4A6FF3;} + .d2-688610505 .stroke-AA4{stroke:#EDF0FD;} + .d2-688610505 .stroke-AA5{stroke:#F7F8FE;} + .d2-688610505 .stroke-AB4{stroke:#EDF0FD;} + .d2-688610505 .stroke-AB5{stroke:#F7F8FE;} + .d2-688610505 .background-color-N1{background-color:#0A0F25;} + .d2-688610505 .background-color-N2{background-color:#676C7E;} + .d2-688610505 .background-color-N3{background-color:#9499AB;} + .d2-688610505 .background-color-N4{background-color:#CFD2DD;} + .d2-688610505 .background-color-N5{background-color:#DEE1EB;} + .d2-688610505 .background-color-N6{background-color:#EEF1F8;} + .d2-688610505 .background-color-N7{background-color:#FFFFFF;} + .d2-688610505 .background-color-B1{background-color:#0D32B2;} + .d2-688610505 .background-color-B2{background-color:#0D32B2;} + .d2-688610505 .background-color-B3{background-color:#E3E9FD;} + .d2-688610505 .background-color-B4{background-color:#E3E9FD;} + .d2-688610505 .background-color-B5{background-color:#EDF0FD;} + .d2-688610505 .background-color-B6{background-color:#F7F8FE;} + .d2-688610505 .background-color-AA2{background-color:#4A6FF3;} + .d2-688610505 .background-color-AA4{background-color:#EDF0FD;} + .d2-688610505 .background-color-AA5{background-color:#F7F8FE;} + .d2-688610505 .background-color-AB4{background-color:#EDF0FD;} + .d2-688610505 .background-color-AB5{background-color:#F7F8FE;} + .d2-688610505 .color-N1{color:#0A0F25;} + .d2-688610505 .color-N2{color:#676C7E;} + .d2-688610505 .color-N3{color:#9499AB;} + .d2-688610505 .color-N4{color:#CFD2DD;} + .d2-688610505 .color-N5{color:#DEE1EB;} + .d2-688610505 .color-N6{color:#EEF1F8;} + .d2-688610505 .color-N7{color:#FFFFFF;} + .d2-688610505 .color-B1{color:#0D32B2;} + .d2-688610505 .color-B2{color:#0D32B2;} + .d2-688610505 .color-B3{color:#E3E9FD;} + .d2-688610505 .color-B4{color:#E3E9FD;} + .d2-688610505 .color-B5{color:#EDF0FD;} + .d2-688610505 .color-B6{color:#F7F8FE;} + .d2-688610505 .color-AA2{color:#4A6FF3;} + .d2-688610505 .color-AA4{color:#EDF0FD;} + .d2-688610505 .color-AA5{color:#F7F8FE;} + .d2-688610505 .color-AB4{color:#EDF0FD;} + .d2-688610505 .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}]]>not bold monobold mono diff --git a/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg b/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg index 3e4b1db38..ac945b749 100644 --- a/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -not bold monobold mono + .d2-4289391560 .fill-N1{fill:#0A0F25;} + .d2-4289391560 .fill-N2{fill:#676C7E;} + .d2-4289391560 .fill-N3{fill:#9499AB;} + .d2-4289391560 .fill-N4{fill:#CFD2DD;} + .d2-4289391560 .fill-N5{fill:#DEE1EB;} + .d2-4289391560 .fill-N6{fill:#EEF1F8;} + .d2-4289391560 .fill-N7{fill:#FFFFFF;} + .d2-4289391560 .fill-B1{fill:#0D32B2;} + .d2-4289391560 .fill-B2{fill:#0D32B2;} + .d2-4289391560 .fill-B3{fill:#E3E9FD;} + .d2-4289391560 .fill-B4{fill:#E3E9FD;} + .d2-4289391560 .fill-B5{fill:#EDF0FD;} + .d2-4289391560 .fill-B6{fill:#F7F8FE;} + .d2-4289391560 .fill-AA2{fill:#4A6FF3;} + .d2-4289391560 .fill-AA4{fill:#EDF0FD;} + .d2-4289391560 .fill-AA5{fill:#F7F8FE;} + .d2-4289391560 .fill-AB4{fill:#EDF0FD;} + .d2-4289391560 .fill-AB5{fill:#F7F8FE;} + .d2-4289391560 .stroke-N1{stroke:#0A0F25;} + .d2-4289391560 .stroke-N2{stroke:#676C7E;} + .d2-4289391560 .stroke-N3{stroke:#9499AB;} + .d2-4289391560 .stroke-N4{stroke:#CFD2DD;} + .d2-4289391560 .stroke-N5{stroke:#DEE1EB;} + .d2-4289391560 .stroke-N6{stroke:#EEF1F8;} + .d2-4289391560 .stroke-N7{stroke:#FFFFFF;} + .d2-4289391560 .stroke-B1{stroke:#0D32B2;} + .d2-4289391560 .stroke-B2{stroke:#0D32B2;} + .d2-4289391560 .stroke-B3{stroke:#E3E9FD;} + .d2-4289391560 .stroke-B4{stroke:#E3E9FD;} + .d2-4289391560 .stroke-B5{stroke:#EDF0FD;} + .d2-4289391560 .stroke-B6{stroke:#F7F8FE;} + .d2-4289391560 .stroke-AA2{stroke:#4A6FF3;} + .d2-4289391560 .stroke-AA4{stroke:#EDF0FD;} + .d2-4289391560 .stroke-AA5{stroke:#F7F8FE;} + .d2-4289391560 .stroke-AB4{stroke:#EDF0FD;} + .d2-4289391560 .stroke-AB5{stroke:#F7F8FE;} + .d2-4289391560 .background-color-N1{background-color:#0A0F25;} + .d2-4289391560 .background-color-N2{background-color:#676C7E;} + .d2-4289391560 .background-color-N3{background-color:#9499AB;} + .d2-4289391560 .background-color-N4{background-color:#CFD2DD;} + .d2-4289391560 .background-color-N5{background-color:#DEE1EB;} + .d2-4289391560 .background-color-N6{background-color:#EEF1F8;} + .d2-4289391560 .background-color-N7{background-color:#FFFFFF;} + .d2-4289391560 .background-color-B1{background-color:#0D32B2;} + .d2-4289391560 .background-color-B2{background-color:#0D32B2;} + .d2-4289391560 .background-color-B3{background-color:#E3E9FD;} + .d2-4289391560 .background-color-B4{background-color:#E3E9FD;} + .d2-4289391560 .background-color-B5{background-color:#EDF0FD;} + .d2-4289391560 .background-color-B6{background-color:#F7F8FE;} + .d2-4289391560 .background-color-AA2{background-color:#4A6FF3;} + .d2-4289391560 .background-color-AA4{background-color:#EDF0FD;} + .d2-4289391560 .background-color-AA5{background-color:#F7F8FE;} + .d2-4289391560 .background-color-AB4{background-color:#EDF0FD;} + .d2-4289391560 .background-color-AB5{background-color:#F7F8FE;} + .d2-4289391560 .color-N1{color:#0A0F25;} + .d2-4289391560 .color-N2{color:#676C7E;} + .d2-4289391560 .color-N3{color:#9499AB;} + .d2-4289391560 .color-N4{color:#CFD2DD;} + .d2-4289391560 .color-N5{color:#DEE1EB;} + .d2-4289391560 .color-N6{color:#EEF1F8;} + .d2-4289391560 .color-N7{color:#FFFFFF;} + .d2-4289391560 .color-B1{color:#0D32B2;} + .d2-4289391560 .color-B2{color:#0D32B2;} + .d2-4289391560 .color-B3{color:#E3E9FD;} + .d2-4289391560 .color-B4{color:#E3E9FD;} + .d2-4289391560 .color-B5{color:#EDF0FD;} + .d2-4289391560 .color-B6{color:#F7F8FE;} + .d2-4289391560 .color-AA2{color:#4A6FF3;} + .d2-4289391560 .color-AA4{color:#EDF0FD;} + .d2-4289391560 .color-AA5{color:#F7F8FE;} + .d2-4289391560 .color-AB4{color:#EDF0FD;} + .d2-4289391560 .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}]]>not bold monobold mono 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 5de735922..0036cf7c4 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,9 +1,9 @@ -xymultiple2double + .d2-681648473 .fill-N1{fill:#0A0F25;} + .d2-681648473 .fill-N2{fill:#676C7E;} + .d2-681648473 .fill-N3{fill:#9499AB;} + .d2-681648473 .fill-N4{fill:#CFD2DD;} + .d2-681648473 .fill-N5{fill:#DEE1EB;} + .d2-681648473 .fill-N6{fill:#EEF1F8;} + .d2-681648473 .fill-N7{fill:#FFFFFF;} + .d2-681648473 .fill-B1{fill:#0D32B2;} + .d2-681648473 .fill-B2{fill:#0D32B2;} + .d2-681648473 .fill-B3{fill:#E3E9FD;} + .d2-681648473 .fill-B4{fill:#E3E9FD;} + .d2-681648473 .fill-B5{fill:#EDF0FD;} + .d2-681648473 .fill-B6{fill:#F7F8FE;} + .d2-681648473 .fill-AA2{fill:#4A6FF3;} + .d2-681648473 .fill-AA4{fill:#EDF0FD;} + .d2-681648473 .fill-AA5{fill:#F7F8FE;} + .d2-681648473 .fill-AB4{fill:#EDF0FD;} + .d2-681648473 .fill-AB5{fill:#F7F8FE;} + .d2-681648473 .stroke-N1{stroke:#0A0F25;} + .d2-681648473 .stroke-N2{stroke:#676C7E;} + .d2-681648473 .stroke-N3{stroke:#9499AB;} + .d2-681648473 .stroke-N4{stroke:#CFD2DD;} + .d2-681648473 .stroke-N5{stroke:#DEE1EB;} + .d2-681648473 .stroke-N6{stroke:#EEF1F8;} + .d2-681648473 .stroke-N7{stroke:#FFFFFF;} + .d2-681648473 .stroke-B1{stroke:#0D32B2;} + .d2-681648473 .stroke-B2{stroke:#0D32B2;} + .d2-681648473 .stroke-B3{stroke:#E3E9FD;} + .d2-681648473 .stroke-B4{stroke:#E3E9FD;} + .d2-681648473 .stroke-B5{stroke:#EDF0FD;} + .d2-681648473 .stroke-B6{stroke:#F7F8FE;} + .d2-681648473 .stroke-AA2{stroke:#4A6FF3;} + .d2-681648473 .stroke-AA4{stroke:#EDF0FD;} + .d2-681648473 .stroke-AA5{stroke:#F7F8FE;} + .d2-681648473 .stroke-AB4{stroke:#EDF0FD;} + .d2-681648473 .stroke-AB5{stroke:#F7F8FE;} + .d2-681648473 .background-color-N1{background-color:#0A0F25;} + .d2-681648473 .background-color-N2{background-color:#676C7E;} + .d2-681648473 .background-color-N3{background-color:#9499AB;} + .d2-681648473 .background-color-N4{background-color:#CFD2DD;} + .d2-681648473 .background-color-N5{background-color:#DEE1EB;} + .d2-681648473 .background-color-N6{background-color:#EEF1F8;} + .d2-681648473 .background-color-N7{background-color:#FFFFFF;} + .d2-681648473 .background-color-B1{background-color:#0D32B2;} + .d2-681648473 .background-color-B2{background-color:#0D32B2;} + .d2-681648473 .background-color-B3{background-color:#E3E9FD;} + .d2-681648473 .background-color-B4{background-color:#E3E9FD;} + .d2-681648473 .background-color-B5{background-color:#EDF0FD;} + .d2-681648473 .background-color-B6{background-color:#F7F8FE;} + .d2-681648473 .background-color-AA2{background-color:#4A6FF3;} + .d2-681648473 .background-color-AA4{background-color:#EDF0FD;} + .d2-681648473 .background-color-AA5{background-color:#F7F8FE;} + .d2-681648473 .background-color-AB4{background-color:#EDF0FD;} + .d2-681648473 .background-color-AB5{background-color:#F7F8FE;} + .d2-681648473 .color-N1{color:#0A0F25;} + .d2-681648473 .color-N2{color:#676C7E;} + .d2-681648473 .color-N3{color:#9499AB;} + .d2-681648473 .color-N4{color:#CFD2DD;} + .d2-681648473 .color-N5{color:#DEE1EB;} + .d2-681648473 .color-N6{color:#EEF1F8;} + .d2-681648473 .color-N7{color:#FFFFFF;} + .d2-681648473 .color-B1{color:#0D32B2;} + .d2-681648473 .color-B2{color:#0D32B2;} + .d2-681648473 .color-B3{color:#E3E9FD;} + .d2-681648473 .color-B4{color:#E3E9FD;} + .d2-681648473 .color-B5{color:#EDF0FD;} + .d2-681648473 .color-B6{color:#F7F8FE;} + .d2-681648473 .color-AA2{color:#4A6FF3;} + .d2-681648473 .color-AA4{color:#EDF0FD;} + .d2-681648473 .color-AA5{color:#F7F8FE;} + .d2-681648473 .color-AB4{color:#EDF0FD;} + .d2-681648473 .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}]]>xymultiple2double -three-dee +three-dee diff --git a/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg b/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg index f7e5414d9..311a76420 100644 --- a/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double + .d2-2736704302 .fill-N1{fill:#0A0F25;} + .d2-2736704302 .fill-N2{fill:#676C7E;} + .d2-2736704302 .fill-N3{fill:#9499AB;} + .d2-2736704302 .fill-N4{fill:#CFD2DD;} + .d2-2736704302 .fill-N5{fill:#DEE1EB;} + .d2-2736704302 .fill-N6{fill:#EEF1F8;} + .d2-2736704302 .fill-N7{fill:#FFFFFF;} + .d2-2736704302 .fill-B1{fill:#0D32B2;} + .d2-2736704302 .fill-B2{fill:#0D32B2;} + .d2-2736704302 .fill-B3{fill:#E3E9FD;} + .d2-2736704302 .fill-B4{fill:#E3E9FD;} + .d2-2736704302 .fill-B5{fill:#EDF0FD;} + .d2-2736704302 .fill-B6{fill:#F7F8FE;} + .d2-2736704302 .fill-AA2{fill:#4A6FF3;} + .d2-2736704302 .fill-AA4{fill:#EDF0FD;} + .d2-2736704302 .fill-AA5{fill:#F7F8FE;} + .d2-2736704302 .fill-AB4{fill:#EDF0FD;} + .d2-2736704302 .fill-AB5{fill:#F7F8FE;} + .d2-2736704302 .stroke-N1{stroke:#0A0F25;} + .d2-2736704302 .stroke-N2{stroke:#676C7E;} + .d2-2736704302 .stroke-N3{stroke:#9499AB;} + .d2-2736704302 .stroke-N4{stroke:#CFD2DD;} + .d2-2736704302 .stroke-N5{stroke:#DEE1EB;} + .d2-2736704302 .stroke-N6{stroke:#EEF1F8;} + .d2-2736704302 .stroke-N7{stroke:#FFFFFF;} + .d2-2736704302 .stroke-B1{stroke:#0D32B2;} + .d2-2736704302 .stroke-B2{stroke:#0D32B2;} + .d2-2736704302 .stroke-B3{stroke:#E3E9FD;} + .d2-2736704302 .stroke-B4{stroke:#E3E9FD;} + .d2-2736704302 .stroke-B5{stroke:#EDF0FD;} + .d2-2736704302 .stroke-B6{stroke:#F7F8FE;} + .d2-2736704302 .stroke-AA2{stroke:#4A6FF3;} + .d2-2736704302 .stroke-AA4{stroke:#EDF0FD;} + .d2-2736704302 .stroke-AA5{stroke:#F7F8FE;} + .d2-2736704302 .stroke-AB4{stroke:#EDF0FD;} + .d2-2736704302 .stroke-AB5{stroke:#F7F8FE;} + .d2-2736704302 .background-color-N1{background-color:#0A0F25;} + .d2-2736704302 .background-color-N2{background-color:#676C7E;} + .d2-2736704302 .background-color-N3{background-color:#9499AB;} + .d2-2736704302 .background-color-N4{background-color:#CFD2DD;} + .d2-2736704302 .background-color-N5{background-color:#DEE1EB;} + .d2-2736704302 .background-color-N6{background-color:#EEF1F8;} + .d2-2736704302 .background-color-N7{background-color:#FFFFFF;} + .d2-2736704302 .background-color-B1{background-color:#0D32B2;} + .d2-2736704302 .background-color-B2{background-color:#0D32B2;} + .d2-2736704302 .background-color-B3{background-color:#E3E9FD;} + .d2-2736704302 .background-color-B4{background-color:#E3E9FD;} + .d2-2736704302 .background-color-B5{background-color:#EDF0FD;} + .d2-2736704302 .background-color-B6{background-color:#F7F8FE;} + .d2-2736704302 .background-color-AA2{background-color:#4A6FF3;} + .d2-2736704302 .background-color-AA4{background-color:#EDF0FD;} + .d2-2736704302 .background-color-AA5{background-color:#F7F8FE;} + .d2-2736704302 .background-color-AB4{background-color:#EDF0FD;} + .d2-2736704302 .background-color-AB5{background-color:#F7F8FE;} + .d2-2736704302 .color-N1{color:#0A0F25;} + .d2-2736704302 .color-N2{color:#676C7E;} + .d2-2736704302 .color-N3{color:#9499AB;} + .d2-2736704302 .color-N4{color:#CFD2DD;} + .d2-2736704302 .color-N5{color:#DEE1EB;} + .d2-2736704302 .color-N6{color:#EEF1F8;} + .d2-2736704302 .color-N7{color:#FFFFFF;} + .d2-2736704302 .color-B1{color:#0D32B2;} + .d2-2736704302 .color-B2{color:#0D32B2;} + .d2-2736704302 .color-B3{color:#E3E9FD;} + .d2-2736704302 .color-B4{color:#E3E9FD;} + .d2-2736704302 .color-B5{color:#EDF0FD;} + .d2-2736704302 .color-B6{color:#F7F8FE;} + .d2-2736704302 .color-AA2{color:#4A6FF3;} + .d2-2736704302 .color-AA4{color:#EDF0FD;} + .d2-2736704302 .color-AA5{color:#F7F8FE;} + .d2-2736704302 .color-AB4{color:#EDF0FD;} + .d2-2736704302 .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}]]>xymultiple2double -three-dee +three-dee diff --git a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg index 003559033..b91c0326e 100644 --- a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double + .d2-985065287 .fill-N1{fill:#0A0F25;} + .d2-985065287 .fill-N2{fill:#676C7E;} + .d2-985065287 .fill-N3{fill:#9499AB;} + .d2-985065287 .fill-N4{fill:#CFD2DD;} + .d2-985065287 .fill-N5{fill:#DEE1EB;} + .d2-985065287 .fill-N6{fill:#EEF1F8;} + .d2-985065287 .fill-N7{fill:#FFFFFF;} + .d2-985065287 .fill-B1{fill:#0D32B2;} + .d2-985065287 .fill-B2{fill:#0D32B2;} + .d2-985065287 .fill-B3{fill:#E3E9FD;} + .d2-985065287 .fill-B4{fill:#E3E9FD;} + .d2-985065287 .fill-B5{fill:#EDF0FD;} + .d2-985065287 .fill-B6{fill:#F7F8FE;} + .d2-985065287 .fill-AA2{fill:#4A6FF3;} + .d2-985065287 .fill-AA4{fill:#EDF0FD;} + .d2-985065287 .fill-AA5{fill:#F7F8FE;} + .d2-985065287 .fill-AB4{fill:#EDF0FD;} + .d2-985065287 .fill-AB5{fill:#F7F8FE;} + .d2-985065287 .stroke-N1{stroke:#0A0F25;} + .d2-985065287 .stroke-N2{stroke:#676C7E;} + .d2-985065287 .stroke-N3{stroke:#9499AB;} + .d2-985065287 .stroke-N4{stroke:#CFD2DD;} + .d2-985065287 .stroke-N5{stroke:#DEE1EB;} + .d2-985065287 .stroke-N6{stroke:#EEF1F8;} + .d2-985065287 .stroke-N7{stroke:#FFFFFF;} + .d2-985065287 .stroke-B1{stroke:#0D32B2;} + .d2-985065287 .stroke-B2{stroke:#0D32B2;} + .d2-985065287 .stroke-B3{stroke:#E3E9FD;} + .d2-985065287 .stroke-B4{stroke:#E3E9FD;} + .d2-985065287 .stroke-B5{stroke:#EDF0FD;} + .d2-985065287 .stroke-B6{stroke:#F7F8FE;} + .d2-985065287 .stroke-AA2{stroke:#4A6FF3;} + .d2-985065287 .stroke-AA4{stroke:#EDF0FD;} + .d2-985065287 .stroke-AA5{stroke:#F7F8FE;} + .d2-985065287 .stroke-AB4{stroke:#EDF0FD;} + .d2-985065287 .stroke-AB5{stroke:#F7F8FE;} + .d2-985065287 .background-color-N1{background-color:#0A0F25;} + .d2-985065287 .background-color-N2{background-color:#676C7E;} + .d2-985065287 .background-color-N3{background-color:#9499AB;} + .d2-985065287 .background-color-N4{background-color:#CFD2DD;} + .d2-985065287 .background-color-N5{background-color:#DEE1EB;} + .d2-985065287 .background-color-N6{background-color:#EEF1F8;} + .d2-985065287 .background-color-N7{background-color:#FFFFFF;} + .d2-985065287 .background-color-B1{background-color:#0D32B2;} + .d2-985065287 .background-color-B2{background-color:#0D32B2;} + .d2-985065287 .background-color-B3{background-color:#E3E9FD;} + .d2-985065287 .background-color-B4{background-color:#E3E9FD;} + .d2-985065287 .background-color-B5{background-color:#EDF0FD;} + .d2-985065287 .background-color-B6{background-color:#F7F8FE;} + .d2-985065287 .background-color-AA2{background-color:#4A6FF3;} + .d2-985065287 .background-color-AA4{background-color:#EDF0FD;} + .d2-985065287 .background-color-AA5{background-color:#F7F8FE;} + .d2-985065287 .background-color-AB4{background-color:#EDF0FD;} + .d2-985065287 .background-color-AB5{background-color:#F7F8FE;} + .d2-985065287 .color-N1{color:#0A0F25;} + .d2-985065287 .color-N2{color:#676C7E;} + .d2-985065287 .color-N3{color:#9499AB;} + .d2-985065287 .color-N4{color:#CFD2DD;} + .d2-985065287 .color-N5{color:#DEE1EB;} + .d2-985065287 .color-N6{color:#EEF1F8;} + .d2-985065287 .color-N7{color:#FFFFFF;} + .d2-985065287 .color-B1{color:#0D32B2;} + .d2-985065287 .color-B2{color:#0D32B2;} + .d2-985065287 .color-B3{color:#E3E9FD;} + .d2-985065287 .color-B4{color:#E3E9FD;} + .d2-985065287 .color-B5{color:#EDF0FD;} + .d2-985065287 .color-B6{color:#F7F8FE;} + .d2-985065287 .color-AA2{color:#4A6FF3;} + .d2-985065287 .color-AA4{color:#EDF0FD;} + .d2-985065287 .color-AA5{color:#F7F8FE;} + .d2-985065287 .color-AB4{color:#EDF0FD;} + .d2-985065287 .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}]]>xymultiple2double -three-dee +three-dee diff --git a/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg b/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg index 32a3630ce..10c233c32 100644 --- a/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double + .d2-1173661246 .fill-N1{fill:#0A0F25;} + .d2-1173661246 .fill-N2{fill:#676C7E;} + .d2-1173661246 .fill-N3{fill:#9499AB;} + .d2-1173661246 .fill-N4{fill:#CFD2DD;} + .d2-1173661246 .fill-N5{fill:#DEE1EB;} + .d2-1173661246 .fill-N6{fill:#EEF1F8;} + .d2-1173661246 .fill-N7{fill:#FFFFFF;} + .d2-1173661246 .fill-B1{fill:#0D32B2;} + .d2-1173661246 .fill-B2{fill:#0D32B2;} + .d2-1173661246 .fill-B3{fill:#E3E9FD;} + .d2-1173661246 .fill-B4{fill:#E3E9FD;} + .d2-1173661246 .fill-B5{fill:#EDF0FD;} + .d2-1173661246 .fill-B6{fill:#F7F8FE;} + .d2-1173661246 .fill-AA2{fill:#4A6FF3;} + .d2-1173661246 .fill-AA4{fill:#EDF0FD;} + .d2-1173661246 .fill-AA5{fill:#F7F8FE;} + .d2-1173661246 .fill-AB4{fill:#EDF0FD;} + .d2-1173661246 .fill-AB5{fill:#F7F8FE;} + .d2-1173661246 .stroke-N1{stroke:#0A0F25;} + .d2-1173661246 .stroke-N2{stroke:#676C7E;} + .d2-1173661246 .stroke-N3{stroke:#9499AB;} + .d2-1173661246 .stroke-N4{stroke:#CFD2DD;} + .d2-1173661246 .stroke-N5{stroke:#DEE1EB;} + .d2-1173661246 .stroke-N6{stroke:#EEF1F8;} + .d2-1173661246 .stroke-N7{stroke:#FFFFFF;} + .d2-1173661246 .stroke-B1{stroke:#0D32B2;} + .d2-1173661246 .stroke-B2{stroke:#0D32B2;} + .d2-1173661246 .stroke-B3{stroke:#E3E9FD;} + .d2-1173661246 .stroke-B4{stroke:#E3E9FD;} + .d2-1173661246 .stroke-B5{stroke:#EDF0FD;} + .d2-1173661246 .stroke-B6{stroke:#F7F8FE;} + .d2-1173661246 .stroke-AA2{stroke:#4A6FF3;} + .d2-1173661246 .stroke-AA4{stroke:#EDF0FD;} + .d2-1173661246 .stroke-AA5{stroke:#F7F8FE;} + .d2-1173661246 .stroke-AB4{stroke:#EDF0FD;} + .d2-1173661246 .stroke-AB5{stroke:#F7F8FE;} + .d2-1173661246 .background-color-N1{background-color:#0A0F25;} + .d2-1173661246 .background-color-N2{background-color:#676C7E;} + .d2-1173661246 .background-color-N3{background-color:#9499AB;} + .d2-1173661246 .background-color-N4{background-color:#CFD2DD;} + .d2-1173661246 .background-color-N5{background-color:#DEE1EB;} + .d2-1173661246 .background-color-N6{background-color:#EEF1F8;} + .d2-1173661246 .background-color-N7{background-color:#FFFFFF;} + .d2-1173661246 .background-color-B1{background-color:#0D32B2;} + .d2-1173661246 .background-color-B2{background-color:#0D32B2;} + .d2-1173661246 .background-color-B3{background-color:#E3E9FD;} + .d2-1173661246 .background-color-B4{background-color:#E3E9FD;} + .d2-1173661246 .background-color-B5{background-color:#EDF0FD;} + .d2-1173661246 .background-color-B6{background-color:#F7F8FE;} + .d2-1173661246 .background-color-AA2{background-color:#4A6FF3;} + .d2-1173661246 .background-color-AA4{background-color:#EDF0FD;} + .d2-1173661246 .background-color-AA5{background-color:#F7F8FE;} + .d2-1173661246 .background-color-AB4{background-color:#EDF0FD;} + .d2-1173661246 .background-color-AB5{background-color:#F7F8FE;} + .d2-1173661246 .color-N1{color:#0A0F25;} + .d2-1173661246 .color-N2{color:#676C7E;} + .d2-1173661246 .color-N3{color:#9499AB;} + .d2-1173661246 .color-N4{color:#CFD2DD;} + .d2-1173661246 .color-N5{color:#DEE1EB;} + .d2-1173661246 .color-N6{color:#EEF1F8;} + .d2-1173661246 .color-N7{color:#FFFFFF;} + .d2-1173661246 .color-B1{color:#0D32B2;} + .d2-1173661246 .color-B2{color:#0D32B2;} + .d2-1173661246 .color-B3{color:#E3E9FD;} + .d2-1173661246 .color-B4{color:#E3E9FD;} + .d2-1173661246 .color-B5{color:#EDF0FD;} + .d2-1173661246 .color-B6{color:#F7F8FE;} + .d2-1173661246 .color-AA2{color:#4A6FF3;} + .d2-1173661246 .color-AA4{color:#EDF0FD;} + .d2-1173661246 .color-AA5{color:#F7F8FE;} + .d2-1173661246 .color-AB4{color:#EDF0FD;} + .d2-1173661246 .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}]]>xymultiple2double -three-dee +three-dee diff --git a/e2etests/testdata/stable/br/dagre/sketch.exp.svg b/e2etests/testdata/stable/br/dagre/sketch.exp.svg index 5fd2c168c..06499b293 100644 --- a/e2etests/testdata/stable/br/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/br/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -

    Headline 1

    @@ -840,7 +840,7 @@

    Headline 3

    This just disappears

    -
     +     \ No newline at end of file diff --git a/e2etests/testdata/stable/br/elk/sketch.exp.svg b/e2etests/testdata/stable/br/elk/sketch.exp.svg index 462cb5091..1dcbf73c1 100644 --- a/e2etests/testdata/stable/br/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/br/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -

    Headline 1

    @@ -840,7 +840,7 @@

    Headline 3

    This just disappears

    -
     +     \ No newline at end of file diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg index dc37a8357..87efd2729 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -r1r2 eth1eth1 + .d2-1076035503 .fill-N1{fill:#0A0F25;} + .d2-1076035503 .fill-N2{fill:#676C7E;} + .d2-1076035503 .fill-N3{fill:#9499AB;} + .d2-1076035503 .fill-N4{fill:#CFD2DD;} + .d2-1076035503 .fill-N5{fill:#DEE1EB;} + .d2-1076035503 .fill-N6{fill:#EEF1F8;} + .d2-1076035503 .fill-N7{fill:#FFFFFF;} + .d2-1076035503 .fill-B1{fill:#0D32B2;} + .d2-1076035503 .fill-B2{fill:#0D32B2;} + .d2-1076035503 .fill-B3{fill:#E3E9FD;} + .d2-1076035503 .fill-B4{fill:#E3E9FD;} + .d2-1076035503 .fill-B5{fill:#EDF0FD;} + .d2-1076035503 .fill-B6{fill:#F7F8FE;} + .d2-1076035503 .fill-AA2{fill:#4A6FF3;} + .d2-1076035503 .fill-AA4{fill:#EDF0FD;} + .d2-1076035503 .fill-AA5{fill:#F7F8FE;} + .d2-1076035503 .fill-AB4{fill:#EDF0FD;} + .d2-1076035503 .fill-AB5{fill:#F7F8FE;} + .d2-1076035503 .stroke-N1{stroke:#0A0F25;} + .d2-1076035503 .stroke-N2{stroke:#676C7E;} + .d2-1076035503 .stroke-N3{stroke:#9499AB;} + .d2-1076035503 .stroke-N4{stroke:#CFD2DD;} + .d2-1076035503 .stroke-N5{stroke:#DEE1EB;} + .d2-1076035503 .stroke-N6{stroke:#EEF1F8;} + .d2-1076035503 .stroke-N7{stroke:#FFFFFF;} + .d2-1076035503 .stroke-B1{stroke:#0D32B2;} + .d2-1076035503 .stroke-B2{stroke:#0D32B2;} + .d2-1076035503 .stroke-B3{stroke:#E3E9FD;} + .d2-1076035503 .stroke-B4{stroke:#E3E9FD;} + .d2-1076035503 .stroke-B5{stroke:#EDF0FD;} + .d2-1076035503 .stroke-B6{stroke:#F7F8FE;} + .d2-1076035503 .stroke-AA2{stroke:#4A6FF3;} + .d2-1076035503 .stroke-AA4{stroke:#EDF0FD;} + .d2-1076035503 .stroke-AA5{stroke:#F7F8FE;} + .d2-1076035503 .stroke-AB4{stroke:#EDF0FD;} + .d2-1076035503 .stroke-AB5{stroke:#F7F8FE;} + .d2-1076035503 .background-color-N1{background-color:#0A0F25;} + .d2-1076035503 .background-color-N2{background-color:#676C7E;} + .d2-1076035503 .background-color-N3{background-color:#9499AB;} + .d2-1076035503 .background-color-N4{background-color:#CFD2DD;} + .d2-1076035503 .background-color-N5{background-color:#DEE1EB;} + .d2-1076035503 .background-color-N6{background-color:#EEF1F8;} + .d2-1076035503 .background-color-N7{background-color:#FFFFFF;} + .d2-1076035503 .background-color-B1{background-color:#0D32B2;} + .d2-1076035503 .background-color-B2{background-color:#0D32B2;} + .d2-1076035503 .background-color-B3{background-color:#E3E9FD;} + .d2-1076035503 .background-color-B4{background-color:#E3E9FD;} + .d2-1076035503 .background-color-B5{background-color:#EDF0FD;} + .d2-1076035503 .background-color-B6{background-color:#F7F8FE;} + .d2-1076035503 .background-color-AA2{background-color:#4A6FF3;} + .d2-1076035503 .background-color-AA4{background-color:#EDF0FD;} + .d2-1076035503 .background-color-AA5{background-color:#F7F8FE;} + .d2-1076035503 .background-color-AB4{background-color:#EDF0FD;} + .d2-1076035503 .background-color-AB5{background-color:#F7F8FE;} + .d2-1076035503 .color-N1{color:#0A0F25;} + .d2-1076035503 .color-N2{color:#676C7E;} + .d2-1076035503 .color-N3{color:#9499AB;} + .d2-1076035503 .color-N4{color:#CFD2DD;} + .d2-1076035503 .color-N5{color:#DEE1EB;} + .d2-1076035503 .color-N6{color:#EEF1F8;} + .d2-1076035503 .color-N7{color:#FFFFFF;} + .d2-1076035503 .color-B1{color:#0D32B2;} + .d2-1076035503 .color-B2{color:#0D32B2;} + .d2-1076035503 .color-B3{color:#E3E9FD;} + .d2-1076035503 .color-B4{color:#E3E9FD;} + .d2-1076035503 .color-B5{color:#EDF0FD;} + .d2-1076035503 .color-B6{color:#F7F8FE;} + .d2-1076035503 .color-AA2{color:#4A6FF3;} + .d2-1076035503 .color-AA4{color:#EDF0FD;} + .d2-1076035503 .color-AA5{color:#F7F8FE;} + .d2-1076035503 .color-AB4{color:#EDF0FD;} + .d2-1076035503 .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}]]>r1r2 eth1eth1 diff --git a/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg index a5fc8a835..e86a50c98 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -r1r2 eth1eth1 + .d2-423924276 .fill-N1{fill:#0A0F25;} + .d2-423924276 .fill-N2{fill:#676C7E;} + .d2-423924276 .fill-N3{fill:#9499AB;} + .d2-423924276 .fill-N4{fill:#CFD2DD;} + .d2-423924276 .fill-N5{fill:#DEE1EB;} + .d2-423924276 .fill-N6{fill:#EEF1F8;} + .d2-423924276 .fill-N7{fill:#FFFFFF;} + .d2-423924276 .fill-B1{fill:#0D32B2;} + .d2-423924276 .fill-B2{fill:#0D32B2;} + .d2-423924276 .fill-B3{fill:#E3E9FD;} + .d2-423924276 .fill-B4{fill:#E3E9FD;} + .d2-423924276 .fill-B5{fill:#EDF0FD;} + .d2-423924276 .fill-B6{fill:#F7F8FE;} + .d2-423924276 .fill-AA2{fill:#4A6FF3;} + .d2-423924276 .fill-AA4{fill:#EDF0FD;} + .d2-423924276 .fill-AA5{fill:#F7F8FE;} + .d2-423924276 .fill-AB4{fill:#EDF0FD;} + .d2-423924276 .fill-AB5{fill:#F7F8FE;} + .d2-423924276 .stroke-N1{stroke:#0A0F25;} + .d2-423924276 .stroke-N2{stroke:#676C7E;} + .d2-423924276 .stroke-N3{stroke:#9499AB;} + .d2-423924276 .stroke-N4{stroke:#CFD2DD;} + .d2-423924276 .stroke-N5{stroke:#DEE1EB;} + .d2-423924276 .stroke-N6{stroke:#EEF1F8;} + .d2-423924276 .stroke-N7{stroke:#FFFFFF;} + .d2-423924276 .stroke-B1{stroke:#0D32B2;} + .d2-423924276 .stroke-B2{stroke:#0D32B2;} + .d2-423924276 .stroke-B3{stroke:#E3E9FD;} + .d2-423924276 .stroke-B4{stroke:#E3E9FD;} + .d2-423924276 .stroke-B5{stroke:#EDF0FD;} + .d2-423924276 .stroke-B6{stroke:#F7F8FE;} + .d2-423924276 .stroke-AA2{stroke:#4A6FF3;} + .d2-423924276 .stroke-AA4{stroke:#EDF0FD;} + .d2-423924276 .stroke-AA5{stroke:#F7F8FE;} + .d2-423924276 .stroke-AB4{stroke:#EDF0FD;} + .d2-423924276 .stroke-AB5{stroke:#F7F8FE;} + .d2-423924276 .background-color-N1{background-color:#0A0F25;} + .d2-423924276 .background-color-N2{background-color:#676C7E;} + .d2-423924276 .background-color-N3{background-color:#9499AB;} + .d2-423924276 .background-color-N4{background-color:#CFD2DD;} + .d2-423924276 .background-color-N5{background-color:#DEE1EB;} + .d2-423924276 .background-color-N6{background-color:#EEF1F8;} + .d2-423924276 .background-color-N7{background-color:#FFFFFF;} + .d2-423924276 .background-color-B1{background-color:#0D32B2;} + .d2-423924276 .background-color-B2{background-color:#0D32B2;} + .d2-423924276 .background-color-B3{background-color:#E3E9FD;} + .d2-423924276 .background-color-B4{background-color:#E3E9FD;} + .d2-423924276 .background-color-B5{background-color:#EDF0FD;} + .d2-423924276 .background-color-B6{background-color:#F7F8FE;} + .d2-423924276 .background-color-AA2{background-color:#4A6FF3;} + .d2-423924276 .background-color-AA4{background-color:#EDF0FD;} + .d2-423924276 .background-color-AA5{background-color:#F7F8FE;} + .d2-423924276 .background-color-AB4{background-color:#EDF0FD;} + .d2-423924276 .background-color-AB5{background-color:#F7F8FE;} + .d2-423924276 .color-N1{color:#0A0F25;} + .d2-423924276 .color-N2{color:#676C7E;} + .d2-423924276 .color-N3{color:#9499AB;} + .d2-423924276 .color-N4{color:#CFD2DD;} + .d2-423924276 .color-N5{color:#DEE1EB;} + .d2-423924276 .color-N6{color:#EEF1F8;} + .d2-423924276 .color-N7{color:#FFFFFF;} + .d2-423924276 .color-B1{color:#0D32B2;} + .d2-423924276 .color-B2{color:#0D32B2;} + .d2-423924276 .color-B3{color:#E3E9FD;} + .d2-423924276 .color-B4{color:#E3E9FD;} + .d2-423924276 .color-B5{color:#EDF0FD;} + .d2-423924276 .color-B6{color:#F7F8FE;} + .d2-423924276 .color-AA2{color:#4A6FF3;} + .d2-423924276 .color-AA4{color:#EDF0FD;} + .d2-423924276 .color-AA5{color:#F7F8FE;} + .d2-423924276 .color-AB4{color:#EDF0FD;} + .d2-423924276 .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}]]>r1r2 eth1eth1 diff --git a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg index f66f1a4a5..6c30532ad 100644 --- a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index 7f59247e8..dffb9b70b 100644 --- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg index 22ddef53b..8aa6d669c 100644 --- a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcd circle filled-circle + .d2-1964876090 .fill-N1{fill:#0A0F25;} + .d2-1964876090 .fill-N2{fill:#676C7E;} + .d2-1964876090 .fill-N3{fill:#9499AB;} + .d2-1964876090 .fill-N4{fill:#CFD2DD;} + .d2-1964876090 .fill-N5{fill:#DEE1EB;} + .d2-1964876090 .fill-N6{fill:#EEF1F8;} + .d2-1964876090 .fill-N7{fill:#FFFFFF;} + .d2-1964876090 .fill-B1{fill:#0D32B2;} + .d2-1964876090 .fill-B2{fill:#0D32B2;} + .d2-1964876090 .fill-B3{fill:#E3E9FD;} + .d2-1964876090 .fill-B4{fill:#E3E9FD;} + .d2-1964876090 .fill-B5{fill:#EDF0FD;} + .d2-1964876090 .fill-B6{fill:#F7F8FE;} + .d2-1964876090 .fill-AA2{fill:#4A6FF3;} + .d2-1964876090 .fill-AA4{fill:#EDF0FD;} + .d2-1964876090 .fill-AA5{fill:#F7F8FE;} + .d2-1964876090 .fill-AB4{fill:#EDF0FD;} + .d2-1964876090 .fill-AB5{fill:#F7F8FE;} + .d2-1964876090 .stroke-N1{stroke:#0A0F25;} + .d2-1964876090 .stroke-N2{stroke:#676C7E;} + .d2-1964876090 .stroke-N3{stroke:#9499AB;} + .d2-1964876090 .stroke-N4{stroke:#CFD2DD;} + .d2-1964876090 .stroke-N5{stroke:#DEE1EB;} + .d2-1964876090 .stroke-N6{stroke:#EEF1F8;} + .d2-1964876090 .stroke-N7{stroke:#FFFFFF;} + .d2-1964876090 .stroke-B1{stroke:#0D32B2;} + .d2-1964876090 .stroke-B2{stroke:#0D32B2;} + .d2-1964876090 .stroke-B3{stroke:#E3E9FD;} + .d2-1964876090 .stroke-B4{stroke:#E3E9FD;} + .d2-1964876090 .stroke-B5{stroke:#EDF0FD;} + .d2-1964876090 .stroke-B6{stroke:#F7F8FE;} + .d2-1964876090 .stroke-AA2{stroke:#4A6FF3;} + .d2-1964876090 .stroke-AA4{stroke:#EDF0FD;} + .d2-1964876090 .stroke-AA5{stroke:#F7F8FE;} + .d2-1964876090 .stroke-AB4{stroke:#EDF0FD;} + .d2-1964876090 .stroke-AB5{stroke:#F7F8FE;} + .d2-1964876090 .background-color-N1{background-color:#0A0F25;} + .d2-1964876090 .background-color-N2{background-color:#676C7E;} + .d2-1964876090 .background-color-N3{background-color:#9499AB;} + .d2-1964876090 .background-color-N4{background-color:#CFD2DD;} + .d2-1964876090 .background-color-N5{background-color:#DEE1EB;} + .d2-1964876090 .background-color-N6{background-color:#EEF1F8;} + .d2-1964876090 .background-color-N7{background-color:#FFFFFF;} + .d2-1964876090 .background-color-B1{background-color:#0D32B2;} + .d2-1964876090 .background-color-B2{background-color:#0D32B2;} + .d2-1964876090 .background-color-B3{background-color:#E3E9FD;} + .d2-1964876090 .background-color-B4{background-color:#E3E9FD;} + .d2-1964876090 .background-color-B5{background-color:#EDF0FD;} + .d2-1964876090 .background-color-B6{background-color:#F7F8FE;} + .d2-1964876090 .background-color-AA2{background-color:#4A6FF3;} + .d2-1964876090 .background-color-AA4{background-color:#EDF0FD;} + .d2-1964876090 .background-color-AA5{background-color:#F7F8FE;} + .d2-1964876090 .background-color-AB4{background-color:#EDF0FD;} + .d2-1964876090 .background-color-AB5{background-color:#F7F8FE;} + .d2-1964876090 .color-N1{color:#0A0F25;} + .d2-1964876090 .color-N2{color:#676C7E;} + .d2-1964876090 .color-N3{color:#9499AB;} + .d2-1964876090 .color-N4{color:#CFD2DD;} + .d2-1964876090 .color-N5{color:#DEE1EB;} + .d2-1964876090 .color-N6{color:#EEF1F8;} + .d2-1964876090 .color-N7{color:#FFFFFF;} + .d2-1964876090 .color-B1{color:#0D32B2;} + .d2-1964876090 .color-B2{color:#0D32B2;} + .d2-1964876090 .color-B3{color:#E3E9FD;} + .d2-1964876090 .color-B4{color:#E3E9FD;} + .d2-1964876090 .color-B5{color:#EDF0FD;} + .d2-1964876090 .color-B6{color:#F7F8FE;} + .d2-1964876090 .color-AA2{color:#4A6FF3;} + .d2-1964876090 .color-AA4{color:#EDF0FD;} + .d2-1964876090 .color-AA5{color:#F7F8FE;} + .d2-1964876090 .color-AB4{color:#EDF0FD;} + .d2-1964876090 .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}]]>abcd circle filled-circle diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg index dfddd3fe3..c9bf38b21 100644 --- a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcd circle filled-circle + .d2-2475695899 .fill-N1{fill:#0A0F25;} + .d2-2475695899 .fill-N2{fill:#676C7E;} + .d2-2475695899 .fill-N3{fill:#9499AB;} + .d2-2475695899 .fill-N4{fill:#CFD2DD;} + .d2-2475695899 .fill-N5{fill:#DEE1EB;} + .d2-2475695899 .fill-N6{fill:#EEF1F8;} + .d2-2475695899 .fill-N7{fill:#FFFFFF;} + .d2-2475695899 .fill-B1{fill:#0D32B2;} + .d2-2475695899 .fill-B2{fill:#0D32B2;} + .d2-2475695899 .fill-B3{fill:#E3E9FD;} + .d2-2475695899 .fill-B4{fill:#E3E9FD;} + .d2-2475695899 .fill-B5{fill:#EDF0FD;} + .d2-2475695899 .fill-B6{fill:#F7F8FE;} + .d2-2475695899 .fill-AA2{fill:#4A6FF3;} + .d2-2475695899 .fill-AA4{fill:#EDF0FD;} + .d2-2475695899 .fill-AA5{fill:#F7F8FE;} + .d2-2475695899 .fill-AB4{fill:#EDF0FD;} + .d2-2475695899 .fill-AB5{fill:#F7F8FE;} + .d2-2475695899 .stroke-N1{stroke:#0A0F25;} + .d2-2475695899 .stroke-N2{stroke:#676C7E;} + .d2-2475695899 .stroke-N3{stroke:#9499AB;} + .d2-2475695899 .stroke-N4{stroke:#CFD2DD;} + .d2-2475695899 .stroke-N5{stroke:#DEE1EB;} + .d2-2475695899 .stroke-N6{stroke:#EEF1F8;} + .d2-2475695899 .stroke-N7{stroke:#FFFFFF;} + .d2-2475695899 .stroke-B1{stroke:#0D32B2;} + .d2-2475695899 .stroke-B2{stroke:#0D32B2;} + .d2-2475695899 .stroke-B3{stroke:#E3E9FD;} + .d2-2475695899 .stroke-B4{stroke:#E3E9FD;} + .d2-2475695899 .stroke-B5{stroke:#EDF0FD;} + .d2-2475695899 .stroke-B6{stroke:#F7F8FE;} + .d2-2475695899 .stroke-AA2{stroke:#4A6FF3;} + .d2-2475695899 .stroke-AA4{stroke:#EDF0FD;} + .d2-2475695899 .stroke-AA5{stroke:#F7F8FE;} + .d2-2475695899 .stroke-AB4{stroke:#EDF0FD;} + .d2-2475695899 .stroke-AB5{stroke:#F7F8FE;} + .d2-2475695899 .background-color-N1{background-color:#0A0F25;} + .d2-2475695899 .background-color-N2{background-color:#676C7E;} + .d2-2475695899 .background-color-N3{background-color:#9499AB;} + .d2-2475695899 .background-color-N4{background-color:#CFD2DD;} + .d2-2475695899 .background-color-N5{background-color:#DEE1EB;} + .d2-2475695899 .background-color-N6{background-color:#EEF1F8;} + .d2-2475695899 .background-color-N7{background-color:#FFFFFF;} + .d2-2475695899 .background-color-B1{background-color:#0D32B2;} + .d2-2475695899 .background-color-B2{background-color:#0D32B2;} + .d2-2475695899 .background-color-B3{background-color:#E3E9FD;} + .d2-2475695899 .background-color-B4{background-color:#E3E9FD;} + .d2-2475695899 .background-color-B5{background-color:#EDF0FD;} + .d2-2475695899 .background-color-B6{background-color:#F7F8FE;} + .d2-2475695899 .background-color-AA2{background-color:#4A6FF3;} + .d2-2475695899 .background-color-AA4{background-color:#EDF0FD;} + .d2-2475695899 .background-color-AA5{background-color:#F7F8FE;} + .d2-2475695899 .background-color-AB4{background-color:#EDF0FD;} + .d2-2475695899 .background-color-AB5{background-color:#F7F8FE;} + .d2-2475695899 .color-N1{color:#0A0F25;} + .d2-2475695899 .color-N2{color:#676C7E;} + .d2-2475695899 .color-N3{color:#9499AB;} + .d2-2475695899 .color-N4{color:#CFD2DD;} + .d2-2475695899 .color-N5{color:#DEE1EB;} + .d2-2475695899 .color-N6{color:#EEF1F8;} + .d2-2475695899 .color-N7{color:#FFFFFF;} + .d2-2475695899 .color-B1{color:#0D32B2;} + .d2-2475695899 .color-B2{color:#0D32B2;} + .d2-2475695899 .color-B3{color:#E3E9FD;} + .d2-2475695899 .color-B4{color:#E3E9FD;} + .d2-2475695899 .color-B5{color:#EDF0FD;} + .d2-2475695899 .color-B6{color:#F7F8FE;} + .d2-2475695899 .color-AA2{color:#4A6FF3;} + .d2-2475695899 .color-AA4{color:#EDF0FD;} + .d2-2475695899 .color-AA5{color:#F7F8FE;} + .d2-2475695899 .color-AB4{color:#EDF0FD;} + .d2-2475695899 .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}]]>abcd circle filled-circle diff --git a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg index 463d9cc1c..84cf11bf5 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-3859270131 .fill-N1{fill:#0A0F25;} + .d2-3859270131 .fill-N2{fill:#676C7E;} + .d2-3859270131 .fill-N3{fill:#9499AB;} + .d2-3859270131 .fill-N4{fill:#CFD2DD;} + .d2-3859270131 .fill-N5{fill:#DEE1EB;} + .d2-3859270131 .fill-N6{fill:#EEF1F8;} + .d2-3859270131 .fill-N7{fill:#FFFFFF;} + .d2-3859270131 .fill-B1{fill:#0D32B2;} + .d2-3859270131 .fill-B2{fill:#0D32B2;} + .d2-3859270131 .fill-B3{fill:#E3E9FD;} + .d2-3859270131 .fill-B4{fill:#E3E9FD;} + .d2-3859270131 .fill-B5{fill:#EDF0FD;} + .d2-3859270131 .fill-B6{fill:#F7F8FE;} + .d2-3859270131 .fill-AA2{fill:#4A6FF3;} + .d2-3859270131 .fill-AA4{fill:#EDF0FD;} + .d2-3859270131 .fill-AA5{fill:#F7F8FE;} + .d2-3859270131 .fill-AB4{fill:#EDF0FD;} + .d2-3859270131 .fill-AB5{fill:#F7F8FE;} + .d2-3859270131 .stroke-N1{stroke:#0A0F25;} + .d2-3859270131 .stroke-N2{stroke:#676C7E;} + .d2-3859270131 .stroke-N3{stroke:#9499AB;} + .d2-3859270131 .stroke-N4{stroke:#CFD2DD;} + .d2-3859270131 .stroke-N5{stroke:#DEE1EB;} + .d2-3859270131 .stroke-N6{stroke:#EEF1F8;} + .d2-3859270131 .stroke-N7{stroke:#FFFFFF;} + .d2-3859270131 .stroke-B1{stroke:#0D32B2;} + .d2-3859270131 .stroke-B2{stroke:#0D32B2;} + .d2-3859270131 .stroke-B3{stroke:#E3E9FD;} + .d2-3859270131 .stroke-B4{stroke:#E3E9FD;} + .d2-3859270131 .stroke-B5{stroke:#EDF0FD;} + .d2-3859270131 .stroke-B6{stroke:#F7F8FE;} + .d2-3859270131 .stroke-AA2{stroke:#4A6FF3;} + .d2-3859270131 .stroke-AA4{stroke:#EDF0FD;} + .d2-3859270131 .stroke-AA5{stroke:#F7F8FE;} + .d2-3859270131 .stroke-AB4{stroke:#EDF0FD;} + .d2-3859270131 .stroke-AB5{stroke:#F7F8FE;} + .d2-3859270131 .background-color-N1{background-color:#0A0F25;} + .d2-3859270131 .background-color-N2{background-color:#676C7E;} + .d2-3859270131 .background-color-N3{background-color:#9499AB;} + .d2-3859270131 .background-color-N4{background-color:#CFD2DD;} + .d2-3859270131 .background-color-N5{background-color:#DEE1EB;} + .d2-3859270131 .background-color-N6{background-color:#EEF1F8;} + .d2-3859270131 .background-color-N7{background-color:#FFFFFF;} + .d2-3859270131 .background-color-B1{background-color:#0D32B2;} + .d2-3859270131 .background-color-B2{background-color:#0D32B2;} + .d2-3859270131 .background-color-B3{background-color:#E3E9FD;} + .d2-3859270131 .background-color-B4{background-color:#E3E9FD;} + .d2-3859270131 .background-color-B5{background-color:#EDF0FD;} + .d2-3859270131 .background-color-B6{background-color:#F7F8FE;} + .d2-3859270131 .background-color-AA2{background-color:#4A6FF3;} + .d2-3859270131 .background-color-AA4{background-color:#EDF0FD;} + .d2-3859270131 .background-color-AA5{background-color:#F7F8FE;} + .d2-3859270131 .background-color-AB4{background-color:#EDF0FD;} + .d2-3859270131 .background-color-AB5{background-color:#F7F8FE;} + .d2-3859270131 .color-N1{color:#0A0F25;} + .d2-3859270131 .color-N2{color:#676C7E;} + .d2-3859270131 .color-N3{color:#9499AB;} + .d2-3859270131 .color-N4{color:#CFD2DD;} + .d2-3859270131 .color-N5{color:#DEE1EB;} + .d2-3859270131 .color-N6{color:#EEF1F8;} + .d2-3859270131 .color-N7{color:#FFFFFF;} + .d2-3859270131 .color-B1{color:#0D32B2;} + .d2-3859270131 .color-B2{color:#0D32B2;} + .d2-3859270131 .color-B3{color:#E3E9FD;} + .d2-3859270131 .color-B4{color:#E3E9FD;} + .d2-3859270131 .color-B5{color:#EDF0FD;} + .d2-3859270131 .color-B6{color:#F7F8FE;} + .d2-3859270131 .color-AA2{color:#4A6FF3;} + .d2-3859270131 .color-AA4{color:#EDF0FD;} + .d2-3859270131 .color-AA5{color:#F7F8FE;} + .d2-3859270131 .color-AB4{color:#EDF0FD;} + .d2-3859270131 .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}]]>abc diff --git a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg index 83a90e42b..01b29bea0 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-3022025952 .fill-N1{fill:#0A0F25;} + .d2-3022025952 .fill-N2{fill:#676C7E;} + .d2-3022025952 .fill-N3{fill:#9499AB;} + .d2-3022025952 .fill-N4{fill:#CFD2DD;} + .d2-3022025952 .fill-N5{fill:#DEE1EB;} + .d2-3022025952 .fill-N6{fill:#EEF1F8;} + .d2-3022025952 .fill-N7{fill:#FFFFFF;} + .d2-3022025952 .fill-B1{fill:#0D32B2;} + .d2-3022025952 .fill-B2{fill:#0D32B2;} + .d2-3022025952 .fill-B3{fill:#E3E9FD;} + .d2-3022025952 .fill-B4{fill:#E3E9FD;} + .d2-3022025952 .fill-B5{fill:#EDF0FD;} + .d2-3022025952 .fill-B6{fill:#F7F8FE;} + .d2-3022025952 .fill-AA2{fill:#4A6FF3;} + .d2-3022025952 .fill-AA4{fill:#EDF0FD;} + .d2-3022025952 .fill-AA5{fill:#F7F8FE;} + .d2-3022025952 .fill-AB4{fill:#EDF0FD;} + .d2-3022025952 .fill-AB5{fill:#F7F8FE;} + .d2-3022025952 .stroke-N1{stroke:#0A0F25;} + .d2-3022025952 .stroke-N2{stroke:#676C7E;} + .d2-3022025952 .stroke-N3{stroke:#9499AB;} + .d2-3022025952 .stroke-N4{stroke:#CFD2DD;} + .d2-3022025952 .stroke-N5{stroke:#DEE1EB;} + .d2-3022025952 .stroke-N6{stroke:#EEF1F8;} + .d2-3022025952 .stroke-N7{stroke:#FFFFFF;} + .d2-3022025952 .stroke-B1{stroke:#0D32B2;} + .d2-3022025952 .stroke-B2{stroke:#0D32B2;} + .d2-3022025952 .stroke-B3{stroke:#E3E9FD;} + .d2-3022025952 .stroke-B4{stroke:#E3E9FD;} + .d2-3022025952 .stroke-B5{stroke:#EDF0FD;} + .d2-3022025952 .stroke-B6{stroke:#F7F8FE;} + .d2-3022025952 .stroke-AA2{stroke:#4A6FF3;} + .d2-3022025952 .stroke-AA4{stroke:#EDF0FD;} + .d2-3022025952 .stroke-AA5{stroke:#F7F8FE;} + .d2-3022025952 .stroke-AB4{stroke:#EDF0FD;} + .d2-3022025952 .stroke-AB5{stroke:#F7F8FE;} + .d2-3022025952 .background-color-N1{background-color:#0A0F25;} + .d2-3022025952 .background-color-N2{background-color:#676C7E;} + .d2-3022025952 .background-color-N3{background-color:#9499AB;} + .d2-3022025952 .background-color-N4{background-color:#CFD2DD;} + .d2-3022025952 .background-color-N5{background-color:#DEE1EB;} + .d2-3022025952 .background-color-N6{background-color:#EEF1F8;} + .d2-3022025952 .background-color-N7{background-color:#FFFFFF;} + .d2-3022025952 .background-color-B1{background-color:#0D32B2;} + .d2-3022025952 .background-color-B2{background-color:#0D32B2;} + .d2-3022025952 .background-color-B3{background-color:#E3E9FD;} + .d2-3022025952 .background-color-B4{background-color:#E3E9FD;} + .d2-3022025952 .background-color-B5{background-color:#EDF0FD;} + .d2-3022025952 .background-color-B6{background-color:#F7F8FE;} + .d2-3022025952 .background-color-AA2{background-color:#4A6FF3;} + .d2-3022025952 .background-color-AA4{background-color:#EDF0FD;} + .d2-3022025952 .background-color-AA5{background-color:#F7F8FE;} + .d2-3022025952 .background-color-AB4{background-color:#EDF0FD;} + .d2-3022025952 .background-color-AB5{background-color:#F7F8FE;} + .d2-3022025952 .color-N1{color:#0A0F25;} + .d2-3022025952 .color-N2{color:#676C7E;} + .d2-3022025952 .color-N3{color:#9499AB;} + .d2-3022025952 .color-N4{color:#CFD2DD;} + .d2-3022025952 .color-N5{color:#DEE1EB;} + .d2-3022025952 .color-N6{color:#EEF1F8;} + .d2-3022025952 .color-N7{color:#FFFFFF;} + .d2-3022025952 .color-B1{color:#0D32B2;} + .d2-3022025952 .color-B2{color:#0D32B2;} + .d2-3022025952 .color-B3{color:#E3E9FD;} + .d2-3022025952 .color-B4{color:#E3E9FD;} + .d2-3022025952 .color-B5{color:#EDF0FD;} + .d2-3022025952 .color-B6{color:#F7F8FE;} + .d2-3022025952 .color-AA2{color:#4A6FF3;} + .d2-3022025952 .color-AA4{color:#EDF0FD;} + .d2-3022025952 .color-AA5{color:#F7F8FE;} + .d2-3022025952 .color-AB4{color:#EDF0FD;} + .d2-3022025952 .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}]]>abc diff --git a/e2etests/testdata/stable/class/dagre/sketch.exp.svg b/e2etests/testdata/stable/class/dagre/sketch.exp.svg index d5b8de3aa..fd5c0aeb7 100644 --- a/e2etests/testdata/stable/class/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2730605657 .fill-N1{fill:#0A0F25;} + .d2-2730605657 .fill-N2{fill:#676C7E;} + .d2-2730605657 .fill-N3{fill:#9499AB;} + .d2-2730605657 .fill-N4{fill:#CFD2DD;} + .d2-2730605657 .fill-N5{fill:#DEE1EB;} + .d2-2730605657 .fill-N6{fill:#EEF1F8;} + .d2-2730605657 .fill-N7{fill:#FFFFFF;} + .d2-2730605657 .fill-B1{fill:#0D32B2;} + .d2-2730605657 .fill-B2{fill:#0D32B2;} + .d2-2730605657 .fill-B3{fill:#E3E9FD;} + .d2-2730605657 .fill-B4{fill:#E3E9FD;} + .d2-2730605657 .fill-B5{fill:#EDF0FD;} + .d2-2730605657 .fill-B6{fill:#F7F8FE;} + .d2-2730605657 .fill-AA2{fill:#4A6FF3;} + .d2-2730605657 .fill-AA4{fill:#EDF0FD;} + .d2-2730605657 .fill-AA5{fill:#F7F8FE;} + .d2-2730605657 .fill-AB4{fill:#EDF0FD;} + .d2-2730605657 .fill-AB5{fill:#F7F8FE;} + .d2-2730605657 .stroke-N1{stroke:#0A0F25;} + .d2-2730605657 .stroke-N2{stroke:#676C7E;} + .d2-2730605657 .stroke-N3{stroke:#9499AB;} + .d2-2730605657 .stroke-N4{stroke:#CFD2DD;} + .d2-2730605657 .stroke-N5{stroke:#DEE1EB;} + .d2-2730605657 .stroke-N6{stroke:#EEF1F8;} + .d2-2730605657 .stroke-N7{stroke:#FFFFFF;} + .d2-2730605657 .stroke-B1{stroke:#0D32B2;} + .d2-2730605657 .stroke-B2{stroke:#0D32B2;} + .d2-2730605657 .stroke-B3{stroke:#E3E9FD;} + .d2-2730605657 .stroke-B4{stroke:#E3E9FD;} + .d2-2730605657 .stroke-B5{stroke:#EDF0FD;} + .d2-2730605657 .stroke-B6{stroke:#F7F8FE;} + .d2-2730605657 .stroke-AA2{stroke:#4A6FF3;} + .d2-2730605657 .stroke-AA4{stroke:#EDF0FD;} + .d2-2730605657 .stroke-AA5{stroke:#F7F8FE;} + .d2-2730605657 .stroke-AB4{stroke:#EDF0FD;} + .d2-2730605657 .stroke-AB5{stroke:#F7F8FE;} + .d2-2730605657 .background-color-N1{background-color:#0A0F25;} + .d2-2730605657 .background-color-N2{background-color:#676C7E;} + .d2-2730605657 .background-color-N3{background-color:#9499AB;} + .d2-2730605657 .background-color-N4{background-color:#CFD2DD;} + .d2-2730605657 .background-color-N5{background-color:#DEE1EB;} + .d2-2730605657 .background-color-N6{background-color:#EEF1F8;} + .d2-2730605657 .background-color-N7{background-color:#FFFFFF;} + .d2-2730605657 .background-color-B1{background-color:#0D32B2;} + .d2-2730605657 .background-color-B2{background-color:#0D32B2;} + .d2-2730605657 .background-color-B3{background-color:#E3E9FD;} + .d2-2730605657 .background-color-B4{background-color:#E3E9FD;} + .d2-2730605657 .background-color-B5{background-color:#EDF0FD;} + .d2-2730605657 .background-color-B6{background-color:#F7F8FE;} + .d2-2730605657 .background-color-AA2{background-color:#4A6FF3;} + .d2-2730605657 .background-color-AA4{background-color:#EDF0FD;} + .d2-2730605657 .background-color-AA5{background-color:#F7F8FE;} + .d2-2730605657 .background-color-AB4{background-color:#EDF0FD;} + .d2-2730605657 .background-color-AB5{background-color:#F7F8FE;} + .d2-2730605657 .color-N1{color:#0A0F25;} + .d2-2730605657 .color-N2{color:#676C7E;} + .d2-2730605657 .color-N3{color:#9499AB;} + .d2-2730605657 .color-N4{color:#CFD2DD;} + .d2-2730605657 .color-N5{color:#DEE1EB;} + .d2-2730605657 .color-N6{color:#EEF1F8;} + .d2-2730605657 .color-N7{color:#FFFFFF;} + .d2-2730605657 .color-B1{color:#0D32B2;} + .d2-2730605657 .color-B2{color:#0D32B2;} + .d2-2730605657 .color-B3{color:#E3E9FD;} + .d2-2730605657 .color-B4{color:#E3E9FD;} + .d2-2730605657 .color-B5{color:#EDF0FD;} + .d2-2730605657 .color-B6{color:#F7F8FE;} + .d2-2730605657 .color-AA2{color:#4A6FF3;} + .d2-2730605657 .color-AA4{color:#EDF0FD;} + .d2-2730605657 .color-AA5{color:#F7F8FE;} + .d2-2730605657 .color-AB4{color:#EDF0FD;} + .d2-2730605657 .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}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/class/elk/sketch.exp.svg b/e2etests/testdata/stable/class/elk/sketch.exp.svg index dd8f9ba1a..9e9d67dfb 100644 --- a/e2etests/testdata/stable/class/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-3545685585 .fill-N1{fill:#0A0F25;} + .d2-3545685585 .fill-N2{fill:#676C7E;} + .d2-3545685585 .fill-N3{fill:#9499AB;} + .d2-3545685585 .fill-N4{fill:#CFD2DD;} + .d2-3545685585 .fill-N5{fill:#DEE1EB;} + .d2-3545685585 .fill-N6{fill:#EEF1F8;} + .d2-3545685585 .fill-N7{fill:#FFFFFF;} + .d2-3545685585 .fill-B1{fill:#0D32B2;} + .d2-3545685585 .fill-B2{fill:#0D32B2;} + .d2-3545685585 .fill-B3{fill:#E3E9FD;} + .d2-3545685585 .fill-B4{fill:#E3E9FD;} + .d2-3545685585 .fill-B5{fill:#EDF0FD;} + .d2-3545685585 .fill-B6{fill:#F7F8FE;} + .d2-3545685585 .fill-AA2{fill:#4A6FF3;} + .d2-3545685585 .fill-AA4{fill:#EDF0FD;} + .d2-3545685585 .fill-AA5{fill:#F7F8FE;} + .d2-3545685585 .fill-AB4{fill:#EDF0FD;} + .d2-3545685585 .fill-AB5{fill:#F7F8FE;} + .d2-3545685585 .stroke-N1{stroke:#0A0F25;} + .d2-3545685585 .stroke-N2{stroke:#676C7E;} + .d2-3545685585 .stroke-N3{stroke:#9499AB;} + .d2-3545685585 .stroke-N4{stroke:#CFD2DD;} + .d2-3545685585 .stroke-N5{stroke:#DEE1EB;} + .d2-3545685585 .stroke-N6{stroke:#EEF1F8;} + .d2-3545685585 .stroke-N7{stroke:#FFFFFF;} + .d2-3545685585 .stroke-B1{stroke:#0D32B2;} + .d2-3545685585 .stroke-B2{stroke:#0D32B2;} + .d2-3545685585 .stroke-B3{stroke:#E3E9FD;} + .d2-3545685585 .stroke-B4{stroke:#E3E9FD;} + .d2-3545685585 .stroke-B5{stroke:#EDF0FD;} + .d2-3545685585 .stroke-B6{stroke:#F7F8FE;} + .d2-3545685585 .stroke-AA2{stroke:#4A6FF3;} + .d2-3545685585 .stroke-AA4{stroke:#EDF0FD;} + .d2-3545685585 .stroke-AA5{stroke:#F7F8FE;} + .d2-3545685585 .stroke-AB4{stroke:#EDF0FD;} + .d2-3545685585 .stroke-AB5{stroke:#F7F8FE;} + .d2-3545685585 .background-color-N1{background-color:#0A0F25;} + .d2-3545685585 .background-color-N2{background-color:#676C7E;} + .d2-3545685585 .background-color-N3{background-color:#9499AB;} + .d2-3545685585 .background-color-N4{background-color:#CFD2DD;} + .d2-3545685585 .background-color-N5{background-color:#DEE1EB;} + .d2-3545685585 .background-color-N6{background-color:#EEF1F8;} + .d2-3545685585 .background-color-N7{background-color:#FFFFFF;} + .d2-3545685585 .background-color-B1{background-color:#0D32B2;} + .d2-3545685585 .background-color-B2{background-color:#0D32B2;} + .d2-3545685585 .background-color-B3{background-color:#E3E9FD;} + .d2-3545685585 .background-color-B4{background-color:#E3E9FD;} + .d2-3545685585 .background-color-B5{background-color:#EDF0FD;} + .d2-3545685585 .background-color-B6{background-color:#F7F8FE;} + .d2-3545685585 .background-color-AA2{background-color:#4A6FF3;} + .d2-3545685585 .background-color-AA4{background-color:#EDF0FD;} + .d2-3545685585 .background-color-AA5{background-color:#F7F8FE;} + .d2-3545685585 .background-color-AB4{background-color:#EDF0FD;} + .d2-3545685585 .background-color-AB5{background-color:#F7F8FE;} + .d2-3545685585 .color-N1{color:#0A0F25;} + .d2-3545685585 .color-N2{color:#676C7E;} + .d2-3545685585 .color-N3{color:#9499AB;} + .d2-3545685585 .color-N4{color:#CFD2DD;} + .d2-3545685585 .color-N5{color:#DEE1EB;} + .d2-3545685585 .color-N6{color:#EEF1F8;} + .d2-3545685585 .color-N7{color:#FFFFFF;} + .d2-3545685585 .color-B1{color:#0D32B2;} + .d2-3545685585 .color-B2{color:#0D32B2;} + .d2-3545685585 .color-B3{color:#E3E9FD;} + .d2-3545685585 .color-B4{color:#E3E9FD;} + .d2-3545685585 .color-B5{color:#EDF0FD;} + .d2-3545685585 .color-B6{color:#F7F8FE;} + .d2-3545685585 .color-AA2{color:#4A6FF3;} + .d2-3545685585 .color-AA4{color:#EDF0FD;} + .d2-3545685585 .color-AA5{color:#F7F8FE;} + .d2-3545685585 .color-AB4{color:#EDF0FD;} + .d2-3545685585 .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}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg index d5510ba38..f9c8bbae4 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-1612300372 .fill-N1{fill:#0A0F25;} + .d2-1612300372 .fill-N2{fill:#676C7E;} + .d2-1612300372 .fill-N3{fill:#9499AB;} + .d2-1612300372 .fill-N4{fill:#CFD2DD;} + .d2-1612300372 .fill-N5{fill:#DEE1EB;} + .d2-1612300372 .fill-N6{fill:#EEF1F8;} + .d2-1612300372 .fill-N7{fill:#FFFFFF;} + .d2-1612300372 .fill-B1{fill:#0D32B2;} + .d2-1612300372 .fill-B2{fill:#0D32B2;} + .d2-1612300372 .fill-B3{fill:#E3E9FD;} + .d2-1612300372 .fill-B4{fill:#E3E9FD;} + .d2-1612300372 .fill-B5{fill:#EDF0FD;} + .d2-1612300372 .fill-B6{fill:#F7F8FE;} + .d2-1612300372 .fill-AA2{fill:#4A6FF3;} + .d2-1612300372 .fill-AA4{fill:#EDF0FD;} + .d2-1612300372 .fill-AA5{fill:#F7F8FE;} + .d2-1612300372 .fill-AB4{fill:#EDF0FD;} + .d2-1612300372 .fill-AB5{fill:#F7F8FE;} + .d2-1612300372 .stroke-N1{stroke:#0A0F25;} + .d2-1612300372 .stroke-N2{stroke:#676C7E;} + .d2-1612300372 .stroke-N3{stroke:#9499AB;} + .d2-1612300372 .stroke-N4{stroke:#CFD2DD;} + .d2-1612300372 .stroke-N5{stroke:#DEE1EB;} + .d2-1612300372 .stroke-N6{stroke:#EEF1F8;} + .d2-1612300372 .stroke-N7{stroke:#FFFFFF;} + .d2-1612300372 .stroke-B1{stroke:#0D32B2;} + .d2-1612300372 .stroke-B2{stroke:#0D32B2;} + .d2-1612300372 .stroke-B3{stroke:#E3E9FD;} + .d2-1612300372 .stroke-B4{stroke:#E3E9FD;} + .d2-1612300372 .stroke-B5{stroke:#EDF0FD;} + .d2-1612300372 .stroke-B6{stroke:#F7F8FE;} + .d2-1612300372 .stroke-AA2{stroke:#4A6FF3;} + .d2-1612300372 .stroke-AA4{stroke:#EDF0FD;} + .d2-1612300372 .stroke-AA5{stroke:#F7F8FE;} + .d2-1612300372 .stroke-AB4{stroke:#EDF0FD;} + .d2-1612300372 .stroke-AB5{stroke:#F7F8FE;} + .d2-1612300372 .background-color-N1{background-color:#0A0F25;} + .d2-1612300372 .background-color-N2{background-color:#676C7E;} + .d2-1612300372 .background-color-N3{background-color:#9499AB;} + .d2-1612300372 .background-color-N4{background-color:#CFD2DD;} + .d2-1612300372 .background-color-N5{background-color:#DEE1EB;} + .d2-1612300372 .background-color-N6{background-color:#EEF1F8;} + .d2-1612300372 .background-color-N7{background-color:#FFFFFF;} + .d2-1612300372 .background-color-B1{background-color:#0D32B2;} + .d2-1612300372 .background-color-B2{background-color:#0D32B2;} + .d2-1612300372 .background-color-B3{background-color:#E3E9FD;} + .d2-1612300372 .background-color-B4{background-color:#E3E9FD;} + .d2-1612300372 .background-color-B5{background-color:#EDF0FD;} + .d2-1612300372 .background-color-B6{background-color:#F7F8FE;} + .d2-1612300372 .background-color-AA2{background-color:#4A6FF3;} + .d2-1612300372 .background-color-AA4{background-color:#EDF0FD;} + .d2-1612300372 .background-color-AA5{background-color:#F7F8FE;} + .d2-1612300372 .background-color-AB4{background-color:#EDF0FD;} + .d2-1612300372 .background-color-AB5{background-color:#F7F8FE;} + .d2-1612300372 .color-N1{color:#0A0F25;} + .d2-1612300372 .color-N2{color:#676C7E;} + .d2-1612300372 .color-N3{color:#9499AB;} + .d2-1612300372 .color-N4{color:#CFD2DD;} + .d2-1612300372 .color-N5{color:#DEE1EB;} + .d2-1612300372 .color-N6{color:#EEF1F8;} + .d2-1612300372 .color-N7{color:#FFFFFF;} + .d2-1612300372 .color-B1{color:#0D32B2;} + .d2-1612300372 .color-B2{color:#0D32B2;} + .d2-1612300372 .color-B3{color:#E3E9FD;} + .d2-1612300372 .color-B4{color:#E3E9FD;} + .d2-1612300372 .color-B5{color:#EDF0FD;} + .d2-1612300372 .color-B6{color:#F7F8FE;} + .d2-1612300372 .color-AA2{color:#4A6FF3;} + .d2-1612300372 .color-AA4{color:#EDF0FD;} + .d2-1612300372 .color-AA5{color:#F7F8FE;} + .d2-1612300372 .color-AB4{color:#EDF0FD;} + .d2-1612300372 .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/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg index b1b98cdee..9ad45d8b0 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-264894640 .fill-N1{fill:#0A0F25;} + .d2-264894640 .fill-N2{fill:#676C7E;} + .d2-264894640 .fill-N3{fill:#9499AB;} + .d2-264894640 .fill-N4{fill:#CFD2DD;} + .d2-264894640 .fill-N5{fill:#DEE1EB;} + .d2-264894640 .fill-N6{fill:#EEF1F8;} + .d2-264894640 .fill-N7{fill:#FFFFFF;} + .d2-264894640 .fill-B1{fill:#0D32B2;} + .d2-264894640 .fill-B2{fill:#0D32B2;} + .d2-264894640 .fill-B3{fill:#E3E9FD;} + .d2-264894640 .fill-B4{fill:#E3E9FD;} + .d2-264894640 .fill-B5{fill:#EDF0FD;} + .d2-264894640 .fill-B6{fill:#F7F8FE;} + .d2-264894640 .fill-AA2{fill:#4A6FF3;} + .d2-264894640 .fill-AA4{fill:#EDF0FD;} + .d2-264894640 .fill-AA5{fill:#F7F8FE;} + .d2-264894640 .fill-AB4{fill:#EDF0FD;} + .d2-264894640 .fill-AB5{fill:#F7F8FE;} + .d2-264894640 .stroke-N1{stroke:#0A0F25;} + .d2-264894640 .stroke-N2{stroke:#676C7E;} + .d2-264894640 .stroke-N3{stroke:#9499AB;} + .d2-264894640 .stroke-N4{stroke:#CFD2DD;} + .d2-264894640 .stroke-N5{stroke:#DEE1EB;} + .d2-264894640 .stroke-N6{stroke:#EEF1F8;} + .d2-264894640 .stroke-N7{stroke:#FFFFFF;} + .d2-264894640 .stroke-B1{stroke:#0D32B2;} + .d2-264894640 .stroke-B2{stroke:#0D32B2;} + .d2-264894640 .stroke-B3{stroke:#E3E9FD;} + .d2-264894640 .stroke-B4{stroke:#E3E9FD;} + .d2-264894640 .stroke-B5{stroke:#EDF0FD;} + .d2-264894640 .stroke-B6{stroke:#F7F8FE;} + .d2-264894640 .stroke-AA2{stroke:#4A6FF3;} + .d2-264894640 .stroke-AA4{stroke:#EDF0FD;} + .d2-264894640 .stroke-AA5{stroke:#F7F8FE;} + .d2-264894640 .stroke-AB4{stroke:#EDF0FD;} + .d2-264894640 .stroke-AB5{stroke:#F7F8FE;} + .d2-264894640 .background-color-N1{background-color:#0A0F25;} + .d2-264894640 .background-color-N2{background-color:#676C7E;} + .d2-264894640 .background-color-N3{background-color:#9499AB;} + .d2-264894640 .background-color-N4{background-color:#CFD2DD;} + .d2-264894640 .background-color-N5{background-color:#DEE1EB;} + .d2-264894640 .background-color-N6{background-color:#EEF1F8;} + .d2-264894640 .background-color-N7{background-color:#FFFFFF;} + .d2-264894640 .background-color-B1{background-color:#0D32B2;} + .d2-264894640 .background-color-B2{background-color:#0D32B2;} + .d2-264894640 .background-color-B3{background-color:#E3E9FD;} + .d2-264894640 .background-color-B4{background-color:#E3E9FD;} + .d2-264894640 .background-color-B5{background-color:#EDF0FD;} + .d2-264894640 .background-color-B6{background-color:#F7F8FE;} + .d2-264894640 .background-color-AA2{background-color:#4A6FF3;} + .d2-264894640 .background-color-AA4{background-color:#EDF0FD;} + .d2-264894640 .background-color-AA5{background-color:#F7F8FE;} + .d2-264894640 .background-color-AB4{background-color:#EDF0FD;} + .d2-264894640 .background-color-AB5{background-color:#F7F8FE;} + .d2-264894640 .color-N1{color:#0A0F25;} + .d2-264894640 .color-N2{color:#676C7E;} + .d2-264894640 .color-N3{color:#9499AB;} + .d2-264894640 .color-N4{color:#CFD2DD;} + .d2-264894640 .color-N5{color:#DEE1EB;} + .d2-264894640 .color-N6{color:#EEF1F8;} + .d2-264894640 .color-N7{color:#FFFFFF;} + .d2-264894640 .color-B1{color:#0D32B2;} + .d2-264894640 .color-B2{color:#0D32B2;} + .d2-264894640 .color-B3{color:#E3E9FD;} + .d2-264894640 .color-B4{color:#E3E9FD;} + .d2-264894640 .color-B5{color:#EDF0FD;} + .d2-264894640 .color-B6{color:#F7F8FE;} + .d2-264894640 .color-AA2{color:#4A6FF3;} + .d2-264894640 .color-AA4{color:#EDF0FD;} + .d2-264894640 .color-AA5{color:#F7F8FE;} + .d2-264894640 .color-AB4{color:#EDF0FD;} + .d2-264894640 .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 cef597d72..21660a50c 100644 --- a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -*** thenthen + .d2-3999366538 .fill-N1{fill:#0A0F25;} + .d2-3999366538 .fill-N2{fill:#676C7E;} + .d2-3999366538 .fill-N3{fill:#9499AB;} + .d2-3999366538 .fill-N4{fill:#CFD2DD;} + .d2-3999366538 .fill-N5{fill:#DEE1EB;} + .d2-3999366538 .fill-N6{fill:#EEF1F8;} + .d2-3999366538 .fill-N7{fill:#FFFFFF;} + .d2-3999366538 .fill-B1{fill:#0D32B2;} + .d2-3999366538 .fill-B2{fill:#0D32B2;} + .d2-3999366538 .fill-B3{fill:#E3E9FD;} + .d2-3999366538 .fill-B4{fill:#E3E9FD;} + .d2-3999366538 .fill-B5{fill:#EDF0FD;} + .d2-3999366538 .fill-B6{fill:#F7F8FE;} + .d2-3999366538 .fill-AA2{fill:#4A6FF3;} + .d2-3999366538 .fill-AA4{fill:#EDF0FD;} + .d2-3999366538 .fill-AA5{fill:#F7F8FE;} + .d2-3999366538 .fill-AB4{fill:#EDF0FD;} + .d2-3999366538 .fill-AB5{fill:#F7F8FE;} + .d2-3999366538 .stroke-N1{stroke:#0A0F25;} + .d2-3999366538 .stroke-N2{stroke:#676C7E;} + .d2-3999366538 .stroke-N3{stroke:#9499AB;} + .d2-3999366538 .stroke-N4{stroke:#CFD2DD;} + .d2-3999366538 .stroke-N5{stroke:#DEE1EB;} + .d2-3999366538 .stroke-N6{stroke:#EEF1F8;} + .d2-3999366538 .stroke-N7{stroke:#FFFFFF;} + .d2-3999366538 .stroke-B1{stroke:#0D32B2;} + .d2-3999366538 .stroke-B2{stroke:#0D32B2;} + .d2-3999366538 .stroke-B3{stroke:#E3E9FD;} + .d2-3999366538 .stroke-B4{stroke:#E3E9FD;} + .d2-3999366538 .stroke-B5{stroke:#EDF0FD;} + .d2-3999366538 .stroke-B6{stroke:#F7F8FE;} + .d2-3999366538 .stroke-AA2{stroke:#4A6FF3;} + .d2-3999366538 .stroke-AA4{stroke:#EDF0FD;} + .d2-3999366538 .stroke-AA5{stroke:#F7F8FE;} + .d2-3999366538 .stroke-AB4{stroke:#EDF0FD;} + .d2-3999366538 .stroke-AB5{stroke:#F7F8FE;} + .d2-3999366538 .background-color-N1{background-color:#0A0F25;} + .d2-3999366538 .background-color-N2{background-color:#676C7E;} + .d2-3999366538 .background-color-N3{background-color:#9499AB;} + .d2-3999366538 .background-color-N4{background-color:#CFD2DD;} + .d2-3999366538 .background-color-N5{background-color:#DEE1EB;} + .d2-3999366538 .background-color-N6{background-color:#EEF1F8;} + .d2-3999366538 .background-color-N7{background-color:#FFFFFF;} + .d2-3999366538 .background-color-B1{background-color:#0D32B2;} + .d2-3999366538 .background-color-B2{background-color:#0D32B2;} + .d2-3999366538 .background-color-B3{background-color:#E3E9FD;} + .d2-3999366538 .background-color-B4{background-color:#E3E9FD;} + .d2-3999366538 .background-color-B5{background-color:#EDF0FD;} + .d2-3999366538 .background-color-B6{background-color:#F7F8FE;} + .d2-3999366538 .background-color-AA2{background-color:#4A6FF3;} + .d2-3999366538 .background-color-AA4{background-color:#EDF0FD;} + .d2-3999366538 .background-color-AA5{background-color:#F7F8FE;} + .d2-3999366538 .background-color-AB4{background-color:#EDF0FD;} + .d2-3999366538 .background-color-AB5{background-color:#F7F8FE;} + .d2-3999366538 .color-N1{color:#0A0F25;} + .d2-3999366538 .color-N2{color:#676C7E;} + .d2-3999366538 .color-N3{color:#9499AB;} + .d2-3999366538 .color-N4{color:#CFD2DD;} + .d2-3999366538 .color-N5{color:#DEE1EB;} + .d2-3999366538 .color-N6{color:#EEF1F8;} + .d2-3999366538 .color-N7{color:#FFFFFF;} + .d2-3999366538 .color-B1{color:#0D32B2;} + .d2-3999366538 .color-B2{color:#0D32B2;} + .d2-3999366538 .color-B3{color:#E3E9FD;} + .d2-3999366538 .color-B4{color:#E3E9FD;} + .d2-3999366538 .color-B5{color:#EDF0FD;} + .d2-3999366538 .color-B6{color:#F7F8FE;} + .d2-3999366538 .color-AA2{color:#4A6FF3;} + .d2-3999366538 .color-AA4{color:#EDF0FD;} + .d2-3999366538 .color-AA5{color:#F7F8FE;} + .d2-3999366538 .color-AB4{color:#EDF0FD;} + .d2-3999366538 .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}]]>*** thenthen diff --git a/e2etests/testdata/stable/classes/elk/sketch.exp.svg b/e2etests/testdata/stable/classes/elk/sketch.exp.svg index 67fbdee36..01e4308c1 100644 --- a/e2etests/testdata/stable/classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -*** thenthen + .d2-2398321321 .fill-N1{fill:#0A0F25;} + .d2-2398321321 .fill-N2{fill:#676C7E;} + .d2-2398321321 .fill-N3{fill:#9499AB;} + .d2-2398321321 .fill-N4{fill:#CFD2DD;} + .d2-2398321321 .fill-N5{fill:#DEE1EB;} + .d2-2398321321 .fill-N6{fill:#EEF1F8;} + .d2-2398321321 .fill-N7{fill:#FFFFFF;} + .d2-2398321321 .fill-B1{fill:#0D32B2;} + .d2-2398321321 .fill-B2{fill:#0D32B2;} + .d2-2398321321 .fill-B3{fill:#E3E9FD;} + .d2-2398321321 .fill-B4{fill:#E3E9FD;} + .d2-2398321321 .fill-B5{fill:#EDF0FD;} + .d2-2398321321 .fill-B6{fill:#F7F8FE;} + .d2-2398321321 .fill-AA2{fill:#4A6FF3;} + .d2-2398321321 .fill-AA4{fill:#EDF0FD;} + .d2-2398321321 .fill-AA5{fill:#F7F8FE;} + .d2-2398321321 .fill-AB4{fill:#EDF0FD;} + .d2-2398321321 .fill-AB5{fill:#F7F8FE;} + .d2-2398321321 .stroke-N1{stroke:#0A0F25;} + .d2-2398321321 .stroke-N2{stroke:#676C7E;} + .d2-2398321321 .stroke-N3{stroke:#9499AB;} + .d2-2398321321 .stroke-N4{stroke:#CFD2DD;} + .d2-2398321321 .stroke-N5{stroke:#DEE1EB;} + .d2-2398321321 .stroke-N6{stroke:#EEF1F8;} + .d2-2398321321 .stroke-N7{stroke:#FFFFFF;} + .d2-2398321321 .stroke-B1{stroke:#0D32B2;} + .d2-2398321321 .stroke-B2{stroke:#0D32B2;} + .d2-2398321321 .stroke-B3{stroke:#E3E9FD;} + .d2-2398321321 .stroke-B4{stroke:#E3E9FD;} + .d2-2398321321 .stroke-B5{stroke:#EDF0FD;} + .d2-2398321321 .stroke-B6{stroke:#F7F8FE;} + .d2-2398321321 .stroke-AA2{stroke:#4A6FF3;} + .d2-2398321321 .stroke-AA4{stroke:#EDF0FD;} + .d2-2398321321 .stroke-AA5{stroke:#F7F8FE;} + .d2-2398321321 .stroke-AB4{stroke:#EDF0FD;} + .d2-2398321321 .stroke-AB5{stroke:#F7F8FE;} + .d2-2398321321 .background-color-N1{background-color:#0A0F25;} + .d2-2398321321 .background-color-N2{background-color:#676C7E;} + .d2-2398321321 .background-color-N3{background-color:#9499AB;} + .d2-2398321321 .background-color-N4{background-color:#CFD2DD;} + .d2-2398321321 .background-color-N5{background-color:#DEE1EB;} + .d2-2398321321 .background-color-N6{background-color:#EEF1F8;} + .d2-2398321321 .background-color-N7{background-color:#FFFFFF;} + .d2-2398321321 .background-color-B1{background-color:#0D32B2;} + .d2-2398321321 .background-color-B2{background-color:#0D32B2;} + .d2-2398321321 .background-color-B3{background-color:#E3E9FD;} + .d2-2398321321 .background-color-B4{background-color:#E3E9FD;} + .d2-2398321321 .background-color-B5{background-color:#EDF0FD;} + .d2-2398321321 .background-color-B6{background-color:#F7F8FE;} + .d2-2398321321 .background-color-AA2{background-color:#4A6FF3;} + .d2-2398321321 .background-color-AA4{background-color:#EDF0FD;} + .d2-2398321321 .background-color-AA5{background-color:#F7F8FE;} + .d2-2398321321 .background-color-AB4{background-color:#EDF0FD;} + .d2-2398321321 .background-color-AB5{background-color:#F7F8FE;} + .d2-2398321321 .color-N1{color:#0A0F25;} + .d2-2398321321 .color-N2{color:#676C7E;} + .d2-2398321321 .color-N3{color:#9499AB;} + .d2-2398321321 .color-N4{color:#CFD2DD;} + .d2-2398321321 .color-N5{color:#DEE1EB;} + .d2-2398321321 .color-N6{color:#EEF1F8;} + .d2-2398321321 .color-N7{color:#FFFFFF;} + .d2-2398321321 .color-B1{color:#0D32B2;} + .d2-2398321321 .color-B2{color:#0D32B2;} + .d2-2398321321 .color-B3{color:#E3E9FD;} + .d2-2398321321 .color-B4{color:#E3E9FD;} + .d2-2398321321 .color-B5{color:#EDF0FD;} + .d2-2398321321 .color-B6{color:#F7F8FE;} + .d2-2398321321 .color-AA2{color:#4A6FF3;} + .d2-2398321321 .color-AA4{color:#EDF0FD;} + .d2-2398321321 .color-AA5{color:#F7F8FE;} + .d2-2398321321 .color-AB4{color:#EDF0FD;} + .d2-2398321321 .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}]]>*** thenthen diff --git a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg index d3538bcbd..1acd62e46 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg @@ -1,30 +1,30 @@ -// RegisterHash registers a function that returns a new instance of the given + .d2-3528049809 .fill-N1{fill:#0A0F25;} + .d2-3528049809 .fill-N2{fill:#676C7E;} + .d2-3528049809 .fill-N3{fill:#9499AB;} + .d2-3528049809 .fill-N4{fill:#CFD2DD;} + .d2-3528049809 .fill-N5{fill:#DEE1EB;} + .d2-3528049809 .fill-N6{fill:#EEF1F8;} + .d2-3528049809 .fill-N7{fill:#FFFFFF;} + .d2-3528049809 .fill-B1{fill:#0D32B2;} + .d2-3528049809 .fill-B2{fill:#0D32B2;} + .d2-3528049809 .fill-B3{fill:#E3E9FD;} + .d2-3528049809 .fill-B4{fill:#E3E9FD;} + .d2-3528049809 .fill-B5{fill:#EDF0FD;} + .d2-3528049809 .fill-B6{fill:#F7F8FE;} + .d2-3528049809 .fill-AA2{fill:#4A6FF3;} + .d2-3528049809 .fill-AA4{fill:#EDF0FD;} + .d2-3528049809 .fill-AA5{fill:#F7F8FE;} + .d2-3528049809 .fill-AB4{fill:#EDF0FD;} + .d2-3528049809 .fill-AB5{fill:#F7F8FE;} + .d2-3528049809 .stroke-N1{stroke:#0A0F25;} + .d2-3528049809 .stroke-N2{stroke:#676C7E;} + .d2-3528049809 .stroke-N3{stroke:#9499AB;} + .d2-3528049809 .stroke-N4{stroke:#CFD2DD;} + .d2-3528049809 .stroke-N5{stroke:#DEE1EB;} + .d2-3528049809 .stroke-N6{stroke:#EEF1F8;} + .d2-3528049809 .stroke-N7{stroke:#FFFFFF;} + .d2-3528049809 .stroke-B1{stroke:#0D32B2;} + .d2-3528049809 .stroke-B2{stroke:#0D32B2;} + .d2-3528049809 .stroke-B3{stroke:#E3E9FD;} + .d2-3528049809 .stroke-B4{stroke:#E3E9FD;} + .d2-3528049809 .stroke-B5{stroke:#EDF0FD;} + .d2-3528049809 .stroke-B6{stroke:#F7F8FE;} + .d2-3528049809 .stroke-AA2{stroke:#4A6FF3;} + .d2-3528049809 .stroke-AA4{stroke:#EDF0FD;} + .d2-3528049809 .stroke-AA5{stroke:#F7F8FE;} + .d2-3528049809 .stroke-AB4{stroke:#EDF0FD;} + .d2-3528049809 .stroke-AB5{stroke:#F7F8FE;} + .d2-3528049809 .background-color-N1{background-color:#0A0F25;} + .d2-3528049809 .background-color-N2{background-color:#676C7E;} + .d2-3528049809 .background-color-N3{background-color:#9499AB;} + .d2-3528049809 .background-color-N4{background-color:#CFD2DD;} + .d2-3528049809 .background-color-N5{background-color:#DEE1EB;} + .d2-3528049809 .background-color-N6{background-color:#EEF1F8;} + .d2-3528049809 .background-color-N7{background-color:#FFFFFF;} + .d2-3528049809 .background-color-B1{background-color:#0D32B2;} + .d2-3528049809 .background-color-B2{background-color:#0D32B2;} + .d2-3528049809 .background-color-B3{background-color:#E3E9FD;} + .d2-3528049809 .background-color-B4{background-color:#E3E9FD;} + .d2-3528049809 .background-color-B5{background-color:#EDF0FD;} + .d2-3528049809 .background-color-B6{background-color:#F7F8FE;} + .d2-3528049809 .background-color-AA2{background-color:#4A6FF3;} + .d2-3528049809 .background-color-AA4{background-color:#EDF0FD;} + .d2-3528049809 .background-color-AA5{background-color:#F7F8FE;} + .d2-3528049809 .background-color-AB4{background-color:#EDF0FD;} + .d2-3528049809 .background-color-AB5{background-color:#F7F8FE;} + .d2-3528049809 .color-N1{color:#0A0F25;} + .d2-3528049809 .color-N2{color:#676C7E;} + .d2-3528049809 .color-N3{color:#9499AB;} + .d2-3528049809 .color-N4{color:#CFD2DD;} + .d2-3528049809 .color-N5{color:#DEE1EB;} + .d2-3528049809 .color-N6{color:#EEF1F8;} + .d2-3528049809 .color-N7{color:#FFFFFF;} + .d2-3528049809 .color-B1{color:#0D32B2;} + .d2-3528049809 .color-B2{color:#0D32B2;} + .d2-3528049809 .color-B3{color:#E3E9FD;} + .d2-3528049809 .color-B4{color:#E3E9FD;} + .d2-3528049809 .color-B5{color:#EDF0FD;} + .d2-3528049809 .color-B6{color:#F7F8FE;} + .d2-3528049809 .color-AA2{color:#4A6FF3;} + .d2-3528049809 .color-AA4{color:#EDF0FD;} + .d2-3528049809 .color-AA5{color:#F7F8FE;} + .d2-3528049809 .color-AB4{color:#EDF0FD;} + .d2-3528049809 .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}]]>// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in // packages that implement hash functions. func RegisterHash(h Hash, f func() hash.Hash) { @@ -126,7 +126,7 @@         panic("crypto: RegisterHash of unknown hash function")     }     hashes[h] = f -}xy +}xy diff --git a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg index fd5c5b756..5da7f5ee6 100644 --- a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -// RegisterHash registers a function that returns a new instance of the given + .d2-3358777174 .fill-N1{fill:#0A0F25;} + .d2-3358777174 .fill-N2{fill:#676C7E;} + .d2-3358777174 .fill-N3{fill:#9499AB;} + .d2-3358777174 .fill-N4{fill:#CFD2DD;} + .d2-3358777174 .fill-N5{fill:#DEE1EB;} + .d2-3358777174 .fill-N6{fill:#EEF1F8;} + .d2-3358777174 .fill-N7{fill:#FFFFFF;} + .d2-3358777174 .fill-B1{fill:#0D32B2;} + .d2-3358777174 .fill-B2{fill:#0D32B2;} + .d2-3358777174 .fill-B3{fill:#E3E9FD;} + .d2-3358777174 .fill-B4{fill:#E3E9FD;} + .d2-3358777174 .fill-B5{fill:#EDF0FD;} + .d2-3358777174 .fill-B6{fill:#F7F8FE;} + .d2-3358777174 .fill-AA2{fill:#4A6FF3;} + .d2-3358777174 .fill-AA4{fill:#EDF0FD;} + .d2-3358777174 .fill-AA5{fill:#F7F8FE;} + .d2-3358777174 .fill-AB4{fill:#EDF0FD;} + .d2-3358777174 .fill-AB5{fill:#F7F8FE;} + .d2-3358777174 .stroke-N1{stroke:#0A0F25;} + .d2-3358777174 .stroke-N2{stroke:#676C7E;} + .d2-3358777174 .stroke-N3{stroke:#9499AB;} + .d2-3358777174 .stroke-N4{stroke:#CFD2DD;} + .d2-3358777174 .stroke-N5{stroke:#DEE1EB;} + .d2-3358777174 .stroke-N6{stroke:#EEF1F8;} + .d2-3358777174 .stroke-N7{stroke:#FFFFFF;} + .d2-3358777174 .stroke-B1{stroke:#0D32B2;} + .d2-3358777174 .stroke-B2{stroke:#0D32B2;} + .d2-3358777174 .stroke-B3{stroke:#E3E9FD;} + .d2-3358777174 .stroke-B4{stroke:#E3E9FD;} + .d2-3358777174 .stroke-B5{stroke:#EDF0FD;} + .d2-3358777174 .stroke-B6{stroke:#F7F8FE;} + .d2-3358777174 .stroke-AA2{stroke:#4A6FF3;} + .d2-3358777174 .stroke-AA4{stroke:#EDF0FD;} + .d2-3358777174 .stroke-AA5{stroke:#F7F8FE;} + .d2-3358777174 .stroke-AB4{stroke:#EDF0FD;} + .d2-3358777174 .stroke-AB5{stroke:#F7F8FE;} + .d2-3358777174 .background-color-N1{background-color:#0A0F25;} + .d2-3358777174 .background-color-N2{background-color:#676C7E;} + .d2-3358777174 .background-color-N3{background-color:#9499AB;} + .d2-3358777174 .background-color-N4{background-color:#CFD2DD;} + .d2-3358777174 .background-color-N5{background-color:#DEE1EB;} + .d2-3358777174 .background-color-N6{background-color:#EEF1F8;} + .d2-3358777174 .background-color-N7{background-color:#FFFFFF;} + .d2-3358777174 .background-color-B1{background-color:#0D32B2;} + .d2-3358777174 .background-color-B2{background-color:#0D32B2;} + .d2-3358777174 .background-color-B3{background-color:#E3E9FD;} + .d2-3358777174 .background-color-B4{background-color:#E3E9FD;} + .d2-3358777174 .background-color-B5{background-color:#EDF0FD;} + .d2-3358777174 .background-color-B6{background-color:#F7F8FE;} + .d2-3358777174 .background-color-AA2{background-color:#4A6FF3;} + .d2-3358777174 .background-color-AA4{background-color:#EDF0FD;} + .d2-3358777174 .background-color-AA5{background-color:#F7F8FE;} + .d2-3358777174 .background-color-AB4{background-color:#EDF0FD;} + .d2-3358777174 .background-color-AB5{background-color:#F7F8FE;} + .d2-3358777174 .color-N1{color:#0A0F25;} + .d2-3358777174 .color-N2{color:#676C7E;} + .d2-3358777174 .color-N3{color:#9499AB;} + .d2-3358777174 .color-N4{color:#CFD2DD;} + .d2-3358777174 .color-N5{color:#DEE1EB;} + .d2-3358777174 .color-N6{color:#EEF1F8;} + .d2-3358777174 .color-N7{color:#FFFFFF;} + .d2-3358777174 .color-B1{color:#0D32B2;} + .d2-3358777174 .color-B2{color:#0D32B2;} + .d2-3358777174 .color-B3{color:#E3E9FD;} + .d2-3358777174 .color-B4{color:#E3E9FD;} + .d2-3358777174 .color-B5{color:#EDF0FD;} + .d2-3358777174 .color-B6{color:#F7F8FE;} + .d2-3358777174 .color-AA2{color:#4A6FF3;} + .d2-3358777174 .color-AA4{color:#EDF0FD;} + .d2-3358777174 .color-AA5{color:#F7F8FE;} + .d2-3358777174 .color-AB4{color:#EDF0FD;} + .d2-3358777174 .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}]]>// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in // packages that implement hash functions. func RegisterHash(h Hash, f func() hash.Hash) { @@ -126,7 +126,7 @@         panic("crypto: RegisterHash of unknown hash function")     }     hashes[h] = f -}xy +}xy diff --git a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg index b190f7fe8..d2c2103e2 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ windowroofgarage +}]]>windowroofgarage -blindsglass +blindsglass -shinglesstarlinkutility hookup +shinglesstarlinkutility hookup -toolsvehicles +toolsvehicles -find contractorscraigslistfacebook +find contractorscraigslistfacebook -find contractorssolicit quotescraigslistfacebook +find contractorssolicit quotescraigslistfacebook -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook @@ -220,7 +220,7 @@ -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook @@ -229,7 +229,7 @@ -windowroofgaragewaterrainthunder +windowroofgaragewaterrainthunder diff --git a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg index 712a5936c..41f280f8e 100644 --- a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg @@ -1,16 +1,16 @@ windowroofgarage +}]]>windowroofgarage -blindsglass +blindsglass -shinglesstarlinkutility hookup +shinglesstarlinkutility hookup -toolsvehicles +toolsvehicles -find contractorscraigslistfacebook +find contractorscraigslistfacebook -find contractorssolicit quotescraigslistfacebook +find contractorssolicit quotescraigslistfacebook -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook @@ -220,7 +220,7 @@ -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook @@ -229,7 +229,7 @@ -windowroofgaragewaterrainthunder +windowroofgaragewaterrainthunder diff --git a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg index f4f1b31f0..e33fb7477 100644 --- a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acfbdhg + .d2-140937193 .fill-N1{fill:#0A0F25;} + .d2-140937193 .fill-N2{fill:#676C7E;} + .d2-140937193 .fill-N3{fill:#9499AB;} + .d2-140937193 .fill-N4{fill:#CFD2DD;} + .d2-140937193 .fill-N5{fill:#DEE1EB;} + .d2-140937193 .fill-N6{fill:#EEF1F8;} + .d2-140937193 .fill-N7{fill:#FFFFFF;} + .d2-140937193 .fill-B1{fill:#0D32B2;} + .d2-140937193 .fill-B2{fill:#0D32B2;} + .d2-140937193 .fill-B3{fill:#E3E9FD;} + .d2-140937193 .fill-B4{fill:#E3E9FD;} + .d2-140937193 .fill-B5{fill:#EDF0FD;} + .d2-140937193 .fill-B6{fill:#F7F8FE;} + .d2-140937193 .fill-AA2{fill:#4A6FF3;} + .d2-140937193 .fill-AA4{fill:#EDF0FD;} + .d2-140937193 .fill-AA5{fill:#F7F8FE;} + .d2-140937193 .fill-AB4{fill:#EDF0FD;} + .d2-140937193 .fill-AB5{fill:#F7F8FE;} + .d2-140937193 .stroke-N1{stroke:#0A0F25;} + .d2-140937193 .stroke-N2{stroke:#676C7E;} + .d2-140937193 .stroke-N3{stroke:#9499AB;} + .d2-140937193 .stroke-N4{stroke:#CFD2DD;} + .d2-140937193 .stroke-N5{stroke:#DEE1EB;} + .d2-140937193 .stroke-N6{stroke:#EEF1F8;} + .d2-140937193 .stroke-N7{stroke:#FFFFFF;} + .d2-140937193 .stroke-B1{stroke:#0D32B2;} + .d2-140937193 .stroke-B2{stroke:#0D32B2;} + .d2-140937193 .stroke-B3{stroke:#E3E9FD;} + .d2-140937193 .stroke-B4{stroke:#E3E9FD;} + .d2-140937193 .stroke-B5{stroke:#EDF0FD;} + .d2-140937193 .stroke-B6{stroke:#F7F8FE;} + .d2-140937193 .stroke-AA2{stroke:#4A6FF3;} + .d2-140937193 .stroke-AA4{stroke:#EDF0FD;} + .d2-140937193 .stroke-AA5{stroke:#F7F8FE;} + .d2-140937193 .stroke-AB4{stroke:#EDF0FD;} + .d2-140937193 .stroke-AB5{stroke:#F7F8FE;} + .d2-140937193 .background-color-N1{background-color:#0A0F25;} + .d2-140937193 .background-color-N2{background-color:#676C7E;} + .d2-140937193 .background-color-N3{background-color:#9499AB;} + .d2-140937193 .background-color-N4{background-color:#CFD2DD;} + .d2-140937193 .background-color-N5{background-color:#DEE1EB;} + .d2-140937193 .background-color-N6{background-color:#EEF1F8;} + .d2-140937193 .background-color-N7{background-color:#FFFFFF;} + .d2-140937193 .background-color-B1{background-color:#0D32B2;} + .d2-140937193 .background-color-B2{background-color:#0D32B2;} + .d2-140937193 .background-color-B3{background-color:#E3E9FD;} + .d2-140937193 .background-color-B4{background-color:#E3E9FD;} + .d2-140937193 .background-color-B5{background-color:#EDF0FD;} + .d2-140937193 .background-color-B6{background-color:#F7F8FE;} + .d2-140937193 .background-color-AA2{background-color:#4A6FF3;} + .d2-140937193 .background-color-AA4{background-color:#EDF0FD;} + .d2-140937193 .background-color-AA5{background-color:#F7F8FE;} + .d2-140937193 .background-color-AB4{background-color:#EDF0FD;} + .d2-140937193 .background-color-AB5{background-color:#F7F8FE;} + .d2-140937193 .color-N1{color:#0A0F25;} + .d2-140937193 .color-N2{color:#676C7E;} + .d2-140937193 .color-N3{color:#9499AB;} + .d2-140937193 .color-N4{color:#CFD2DD;} + .d2-140937193 .color-N5{color:#DEE1EB;} + .d2-140937193 .color-N6{color:#EEF1F8;} + .d2-140937193 .color-N7{color:#FFFFFF;} + .d2-140937193 .color-B1{color:#0D32B2;} + .d2-140937193 .color-B2{color:#0D32B2;} + .d2-140937193 .color-B3{color:#E3E9FD;} + .d2-140937193 .color-B4{color:#E3E9FD;} + .d2-140937193 .color-B5{color:#EDF0FD;} + .d2-140937193 .color-B6{color:#F7F8FE;} + .d2-140937193 .color-AA2{color:#4A6FF3;} + .d2-140937193 .color-AA4{color:#EDF0FD;} + .d2-140937193 .color-AA5{color:#F7F8FE;} + .d2-140937193 .color-AB4{color:#EDF0FD;} + .d2-140937193 .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}]]>acfbdhg diff --git a/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg b/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg index 49809c8c2..20bc8fdf5 100644 --- a/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acfbdhg + .d2-1664589405 .fill-N1{fill:#0A0F25;} + .d2-1664589405 .fill-N2{fill:#676C7E;} + .d2-1664589405 .fill-N3{fill:#9499AB;} + .d2-1664589405 .fill-N4{fill:#CFD2DD;} + .d2-1664589405 .fill-N5{fill:#DEE1EB;} + .d2-1664589405 .fill-N6{fill:#EEF1F8;} + .d2-1664589405 .fill-N7{fill:#FFFFFF;} + .d2-1664589405 .fill-B1{fill:#0D32B2;} + .d2-1664589405 .fill-B2{fill:#0D32B2;} + .d2-1664589405 .fill-B3{fill:#E3E9FD;} + .d2-1664589405 .fill-B4{fill:#E3E9FD;} + .d2-1664589405 .fill-B5{fill:#EDF0FD;} + .d2-1664589405 .fill-B6{fill:#F7F8FE;} + .d2-1664589405 .fill-AA2{fill:#4A6FF3;} + .d2-1664589405 .fill-AA4{fill:#EDF0FD;} + .d2-1664589405 .fill-AA5{fill:#F7F8FE;} + .d2-1664589405 .fill-AB4{fill:#EDF0FD;} + .d2-1664589405 .fill-AB5{fill:#F7F8FE;} + .d2-1664589405 .stroke-N1{stroke:#0A0F25;} + .d2-1664589405 .stroke-N2{stroke:#676C7E;} + .d2-1664589405 .stroke-N3{stroke:#9499AB;} + .d2-1664589405 .stroke-N4{stroke:#CFD2DD;} + .d2-1664589405 .stroke-N5{stroke:#DEE1EB;} + .d2-1664589405 .stroke-N6{stroke:#EEF1F8;} + .d2-1664589405 .stroke-N7{stroke:#FFFFFF;} + .d2-1664589405 .stroke-B1{stroke:#0D32B2;} + .d2-1664589405 .stroke-B2{stroke:#0D32B2;} + .d2-1664589405 .stroke-B3{stroke:#E3E9FD;} + .d2-1664589405 .stroke-B4{stroke:#E3E9FD;} + .d2-1664589405 .stroke-B5{stroke:#EDF0FD;} + .d2-1664589405 .stroke-B6{stroke:#F7F8FE;} + .d2-1664589405 .stroke-AA2{stroke:#4A6FF3;} + .d2-1664589405 .stroke-AA4{stroke:#EDF0FD;} + .d2-1664589405 .stroke-AA5{stroke:#F7F8FE;} + .d2-1664589405 .stroke-AB4{stroke:#EDF0FD;} + .d2-1664589405 .stroke-AB5{stroke:#F7F8FE;} + .d2-1664589405 .background-color-N1{background-color:#0A0F25;} + .d2-1664589405 .background-color-N2{background-color:#676C7E;} + .d2-1664589405 .background-color-N3{background-color:#9499AB;} + .d2-1664589405 .background-color-N4{background-color:#CFD2DD;} + .d2-1664589405 .background-color-N5{background-color:#DEE1EB;} + .d2-1664589405 .background-color-N6{background-color:#EEF1F8;} + .d2-1664589405 .background-color-N7{background-color:#FFFFFF;} + .d2-1664589405 .background-color-B1{background-color:#0D32B2;} + .d2-1664589405 .background-color-B2{background-color:#0D32B2;} + .d2-1664589405 .background-color-B3{background-color:#E3E9FD;} + .d2-1664589405 .background-color-B4{background-color:#E3E9FD;} + .d2-1664589405 .background-color-B5{background-color:#EDF0FD;} + .d2-1664589405 .background-color-B6{background-color:#F7F8FE;} + .d2-1664589405 .background-color-AA2{background-color:#4A6FF3;} + .d2-1664589405 .background-color-AA4{background-color:#EDF0FD;} + .d2-1664589405 .background-color-AA5{background-color:#F7F8FE;} + .d2-1664589405 .background-color-AB4{background-color:#EDF0FD;} + .d2-1664589405 .background-color-AB5{background-color:#F7F8FE;} + .d2-1664589405 .color-N1{color:#0A0F25;} + .d2-1664589405 .color-N2{color:#676C7E;} + .d2-1664589405 .color-N3{color:#9499AB;} + .d2-1664589405 .color-N4{color:#CFD2DD;} + .d2-1664589405 .color-N5{color:#DEE1EB;} + .d2-1664589405 .color-N6{color:#EEF1F8;} + .d2-1664589405 .color-N7{color:#FFFFFF;} + .d2-1664589405 .color-B1{color:#0D32B2;} + .d2-1664589405 .color-B2{color:#0D32B2;} + .d2-1664589405 .color-B3{color:#E3E9FD;} + .d2-1664589405 .color-B4{color:#E3E9FD;} + .d2-1664589405 .color-B5{color:#EDF0FD;} + .d2-1664589405 .color-B6{color:#F7F8FE;} + .d2-1664589405 .color-AA2{color:#4A6FF3;} + .d2-1664589405 .color-AA4{color:#EDF0FD;} + .d2-1664589405 .color-AA5{color:#F7F8FE;} + .d2-1664589405 .color-AB4{color:#EDF0FD;} + .d2-1664589405 .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}]]>acfbdhg 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 164fbdd9b..78134855a 100644 --- a/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -xyThe top of the mountain

    Cats, no less liquid than their shadows, offer no angles to the wind.

    If we can't fix it, it ain't broke.

    Dieters live life in the fasting lane.

    -
    JoeDonaldi am top lefti am top righti am bottom lefti am bottom right +    JoeDonaldi am top lefti am top righti am bottom lefti am bottom right diff --git a/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg b/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg index 9d7d6df05..d85bffe5b 100644 --- a/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -xyThe top of the mountain

    Cats, no less liquid than their shadows, offer no angles to the wind.

    If we can't fix it, it ain't broke.

    Dieters live life in the fasting lane.

    -
    JoeDonaldi am top lefti am top righti am bottom lefti am bottom right +    JoeDonaldi am top lefti am top righti am bottom lefti am bottom right diff --git a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg index b19586b7a..91cd0cab6 100644 --- a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -poll the peopleresultsunfavorablefavorablewill of the people

    A winning strategy

    -
     + diff --git a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg index fd12d8db5..8d6e6ec78 100644 --- a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -poll the peopleresultsunfavorablefavorablewill of the people

    A winning strategy

    -
     + diff --git a/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg index ab934ac78..ad2dae02d 100644 --- a/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -agdfbhec + .d2-2124593193 .fill-N1{fill:#0A0F25;} + .d2-2124593193 .fill-N2{fill:#676C7E;} + .d2-2124593193 .fill-N3{fill:#9499AB;} + .d2-2124593193 .fill-N4{fill:#CFD2DD;} + .d2-2124593193 .fill-N5{fill:#DEE1EB;} + .d2-2124593193 .fill-N6{fill:#EEF1F8;} + .d2-2124593193 .fill-N7{fill:#FFFFFF;} + .d2-2124593193 .fill-B1{fill:#0D32B2;} + .d2-2124593193 .fill-B2{fill:#0D32B2;} + .d2-2124593193 .fill-B3{fill:#E3E9FD;} + .d2-2124593193 .fill-B4{fill:#E3E9FD;} + .d2-2124593193 .fill-B5{fill:#EDF0FD;} + .d2-2124593193 .fill-B6{fill:#F7F8FE;} + .d2-2124593193 .fill-AA2{fill:#4A6FF3;} + .d2-2124593193 .fill-AA4{fill:#EDF0FD;} + .d2-2124593193 .fill-AA5{fill:#F7F8FE;} + .d2-2124593193 .fill-AB4{fill:#EDF0FD;} + .d2-2124593193 .fill-AB5{fill:#F7F8FE;} + .d2-2124593193 .stroke-N1{stroke:#0A0F25;} + .d2-2124593193 .stroke-N2{stroke:#676C7E;} + .d2-2124593193 .stroke-N3{stroke:#9499AB;} + .d2-2124593193 .stroke-N4{stroke:#CFD2DD;} + .d2-2124593193 .stroke-N5{stroke:#DEE1EB;} + .d2-2124593193 .stroke-N6{stroke:#EEF1F8;} + .d2-2124593193 .stroke-N7{stroke:#FFFFFF;} + .d2-2124593193 .stroke-B1{stroke:#0D32B2;} + .d2-2124593193 .stroke-B2{stroke:#0D32B2;} + .d2-2124593193 .stroke-B3{stroke:#E3E9FD;} + .d2-2124593193 .stroke-B4{stroke:#E3E9FD;} + .d2-2124593193 .stroke-B5{stroke:#EDF0FD;} + .d2-2124593193 .stroke-B6{stroke:#F7F8FE;} + .d2-2124593193 .stroke-AA2{stroke:#4A6FF3;} + .d2-2124593193 .stroke-AA4{stroke:#EDF0FD;} + .d2-2124593193 .stroke-AA5{stroke:#F7F8FE;} + .d2-2124593193 .stroke-AB4{stroke:#EDF0FD;} + .d2-2124593193 .stroke-AB5{stroke:#F7F8FE;} + .d2-2124593193 .background-color-N1{background-color:#0A0F25;} + .d2-2124593193 .background-color-N2{background-color:#676C7E;} + .d2-2124593193 .background-color-N3{background-color:#9499AB;} + .d2-2124593193 .background-color-N4{background-color:#CFD2DD;} + .d2-2124593193 .background-color-N5{background-color:#DEE1EB;} + .d2-2124593193 .background-color-N6{background-color:#EEF1F8;} + .d2-2124593193 .background-color-N7{background-color:#FFFFFF;} + .d2-2124593193 .background-color-B1{background-color:#0D32B2;} + .d2-2124593193 .background-color-B2{background-color:#0D32B2;} + .d2-2124593193 .background-color-B3{background-color:#E3E9FD;} + .d2-2124593193 .background-color-B4{background-color:#E3E9FD;} + .d2-2124593193 .background-color-B5{background-color:#EDF0FD;} + .d2-2124593193 .background-color-B6{background-color:#F7F8FE;} + .d2-2124593193 .background-color-AA2{background-color:#4A6FF3;} + .d2-2124593193 .background-color-AA4{background-color:#EDF0FD;} + .d2-2124593193 .background-color-AA5{background-color:#F7F8FE;} + .d2-2124593193 .background-color-AB4{background-color:#EDF0FD;} + .d2-2124593193 .background-color-AB5{background-color:#F7F8FE;} + .d2-2124593193 .color-N1{color:#0A0F25;} + .d2-2124593193 .color-N2{color:#676C7E;} + .d2-2124593193 .color-N3{color:#9499AB;} + .d2-2124593193 .color-N4{color:#CFD2DD;} + .d2-2124593193 .color-N5{color:#DEE1EB;} + .d2-2124593193 .color-N6{color:#EEF1F8;} + .d2-2124593193 .color-N7{color:#FFFFFF;} + .d2-2124593193 .color-B1{color:#0D32B2;} + .d2-2124593193 .color-B2{color:#0D32B2;} + .d2-2124593193 .color-B3{color:#E3E9FD;} + .d2-2124593193 .color-B4{color:#E3E9FD;} + .d2-2124593193 .color-B5{color:#EDF0FD;} + .d2-2124593193 .color-B6{color:#F7F8FE;} + .d2-2124593193 .color-AA2{color:#4A6FF3;} + .d2-2124593193 .color-AA4{color:#EDF0FD;} + .d2-2124593193 .color-AA5{color:#F7F8FE;} + .d2-2124593193 .color-AB4{color:#EDF0FD;} + .d2-2124593193 .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 diff --git a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg index 5f547f4da..8f92d058f 100644 --- a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -agdfbhec + .d2-62429622 .fill-N1{fill:#0A0F25;} + .d2-62429622 .fill-N2{fill:#676C7E;} + .d2-62429622 .fill-N3{fill:#9499AB;} + .d2-62429622 .fill-N4{fill:#CFD2DD;} + .d2-62429622 .fill-N5{fill:#DEE1EB;} + .d2-62429622 .fill-N6{fill:#EEF1F8;} + .d2-62429622 .fill-N7{fill:#FFFFFF;} + .d2-62429622 .fill-B1{fill:#0D32B2;} + .d2-62429622 .fill-B2{fill:#0D32B2;} + .d2-62429622 .fill-B3{fill:#E3E9FD;} + .d2-62429622 .fill-B4{fill:#E3E9FD;} + .d2-62429622 .fill-B5{fill:#EDF0FD;} + .d2-62429622 .fill-B6{fill:#F7F8FE;} + .d2-62429622 .fill-AA2{fill:#4A6FF3;} + .d2-62429622 .fill-AA4{fill:#EDF0FD;} + .d2-62429622 .fill-AA5{fill:#F7F8FE;} + .d2-62429622 .fill-AB4{fill:#EDF0FD;} + .d2-62429622 .fill-AB5{fill:#F7F8FE;} + .d2-62429622 .stroke-N1{stroke:#0A0F25;} + .d2-62429622 .stroke-N2{stroke:#676C7E;} + .d2-62429622 .stroke-N3{stroke:#9499AB;} + .d2-62429622 .stroke-N4{stroke:#CFD2DD;} + .d2-62429622 .stroke-N5{stroke:#DEE1EB;} + .d2-62429622 .stroke-N6{stroke:#EEF1F8;} + .d2-62429622 .stroke-N7{stroke:#FFFFFF;} + .d2-62429622 .stroke-B1{stroke:#0D32B2;} + .d2-62429622 .stroke-B2{stroke:#0D32B2;} + .d2-62429622 .stroke-B3{stroke:#E3E9FD;} + .d2-62429622 .stroke-B4{stroke:#E3E9FD;} + .d2-62429622 .stroke-B5{stroke:#EDF0FD;} + .d2-62429622 .stroke-B6{stroke:#F7F8FE;} + .d2-62429622 .stroke-AA2{stroke:#4A6FF3;} + .d2-62429622 .stroke-AA4{stroke:#EDF0FD;} + .d2-62429622 .stroke-AA5{stroke:#F7F8FE;} + .d2-62429622 .stroke-AB4{stroke:#EDF0FD;} + .d2-62429622 .stroke-AB5{stroke:#F7F8FE;} + .d2-62429622 .background-color-N1{background-color:#0A0F25;} + .d2-62429622 .background-color-N2{background-color:#676C7E;} + .d2-62429622 .background-color-N3{background-color:#9499AB;} + .d2-62429622 .background-color-N4{background-color:#CFD2DD;} + .d2-62429622 .background-color-N5{background-color:#DEE1EB;} + .d2-62429622 .background-color-N6{background-color:#EEF1F8;} + .d2-62429622 .background-color-N7{background-color:#FFFFFF;} + .d2-62429622 .background-color-B1{background-color:#0D32B2;} + .d2-62429622 .background-color-B2{background-color:#0D32B2;} + .d2-62429622 .background-color-B3{background-color:#E3E9FD;} + .d2-62429622 .background-color-B4{background-color:#E3E9FD;} + .d2-62429622 .background-color-B5{background-color:#EDF0FD;} + .d2-62429622 .background-color-B6{background-color:#F7F8FE;} + .d2-62429622 .background-color-AA2{background-color:#4A6FF3;} + .d2-62429622 .background-color-AA4{background-color:#EDF0FD;} + .d2-62429622 .background-color-AA5{background-color:#F7F8FE;} + .d2-62429622 .background-color-AB4{background-color:#EDF0FD;} + .d2-62429622 .background-color-AB5{background-color:#F7F8FE;} + .d2-62429622 .color-N1{color:#0A0F25;} + .d2-62429622 .color-N2{color:#676C7E;} + .d2-62429622 .color-N3{color:#9499AB;} + .d2-62429622 .color-N4{color:#CFD2DD;} + .d2-62429622 .color-N5{color:#DEE1EB;} + .d2-62429622 .color-N6{color:#EEF1F8;} + .d2-62429622 .color-N7{color:#FFFFFF;} + .d2-62429622 .color-B1{color:#0D32B2;} + .d2-62429622 .color-B2{color:#0D32B2;} + .d2-62429622 .color-B3{color:#E3E9FD;} + .d2-62429622 .color-B4{color:#E3E9FD;} + .d2-62429622 .color-B5{color:#EDF0FD;} + .d2-62429622 .color-B6{color:#F7F8FE;} + .d2-62429622 .color-AA2{color:#4A6FF3;} + .d2-62429622 .color-AA4{color:#EDF0FD;} + .d2-62429622 .color-AA5{color:#F7F8FE;} + .d2-62429622 .color-AB4{color:#EDF0FD;} + .d2-62429622 .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 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 ac5e43024..d5ebb4a34 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf + .d2-2476952213 .fill-N1{fill:#0A0F25;} + .d2-2476952213 .fill-N2{fill:#676C7E;} + .d2-2476952213 .fill-N3{fill:#9499AB;} + .d2-2476952213 .fill-N4{fill:#CFD2DD;} + .d2-2476952213 .fill-N5{fill:#DEE1EB;} + .d2-2476952213 .fill-N6{fill:#EEF1F8;} + .d2-2476952213 .fill-N7{fill:#FFFFFF;} + .d2-2476952213 .fill-B1{fill:#0D32B2;} + .d2-2476952213 .fill-B2{fill:#0D32B2;} + .d2-2476952213 .fill-B3{fill:#E3E9FD;} + .d2-2476952213 .fill-B4{fill:#E3E9FD;} + .d2-2476952213 .fill-B5{fill:#EDF0FD;} + .d2-2476952213 .fill-B6{fill:#F7F8FE;} + .d2-2476952213 .fill-AA2{fill:#4A6FF3;} + .d2-2476952213 .fill-AA4{fill:#EDF0FD;} + .d2-2476952213 .fill-AA5{fill:#F7F8FE;} + .d2-2476952213 .fill-AB4{fill:#EDF0FD;} + .d2-2476952213 .fill-AB5{fill:#F7F8FE;} + .d2-2476952213 .stroke-N1{stroke:#0A0F25;} + .d2-2476952213 .stroke-N2{stroke:#676C7E;} + .d2-2476952213 .stroke-N3{stroke:#9499AB;} + .d2-2476952213 .stroke-N4{stroke:#CFD2DD;} + .d2-2476952213 .stroke-N5{stroke:#DEE1EB;} + .d2-2476952213 .stroke-N6{stroke:#EEF1F8;} + .d2-2476952213 .stroke-N7{stroke:#FFFFFF;} + .d2-2476952213 .stroke-B1{stroke:#0D32B2;} + .d2-2476952213 .stroke-B2{stroke:#0D32B2;} + .d2-2476952213 .stroke-B3{stroke:#E3E9FD;} + .d2-2476952213 .stroke-B4{stroke:#E3E9FD;} + .d2-2476952213 .stroke-B5{stroke:#EDF0FD;} + .d2-2476952213 .stroke-B6{stroke:#F7F8FE;} + .d2-2476952213 .stroke-AA2{stroke:#4A6FF3;} + .d2-2476952213 .stroke-AA4{stroke:#EDF0FD;} + .d2-2476952213 .stroke-AA5{stroke:#F7F8FE;} + .d2-2476952213 .stroke-AB4{stroke:#EDF0FD;} + .d2-2476952213 .stroke-AB5{stroke:#F7F8FE;} + .d2-2476952213 .background-color-N1{background-color:#0A0F25;} + .d2-2476952213 .background-color-N2{background-color:#676C7E;} + .d2-2476952213 .background-color-N3{background-color:#9499AB;} + .d2-2476952213 .background-color-N4{background-color:#CFD2DD;} + .d2-2476952213 .background-color-N5{background-color:#DEE1EB;} + .d2-2476952213 .background-color-N6{background-color:#EEF1F8;} + .d2-2476952213 .background-color-N7{background-color:#FFFFFF;} + .d2-2476952213 .background-color-B1{background-color:#0D32B2;} + .d2-2476952213 .background-color-B2{background-color:#0D32B2;} + .d2-2476952213 .background-color-B3{background-color:#E3E9FD;} + .d2-2476952213 .background-color-B4{background-color:#E3E9FD;} + .d2-2476952213 .background-color-B5{background-color:#EDF0FD;} + .d2-2476952213 .background-color-B6{background-color:#F7F8FE;} + .d2-2476952213 .background-color-AA2{background-color:#4A6FF3;} + .d2-2476952213 .background-color-AA4{background-color:#EDF0FD;} + .d2-2476952213 .background-color-AA5{background-color:#F7F8FE;} + .d2-2476952213 .background-color-AB4{background-color:#EDF0FD;} + .d2-2476952213 .background-color-AB5{background-color:#F7F8FE;} + .d2-2476952213 .color-N1{color:#0A0F25;} + .d2-2476952213 .color-N2{color:#676C7E;} + .d2-2476952213 .color-N3{color:#9499AB;} + .d2-2476952213 .color-N4{color:#CFD2DD;} + .d2-2476952213 .color-N5{color:#DEE1EB;} + .d2-2476952213 .color-N6{color:#EEF1F8;} + .d2-2476952213 .color-N7{color:#FFFFFF;} + .d2-2476952213 .color-B1{color:#0D32B2;} + .d2-2476952213 .color-B2{color:#0D32B2;} + .d2-2476952213 .color-B3{color:#E3E9FD;} + .d2-2476952213 .color-B4{color:#E3E9FD;} + .d2-2476952213 .color-B5{color:#EDF0FD;} + .d2-2476952213 .color-B6{color:#F7F8FE;} + .d2-2476952213 .color-AA2{color:#4A6FF3;} + .d2-2476952213 .color-AA4{color:#EDF0FD;} + .d2-2476952213 .color-AA5{color:#F7F8FE;} + .d2-2476952213 .color-AB4{color:#EDF0FD;} + .d2-2476952213 .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}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf 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 d553157b3..9b2a5d4bc 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf + .d2-2427018465 .fill-N1{fill:#0A0F25;} + .d2-2427018465 .fill-N2{fill:#676C7E;} + .d2-2427018465 .fill-N3{fill:#9499AB;} + .d2-2427018465 .fill-N4{fill:#CFD2DD;} + .d2-2427018465 .fill-N5{fill:#DEE1EB;} + .d2-2427018465 .fill-N6{fill:#EEF1F8;} + .d2-2427018465 .fill-N7{fill:#FFFFFF;} + .d2-2427018465 .fill-B1{fill:#0D32B2;} + .d2-2427018465 .fill-B2{fill:#0D32B2;} + .d2-2427018465 .fill-B3{fill:#E3E9FD;} + .d2-2427018465 .fill-B4{fill:#E3E9FD;} + .d2-2427018465 .fill-B5{fill:#EDF0FD;} + .d2-2427018465 .fill-B6{fill:#F7F8FE;} + .d2-2427018465 .fill-AA2{fill:#4A6FF3;} + .d2-2427018465 .fill-AA4{fill:#EDF0FD;} + .d2-2427018465 .fill-AA5{fill:#F7F8FE;} + .d2-2427018465 .fill-AB4{fill:#EDF0FD;} + .d2-2427018465 .fill-AB5{fill:#F7F8FE;} + .d2-2427018465 .stroke-N1{stroke:#0A0F25;} + .d2-2427018465 .stroke-N2{stroke:#676C7E;} + .d2-2427018465 .stroke-N3{stroke:#9499AB;} + .d2-2427018465 .stroke-N4{stroke:#CFD2DD;} + .d2-2427018465 .stroke-N5{stroke:#DEE1EB;} + .d2-2427018465 .stroke-N6{stroke:#EEF1F8;} + .d2-2427018465 .stroke-N7{stroke:#FFFFFF;} + .d2-2427018465 .stroke-B1{stroke:#0D32B2;} + .d2-2427018465 .stroke-B2{stroke:#0D32B2;} + .d2-2427018465 .stroke-B3{stroke:#E3E9FD;} + .d2-2427018465 .stroke-B4{stroke:#E3E9FD;} + .d2-2427018465 .stroke-B5{stroke:#EDF0FD;} + .d2-2427018465 .stroke-B6{stroke:#F7F8FE;} + .d2-2427018465 .stroke-AA2{stroke:#4A6FF3;} + .d2-2427018465 .stroke-AA4{stroke:#EDF0FD;} + .d2-2427018465 .stroke-AA5{stroke:#F7F8FE;} + .d2-2427018465 .stroke-AB4{stroke:#EDF0FD;} + .d2-2427018465 .stroke-AB5{stroke:#F7F8FE;} + .d2-2427018465 .background-color-N1{background-color:#0A0F25;} + .d2-2427018465 .background-color-N2{background-color:#676C7E;} + .d2-2427018465 .background-color-N3{background-color:#9499AB;} + .d2-2427018465 .background-color-N4{background-color:#CFD2DD;} + .d2-2427018465 .background-color-N5{background-color:#DEE1EB;} + .d2-2427018465 .background-color-N6{background-color:#EEF1F8;} + .d2-2427018465 .background-color-N7{background-color:#FFFFFF;} + .d2-2427018465 .background-color-B1{background-color:#0D32B2;} + .d2-2427018465 .background-color-B2{background-color:#0D32B2;} + .d2-2427018465 .background-color-B3{background-color:#E3E9FD;} + .d2-2427018465 .background-color-B4{background-color:#E3E9FD;} + .d2-2427018465 .background-color-B5{background-color:#EDF0FD;} + .d2-2427018465 .background-color-B6{background-color:#F7F8FE;} + .d2-2427018465 .background-color-AA2{background-color:#4A6FF3;} + .d2-2427018465 .background-color-AA4{background-color:#EDF0FD;} + .d2-2427018465 .background-color-AA5{background-color:#F7F8FE;} + .d2-2427018465 .background-color-AB4{background-color:#EDF0FD;} + .d2-2427018465 .background-color-AB5{background-color:#F7F8FE;} + .d2-2427018465 .color-N1{color:#0A0F25;} + .d2-2427018465 .color-N2{color:#676C7E;} + .d2-2427018465 .color-N3{color:#9499AB;} + .d2-2427018465 .color-N4{color:#CFD2DD;} + .d2-2427018465 .color-N5{color:#DEE1EB;} + .d2-2427018465 .color-N6{color:#EEF1F8;} + .d2-2427018465 .color-N7{color:#FFFFFF;} + .d2-2427018465 .color-B1{color:#0D32B2;} + .d2-2427018465 .color-B2{color:#0D32B2;} + .d2-2427018465 .color-B3{color:#E3E9FD;} + .d2-2427018465 .color-B4{color:#E3E9FD;} + .d2-2427018465 .color-B5{color:#EDF0FD;} + .d2-2427018465 .color-B6{color:#F7F8FE;} + .d2-2427018465 .color-AA2{color:#4A6FF3;} + .d2-2427018465 .color-AA4{color:#EDF0FD;} + .d2-2427018465 .color-AA5{color:#F7F8FE;} + .d2-2427018465 .color-AB4{color:#EDF0FD;} + .d2-2427018465 .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}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf diff --git a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg index 6ce182300..b3f13373b 100644 --- a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + .d2-1034147298 .fill-N1{fill:#0A0F25;} + .d2-1034147298 .fill-N2{fill:#676C7E;} + .d2-1034147298 .fill-N3{fill:#9499AB;} + .d2-1034147298 .fill-N4{fill:#CFD2DD;} + .d2-1034147298 .fill-N5{fill:#DEE1EB;} + .d2-1034147298 .fill-N6{fill:#EEF1F8;} + .d2-1034147298 .fill-N7{fill:#FFFFFF;} + .d2-1034147298 .fill-B1{fill:#0D32B2;} + .d2-1034147298 .fill-B2{fill:#0D32B2;} + .d2-1034147298 .fill-B3{fill:#E3E9FD;} + .d2-1034147298 .fill-B4{fill:#E3E9FD;} + .d2-1034147298 .fill-B5{fill:#EDF0FD;} + .d2-1034147298 .fill-B6{fill:#F7F8FE;} + .d2-1034147298 .fill-AA2{fill:#4A6FF3;} + .d2-1034147298 .fill-AA4{fill:#EDF0FD;} + .d2-1034147298 .fill-AA5{fill:#F7F8FE;} + .d2-1034147298 .fill-AB4{fill:#EDF0FD;} + .d2-1034147298 .fill-AB5{fill:#F7F8FE;} + .d2-1034147298 .stroke-N1{stroke:#0A0F25;} + .d2-1034147298 .stroke-N2{stroke:#676C7E;} + .d2-1034147298 .stroke-N3{stroke:#9499AB;} + .d2-1034147298 .stroke-N4{stroke:#CFD2DD;} + .d2-1034147298 .stroke-N5{stroke:#DEE1EB;} + .d2-1034147298 .stroke-N6{stroke:#EEF1F8;} + .d2-1034147298 .stroke-N7{stroke:#FFFFFF;} + .d2-1034147298 .stroke-B1{stroke:#0D32B2;} + .d2-1034147298 .stroke-B2{stroke:#0D32B2;} + .d2-1034147298 .stroke-B3{stroke:#E3E9FD;} + .d2-1034147298 .stroke-B4{stroke:#E3E9FD;} + .d2-1034147298 .stroke-B5{stroke:#EDF0FD;} + .d2-1034147298 .stroke-B6{stroke:#F7F8FE;} + .d2-1034147298 .stroke-AA2{stroke:#4A6FF3;} + .d2-1034147298 .stroke-AA4{stroke:#EDF0FD;} + .d2-1034147298 .stroke-AA5{stroke:#F7F8FE;} + .d2-1034147298 .stroke-AB4{stroke:#EDF0FD;} + .d2-1034147298 .stroke-AB5{stroke:#F7F8FE;} + .d2-1034147298 .background-color-N1{background-color:#0A0F25;} + .d2-1034147298 .background-color-N2{background-color:#676C7E;} + .d2-1034147298 .background-color-N3{background-color:#9499AB;} + .d2-1034147298 .background-color-N4{background-color:#CFD2DD;} + .d2-1034147298 .background-color-N5{background-color:#DEE1EB;} + .d2-1034147298 .background-color-N6{background-color:#EEF1F8;} + .d2-1034147298 .background-color-N7{background-color:#FFFFFF;} + .d2-1034147298 .background-color-B1{background-color:#0D32B2;} + .d2-1034147298 .background-color-B2{background-color:#0D32B2;} + .d2-1034147298 .background-color-B3{background-color:#E3E9FD;} + .d2-1034147298 .background-color-B4{background-color:#E3E9FD;} + .d2-1034147298 .background-color-B5{background-color:#EDF0FD;} + .d2-1034147298 .background-color-B6{background-color:#F7F8FE;} + .d2-1034147298 .background-color-AA2{background-color:#4A6FF3;} + .d2-1034147298 .background-color-AA4{background-color:#EDF0FD;} + .d2-1034147298 .background-color-AA5{background-color:#F7F8FE;} + .d2-1034147298 .background-color-AB4{background-color:#EDF0FD;} + .d2-1034147298 .background-color-AB5{background-color:#F7F8FE;} + .d2-1034147298 .color-N1{color:#0A0F25;} + .d2-1034147298 .color-N2{color:#676C7E;} + .d2-1034147298 .color-N3{color:#9499AB;} + .d2-1034147298 .color-N4{color:#CFD2DD;} + .d2-1034147298 .color-N5{color:#DEE1EB;} + .d2-1034147298 .color-N6{color:#EEF1F8;} + .d2-1034147298 .color-N7{color:#FFFFFF;} + .d2-1034147298 .color-B1{color:#0D32B2;} + .d2-1034147298 .color-B2{color:#0D32B2;} + .d2-1034147298 .color-B3{color:#E3E9FD;} + .d2-1034147298 .color-B4{color:#E3E9FD;} + .d2-1034147298 .color-B5{color:#EDF0FD;} + .d2-1034147298 .color-B6{color:#F7F8FE;} + .d2-1034147298 .color-AA2{color:#4A6FF3;} + .d2-1034147298 .color-AA4{color:#EDF0FD;} + .d2-1034147298 .color-AA5{color:#F7F8FE;} + .d2-1034147298 .color-AB4{color:#EDF0FD;} + .d2-1034147298 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana diff --git a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg index e80f73b38..b6de61434 100644 --- a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + .d2-1417103532 .fill-N1{fill:#0A0F25;} + .d2-1417103532 .fill-N2{fill:#676C7E;} + .d2-1417103532 .fill-N3{fill:#9499AB;} + .d2-1417103532 .fill-N4{fill:#CFD2DD;} + .d2-1417103532 .fill-N5{fill:#DEE1EB;} + .d2-1417103532 .fill-N6{fill:#EEF1F8;} + .d2-1417103532 .fill-N7{fill:#FFFFFF;} + .d2-1417103532 .fill-B1{fill:#0D32B2;} + .d2-1417103532 .fill-B2{fill:#0D32B2;} + .d2-1417103532 .fill-B3{fill:#E3E9FD;} + .d2-1417103532 .fill-B4{fill:#E3E9FD;} + .d2-1417103532 .fill-B5{fill:#EDF0FD;} + .d2-1417103532 .fill-B6{fill:#F7F8FE;} + .d2-1417103532 .fill-AA2{fill:#4A6FF3;} + .d2-1417103532 .fill-AA4{fill:#EDF0FD;} + .d2-1417103532 .fill-AA5{fill:#F7F8FE;} + .d2-1417103532 .fill-AB4{fill:#EDF0FD;} + .d2-1417103532 .fill-AB5{fill:#F7F8FE;} + .d2-1417103532 .stroke-N1{stroke:#0A0F25;} + .d2-1417103532 .stroke-N2{stroke:#676C7E;} + .d2-1417103532 .stroke-N3{stroke:#9499AB;} + .d2-1417103532 .stroke-N4{stroke:#CFD2DD;} + .d2-1417103532 .stroke-N5{stroke:#DEE1EB;} + .d2-1417103532 .stroke-N6{stroke:#EEF1F8;} + .d2-1417103532 .stroke-N7{stroke:#FFFFFF;} + .d2-1417103532 .stroke-B1{stroke:#0D32B2;} + .d2-1417103532 .stroke-B2{stroke:#0D32B2;} + .d2-1417103532 .stroke-B3{stroke:#E3E9FD;} + .d2-1417103532 .stroke-B4{stroke:#E3E9FD;} + .d2-1417103532 .stroke-B5{stroke:#EDF0FD;} + .d2-1417103532 .stroke-B6{stroke:#F7F8FE;} + .d2-1417103532 .stroke-AA2{stroke:#4A6FF3;} + .d2-1417103532 .stroke-AA4{stroke:#EDF0FD;} + .d2-1417103532 .stroke-AA5{stroke:#F7F8FE;} + .d2-1417103532 .stroke-AB4{stroke:#EDF0FD;} + .d2-1417103532 .stroke-AB5{stroke:#F7F8FE;} + .d2-1417103532 .background-color-N1{background-color:#0A0F25;} + .d2-1417103532 .background-color-N2{background-color:#676C7E;} + .d2-1417103532 .background-color-N3{background-color:#9499AB;} + .d2-1417103532 .background-color-N4{background-color:#CFD2DD;} + .d2-1417103532 .background-color-N5{background-color:#DEE1EB;} + .d2-1417103532 .background-color-N6{background-color:#EEF1F8;} + .d2-1417103532 .background-color-N7{background-color:#FFFFFF;} + .d2-1417103532 .background-color-B1{background-color:#0D32B2;} + .d2-1417103532 .background-color-B2{background-color:#0D32B2;} + .d2-1417103532 .background-color-B3{background-color:#E3E9FD;} + .d2-1417103532 .background-color-B4{background-color:#E3E9FD;} + .d2-1417103532 .background-color-B5{background-color:#EDF0FD;} + .d2-1417103532 .background-color-B6{background-color:#F7F8FE;} + .d2-1417103532 .background-color-AA2{background-color:#4A6FF3;} + .d2-1417103532 .background-color-AA4{background-color:#EDF0FD;} + .d2-1417103532 .background-color-AA5{background-color:#F7F8FE;} + .d2-1417103532 .background-color-AB4{background-color:#EDF0FD;} + .d2-1417103532 .background-color-AB5{background-color:#F7F8FE;} + .d2-1417103532 .color-N1{color:#0A0F25;} + .d2-1417103532 .color-N2{color:#676C7E;} + .d2-1417103532 .color-N3{color:#9499AB;} + .d2-1417103532 .color-N4{color:#CFD2DD;} + .d2-1417103532 .color-N5{color:#DEE1EB;} + .d2-1417103532 .color-N6{color:#EEF1F8;} + .d2-1417103532 .color-N7{color:#FFFFFF;} + .d2-1417103532 .color-B1{color:#0D32B2;} + .d2-1417103532 .color-B2{color:#0D32B2;} + .d2-1417103532 .color-B3{color:#E3E9FD;} + .d2-1417103532 .color-B4{color:#E3E9FD;} + .d2-1417103532 .color-B5{color:#EDF0FD;} + .d2-1417103532 .color-B6{color:#F7F8FE;} + .d2-1417103532 .color-AA2{color:#4A6FF3;} + .d2-1417103532 .color-AA4{color:#EDF0FD;} + .d2-1417103532 .color-AA5{color:#F7F8FE;} + .d2-1417103532 .color-AB4{color:#EDF0FD;} + .d2-1417103532 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana diff --git a/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg index 14b0815a8..f3e6aa1cf 100644 --- a/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES + .d2-3202020967 .fill-N1{fill:#0A0F25;} + .d2-3202020967 .fill-N2{fill:#676C7E;} + .d2-3202020967 .fill-N3{fill:#9499AB;} + .d2-3202020967 .fill-N4{fill:#CFD2DD;} + .d2-3202020967 .fill-N5{fill:#DEE1EB;} + .d2-3202020967 .fill-N6{fill:#EEF1F8;} + .d2-3202020967 .fill-N7{fill:#FFFFFF;} + .d2-3202020967 .fill-B1{fill:#0D32B2;} + .d2-3202020967 .fill-B2{fill:#0D32B2;} + .d2-3202020967 .fill-B3{fill:#E3E9FD;} + .d2-3202020967 .fill-B4{fill:#E3E9FD;} + .d2-3202020967 .fill-B5{fill:#EDF0FD;} + .d2-3202020967 .fill-B6{fill:#F7F8FE;} + .d2-3202020967 .fill-AA2{fill:#4A6FF3;} + .d2-3202020967 .fill-AA4{fill:#EDF0FD;} + .d2-3202020967 .fill-AA5{fill:#F7F8FE;} + .d2-3202020967 .fill-AB4{fill:#EDF0FD;} + .d2-3202020967 .fill-AB5{fill:#F7F8FE;} + .d2-3202020967 .stroke-N1{stroke:#0A0F25;} + .d2-3202020967 .stroke-N2{stroke:#676C7E;} + .d2-3202020967 .stroke-N3{stroke:#9499AB;} + .d2-3202020967 .stroke-N4{stroke:#CFD2DD;} + .d2-3202020967 .stroke-N5{stroke:#DEE1EB;} + .d2-3202020967 .stroke-N6{stroke:#EEF1F8;} + .d2-3202020967 .stroke-N7{stroke:#FFFFFF;} + .d2-3202020967 .stroke-B1{stroke:#0D32B2;} + .d2-3202020967 .stroke-B2{stroke:#0D32B2;} + .d2-3202020967 .stroke-B3{stroke:#E3E9FD;} + .d2-3202020967 .stroke-B4{stroke:#E3E9FD;} + .d2-3202020967 .stroke-B5{stroke:#EDF0FD;} + .d2-3202020967 .stroke-B6{stroke:#F7F8FE;} + .d2-3202020967 .stroke-AA2{stroke:#4A6FF3;} + .d2-3202020967 .stroke-AA4{stroke:#EDF0FD;} + .d2-3202020967 .stroke-AA5{stroke:#F7F8FE;} + .d2-3202020967 .stroke-AB4{stroke:#EDF0FD;} + .d2-3202020967 .stroke-AB5{stroke:#F7F8FE;} + .d2-3202020967 .background-color-N1{background-color:#0A0F25;} + .d2-3202020967 .background-color-N2{background-color:#676C7E;} + .d2-3202020967 .background-color-N3{background-color:#9499AB;} + .d2-3202020967 .background-color-N4{background-color:#CFD2DD;} + .d2-3202020967 .background-color-N5{background-color:#DEE1EB;} + .d2-3202020967 .background-color-N6{background-color:#EEF1F8;} + .d2-3202020967 .background-color-N7{background-color:#FFFFFF;} + .d2-3202020967 .background-color-B1{background-color:#0D32B2;} + .d2-3202020967 .background-color-B2{background-color:#0D32B2;} + .d2-3202020967 .background-color-B3{background-color:#E3E9FD;} + .d2-3202020967 .background-color-B4{background-color:#E3E9FD;} + .d2-3202020967 .background-color-B5{background-color:#EDF0FD;} + .d2-3202020967 .background-color-B6{background-color:#F7F8FE;} + .d2-3202020967 .background-color-AA2{background-color:#4A6FF3;} + .d2-3202020967 .background-color-AA4{background-color:#EDF0FD;} + .d2-3202020967 .background-color-AA5{background-color:#F7F8FE;} + .d2-3202020967 .background-color-AB4{background-color:#EDF0FD;} + .d2-3202020967 .background-color-AB5{background-color:#F7F8FE;} + .d2-3202020967 .color-N1{color:#0A0F25;} + .d2-3202020967 .color-N2{color:#676C7E;} + .d2-3202020967 .color-N3{color:#9499AB;} + .d2-3202020967 .color-N4{color:#CFD2DD;} + .d2-3202020967 .color-N5{color:#DEE1EB;} + .d2-3202020967 .color-N6{color:#EEF1F8;} + .d2-3202020967 .color-N7{color:#FFFFFF;} + .d2-3202020967 .color-B1{color:#0D32B2;} + .d2-3202020967 .color-B2{color:#0D32B2;} + .d2-3202020967 .color-B3{color:#E3E9FD;} + .d2-3202020967 .color-B4{color:#E3E9FD;} + .d2-3202020967 .color-B5{color:#EDF0FD;} + .d2-3202020967 .color-B6{color:#F7F8FE;} + .d2-3202020967 .color-AA2{color:#4A6FF3;} + .d2-3202020967 .color-AA4{color:#EDF0FD;} + .d2-3202020967 .color-AA5{color:#F7F8FE;} + .d2-3202020967 .color-AB4{color:#EDF0FD;} + .d2-3202020967 .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}]]>DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES diff --git a/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg index 14b0815a8..f3e6aa1cf 100644 --- a/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES + .d2-3202020967 .fill-N1{fill:#0A0F25;} + .d2-3202020967 .fill-N2{fill:#676C7E;} + .d2-3202020967 .fill-N3{fill:#9499AB;} + .d2-3202020967 .fill-N4{fill:#CFD2DD;} + .d2-3202020967 .fill-N5{fill:#DEE1EB;} + .d2-3202020967 .fill-N6{fill:#EEF1F8;} + .d2-3202020967 .fill-N7{fill:#FFFFFF;} + .d2-3202020967 .fill-B1{fill:#0D32B2;} + .d2-3202020967 .fill-B2{fill:#0D32B2;} + .d2-3202020967 .fill-B3{fill:#E3E9FD;} + .d2-3202020967 .fill-B4{fill:#E3E9FD;} + .d2-3202020967 .fill-B5{fill:#EDF0FD;} + .d2-3202020967 .fill-B6{fill:#F7F8FE;} + .d2-3202020967 .fill-AA2{fill:#4A6FF3;} + .d2-3202020967 .fill-AA4{fill:#EDF0FD;} + .d2-3202020967 .fill-AA5{fill:#F7F8FE;} + .d2-3202020967 .fill-AB4{fill:#EDF0FD;} + .d2-3202020967 .fill-AB5{fill:#F7F8FE;} + .d2-3202020967 .stroke-N1{stroke:#0A0F25;} + .d2-3202020967 .stroke-N2{stroke:#676C7E;} + .d2-3202020967 .stroke-N3{stroke:#9499AB;} + .d2-3202020967 .stroke-N4{stroke:#CFD2DD;} + .d2-3202020967 .stroke-N5{stroke:#DEE1EB;} + .d2-3202020967 .stroke-N6{stroke:#EEF1F8;} + .d2-3202020967 .stroke-N7{stroke:#FFFFFF;} + .d2-3202020967 .stroke-B1{stroke:#0D32B2;} + .d2-3202020967 .stroke-B2{stroke:#0D32B2;} + .d2-3202020967 .stroke-B3{stroke:#E3E9FD;} + .d2-3202020967 .stroke-B4{stroke:#E3E9FD;} + .d2-3202020967 .stroke-B5{stroke:#EDF0FD;} + .d2-3202020967 .stroke-B6{stroke:#F7F8FE;} + .d2-3202020967 .stroke-AA2{stroke:#4A6FF3;} + .d2-3202020967 .stroke-AA4{stroke:#EDF0FD;} + .d2-3202020967 .stroke-AA5{stroke:#F7F8FE;} + .d2-3202020967 .stroke-AB4{stroke:#EDF0FD;} + .d2-3202020967 .stroke-AB5{stroke:#F7F8FE;} + .d2-3202020967 .background-color-N1{background-color:#0A0F25;} + .d2-3202020967 .background-color-N2{background-color:#676C7E;} + .d2-3202020967 .background-color-N3{background-color:#9499AB;} + .d2-3202020967 .background-color-N4{background-color:#CFD2DD;} + .d2-3202020967 .background-color-N5{background-color:#DEE1EB;} + .d2-3202020967 .background-color-N6{background-color:#EEF1F8;} + .d2-3202020967 .background-color-N7{background-color:#FFFFFF;} + .d2-3202020967 .background-color-B1{background-color:#0D32B2;} + .d2-3202020967 .background-color-B2{background-color:#0D32B2;} + .d2-3202020967 .background-color-B3{background-color:#E3E9FD;} + .d2-3202020967 .background-color-B4{background-color:#E3E9FD;} + .d2-3202020967 .background-color-B5{background-color:#EDF0FD;} + .d2-3202020967 .background-color-B6{background-color:#F7F8FE;} + .d2-3202020967 .background-color-AA2{background-color:#4A6FF3;} + .d2-3202020967 .background-color-AA4{background-color:#EDF0FD;} + .d2-3202020967 .background-color-AA5{background-color:#F7F8FE;} + .d2-3202020967 .background-color-AB4{background-color:#EDF0FD;} + .d2-3202020967 .background-color-AB5{background-color:#F7F8FE;} + .d2-3202020967 .color-N1{color:#0A0F25;} + .d2-3202020967 .color-N2{color:#676C7E;} + .d2-3202020967 .color-N3{color:#9499AB;} + .d2-3202020967 .color-N4{color:#CFD2DD;} + .d2-3202020967 .color-N5{color:#DEE1EB;} + .d2-3202020967 .color-N6{color:#EEF1F8;} + .d2-3202020967 .color-N7{color:#FFFFFF;} + .d2-3202020967 .color-B1{color:#0D32B2;} + .d2-3202020967 .color-B2{color:#0D32B2;} + .d2-3202020967 .color-B3{color:#E3E9FD;} + .d2-3202020967 .color-B4{color:#E3E9FD;} + .d2-3202020967 .color-B5{color:#EDF0FD;} + .d2-3202020967 .color-B6{color:#F7F8FE;} + .d2-3202020967 .color-AA2{color:#4A6FF3;} + .d2-3202020967 .color-AA4{color:#EDF0FD;} + .d2-3202020967 .color-AA5{color:#F7F8FE;} + .d2-3202020967 .color-AB4{color:#EDF0FD;} + .d2-3202020967 .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}]]>DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES diff --git a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg index c8364f4f4..a7ef6b48a 100644 --- a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ababcabc + .d2-4204566465 .fill-N1{fill:#0A0F25;} + .d2-4204566465 .fill-N2{fill:#676C7E;} + .d2-4204566465 .fill-N3{fill:#9499AB;} + .d2-4204566465 .fill-N4{fill:#CFD2DD;} + .d2-4204566465 .fill-N5{fill:#DEE1EB;} + .d2-4204566465 .fill-N6{fill:#EEF1F8;} + .d2-4204566465 .fill-N7{fill:#FFFFFF;} + .d2-4204566465 .fill-B1{fill:#0D32B2;} + .d2-4204566465 .fill-B2{fill:#0D32B2;} + .d2-4204566465 .fill-B3{fill:#E3E9FD;} + .d2-4204566465 .fill-B4{fill:#E3E9FD;} + .d2-4204566465 .fill-B5{fill:#EDF0FD;} + .d2-4204566465 .fill-B6{fill:#F7F8FE;} + .d2-4204566465 .fill-AA2{fill:#4A6FF3;} + .d2-4204566465 .fill-AA4{fill:#EDF0FD;} + .d2-4204566465 .fill-AA5{fill:#F7F8FE;} + .d2-4204566465 .fill-AB4{fill:#EDF0FD;} + .d2-4204566465 .fill-AB5{fill:#F7F8FE;} + .d2-4204566465 .stroke-N1{stroke:#0A0F25;} + .d2-4204566465 .stroke-N2{stroke:#676C7E;} + .d2-4204566465 .stroke-N3{stroke:#9499AB;} + .d2-4204566465 .stroke-N4{stroke:#CFD2DD;} + .d2-4204566465 .stroke-N5{stroke:#DEE1EB;} + .d2-4204566465 .stroke-N6{stroke:#EEF1F8;} + .d2-4204566465 .stroke-N7{stroke:#FFFFFF;} + .d2-4204566465 .stroke-B1{stroke:#0D32B2;} + .d2-4204566465 .stroke-B2{stroke:#0D32B2;} + .d2-4204566465 .stroke-B3{stroke:#E3E9FD;} + .d2-4204566465 .stroke-B4{stroke:#E3E9FD;} + .d2-4204566465 .stroke-B5{stroke:#EDF0FD;} + .d2-4204566465 .stroke-B6{stroke:#F7F8FE;} + .d2-4204566465 .stroke-AA2{stroke:#4A6FF3;} + .d2-4204566465 .stroke-AA4{stroke:#EDF0FD;} + .d2-4204566465 .stroke-AA5{stroke:#F7F8FE;} + .d2-4204566465 .stroke-AB4{stroke:#EDF0FD;} + .d2-4204566465 .stroke-AB5{stroke:#F7F8FE;} + .d2-4204566465 .background-color-N1{background-color:#0A0F25;} + .d2-4204566465 .background-color-N2{background-color:#676C7E;} + .d2-4204566465 .background-color-N3{background-color:#9499AB;} + .d2-4204566465 .background-color-N4{background-color:#CFD2DD;} + .d2-4204566465 .background-color-N5{background-color:#DEE1EB;} + .d2-4204566465 .background-color-N6{background-color:#EEF1F8;} + .d2-4204566465 .background-color-N7{background-color:#FFFFFF;} + .d2-4204566465 .background-color-B1{background-color:#0D32B2;} + .d2-4204566465 .background-color-B2{background-color:#0D32B2;} + .d2-4204566465 .background-color-B3{background-color:#E3E9FD;} + .d2-4204566465 .background-color-B4{background-color:#E3E9FD;} + .d2-4204566465 .background-color-B5{background-color:#EDF0FD;} + .d2-4204566465 .background-color-B6{background-color:#F7F8FE;} + .d2-4204566465 .background-color-AA2{background-color:#4A6FF3;} + .d2-4204566465 .background-color-AA4{background-color:#EDF0FD;} + .d2-4204566465 .background-color-AA5{background-color:#F7F8FE;} + .d2-4204566465 .background-color-AB4{background-color:#EDF0FD;} + .d2-4204566465 .background-color-AB5{background-color:#F7F8FE;} + .d2-4204566465 .color-N1{color:#0A0F25;} + .d2-4204566465 .color-N2{color:#676C7E;} + .d2-4204566465 .color-N3{color:#9499AB;} + .d2-4204566465 .color-N4{color:#CFD2DD;} + .d2-4204566465 .color-N5{color:#DEE1EB;} + .d2-4204566465 .color-N6{color:#EEF1F8;} + .d2-4204566465 .color-N7{color:#FFFFFF;} + .d2-4204566465 .color-B1{color:#0D32B2;} + .d2-4204566465 .color-B2{color:#0D32B2;} + .d2-4204566465 .color-B3{color:#E3E9FD;} + .d2-4204566465 .color-B4{color:#E3E9FD;} + .d2-4204566465 .color-B5{color:#EDF0FD;} + .d2-4204566465 .color-B6{color:#F7F8FE;} + .d2-4204566465 .color-AA2{color:#4A6FF3;} + .d2-4204566465 .color-AA4{color:#EDF0FD;} + .d2-4204566465 .color-AA5{color:#F7F8FE;} + .d2-4204566465 .color-AB4{color:#EDF0FD;} + .d2-4204566465 .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}]]>ababcabc diff --git a/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg index 1e55d2d28..af3a2bad4 100644 --- a/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ababcabc + .d2-1725799876 .fill-N1{fill:#0A0F25;} + .d2-1725799876 .fill-N2{fill:#676C7E;} + .d2-1725799876 .fill-N3{fill:#9499AB;} + .d2-1725799876 .fill-N4{fill:#CFD2DD;} + .d2-1725799876 .fill-N5{fill:#DEE1EB;} + .d2-1725799876 .fill-N6{fill:#EEF1F8;} + .d2-1725799876 .fill-N7{fill:#FFFFFF;} + .d2-1725799876 .fill-B1{fill:#0D32B2;} + .d2-1725799876 .fill-B2{fill:#0D32B2;} + .d2-1725799876 .fill-B3{fill:#E3E9FD;} + .d2-1725799876 .fill-B4{fill:#E3E9FD;} + .d2-1725799876 .fill-B5{fill:#EDF0FD;} + .d2-1725799876 .fill-B6{fill:#F7F8FE;} + .d2-1725799876 .fill-AA2{fill:#4A6FF3;} + .d2-1725799876 .fill-AA4{fill:#EDF0FD;} + .d2-1725799876 .fill-AA5{fill:#F7F8FE;} + .d2-1725799876 .fill-AB4{fill:#EDF0FD;} + .d2-1725799876 .fill-AB5{fill:#F7F8FE;} + .d2-1725799876 .stroke-N1{stroke:#0A0F25;} + .d2-1725799876 .stroke-N2{stroke:#676C7E;} + .d2-1725799876 .stroke-N3{stroke:#9499AB;} + .d2-1725799876 .stroke-N4{stroke:#CFD2DD;} + .d2-1725799876 .stroke-N5{stroke:#DEE1EB;} + .d2-1725799876 .stroke-N6{stroke:#EEF1F8;} + .d2-1725799876 .stroke-N7{stroke:#FFFFFF;} + .d2-1725799876 .stroke-B1{stroke:#0D32B2;} + .d2-1725799876 .stroke-B2{stroke:#0D32B2;} + .d2-1725799876 .stroke-B3{stroke:#E3E9FD;} + .d2-1725799876 .stroke-B4{stroke:#E3E9FD;} + .d2-1725799876 .stroke-B5{stroke:#EDF0FD;} + .d2-1725799876 .stroke-B6{stroke:#F7F8FE;} + .d2-1725799876 .stroke-AA2{stroke:#4A6FF3;} + .d2-1725799876 .stroke-AA4{stroke:#EDF0FD;} + .d2-1725799876 .stroke-AA5{stroke:#F7F8FE;} + .d2-1725799876 .stroke-AB4{stroke:#EDF0FD;} + .d2-1725799876 .stroke-AB5{stroke:#F7F8FE;} + .d2-1725799876 .background-color-N1{background-color:#0A0F25;} + .d2-1725799876 .background-color-N2{background-color:#676C7E;} + .d2-1725799876 .background-color-N3{background-color:#9499AB;} + .d2-1725799876 .background-color-N4{background-color:#CFD2DD;} + .d2-1725799876 .background-color-N5{background-color:#DEE1EB;} + .d2-1725799876 .background-color-N6{background-color:#EEF1F8;} + .d2-1725799876 .background-color-N7{background-color:#FFFFFF;} + .d2-1725799876 .background-color-B1{background-color:#0D32B2;} + .d2-1725799876 .background-color-B2{background-color:#0D32B2;} + .d2-1725799876 .background-color-B3{background-color:#E3E9FD;} + .d2-1725799876 .background-color-B4{background-color:#E3E9FD;} + .d2-1725799876 .background-color-B5{background-color:#EDF0FD;} + .d2-1725799876 .background-color-B6{background-color:#F7F8FE;} + .d2-1725799876 .background-color-AA2{background-color:#4A6FF3;} + .d2-1725799876 .background-color-AA4{background-color:#EDF0FD;} + .d2-1725799876 .background-color-AA5{background-color:#F7F8FE;} + .d2-1725799876 .background-color-AB4{background-color:#EDF0FD;} + .d2-1725799876 .background-color-AB5{background-color:#F7F8FE;} + .d2-1725799876 .color-N1{color:#0A0F25;} + .d2-1725799876 .color-N2{color:#676C7E;} + .d2-1725799876 .color-N3{color:#9499AB;} + .d2-1725799876 .color-N4{color:#CFD2DD;} + .d2-1725799876 .color-N5{color:#DEE1EB;} + .d2-1725799876 .color-N6{color:#EEF1F8;} + .d2-1725799876 .color-N7{color:#FFFFFF;} + .d2-1725799876 .color-B1{color:#0D32B2;} + .d2-1725799876 .color-B2{color:#0D32B2;} + .d2-1725799876 .color-B3{color:#E3E9FD;} + .d2-1725799876 .color-B4{color:#E3E9FD;} + .d2-1725799876 .color-B5{color:#EDF0FD;} + .d2-1725799876 .color-B6{color:#F7F8FE;} + .d2-1725799876 .color-AA2{color:#4A6FF3;} + .d2-1725799876 .color-AA4{color:#EDF0FD;} + .d2-1725799876 .color-AA5{color:#F7F8FE;} + .d2-1725799876 .color-AB4{color:#EDF0FD;} + .d2-1725799876 .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}]]>ababcabc diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg index b24011fe7..da60dfe42 100644 --- a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-493210531 .fill-N1{fill:#0A0F25;} + .d2-493210531 .fill-N2{fill:#676C7E;} + .d2-493210531 .fill-N3{fill:#9499AB;} + .d2-493210531 .fill-N4{fill:#CFD2DD;} + .d2-493210531 .fill-N5{fill:#DEE1EB;} + .d2-493210531 .fill-N6{fill:#EEF1F8;} + .d2-493210531 .fill-N7{fill:#FFFFFF;} + .d2-493210531 .fill-B1{fill:#0D32B2;} + .d2-493210531 .fill-B2{fill:#0D32B2;} + .d2-493210531 .fill-B3{fill:#E3E9FD;} + .d2-493210531 .fill-B4{fill:#E3E9FD;} + .d2-493210531 .fill-B5{fill:#EDF0FD;} + .d2-493210531 .fill-B6{fill:#F7F8FE;} + .d2-493210531 .fill-AA2{fill:#4A6FF3;} + .d2-493210531 .fill-AA4{fill:#EDF0FD;} + .d2-493210531 .fill-AA5{fill:#F7F8FE;} + .d2-493210531 .fill-AB4{fill:#EDF0FD;} + .d2-493210531 .fill-AB5{fill:#F7F8FE;} + .d2-493210531 .stroke-N1{stroke:#0A0F25;} + .d2-493210531 .stroke-N2{stroke:#676C7E;} + .d2-493210531 .stroke-N3{stroke:#9499AB;} + .d2-493210531 .stroke-N4{stroke:#CFD2DD;} + .d2-493210531 .stroke-N5{stroke:#DEE1EB;} + .d2-493210531 .stroke-N6{stroke:#EEF1F8;} + .d2-493210531 .stroke-N7{stroke:#FFFFFF;} + .d2-493210531 .stroke-B1{stroke:#0D32B2;} + .d2-493210531 .stroke-B2{stroke:#0D32B2;} + .d2-493210531 .stroke-B3{stroke:#E3E9FD;} + .d2-493210531 .stroke-B4{stroke:#E3E9FD;} + .d2-493210531 .stroke-B5{stroke:#EDF0FD;} + .d2-493210531 .stroke-B6{stroke:#F7F8FE;} + .d2-493210531 .stroke-AA2{stroke:#4A6FF3;} + .d2-493210531 .stroke-AA4{stroke:#EDF0FD;} + .d2-493210531 .stroke-AA5{stroke:#F7F8FE;} + .d2-493210531 .stroke-AB4{stroke:#EDF0FD;} + .d2-493210531 .stroke-AB5{stroke:#F7F8FE;} + .d2-493210531 .background-color-N1{background-color:#0A0F25;} + .d2-493210531 .background-color-N2{background-color:#676C7E;} + .d2-493210531 .background-color-N3{background-color:#9499AB;} + .d2-493210531 .background-color-N4{background-color:#CFD2DD;} + .d2-493210531 .background-color-N5{background-color:#DEE1EB;} + .d2-493210531 .background-color-N6{background-color:#EEF1F8;} + .d2-493210531 .background-color-N7{background-color:#FFFFFF;} + .d2-493210531 .background-color-B1{background-color:#0D32B2;} + .d2-493210531 .background-color-B2{background-color:#0D32B2;} + .d2-493210531 .background-color-B3{background-color:#E3E9FD;} + .d2-493210531 .background-color-B4{background-color:#E3E9FD;} + .d2-493210531 .background-color-B5{background-color:#EDF0FD;} + .d2-493210531 .background-color-B6{background-color:#F7F8FE;} + .d2-493210531 .background-color-AA2{background-color:#4A6FF3;} + .d2-493210531 .background-color-AA4{background-color:#EDF0FD;} + .d2-493210531 .background-color-AA5{background-color:#F7F8FE;} + .d2-493210531 .background-color-AB4{background-color:#EDF0FD;} + .d2-493210531 .background-color-AB5{background-color:#F7F8FE;} + .d2-493210531 .color-N1{color:#0A0F25;} + .d2-493210531 .color-N2{color:#676C7E;} + .d2-493210531 .color-N3{color:#9499AB;} + .d2-493210531 .color-N4{color:#CFD2DD;} + .d2-493210531 .color-N5{color:#DEE1EB;} + .d2-493210531 .color-N6{color:#EEF1F8;} + .d2-493210531 .color-N7{color:#FFFFFF;} + .d2-493210531 .color-B1{color:#0D32B2;} + .d2-493210531 .color-B2{color:#0D32B2;} + .d2-493210531 .color-B3{color:#E3E9FD;} + .d2-493210531 .color-B4{color:#E3E9FD;} + .d2-493210531 .color-B5{color:#EDF0FD;} + .d2-493210531 .color-B6{color:#F7F8FE;} + .d2-493210531 .color-AA2{color:#4A6FF3;} + .d2-493210531 .color-AA4{color:#EDF0FD;} + .d2-493210531 .color-AA5{color:#F7F8FE;} + .d2-493210531 .color-AB4{color:#EDF0FD;} + .d2-493210531 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg index 62357da27..b46d93fdc 100644 --- a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-842214459 .fill-N1{fill:#0A0F25;} + .d2-842214459 .fill-N2{fill:#676C7E;} + .d2-842214459 .fill-N3{fill:#9499AB;} + .d2-842214459 .fill-N4{fill:#CFD2DD;} + .d2-842214459 .fill-N5{fill:#DEE1EB;} + .d2-842214459 .fill-N6{fill:#EEF1F8;} + .d2-842214459 .fill-N7{fill:#FFFFFF;} + .d2-842214459 .fill-B1{fill:#0D32B2;} + .d2-842214459 .fill-B2{fill:#0D32B2;} + .d2-842214459 .fill-B3{fill:#E3E9FD;} + .d2-842214459 .fill-B4{fill:#E3E9FD;} + .d2-842214459 .fill-B5{fill:#EDF0FD;} + .d2-842214459 .fill-B6{fill:#F7F8FE;} + .d2-842214459 .fill-AA2{fill:#4A6FF3;} + .d2-842214459 .fill-AA4{fill:#EDF0FD;} + .d2-842214459 .fill-AA5{fill:#F7F8FE;} + .d2-842214459 .fill-AB4{fill:#EDF0FD;} + .d2-842214459 .fill-AB5{fill:#F7F8FE;} + .d2-842214459 .stroke-N1{stroke:#0A0F25;} + .d2-842214459 .stroke-N2{stroke:#676C7E;} + .d2-842214459 .stroke-N3{stroke:#9499AB;} + .d2-842214459 .stroke-N4{stroke:#CFD2DD;} + .d2-842214459 .stroke-N5{stroke:#DEE1EB;} + .d2-842214459 .stroke-N6{stroke:#EEF1F8;} + .d2-842214459 .stroke-N7{stroke:#FFFFFF;} + .d2-842214459 .stroke-B1{stroke:#0D32B2;} + .d2-842214459 .stroke-B2{stroke:#0D32B2;} + .d2-842214459 .stroke-B3{stroke:#E3E9FD;} + .d2-842214459 .stroke-B4{stroke:#E3E9FD;} + .d2-842214459 .stroke-B5{stroke:#EDF0FD;} + .d2-842214459 .stroke-B6{stroke:#F7F8FE;} + .d2-842214459 .stroke-AA2{stroke:#4A6FF3;} + .d2-842214459 .stroke-AA4{stroke:#EDF0FD;} + .d2-842214459 .stroke-AA5{stroke:#F7F8FE;} + .d2-842214459 .stroke-AB4{stroke:#EDF0FD;} + .d2-842214459 .stroke-AB5{stroke:#F7F8FE;} + .d2-842214459 .background-color-N1{background-color:#0A0F25;} + .d2-842214459 .background-color-N2{background-color:#676C7E;} + .d2-842214459 .background-color-N3{background-color:#9499AB;} + .d2-842214459 .background-color-N4{background-color:#CFD2DD;} + .d2-842214459 .background-color-N5{background-color:#DEE1EB;} + .d2-842214459 .background-color-N6{background-color:#EEF1F8;} + .d2-842214459 .background-color-N7{background-color:#FFFFFF;} + .d2-842214459 .background-color-B1{background-color:#0D32B2;} + .d2-842214459 .background-color-B2{background-color:#0D32B2;} + .d2-842214459 .background-color-B3{background-color:#E3E9FD;} + .d2-842214459 .background-color-B4{background-color:#E3E9FD;} + .d2-842214459 .background-color-B5{background-color:#EDF0FD;} + .d2-842214459 .background-color-B6{background-color:#F7F8FE;} + .d2-842214459 .background-color-AA2{background-color:#4A6FF3;} + .d2-842214459 .background-color-AA4{background-color:#EDF0FD;} + .d2-842214459 .background-color-AA5{background-color:#F7F8FE;} + .d2-842214459 .background-color-AB4{background-color:#EDF0FD;} + .d2-842214459 .background-color-AB5{background-color:#F7F8FE;} + .d2-842214459 .color-N1{color:#0A0F25;} + .d2-842214459 .color-N2{color:#676C7E;} + .d2-842214459 .color-N3{color:#9499AB;} + .d2-842214459 .color-N4{color:#CFD2DD;} + .d2-842214459 .color-N5{color:#DEE1EB;} + .d2-842214459 .color-N6{color:#EEF1F8;} + .d2-842214459 .color-N7{color:#FFFFFF;} + .d2-842214459 .color-B1{color:#0D32B2;} + .d2-842214459 .color-B2{color:#0D32B2;} + .d2-842214459 .color-B3{color:#E3E9FD;} + .d2-842214459 .color-B4{color:#E3E9FD;} + .d2-842214459 .color-B5{color:#EDF0FD;} + .d2-842214459 .color-B6{color:#F7F8FE;} + .d2-842214459 .color-AA2{color:#4A6FF3;} + .d2-842214459 .color-AA4{color:#EDF0FD;} + .d2-842214459 .color-AA5{color:#F7F8FE;} + .d2-842214459 .color-AB4{color:#EDF0FD;} + .d2-842214459 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg index ee1106a30..7efeeed53 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-1112681400 .fill-N1{fill:#0A0F25;} + .d2-1112681400 .fill-N2{fill:#676C7E;} + .d2-1112681400 .fill-N3{fill:#9499AB;} + .d2-1112681400 .fill-N4{fill:#CFD2DD;} + .d2-1112681400 .fill-N5{fill:#DEE1EB;} + .d2-1112681400 .fill-N6{fill:#EEF1F8;} + .d2-1112681400 .fill-N7{fill:#FFFFFF;} + .d2-1112681400 .fill-B1{fill:#0D32B2;} + .d2-1112681400 .fill-B2{fill:#0D32B2;} + .d2-1112681400 .fill-B3{fill:#E3E9FD;} + .d2-1112681400 .fill-B4{fill:#E3E9FD;} + .d2-1112681400 .fill-B5{fill:#EDF0FD;} + .d2-1112681400 .fill-B6{fill:#F7F8FE;} + .d2-1112681400 .fill-AA2{fill:#4A6FF3;} + .d2-1112681400 .fill-AA4{fill:#EDF0FD;} + .d2-1112681400 .fill-AA5{fill:#F7F8FE;} + .d2-1112681400 .fill-AB4{fill:#EDF0FD;} + .d2-1112681400 .fill-AB5{fill:#F7F8FE;} + .d2-1112681400 .stroke-N1{stroke:#0A0F25;} + .d2-1112681400 .stroke-N2{stroke:#676C7E;} + .d2-1112681400 .stroke-N3{stroke:#9499AB;} + .d2-1112681400 .stroke-N4{stroke:#CFD2DD;} + .d2-1112681400 .stroke-N5{stroke:#DEE1EB;} + .d2-1112681400 .stroke-N6{stroke:#EEF1F8;} + .d2-1112681400 .stroke-N7{stroke:#FFFFFF;} + .d2-1112681400 .stroke-B1{stroke:#0D32B2;} + .d2-1112681400 .stroke-B2{stroke:#0D32B2;} + .d2-1112681400 .stroke-B3{stroke:#E3E9FD;} + .d2-1112681400 .stroke-B4{stroke:#E3E9FD;} + .d2-1112681400 .stroke-B5{stroke:#EDF0FD;} + .d2-1112681400 .stroke-B6{stroke:#F7F8FE;} + .d2-1112681400 .stroke-AA2{stroke:#4A6FF3;} + .d2-1112681400 .stroke-AA4{stroke:#EDF0FD;} + .d2-1112681400 .stroke-AA5{stroke:#F7F8FE;} + .d2-1112681400 .stroke-AB4{stroke:#EDF0FD;} + .d2-1112681400 .stroke-AB5{stroke:#F7F8FE;} + .d2-1112681400 .background-color-N1{background-color:#0A0F25;} + .d2-1112681400 .background-color-N2{background-color:#676C7E;} + .d2-1112681400 .background-color-N3{background-color:#9499AB;} + .d2-1112681400 .background-color-N4{background-color:#CFD2DD;} + .d2-1112681400 .background-color-N5{background-color:#DEE1EB;} + .d2-1112681400 .background-color-N6{background-color:#EEF1F8;} + .d2-1112681400 .background-color-N7{background-color:#FFFFFF;} + .d2-1112681400 .background-color-B1{background-color:#0D32B2;} + .d2-1112681400 .background-color-B2{background-color:#0D32B2;} + .d2-1112681400 .background-color-B3{background-color:#E3E9FD;} + .d2-1112681400 .background-color-B4{background-color:#E3E9FD;} + .d2-1112681400 .background-color-B5{background-color:#EDF0FD;} + .d2-1112681400 .background-color-B6{background-color:#F7F8FE;} + .d2-1112681400 .background-color-AA2{background-color:#4A6FF3;} + .d2-1112681400 .background-color-AA4{background-color:#EDF0FD;} + .d2-1112681400 .background-color-AA5{background-color:#F7F8FE;} + .d2-1112681400 .background-color-AB4{background-color:#EDF0FD;} + .d2-1112681400 .background-color-AB5{background-color:#F7F8FE;} + .d2-1112681400 .color-N1{color:#0A0F25;} + .d2-1112681400 .color-N2{color:#676C7E;} + .d2-1112681400 .color-N3{color:#9499AB;} + .d2-1112681400 .color-N4{color:#CFD2DD;} + .d2-1112681400 .color-N5{color:#DEE1EB;} + .d2-1112681400 .color-N6{color:#EEF1F8;} + .d2-1112681400 .color-N7{color:#FFFFFF;} + .d2-1112681400 .color-B1{color:#0D32B2;} + .d2-1112681400 .color-B2{color:#0D32B2;} + .d2-1112681400 .color-B3{color:#E3E9FD;} + .d2-1112681400 .color-B4{color:#E3E9FD;} + .d2-1112681400 .color-B5{color:#EDF0FD;} + .d2-1112681400 .color-B6{color:#F7F8FE;} + .d2-1112681400 .color-AA2{color:#4A6FF3;} + .d2-1112681400 .color-AA4{color:#EDF0FD;} + .d2-1112681400 .color-AA5{color:#F7F8FE;} + .d2-1112681400 .color-AB4{color:#EDF0FD;} + .d2-1112681400 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg index 29a8dd97a..a19e70bc9 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-4134635196 .fill-N1{fill:#0A0F25;} + .d2-4134635196 .fill-N2{fill:#676C7E;} + .d2-4134635196 .fill-N3{fill:#9499AB;} + .d2-4134635196 .fill-N4{fill:#CFD2DD;} + .d2-4134635196 .fill-N5{fill:#DEE1EB;} + .d2-4134635196 .fill-N6{fill:#EEF1F8;} + .d2-4134635196 .fill-N7{fill:#FFFFFF;} + .d2-4134635196 .fill-B1{fill:#0D32B2;} + .d2-4134635196 .fill-B2{fill:#0D32B2;} + .d2-4134635196 .fill-B3{fill:#E3E9FD;} + .d2-4134635196 .fill-B4{fill:#E3E9FD;} + .d2-4134635196 .fill-B5{fill:#EDF0FD;} + .d2-4134635196 .fill-B6{fill:#F7F8FE;} + .d2-4134635196 .fill-AA2{fill:#4A6FF3;} + .d2-4134635196 .fill-AA4{fill:#EDF0FD;} + .d2-4134635196 .fill-AA5{fill:#F7F8FE;} + .d2-4134635196 .fill-AB4{fill:#EDF0FD;} + .d2-4134635196 .fill-AB5{fill:#F7F8FE;} + .d2-4134635196 .stroke-N1{stroke:#0A0F25;} + .d2-4134635196 .stroke-N2{stroke:#676C7E;} + .d2-4134635196 .stroke-N3{stroke:#9499AB;} + .d2-4134635196 .stroke-N4{stroke:#CFD2DD;} + .d2-4134635196 .stroke-N5{stroke:#DEE1EB;} + .d2-4134635196 .stroke-N6{stroke:#EEF1F8;} + .d2-4134635196 .stroke-N7{stroke:#FFFFFF;} + .d2-4134635196 .stroke-B1{stroke:#0D32B2;} + .d2-4134635196 .stroke-B2{stroke:#0D32B2;} + .d2-4134635196 .stroke-B3{stroke:#E3E9FD;} + .d2-4134635196 .stroke-B4{stroke:#E3E9FD;} + .d2-4134635196 .stroke-B5{stroke:#EDF0FD;} + .d2-4134635196 .stroke-B6{stroke:#F7F8FE;} + .d2-4134635196 .stroke-AA2{stroke:#4A6FF3;} + .d2-4134635196 .stroke-AA4{stroke:#EDF0FD;} + .d2-4134635196 .stroke-AA5{stroke:#F7F8FE;} + .d2-4134635196 .stroke-AB4{stroke:#EDF0FD;} + .d2-4134635196 .stroke-AB5{stroke:#F7F8FE;} + .d2-4134635196 .background-color-N1{background-color:#0A0F25;} + .d2-4134635196 .background-color-N2{background-color:#676C7E;} + .d2-4134635196 .background-color-N3{background-color:#9499AB;} + .d2-4134635196 .background-color-N4{background-color:#CFD2DD;} + .d2-4134635196 .background-color-N5{background-color:#DEE1EB;} + .d2-4134635196 .background-color-N6{background-color:#EEF1F8;} + .d2-4134635196 .background-color-N7{background-color:#FFFFFF;} + .d2-4134635196 .background-color-B1{background-color:#0D32B2;} + .d2-4134635196 .background-color-B2{background-color:#0D32B2;} + .d2-4134635196 .background-color-B3{background-color:#E3E9FD;} + .d2-4134635196 .background-color-B4{background-color:#E3E9FD;} + .d2-4134635196 .background-color-B5{background-color:#EDF0FD;} + .d2-4134635196 .background-color-B6{background-color:#F7F8FE;} + .d2-4134635196 .background-color-AA2{background-color:#4A6FF3;} + .d2-4134635196 .background-color-AA4{background-color:#EDF0FD;} + .d2-4134635196 .background-color-AA5{background-color:#F7F8FE;} + .d2-4134635196 .background-color-AB4{background-color:#EDF0FD;} + .d2-4134635196 .background-color-AB5{background-color:#F7F8FE;} + .d2-4134635196 .color-N1{color:#0A0F25;} + .d2-4134635196 .color-N2{color:#676C7E;} + .d2-4134635196 .color-N3{color:#9499AB;} + .d2-4134635196 .color-N4{color:#CFD2DD;} + .d2-4134635196 .color-N5{color:#DEE1EB;} + .d2-4134635196 .color-N6{color:#EEF1F8;} + .d2-4134635196 .color-N7{color:#FFFFFF;} + .d2-4134635196 .color-B1{color:#0D32B2;} + .d2-4134635196 .color-B2{color:#0D32B2;} + .d2-4134635196 .color-B3{color:#E3E9FD;} + .d2-4134635196 .color-B4{color:#E3E9FD;} + .d2-4134635196 .color-B5{color:#EDF0FD;} + .d2-4134635196 .color-B6{color:#F7F8FE;} + .d2-4134635196 .color-AA2{color:#4A6FF3;} + .d2-4134635196 .color-AA4{color:#EDF0FD;} + .d2-4134635196 .color-AA5{color:#F7F8FE;} + .d2-4134635196 .color-AB4{color:#EDF0FD;} + .d2-4134635196 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg index 00606b7b3..01c1a2823 100644 --- a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopq + .d2-4142769503 .fill-N1{fill:#0A0F25;} + .d2-4142769503 .fill-N2{fill:#676C7E;} + .d2-4142769503 .fill-N3{fill:#9499AB;} + .d2-4142769503 .fill-N4{fill:#CFD2DD;} + .d2-4142769503 .fill-N5{fill:#DEE1EB;} + .d2-4142769503 .fill-N6{fill:#EEF1F8;} + .d2-4142769503 .fill-N7{fill:#FFFFFF;} + .d2-4142769503 .fill-B1{fill:#0D32B2;} + .d2-4142769503 .fill-B2{fill:#0D32B2;} + .d2-4142769503 .fill-B3{fill:#E3E9FD;} + .d2-4142769503 .fill-B4{fill:#E3E9FD;} + .d2-4142769503 .fill-B5{fill:#EDF0FD;} + .d2-4142769503 .fill-B6{fill:#F7F8FE;} + .d2-4142769503 .fill-AA2{fill:#4A6FF3;} + .d2-4142769503 .fill-AA4{fill:#EDF0FD;} + .d2-4142769503 .fill-AA5{fill:#F7F8FE;} + .d2-4142769503 .fill-AB4{fill:#EDF0FD;} + .d2-4142769503 .fill-AB5{fill:#F7F8FE;} + .d2-4142769503 .stroke-N1{stroke:#0A0F25;} + .d2-4142769503 .stroke-N2{stroke:#676C7E;} + .d2-4142769503 .stroke-N3{stroke:#9499AB;} + .d2-4142769503 .stroke-N4{stroke:#CFD2DD;} + .d2-4142769503 .stroke-N5{stroke:#DEE1EB;} + .d2-4142769503 .stroke-N6{stroke:#EEF1F8;} + .d2-4142769503 .stroke-N7{stroke:#FFFFFF;} + .d2-4142769503 .stroke-B1{stroke:#0D32B2;} + .d2-4142769503 .stroke-B2{stroke:#0D32B2;} + .d2-4142769503 .stroke-B3{stroke:#E3E9FD;} + .d2-4142769503 .stroke-B4{stroke:#E3E9FD;} + .d2-4142769503 .stroke-B5{stroke:#EDF0FD;} + .d2-4142769503 .stroke-B6{stroke:#F7F8FE;} + .d2-4142769503 .stroke-AA2{stroke:#4A6FF3;} + .d2-4142769503 .stroke-AA4{stroke:#EDF0FD;} + .d2-4142769503 .stroke-AA5{stroke:#F7F8FE;} + .d2-4142769503 .stroke-AB4{stroke:#EDF0FD;} + .d2-4142769503 .stroke-AB5{stroke:#F7F8FE;} + .d2-4142769503 .background-color-N1{background-color:#0A0F25;} + .d2-4142769503 .background-color-N2{background-color:#676C7E;} + .d2-4142769503 .background-color-N3{background-color:#9499AB;} + .d2-4142769503 .background-color-N4{background-color:#CFD2DD;} + .d2-4142769503 .background-color-N5{background-color:#DEE1EB;} + .d2-4142769503 .background-color-N6{background-color:#EEF1F8;} + .d2-4142769503 .background-color-N7{background-color:#FFFFFF;} + .d2-4142769503 .background-color-B1{background-color:#0D32B2;} + .d2-4142769503 .background-color-B2{background-color:#0D32B2;} + .d2-4142769503 .background-color-B3{background-color:#E3E9FD;} + .d2-4142769503 .background-color-B4{background-color:#E3E9FD;} + .d2-4142769503 .background-color-B5{background-color:#EDF0FD;} + .d2-4142769503 .background-color-B6{background-color:#F7F8FE;} + .d2-4142769503 .background-color-AA2{background-color:#4A6FF3;} + .d2-4142769503 .background-color-AA4{background-color:#EDF0FD;} + .d2-4142769503 .background-color-AA5{background-color:#F7F8FE;} + .d2-4142769503 .background-color-AB4{background-color:#EDF0FD;} + .d2-4142769503 .background-color-AB5{background-color:#F7F8FE;} + .d2-4142769503 .color-N1{color:#0A0F25;} + .d2-4142769503 .color-N2{color:#676C7E;} + .d2-4142769503 .color-N3{color:#9499AB;} + .d2-4142769503 .color-N4{color:#CFD2DD;} + .d2-4142769503 .color-N5{color:#DEE1EB;} + .d2-4142769503 .color-N6{color:#EEF1F8;} + .d2-4142769503 .color-N7{color:#FFFFFF;} + .d2-4142769503 .color-B1{color:#0D32B2;} + .d2-4142769503 .color-B2{color:#0D32B2;} + .d2-4142769503 .color-B3{color:#E3E9FD;} + .d2-4142769503 .color-B4{color:#E3E9FD;} + .d2-4142769503 .color-B5{color:#EDF0FD;} + .d2-4142769503 .color-B6{color:#F7F8FE;} + .d2-4142769503 .color-AA2{color:#4A6FF3;} + .d2-4142769503 .color-AA4{color:#EDF0FD;} + .d2-4142769503 .color-AA5{color:#F7F8FE;} + .d2-4142769503 .color-AB4{color:#EDF0FD;} + .d2-4142769503 .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}]]>abcdefghijklmnopq diff --git a/e2etests/testdata/stable/dense/elk/sketch.exp.svg b/e2etests/testdata/stable/dense/elk/sketch.exp.svg index 89027d7fb..c0470cedd 100644 --- a/e2etests/testdata/stable/dense/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopq + .d2-3932570534 .fill-N1{fill:#0A0F25;} + .d2-3932570534 .fill-N2{fill:#676C7E;} + .d2-3932570534 .fill-N3{fill:#9499AB;} + .d2-3932570534 .fill-N4{fill:#CFD2DD;} + .d2-3932570534 .fill-N5{fill:#DEE1EB;} + .d2-3932570534 .fill-N6{fill:#EEF1F8;} + .d2-3932570534 .fill-N7{fill:#FFFFFF;} + .d2-3932570534 .fill-B1{fill:#0D32B2;} + .d2-3932570534 .fill-B2{fill:#0D32B2;} + .d2-3932570534 .fill-B3{fill:#E3E9FD;} + .d2-3932570534 .fill-B4{fill:#E3E9FD;} + .d2-3932570534 .fill-B5{fill:#EDF0FD;} + .d2-3932570534 .fill-B6{fill:#F7F8FE;} + .d2-3932570534 .fill-AA2{fill:#4A6FF3;} + .d2-3932570534 .fill-AA4{fill:#EDF0FD;} + .d2-3932570534 .fill-AA5{fill:#F7F8FE;} + .d2-3932570534 .fill-AB4{fill:#EDF0FD;} + .d2-3932570534 .fill-AB5{fill:#F7F8FE;} + .d2-3932570534 .stroke-N1{stroke:#0A0F25;} + .d2-3932570534 .stroke-N2{stroke:#676C7E;} + .d2-3932570534 .stroke-N3{stroke:#9499AB;} + .d2-3932570534 .stroke-N4{stroke:#CFD2DD;} + .d2-3932570534 .stroke-N5{stroke:#DEE1EB;} + .d2-3932570534 .stroke-N6{stroke:#EEF1F8;} + .d2-3932570534 .stroke-N7{stroke:#FFFFFF;} + .d2-3932570534 .stroke-B1{stroke:#0D32B2;} + .d2-3932570534 .stroke-B2{stroke:#0D32B2;} + .d2-3932570534 .stroke-B3{stroke:#E3E9FD;} + .d2-3932570534 .stroke-B4{stroke:#E3E9FD;} + .d2-3932570534 .stroke-B5{stroke:#EDF0FD;} + .d2-3932570534 .stroke-B6{stroke:#F7F8FE;} + .d2-3932570534 .stroke-AA2{stroke:#4A6FF3;} + .d2-3932570534 .stroke-AA4{stroke:#EDF0FD;} + .d2-3932570534 .stroke-AA5{stroke:#F7F8FE;} + .d2-3932570534 .stroke-AB4{stroke:#EDF0FD;} + .d2-3932570534 .stroke-AB5{stroke:#F7F8FE;} + .d2-3932570534 .background-color-N1{background-color:#0A0F25;} + .d2-3932570534 .background-color-N2{background-color:#676C7E;} + .d2-3932570534 .background-color-N3{background-color:#9499AB;} + .d2-3932570534 .background-color-N4{background-color:#CFD2DD;} + .d2-3932570534 .background-color-N5{background-color:#DEE1EB;} + .d2-3932570534 .background-color-N6{background-color:#EEF1F8;} + .d2-3932570534 .background-color-N7{background-color:#FFFFFF;} + .d2-3932570534 .background-color-B1{background-color:#0D32B2;} + .d2-3932570534 .background-color-B2{background-color:#0D32B2;} + .d2-3932570534 .background-color-B3{background-color:#E3E9FD;} + .d2-3932570534 .background-color-B4{background-color:#E3E9FD;} + .d2-3932570534 .background-color-B5{background-color:#EDF0FD;} + .d2-3932570534 .background-color-B6{background-color:#F7F8FE;} + .d2-3932570534 .background-color-AA2{background-color:#4A6FF3;} + .d2-3932570534 .background-color-AA4{background-color:#EDF0FD;} + .d2-3932570534 .background-color-AA5{background-color:#F7F8FE;} + .d2-3932570534 .background-color-AB4{background-color:#EDF0FD;} + .d2-3932570534 .background-color-AB5{background-color:#F7F8FE;} + .d2-3932570534 .color-N1{color:#0A0F25;} + .d2-3932570534 .color-N2{color:#676C7E;} + .d2-3932570534 .color-N3{color:#9499AB;} + .d2-3932570534 .color-N4{color:#CFD2DD;} + .d2-3932570534 .color-N5{color:#DEE1EB;} + .d2-3932570534 .color-N6{color:#EEF1F8;} + .d2-3932570534 .color-N7{color:#FFFFFF;} + .d2-3932570534 .color-B1{color:#0D32B2;} + .d2-3932570534 .color-B2{color:#0D32B2;} + .d2-3932570534 .color-B3{color:#E3E9FD;} + .d2-3932570534 .color-B4{color:#E3E9FD;} + .d2-3932570534 .color-B5{color:#EDF0FD;} + .d2-3932570534 .color-B6{color:#F7F8FE;} + .d2-3932570534 .color-AA2{color:#4A6FF3;} + .d2-3932570534 .color-AA4{color:#EDF0FD;} + .d2-3932570534 .color-AA5{color:#F7F8FE;} + .d2-3932570534 .color-AB4{color:#EDF0FD;} + .d2-3932570534 .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}]]>abcdefghijklmnopq diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg index 20528c784..d35d8be97 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot + .d2-696853950 .fill-N1{fill:#0A0F25;} + .d2-696853950 .fill-N2{fill:#676C7E;} + .d2-696853950 .fill-N3{fill:#9499AB;} + .d2-696853950 .fill-N4{fill:#CFD2DD;} + .d2-696853950 .fill-N5{fill:#DEE1EB;} + .d2-696853950 .fill-N6{fill:#EEF1F8;} + .d2-696853950 .fill-N7{fill:#FFFFFF;} + .d2-696853950 .fill-B1{fill:#0D32B2;} + .d2-696853950 .fill-B2{fill:#0D32B2;} + .d2-696853950 .fill-B3{fill:#E3E9FD;} + .d2-696853950 .fill-B4{fill:#E3E9FD;} + .d2-696853950 .fill-B5{fill:#EDF0FD;} + .d2-696853950 .fill-B6{fill:#F7F8FE;} + .d2-696853950 .fill-AA2{fill:#4A6FF3;} + .d2-696853950 .fill-AA4{fill:#EDF0FD;} + .d2-696853950 .fill-AA5{fill:#F7F8FE;} + .d2-696853950 .fill-AB4{fill:#EDF0FD;} + .d2-696853950 .fill-AB5{fill:#F7F8FE;} + .d2-696853950 .stroke-N1{stroke:#0A0F25;} + .d2-696853950 .stroke-N2{stroke:#676C7E;} + .d2-696853950 .stroke-N3{stroke:#9499AB;} + .d2-696853950 .stroke-N4{stroke:#CFD2DD;} + .d2-696853950 .stroke-N5{stroke:#DEE1EB;} + .d2-696853950 .stroke-N6{stroke:#EEF1F8;} + .d2-696853950 .stroke-N7{stroke:#FFFFFF;} + .d2-696853950 .stroke-B1{stroke:#0D32B2;} + .d2-696853950 .stroke-B2{stroke:#0D32B2;} + .d2-696853950 .stroke-B3{stroke:#E3E9FD;} + .d2-696853950 .stroke-B4{stroke:#E3E9FD;} + .d2-696853950 .stroke-B5{stroke:#EDF0FD;} + .d2-696853950 .stroke-B6{stroke:#F7F8FE;} + .d2-696853950 .stroke-AA2{stroke:#4A6FF3;} + .d2-696853950 .stroke-AA4{stroke:#EDF0FD;} + .d2-696853950 .stroke-AA5{stroke:#F7F8FE;} + .d2-696853950 .stroke-AB4{stroke:#EDF0FD;} + .d2-696853950 .stroke-AB5{stroke:#F7F8FE;} + .d2-696853950 .background-color-N1{background-color:#0A0F25;} + .d2-696853950 .background-color-N2{background-color:#676C7E;} + .d2-696853950 .background-color-N3{background-color:#9499AB;} + .d2-696853950 .background-color-N4{background-color:#CFD2DD;} + .d2-696853950 .background-color-N5{background-color:#DEE1EB;} + .d2-696853950 .background-color-N6{background-color:#EEF1F8;} + .d2-696853950 .background-color-N7{background-color:#FFFFFF;} + .d2-696853950 .background-color-B1{background-color:#0D32B2;} + .d2-696853950 .background-color-B2{background-color:#0D32B2;} + .d2-696853950 .background-color-B3{background-color:#E3E9FD;} + .d2-696853950 .background-color-B4{background-color:#E3E9FD;} + .d2-696853950 .background-color-B5{background-color:#EDF0FD;} + .d2-696853950 .background-color-B6{background-color:#F7F8FE;} + .d2-696853950 .background-color-AA2{background-color:#4A6FF3;} + .d2-696853950 .background-color-AA4{background-color:#EDF0FD;} + .d2-696853950 .background-color-AA5{background-color:#F7F8FE;} + .d2-696853950 .background-color-AB4{background-color:#EDF0FD;} + .d2-696853950 .background-color-AB5{background-color:#F7F8FE;} + .d2-696853950 .color-N1{color:#0A0F25;} + .d2-696853950 .color-N2{color:#676C7E;} + .d2-696853950 .color-N3{color:#9499AB;} + .d2-696853950 .color-N4{color:#CFD2DD;} + .d2-696853950 .color-N5{color:#DEE1EB;} + .d2-696853950 .color-N6{color:#EEF1F8;} + .d2-696853950 .color-N7{color:#FFFFFF;} + .d2-696853950 .color-B1{color:#0D32B2;} + .d2-696853950 .color-B2{color:#0D32B2;} + .d2-696853950 .color-B3{color:#E3E9FD;} + .d2-696853950 .color-B4{color:#E3E9FD;} + .d2-696853950 .color-B5{color:#EDF0FD;} + .d2-696853950 .color-B6{color:#F7F8FE;} + .d2-696853950 .color-AA2{color:#4A6FF3;} + .d2-696853950 .color-AA4{color:#EDF0FD;} + .d2-696853950 .color-AA5{color:#F7F8FE;} + .d2-696853950 .color-AB4{color:#EDF0FD;} + .d2-696853950 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot diff --git a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg index e3bc9fb13..bf0d562fb 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot + .d2-1096842315 .fill-N1{fill:#0A0F25;} + .d2-1096842315 .fill-N2{fill:#676C7E;} + .d2-1096842315 .fill-N3{fill:#9499AB;} + .d2-1096842315 .fill-N4{fill:#CFD2DD;} + .d2-1096842315 .fill-N5{fill:#DEE1EB;} + .d2-1096842315 .fill-N6{fill:#EEF1F8;} + .d2-1096842315 .fill-N7{fill:#FFFFFF;} + .d2-1096842315 .fill-B1{fill:#0D32B2;} + .d2-1096842315 .fill-B2{fill:#0D32B2;} + .d2-1096842315 .fill-B3{fill:#E3E9FD;} + .d2-1096842315 .fill-B4{fill:#E3E9FD;} + .d2-1096842315 .fill-B5{fill:#EDF0FD;} + .d2-1096842315 .fill-B6{fill:#F7F8FE;} + .d2-1096842315 .fill-AA2{fill:#4A6FF3;} + .d2-1096842315 .fill-AA4{fill:#EDF0FD;} + .d2-1096842315 .fill-AA5{fill:#F7F8FE;} + .d2-1096842315 .fill-AB4{fill:#EDF0FD;} + .d2-1096842315 .fill-AB5{fill:#F7F8FE;} + .d2-1096842315 .stroke-N1{stroke:#0A0F25;} + .d2-1096842315 .stroke-N2{stroke:#676C7E;} + .d2-1096842315 .stroke-N3{stroke:#9499AB;} + .d2-1096842315 .stroke-N4{stroke:#CFD2DD;} + .d2-1096842315 .stroke-N5{stroke:#DEE1EB;} + .d2-1096842315 .stroke-N6{stroke:#EEF1F8;} + .d2-1096842315 .stroke-N7{stroke:#FFFFFF;} + .d2-1096842315 .stroke-B1{stroke:#0D32B2;} + .d2-1096842315 .stroke-B2{stroke:#0D32B2;} + .d2-1096842315 .stroke-B3{stroke:#E3E9FD;} + .d2-1096842315 .stroke-B4{stroke:#E3E9FD;} + .d2-1096842315 .stroke-B5{stroke:#EDF0FD;} + .d2-1096842315 .stroke-B6{stroke:#F7F8FE;} + .d2-1096842315 .stroke-AA2{stroke:#4A6FF3;} + .d2-1096842315 .stroke-AA4{stroke:#EDF0FD;} + .d2-1096842315 .stroke-AA5{stroke:#F7F8FE;} + .d2-1096842315 .stroke-AB4{stroke:#EDF0FD;} + .d2-1096842315 .stroke-AB5{stroke:#F7F8FE;} + .d2-1096842315 .background-color-N1{background-color:#0A0F25;} + .d2-1096842315 .background-color-N2{background-color:#676C7E;} + .d2-1096842315 .background-color-N3{background-color:#9499AB;} + .d2-1096842315 .background-color-N4{background-color:#CFD2DD;} + .d2-1096842315 .background-color-N5{background-color:#DEE1EB;} + .d2-1096842315 .background-color-N6{background-color:#EEF1F8;} + .d2-1096842315 .background-color-N7{background-color:#FFFFFF;} + .d2-1096842315 .background-color-B1{background-color:#0D32B2;} + .d2-1096842315 .background-color-B2{background-color:#0D32B2;} + .d2-1096842315 .background-color-B3{background-color:#E3E9FD;} + .d2-1096842315 .background-color-B4{background-color:#E3E9FD;} + .d2-1096842315 .background-color-B5{background-color:#EDF0FD;} + .d2-1096842315 .background-color-B6{background-color:#F7F8FE;} + .d2-1096842315 .background-color-AA2{background-color:#4A6FF3;} + .d2-1096842315 .background-color-AA4{background-color:#EDF0FD;} + .d2-1096842315 .background-color-AA5{background-color:#F7F8FE;} + .d2-1096842315 .background-color-AB4{background-color:#EDF0FD;} + .d2-1096842315 .background-color-AB5{background-color:#F7F8FE;} + .d2-1096842315 .color-N1{color:#0A0F25;} + .d2-1096842315 .color-N2{color:#676C7E;} + .d2-1096842315 .color-N3{color:#9499AB;} + .d2-1096842315 .color-N4{color:#CFD2DD;} + .d2-1096842315 .color-N5{color:#DEE1EB;} + .d2-1096842315 .color-N6{color:#EEF1F8;} + .d2-1096842315 .color-N7{color:#FFFFFF;} + .d2-1096842315 .color-B1{color:#0D32B2;} + .d2-1096842315 .color-B2{color:#0D32B2;} + .d2-1096842315 .color-B3{color:#E3E9FD;} + .d2-1096842315 .color-B4{color:#E3E9FD;} + .d2-1096842315 .color-B5{color:#EDF0FD;} + .d2-1096842315 .color-B6{color:#F7F8FE;} + .d2-1096842315 .color-AA2{color:#4A6FF3;} + .d2-1096842315 .color-AA4{color:#EDF0FD;} + .d2-1096842315 .color-AA5{color:#F7F8FE;} + .d2-1096842315 .color-AB4{color:#EDF0FD;} + .d2-1096842315 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot diff --git a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg index d8ff2c5ad..38d6d0a20 100644 --- a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcde12345abcde + .d2-1191740353 .fill-N1{fill:#0A0F25;} + .d2-1191740353 .fill-N2{fill:#676C7E;} + .d2-1191740353 .fill-N3{fill:#9499AB;} + .d2-1191740353 .fill-N4{fill:#CFD2DD;} + .d2-1191740353 .fill-N5{fill:#DEE1EB;} + .d2-1191740353 .fill-N6{fill:#EEF1F8;} + .d2-1191740353 .fill-N7{fill:#FFFFFF;} + .d2-1191740353 .fill-B1{fill:#0D32B2;} + .d2-1191740353 .fill-B2{fill:#0D32B2;} + .d2-1191740353 .fill-B3{fill:#E3E9FD;} + .d2-1191740353 .fill-B4{fill:#E3E9FD;} + .d2-1191740353 .fill-B5{fill:#EDF0FD;} + .d2-1191740353 .fill-B6{fill:#F7F8FE;} + .d2-1191740353 .fill-AA2{fill:#4A6FF3;} + .d2-1191740353 .fill-AA4{fill:#EDF0FD;} + .d2-1191740353 .fill-AA5{fill:#F7F8FE;} + .d2-1191740353 .fill-AB4{fill:#EDF0FD;} + .d2-1191740353 .fill-AB5{fill:#F7F8FE;} + .d2-1191740353 .stroke-N1{stroke:#0A0F25;} + .d2-1191740353 .stroke-N2{stroke:#676C7E;} + .d2-1191740353 .stroke-N3{stroke:#9499AB;} + .d2-1191740353 .stroke-N4{stroke:#CFD2DD;} + .d2-1191740353 .stroke-N5{stroke:#DEE1EB;} + .d2-1191740353 .stroke-N6{stroke:#EEF1F8;} + .d2-1191740353 .stroke-N7{stroke:#FFFFFF;} + .d2-1191740353 .stroke-B1{stroke:#0D32B2;} + .d2-1191740353 .stroke-B2{stroke:#0D32B2;} + .d2-1191740353 .stroke-B3{stroke:#E3E9FD;} + .d2-1191740353 .stroke-B4{stroke:#E3E9FD;} + .d2-1191740353 .stroke-B5{stroke:#EDF0FD;} + .d2-1191740353 .stroke-B6{stroke:#F7F8FE;} + .d2-1191740353 .stroke-AA2{stroke:#4A6FF3;} + .d2-1191740353 .stroke-AA4{stroke:#EDF0FD;} + .d2-1191740353 .stroke-AA5{stroke:#F7F8FE;} + .d2-1191740353 .stroke-AB4{stroke:#EDF0FD;} + .d2-1191740353 .stroke-AB5{stroke:#F7F8FE;} + .d2-1191740353 .background-color-N1{background-color:#0A0F25;} + .d2-1191740353 .background-color-N2{background-color:#676C7E;} + .d2-1191740353 .background-color-N3{background-color:#9499AB;} + .d2-1191740353 .background-color-N4{background-color:#CFD2DD;} + .d2-1191740353 .background-color-N5{background-color:#DEE1EB;} + .d2-1191740353 .background-color-N6{background-color:#EEF1F8;} + .d2-1191740353 .background-color-N7{background-color:#FFFFFF;} + .d2-1191740353 .background-color-B1{background-color:#0D32B2;} + .d2-1191740353 .background-color-B2{background-color:#0D32B2;} + .d2-1191740353 .background-color-B3{background-color:#E3E9FD;} + .d2-1191740353 .background-color-B4{background-color:#E3E9FD;} + .d2-1191740353 .background-color-B5{background-color:#EDF0FD;} + .d2-1191740353 .background-color-B6{background-color:#F7F8FE;} + .d2-1191740353 .background-color-AA2{background-color:#4A6FF3;} + .d2-1191740353 .background-color-AA4{background-color:#EDF0FD;} + .d2-1191740353 .background-color-AA5{background-color:#F7F8FE;} + .d2-1191740353 .background-color-AB4{background-color:#EDF0FD;} + .d2-1191740353 .background-color-AB5{background-color:#F7F8FE;} + .d2-1191740353 .color-N1{color:#0A0F25;} + .d2-1191740353 .color-N2{color:#676C7E;} + .d2-1191740353 .color-N3{color:#9499AB;} + .d2-1191740353 .color-N4{color:#CFD2DD;} + .d2-1191740353 .color-N5{color:#DEE1EB;} + .d2-1191740353 .color-N6{color:#EEF1F8;} + .d2-1191740353 .color-N7{color:#FFFFFF;} + .d2-1191740353 .color-B1{color:#0D32B2;} + .d2-1191740353 .color-B2{color:#0D32B2;} + .d2-1191740353 .color-B3{color:#E3E9FD;} + .d2-1191740353 .color-B4{color:#E3E9FD;} + .d2-1191740353 .color-B5{color:#EDF0FD;} + .d2-1191740353 .color-B6{color:#F7F8FE;} + .d2-1191740353 .color-AA2{color:#4A6FF3;} + .d2-1191740353 .color-AA4{color:#EDF0FD;} + .d2-1191740353 .color-AA5{color:#F7F8FE;} + .d2-1191740353 .color-AB4{color:#EDF0FD;} + .d2-1191740353 .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}]]>abcde12345abcde diff --git a/e2etests/testdata/stable/direction/elk/sketch.exp.svg b/e2etests/testdata/stable/direction/elk/sketch.exp.svg index fa92ec0ef..eb02a78ec 100644 --- a/e2etests/testdata/stable/direction/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcde12345abcde + .d2-514344385 .fill-N1{fill:#0A0F25;} + .d2-514344385 .fill-N2{fill:#676C7E;} + .d2-514344385 .fill-N3{fill:#9499AB;} + .d2-514344385 .fill-N4{fill:#CFD2DD;} + .d2-514344385 .fill-N5{fill:#DEE1EB;} + .d2-514344385 .fill-N6{fill:#EEF1F8;} + .d2-514344385 .fill-N7{fill:#FFFFFF;} + .d2-514344385 .fill-B1{fill:#0D32B2;} + .d2-514344385 .fill-B2{fill:#0D32B2;} + .d2-514344385 .fill-B3{fill:#E3E9FD;} + .d2-514344385 .fill-B4{fill:#E3E9FD;} + .d2-514344385 .fill-B5{fill:#EDF0FD;} + .d2-514344385 .fill-B6{fill:#F7F8FE;} + .d2-514344385 .fill-AA2{fill:#4A6FF3;} + .d2-514344385 .fill-AA4{fill:#EDF0FD;} + .d2-514344385 .fill-AA5{fill:#F7F8FE;} + .d2-514344385 .fill-AB4{fill:#EDF0FD;} + .d2-514344385 .fill-AB5{fill:#F7F8FE;} + .d2-514344385 .stroke-N1{stroke:#0A0F25;} + .d2-514344385 .stroke-N2{stroke:#676C7E;} + .d2-514344385 .stroke-N3{stroke:#9499AB;} + .d2-514344385 .stroke-N4{stroke:#CFD2DD;} + .d2-514344385 .stroke-N5{stroke:#DEE1EB;} + .d2-514344385 .stroke-N6{stroke:#EEF1F8;} + .d2-514344385 .stroke-N7{stroke:#FFFFFF;} + .d2-514344385 .stroke-B1{stroke:#0D32B2;} + .d2-514344385 .stroke-B2{stroke:#0D32B2;} + .d2-514344385 .stroke-B3{stroke:#E3E9FD;} + .d2-514344385 .stroke-B4{stroke:#E3E9FD;} + .d2-514344385 .stroke-B5{stroke:#EDF0FD;} + .d2-514344385 .stroke-B6{stroke:#F7F8FE;} + .d2-514344385 .stroke-AA2{stroke:#4A6FF3;} + .d2-514344385 .stroke-AA4{stroke:#EDF0FD;} + .d2-514344385 .stroke-AA5{stroke:#F7F8FE;} + .d2-514344385 .stroke-AB4{stroke:#EDF0FD;} + .d2-514344385 .stroke-AB5{stroke:#F7F8FE;} + .d2-514344385 .background-color-N1{background-color:#0A0F25;} + .d2-514344385 .background-color-N2{background-color:#676C7E;} + .d2-514344385 .background-color-N3{background-color:#9499AB;} + .d2-514344385 .background-color-N4{background-color:#CFD2DD;} + .d2-514344385 .background-color-N5{background-color:#DEE1EB;} + .d2-514344385 .background-color-N6{background-color:#EEF1F8;} + .d2-514344385 .background-color-N7{background-color:#FFFFFF;} + .d2-514344385 .background-color-B1{background-color:#0D32B2;} + .d2-514344385 .background-color-B2{background-color:#0D32B2;} + .d2-514344385 .background-color-B3{background-color:#E3E9FD;} + .d2-514344385 .background-color-B4{background-color:#E3E9FD;} + .d2-514344385 .background-color-B5{background-color:#EDF0FD;} + .d2-514344385 .background-color-B6{background-color:#F7F8FE;} + .d2-514344385 .background-color-AA2{background-color:#4A6FF3;} + .d2-514344385 .background-color-AA4{background-color:#EDF0FD;} + .d2-514344385 .background-color-AA5{background-color:#F7F8FE;} + .d2-514344385 .background-color-AB4{background-color:#EDF0FD;} + .d2-514344385 .background-color-AB5{background-color:#F7F8FE;} + .d2-514344385 .color-N1{color:#0A0F25;} + .d2-514344385 .color-N2{color:#676C7E;} + .d2-514344385 .color-N3{color:#9499AB;} + .d2-514344385 .color-N4{color:#CFD2DD;} + .d2-514344385 .color-N5{color:#DEE1EB;} + .d2-514344385 .color-N6{color:#EEF1F8;} + .d2-514344385 .color-N7{color:#FFFFFF;} + .d2-514344385 .color-B1{color:#0D32B2;} + .d2-514344385 .color-B2{color:#0D32B2;} + .d2-514344385 .color-B3{color:#E3E9FD;} + .d2-514344385 .color-B4{color:#E3E9FD;} + .d2-514344385 .color-B5{color:#EDF0FD;} + .d2-514344385 .color-B6{color:#F7F8FE;} + .d2-514344385 .color-AA2{color:#4A6FF3;} + .d2-514344385 .color-AA4{color:#EDF0FD;} + .d2-514344385 .color-AA5{color:#F7F8FE;} + .d2-514344385 .color-AB4{color:#EDF0FD;} + .d2-514344385 .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}]]>abcde12345abcde 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 b4fb2af67..108151eb9 100644 --- a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal + .d2-4227359708 .fill-N1{fill:#0A0F25;} + .d2-4227359708 .fill-N2{fill:#676C7E;} + .d2-4227359708 .fill-N3{fill:#9499AB;} + .d2-4227359708 .fill-N4{fill:#CFD2DD;} + .d2-4227359708 .fill-N5{fill:#DEE1EB;} + .d2-4227359708 .fill-N6{fill:#EEF1F8;} + .d2-4227359708 .fill-N7{fill:#FFFFFF;} + .d2-4227359708 .fill-B1{fill:#0D32B2;} + .d2-4227359708 .fill-B2{fill:#0D32B2;} + .d2-4227359708 .fill-B3{fill:#E3E9FD;} + .d2-4227359708 .fill-B4{fill:#E3E9FD;} + .d2-4227359708 .fill-B5{fill:#EDF0FD;} + .d2-4227359708 .fill-B6{fill:#F7F8FE;} + .d2-4227359708 .fill-AA2{fill:#4A6FF3;} + .d2-4227359708 .fill-AA4{fill:#EDF0FD;} + .d2-4227359708 .fill-AA5{fill:#F7F8FE;} + .d2-4227359708 .fill-AB4{fill:#EDF0FD;} + .d2-4227359708 .fill-AB5{fill:#F7F8FE;} + .d2-4227359708 .stroke-N1{stroke:#0A0F25;} + .d2-4227359708 .stroke-N2{stroke:#676C7E;} + .d2-4227359708 .stroke-N3{stroke:#9499AB;} + .d2-4227359708 .stroke-N4{stroke:#CFD2DD;} + .d2-4227359708 .stroke-N5{stroke:#DEE1EB;} + .d2-4227359708 .stroke-N6{stroke:#EEF1F8;} + .d2-4227359708 .stroke-N7{stroke:#FFFFFF;} + .d2-4227359708 .stroke-B1{stroke:#0D32B2;} + .d2-4227359708 .stroke-B2{stroke:#0D32B2;} + .d2-4227359708 .stroke-B3{stroke:#E3E9FD;} + .d2-4227359708 .stroke-B4{stroke:#E3E9FD;} + .d2-4227359708 .stroke-B5{stroke:#EDF0FD;} + .d2-4227359708 .stroke-B6{stroke:#F7F8FE;} + .d2-4227359708 .stroke-AA2{stroke:#4A6FF3;} + .d2-4227359708 .stroke-AA4{stroke:#EDF0FD;} + .d2-4227359708 .stroke-AA5{stroke:#F7F8FE;} + .d2-4227359708 .stroke-AB4{stroke:#EDF0FD;} + .d2-4227359708 .stroke-AB5{stroke:#F7F8FE;} + .d2-4227359708 .background-color-N1{background-color:#0A0F25;} + .d2-4227359708 .background-color-N2{background-color:#676C7E;} + .d2-4227359708 .background-color-N3{background-color:#9499AB;} + .d2-4227359708 .background-color-N4{background-color:#CFD2DD;} + .d2-4227359708 .background-color-N5{background-color:#DEE1EB;} + .d2-4227359708 .background-color-N6{background-color:#EEF1F8;} + .d2-4227359708 .background-color-N7{background-color:#FFFFFF;} + .d2-4227359708 .background-color-B1{background-color:#0D32B2;} + .d2-4227359708 .background-color-B2{background-color:#0D32B2;} + .d2-4227359708 .background-color-B3{background-color:#E3E9FD;} + .d2-4227359708 .background-color-B4{background-color:#E3E9FD;} + .d2-4227359708 .background-color-B5{background-color:#EDF0FD;} + .d2-4227359708 .background-color-B6{background-color:#F7F8FE;} + .d2-4227359708 .background-color-AA2{background-color:#4A6FF3;} + .d2-4227359708 .background-color-AA4{background-color:#EDF0FD;} + .d2-4227359708 .background-color-AA5{background-color:#F7F8FE;} + .d2-4227359708 .background-color-AB4{background-color:#EDF0FD;} + .d2-4227359708 .background-color-AB5{background-color:#F7F8FE;} + .d2-4227359708 .color-N1{color:#0A0F25;} + .d2-4227359708 .color-N2{color:#676C7E;} + .d2-4227359708 .color-N3{color:#9499AB;} + .d2-4227359708 .color-N4{color:#CFD2DD;} + .d2-4227359708 .color-N5{color:#DEE1EB;} + .d2-4227359708 .color-N6{color:#EEF1F8;} + .d2-4227359708 .color-N7{color:#FFFFFF;} + .d2-4227359708 .color-B1{color:#0D32B2;} + .d2-4227359708 .color-B2{color:#0D32B2;} + .d2-4227359708 .color-B3{color:#E3E9FD;} + .d2-4227359708 .color-B4{color:#E3E9FD;} + .d2-4227359708 .color-B5{color:#EDF0FD;} + .d2-4227359708 .color-B6{color:#F7F8FE;} + .d2-4227359708 .color-AA2{color:#4A6FF3;} + .d2-4227359708 .color-AA4{color:#EDF0FD;} + .d2-4227359708 .color-AA5{color:#F7F8FE;} + .d2-4227359708 .color-AB4{color:#EDF0FD;} + .d2-4227359708 .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}]]>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 6dfcc19b5..068cfd674 100644 --- a/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal + .d2-1480834410 .fill-N1{fill:#0A0F25;} + .d2-1480834410 .fill-N2{fill:#676C7E;} + .d2-1480834410 .fill-N3{fill:#9499AB;} + .d2-1480834410 .fill-N4{fill:#CFD2DD;} + .d2-1480834410 .fill-N5{fill:#DEE1EB;} + .d2-1480834410 .fill-N6{fill:#EEF1F8;} + .d2-1480834410 .fill-N7{fill:#FFFFFF;} + .d2-1480834410 .fill-B1{fill:#0D32B2;} + .d2-1480834410 .fill-B2{fill:#0D32B2;} + .d2-1480834410 .fill-B3{fill:#E3E9FD;} + .d2-1480834410 .fill-B4{fill:#E3E9FD;} + .d2-1480834410 .fill-B5{fill:#EDF0FD;} + .d2-1480834410 .fill-B6{fill:#F7F8FE;} + .d2-1480834410 .fill-AA2{fill:#4A6FF3;} + .d2-1480834410 .fill-AA4{fill:#EDF0FD;} + .d2-1480834410 .fill-AA5{fill:#F7F8FE;} + .d2-1480834410 .fill-AB4{fill:#EDF0FD;} + .d2-1480834410 .fill-AB5{fill:#F7F8FE;} + .d2-1480834410 .stroke-N1{stroke:#0A0F25;} + .d2-1480834410 .stroke-N2{stroke:#676C7E;} + .d2-1480834410 .stroke-N3{stroke:#9499AB;} + .d2-1480834410 .stroke-N4{stroke:#CFD2DD;} + .d2-1480834410 .stroke-N5{stroke:#DEE1EB;} + .d2-1480834410 .stroke-N6{stroke:#EEF1F8;} + .d2-1480834410 .stroke-N7{stroke:#FFFFFF;} + .d2-1480834410 .stroke-B1{stroke:#0D32B2;} + .d2-1480834410 .stroke-B2{stroke:#0D32B2;} + .d2-1480834410 .stroke-B3{stroke:#E3E9FD;} + .d2-1480834410 .stroke-B4{stroke:#E3E9FD;} + .d2-1480834410 .stroke-B5{stroke:#EDF0FD;} + .d2-1480834410 .stroke-B6{stroke:#F7F8FE;} + .d2-1480834410 .stroke-AA2{stroke:#4A6FF3;} + .d2-1480834410 .stroke-AA4{stroke:#EDF0FD;} + .d2-1480834410 .stroke-AA5{stroke:#F7F8FE;} + .d2-1480834410 .stroke-AB4{stroke:#EDF0FD;} + .d2-1480834410 .stroke-AB5{stroke:#F7F8FE;} + .d2-1480834410 .background-color-N1{background-color:#0A0F25;} + .d2-1480834410 .background-color-N2{background-color:#676C7E;} + .d2-1480834410 .background-color-N3{background-color:#9499AB;} + .d2-1480834410 .background-color-N4{background-color:#CFD2DD;} + .d2-1480834410 .background-color-N5{background-color:#DEE1EB;} + .d2-1480834410 .background-color-N6{background-color:#EEF1F8;} + .d2-1480834410 .background-color-N7{background-color:#FFFFFF;} + .d2-1480834410 .background-color-B1{background-color:#0D32B2;} + .d2-1480834410 .background-color-B2{background-color:#0D32B2;} + .d2-1480834410 .background-color-B3{background-color:#E3E9FD;} + .d2-1480834410 .background-color-B4{background-color:#E3E9FD;} + .d2-1480834410 .background-color-B5{background-color:#EDF0FD;} + .d2-1480834410 .background-color-B6{background-color:#F7F8FE;} + .d2-1480834410 .background-color-AA2{background-color:#4A6FF3;} + .d2-1480834410 .background-color-AA4{background-color:#EDF0FD;} + .d2-1480834410 .background-color-AA5{background-color:#F7F8FE;} + .d2-1480834410 .background-color-AB4{background-color:#EDF0FD;} + .d2-1480834410 .background-color-AB5{background-color:#F7F8FE;} + .d2-1480834410 .color-N1{color:#0A0F25;} + .d2-1480834410 .color-N2{color:#676C7E;} + .d2-1480834410 .color-N3{color:#9499AB;} + .d2-1480834410 .color-N4{color:#CFD2DD;} + .d2-1480834410 .color-N5{color:#DEE1EB;} + .d2-1480834410 .color-N6{color:#EEF1F8;} + .d2-1480834410 .color-N7{color:#FFFFFF;} + .d2-1480834410 .color-B1{color:#0D32B2;} + .d2-1480834410 .color-B2{color:#0D32B2;} + .d2-1480834410 .color-B3{color:#E3E9FD;} + .d2-1480834410 .color-B4{color:#E3E9FD;} + .d2-1480834410 .color-B5{color:#EDF0FD;} + .d2-1480834410 .color-B6{color:#F7F8FE;} + .d2-1480834410 .color-AA2{color:#4A6FF3;} + .d2-1480834410 .color-AA4{color:#EDF0FD;} + .d2-1480834410 .color-AA5{color:#F7F8FE;} + .d2-1480834410 .color-AB4{color:#EDF0FD;} + .d2-1480834410 .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}]]>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 574e7edfa..05e74ed57 100644 --- a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcefg + .d2-2026819057 .fill-N1{fill:#0A0F25;} + .d2-2026819057 .fill-N2{fill:#676C7E;} + .d2-2026819057 .fill-N3{fill:#9499AB;} + .d2-2026819057 .fill-N4{fill:#CFD2DD;} + .d2-2026819057 .fill-N5{fill:#DEE1EB;} + .d2-2026819057 .fill-N6{fill:#EEF1F8;} + .d2-2026819057 .fill-N7{fill:#FFFFFF;} + .d2-2026819057 .fill-B1{fill:#0D32B2;} + .d2-2026819057 .fill-B2{fill:#0D32B2;} + .d2-2026819057 .fill-B3{fill:#E3E9FD;} + .d2-2026819057 .fill-B4{fill:#E3E9FD;} + .d2-2026819057 .fill-B5{fill:#EDF0FD;} + .d2-2026819057 .fill-B6{fill:#F7F8FE;} + .d2-2026819057 .fill-AA2{fill:#4A6FF3;} + .d2-2026819057 .fill-AA4{fill:#EDF0FD;} + .d2-2026819057 .fill-AA5{fill:#F7F8FE;} + .d2-2026819057 .fill-AB4{fill:#EDF0FD;} + .d2-2026819057 .fill-AB5{fill:#F7F8FE;} + .d2-2026819057 .stroke-N1{stroke:#0A0F25;} + .d2-2026819057 .stroke-N2{stroke:#676C7E;} + .d2-2026819057 .stroke-N3{stroke:#9499AB;} + .d2-2026819057 .stroke-N4{stroke:#CFD2DD;} + .d2-2026819057 .stroke-N5{stroke:#DEE1EB;} + .d2-2026819057 .stroke-N6{stroke:#EEF1F8;} + .d2-2026819057 .stroke-N7{stroke:#FFFFFF;} + .d2-2026819057 .stroke-B1{stroke:#0D32B2;} + .d2-2026819057 .stroke-B2{stroke:#0D32B2;} + .d2-2026819057 .stroke-B3{stroke:#E3E9FD;} + .d2-2026819057 .stroke-B4{stroke:#E3E9FD;} + .d2-2026819057 .stroke-B5{stroke:#EDF0FD;} + .d2-2026819057 .stroke-B6{stroke:#F7F8FE;} + .d2-2026819057 .stroke-AA2{stroke:#4A6FF3;} + .d2-2026819057 .stroke-AA4{stroke:#EDF0FD;} + .d2-2026819057 .stroke-AA5{stroke:#F7F8FE;} + .d2-2026819057 .stroke-AB4{stroke:#EDF0FD;} + .d2-2026819057 .stroke-AB5{stroke:#F7F8FE;} + .d2-2026819057 .background-color-N1{background-color:#0A0F25;} + .d2-2026819057 .background-color-N2{background-color:#676C7E;} + .d2-2026819057 .background-color-N3{background-color:#9499AB;} + .d2-2026819057 .background-color-N4{background-color:#CFD2DD;} + .d2-2026819057 .background-color-N5{background-color:#DEE1EB;} + .d2-2026819057 .background-color-N6{background-color:#EEF1F8;} + .d2-2026819057 .background-color-N7{background-color:#FFFFFF;} + .d2-2026819057 .background-color-B1{background-color:#0D32B2;} + .d2-2026819057 .background-color-B2{background-color:#0D32B2;} + .d2-2026819057 .background-color-B3{background-color:#E3E9FD;} + .d2-2026819057 .background-color-B4{background-color:#E3E9FD;} + .d2-2026819057 .background-color-B5{background-color:#EDF0FD;} + .d2-2026819057 .background-color-B6{background-color:#F7F8FE;} + .d2-2026819057 .background-color-AA2{background-color:#4A6FF3;} + .d2-2026819057 .background-color-AA4{background-color:#EDF0FD;} + .d2-2026819057 .background-color-AA5{background-color:#F7F8FE;} + .d2-2026819057 .background-color-AB4{background-color:#EDF0FD;} + .d2-2026819057 .background-color-AB5{background-color:#F7F8FE;} + .d2-2026819057 .color-N1{color:#0A0F25;} + .d2-2026819057 .color-N2{color:#676C7E;} + .d2-2026819057 .color-N3{color:#9499AB;} + .d2-2026819057 .color-N4{color:#CFD2DD;} + .d2-2026819057 .color-N5{color:#DEE1EB;} + .d2-2026819057 .color-N6{color:#EEF1F8;} + .d2-2026819057 .color-N7{color:#FFFFFF;} + .d2-2026819057 .color-B1{color:#0D32B2;} + .d2-2026819057 .color-B2{color:#0D32B2;} + .d2-2026819057 .color-B3{color:#E3E9FD;} + .d2-2026819057 .color-B4{color:#E3E9FD;} + .d2-2026819057 .color-B5{color:#EDF0FD;} + .d2-2026819057 .color-B6{color:#F7F8FE;} + .d2-2026819057 .color-AA2{color:#4A6FF3;} + .d2-2026819057 .color-AA4{color:#EDF0FD;} + .d2-2026819057 .color-AA5{color:#F7F8FE;} + .d2-2026819057 .color-AB4{color:#EDF0FD;} + .d2-2026819057 .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}]]>abcefg 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 aae7bb7e0..b2637e64e 100644 --- a/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcefg + .d2-1553621327 .fill-N1{fill:#0A0F25;} + .d2-1553621327 .fill-N2{fill:#676C7E;} + .d2-1553621327 .fill-N3{fill:#9499AB;} + .d2-1553621327 .fill-N4{fill:#CFD2DD;} + .d2-1553621327 .fill-N5{fill:#DEE1EB;} + .d2-1553621327 .fill-N6{fill:#EEF1F8;} + .d2-1553621327 .fill-N7{fill:#FFFFFF;} + .d2-1553621327 .fill-B1{fill:#0D32B2;} + .d2-1553621327 .fill-B2{fill:#0D32B2;} + .d2-1553621327 .fill-B3{fill:#E3E9FD;} + .d2-1553621327 .fill-B4{fill:#E3E9FD;} + .d2-1553621327 .fill-B5{fill:#EDF0FD;} + .d2-1553621327 .fill-B6{fill:#F7F8FE;} + .d2-1553621327 .fill-AA2{fill:#4A6FF3;} + .d2-1553621327 .fill-AA4{fill:#EDF0FD;} + .d2-1553621327 .fill-AA5{fill:#F7F8FE;} + .d2-1553621327 .fill-AB4{fill:#EDF0FD;} + .d2-1553621327 .fill-AB5{fill:#F7F8FE;} + .d2-1553621327 .stroke-N1{stroke:#0A0F25;} + .d2-1553621327 .stroke-N2{stroke:#676C7E;} + .d2-1553621327 .stroke-N3{stroke:#9499AB;} + .d2-1553621327 .stroke-N4{stroke:#CFD2DD;} + .d2-1553621327 .stroke-N5{stroke:#DEE1EB;} + .d2-1553621327 .stroke-N6{stroke:#EEF1F8;} + .d2-1553621327 .stroke-N7{stroke:#FFFFFF;} + .d2-1553621327 .stroke-B1{stroke:#0D32B2;} + .d2-1553621327 .stroke-B2{stroke:#0D32B2;} + .d2-1553621327 .stroke-B3{stroke:#E3E9FD;} + .d2-1553621327 .stroke-B4{stroke:#E3E9FD;} + .d2-1553621327 .stroke-B5{stroke:#EDF0FD;} + .d2-1553621327 .stroke-B6{stroke:#F7F8FE;} + .d2-1553621327 .stroke-AA2{stroke:#4A6FF3;} + .d2-1553621327 .stroke-AA4{stroke:#EDF0FD;} + .d2-1553621327 .stroke-AA5{stroke:#F7F8FE;} + .d2-1553621327 .stroke-AB4{stroke:#EDF0FD;} + .d2-1553621327 .stroke-AB5{stroke:#F7F8FE;} + .d2-1553621327 .background-color-N1{background-color:#0A0F25;} + .d2-1553621327 .background-color-N2{background-color:#676C7E;} + .d2-1553621327 .background-color-N3{background-color:#9499AB;} + .d2-1553621327 .background-color-N4{background-color:#CFD2DD;} + .d2-1553621327 .background-color-N5{background-color:#DEE1EB;} + .d2-1553621327 .background-color-N6{background-color:#EEF1F8;} + .d2-1553621327 .background-color-N7{background-color:#FFFFFF;} + .d2-1553621327 .background-color-B1{background-color:#0D32B2;} + .d2-1553621327 .background-color-B2{background-color:#0D32B2;} + .d2-1553621327 .background-color-B3{background-color:#E3E9FD;} + .d2-1553621327 .background-color-B4{background-color:#E3E9FD;} + .d2-1553621327 .background-color-B5{background-color:#EDF0FD;} + .d2-1553621327 .background-color-B6{background-color:#F7F8FE;} + .d2-1553621327 .background-color-AA2{background-color:#4A6FF3;} + .d2-1553621327 .background-color-AA4{background-color:#EDF0FD;} + .d2-1553621327 .background-color-AA5{background-color:#F7F8FE;} + .d2-1553621327 .background-color-AB4{background-color:#EDF0FD;} + .d2-1553621327 .background-color-AB5{background-color:#F7F8FE;} + .d2-1553621327 .color-N1{color:#0A0F25;} + .d2-1553621327 .color-N2{color:#676C7E;} + .d2-1553621327 .color-N3{color:#9499AB;} + .d2-1553621327 .color-N4{color:#CFD2DD;} + .d2-1553621327 .color-N5{color:#DEE1EB;} + .d2-1553621327 .color-N6{color:#EEF1F8;} + .d2-1553621327 .color-N7{color:#FFFFFF;} + .d2-1553621327 .color-B1{color:#0D32B2;} + .d2-1553621327 .color-B2{color:#0D32B2;} + .d2-1553621327 .color-B3{color:#E3E9FD;} + .d2-1553621327 .color-B4{color:#E3E9FD;} + .d2-1553621327 .color-B5{color:#EDF0FD;} + .d2-1553621327 .color-B6{color:#F7F8FE;} + .d2-1553621327 .color-AA2{color:#4A6FF3;} + .d2-1553621327 .color-AA4{color:#EDF0FD;} + .d2-1553621327 .color-AA5{color:#F7F8FE;} + .d2-1553621327 .color-AB4{color:#EDF0FD;} + .d2-1553621327 .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}]]>abcefg 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 0cd94721d..141c7c649 100644 --- a/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -i can not see the titlex + .d2-156367713 .fill-N1{fill:#0A0F25;} + .d2-156367713 .fill-N2{fill:#676C7E;} + .d2-156367713 .fill-N3{fill:#9499AB;} + .d2-156367713 .fill-N4{fill:#CFD2DD;} + .d2-156367713 .fill-N5{fill:#DEE1EB;} + .d2-156367713 .fill-N6{fill:#EEF1F8;} + .d2-156367713 .fill-N7{fill:#FFFFFF;} + .d2-156367713 .fill-B1{fill:#0D32B2;} + .d2-156367713 .fill-B2{fill:#0D32B2;} + .d2-156367713 .fill-B3{fill:#E3E9FD;} + .d2-156367713 .fill-B4{fill:#E3E9FD;} + .d2-156367713 .fill-B5{fill:#EDF0FD;} + .d2-156367713 .fill-B6{fill:#F7F8FE;} + .d2-156367713 .fill-AA2{fill:#4A6FF3;} + .d2-156367713 .fill-AA4{fill:#EDF0FD;} + .d2-156367713 .fill-AA5{fill:#F7F8FE;} + .d2-156367713 .fill-AB4{fill:#EDF0FD;} + .d2-156367713 .fill-AB5{fill:#F7F8FE;} + .d2-156367713 .stroke-N1{stroke:#0A0F25;} + .d2-156367713 .stroke-N2{stroke:#676C7E;} + .d2-156367713 .stroke-N3{stroke:#9499AB;} + .d2-156367713 .stroke-N4{stroke:#CFD2DD;} + .d2-156367713 .stroke-N5{stroke:#DEE1EB;} + .d2-156367713 .stroke-N6{stroke:#EEF1F8;} + .d2-156367713 .stroke-N7{stroke:#FFFFFF;} + .d2-156367713 .stroke-B1{stroke:#0D32B2;} + .d2-156367713 .stroke-B2{stroke:#0D32B2;} + .d2-156367713 .stroke-B3{stroke:#E3E9FD;} + .d2-156367713 .stroke-B4{stroke:#E3E9FD;} + .d2-156367713 .stroke-B5{stroke:#EDF0FD;} + .d2-156367713 .stroke-B6{stroke:#F7F8FE;} + .d2-156367713 .stroke-AA2{stroke:#4A6FF3;} + .d2-156367713 .stroke-AA4{stroke:#EDF0FD;} + .d2-156367713 .stroke-AA5{stroke:#F7F8FE;} + .d2-156367713 .stroke-AB4{stroke:#EDF0FD;} + .d2-156367713 .stroke-AB5{stroke:#F7F8FE;} + .d2-156367713 .background-color-N1{background-color:#0A0F25;} + .d2-156367713 .background-color-N2{background-color:#676C7E;} + .d2-156367713 .background-color-N3{background-color:#9499AB;} + .d2-156367713 .background-color-N4{background-color:#CFD2DD;} + .d2-156367713 .background-color-N5{background-color:#DEE1EB;} + .d2-156367713 .background-color-N6{background-color:#EEF1F8;} + .d2-156367713 .background-color-N7{background-color:#FFFFFF;} + .d2-156367713 .background-color-B1{background-color:#0D32B2;} + .d2-156367713 .background-color-B2{background-color:#0D32B2;} + .d2-156367713 .background-color-B3{background-color:#E3E9FD;} + .d2-156367713 .background-color-B4{background-color:#E3E9FD;} + .d2-156367713 .background-color-B5{background-color:#EDF0FD;} + .d2-156367713 .background-color-B6{background-color:#F7F8FE;} + .d2-156367713 .background-color-AA2{background-color:#4A6FF3;} + .d2-156367713 .background-color-AA4{background-color:#EDF0FD;} + .d2-156367713 .background-color-AA5{background-color:#F7F8FE;} + .d2-156367713 .background-color-AB4{background-color:#EDF0FD;} + .d2-156367713 .background-color-AB5{background-color:#F7F8FE;} + .d2-156367713 .color-N1{color:#0A0F25;} + .d2-156367713 .color-N2{color:#676C7E;} + .d2-156367713 .color-N3{color:#9499AB;} + .d2-156367713 .color-N4{color:#CFD2DD;} + .d2-156367713 .color-N5{color:#DEE1EB;} + .d2-156367713 .color-N6{color:#EEF1F8;} + .d2-156367713 .color-N7{color:#FFFFFF;} + .d2-156367713 .color-B1{color:#0D32B2;} + .d2-156367713 .color-B2{color:#0D32B2;} + .d2-156367713 .color-B3{color:#E3E9FD;} + .d2-156367713 .color-B4{color:#E3E9FD;} + .d2-156367713 .color-B5{color:#EDF0FD;} + .d2-156367713 .color-B6{color:#F7F8FE;} + .d2-156367713 .color-AA2{color:#4A6FF3;} + .d2-156367713 .color-AA4{color:#EDF0FD;} + .d2-156367713 .color-AA5{color:#F7F8FE;} + .d2-156367713 .color-AB4{color:#EDF0FD;} + .d2-156367713 .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}]]>i can not see the titlex 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 82135c34f..d751d599a 100644 --- a/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -i can not see the titlex + .d2-3769327294 .fill-N1{fill:#0A0F25;} + .d2-3769327294 .fill-N2{fill:#676C7E;} + .d2-3769327294 .fill-N3{fill:#9499AB;} + .d2-3769327294 .fill-N4{fill:#CFD2DD;} + .d2-3769327294 .fill-N5{fill:#DEE1EB;} + .d2-3769327294 .fill-N6{fill:#EEF1F8;} + .d2-3769327294 .fill-N7{fill:#FFFFFF;} + .d2-3769327294 .fill-B1{fill:#0D32B2;} + .d2-3769327294 .fill-B2{fill:#0D32B2;} + .d2-3769327294 .fill-B3{fill:#E3E9FD;} + .d2-3769327294 .fill-B4{fill:#E3E9FD;} + .d2-3769327294 .fill-B5{fill:#EDF0FD;} + .d2-3769327294 .fill-B6{fill:#F7F8FE;} + .d2-3769327294 .fill-AA2{fill:#4A6FF3;} + .d2-3769327294 .fill-AA4{fill:#EDF0FD;} + .d2-3769327294 .fill-AA5{fill:#F7F8FE;} + .d2-3769327294 .fill-AB4{fill:#EDF0FD;} + .d2-3769327294 .fill-AB5{fill:#F7F8FE;} + .d2-3769327294 .stroke-N1{stroke:#0A0F25;} + .d2-3769327294 .stroke-N2{stroke:#676C7E;} + .d2-3769327294 .stroke-N3{stroke:#9499AB;} + .d2-3769327294 .stroke-N4{stroke:#CFD2DD;} + .d2-3769327294 .stroke-N5{stroke:#DEE1EB;} + .d2-3769327294 .stroke-N6{stroke:#EEF1F8;} + .d2-3769327294 .stroke-N7{stroke:#FFFFFF;} + .d2-3769327294 .stroke-B1{stroke:#0D32B2;} + .d2-3769327294 .stroke-B2{stroke:#0D32B2;} + .d2-3769327294 .stroke-B3{stroke:#E3E9FD;} + .d2-3769327294 .stroke-B4{stroke:#E3E9FD;} + .d2-3769327294 .stroke-B5{stroke:#EDF0FD;} + .d2-3769327294 .stroke-B6{stroke:#F7F8FE;} + .d2-3769327294 .stroke-AA2{stroke:#4A6FF3;} + .d2-3769327294 .stroke-AA4{stroke:#EDF0FD;} + .d2-3769327294 .stroke-AA5{stroke:#F7F8FE;} + .d2-3769327294 .stroke-AB4{stroke:#EDF0FD;} + .d2-3769327294 .stroke-AB5{stroke:#F7F8FE;} + .d2-3769327294 .background-color-N1{background-color:#0A0F25;} + .d2-3769327294 .background-color-N2{background-color:#676C7E;} + .d2-3769327294 .background-color-N3{background-color:#9499AB;} + .d2-3769327294 .background-color-N4{background-color:#CFD2DD;} + .d2-3769327294 .background-color-N5{background-color:#DEE1EB;} + .d2-3769327294 .background-color-N6{background-color:#EEF1F8;} + .d2-3769327294 .background-color-N7{background-color:#FFFFFF;} + .d2-3769327294 .background-color-B1{background-color:#0D32B2;} + .d2-3769327294 .background-color-B2{background-color:#0D32B2;} + .d2-3769327294 .background-color-B3{background-color:#E3E9FD;} + .d2-3769327294 .background-color-B4{background-color:#E3E9FD;} + .d2-3769327294 .background-color-B5{background-color:#EDF0FD;} + .d2-3769327294 .background-color-B6{background-color:#F7F8FE;} + .d2-3769327294 .background-color-AA2{background-color:#4A6FF3;} + .d2-3769327294 .background-color-AA4{background-color:#EDF0FD;} + .d2-3769327294 .background-color-AA5{background-color:#F7F8FE;} + .d2-3769327294 .background-color-AB4{background-color:#EDF0FD;} + .d2-3769327294 .background-color-AB5{background-color:#F7F8FE;} + .d2-3769327294 .color-N1{color:#0A0F25;} + .d2-3769327294 .color-N2{color:#676C7E;} + .d2-3769327294 .color-N3{color:#9499AB;} + .d2-3769327294 .color-N4{color:#CFD2DD;} + .d2-3769327294 .color-N5{color:#DEE1EB;} + .d2-3769327294 .color-N6{color:#EEF1F8;} + .d2-3769327294 .color-N7{color:#FFFFFF;} + .d2-3769327294 .color-B1{color:#0D32B2;} + .d2-3769327294 .color-B2{color:#0D32B2;} + .d2-3769327294 .color-B3{color:#E3E9FD;} + .d2-3769327294 .color-B4{color:#E3E9FD;} + .d2-3769327294 .color-B5{color:#EDF0FD;} + .d2-3769327294 .color-B6{color:#F7F8FE;} + .d2-3769327294 .color-AA2{color:#4A6FF3;} + .d2-3769327294 .color-AA4{color:#EDF0FD;} + .d2-3769327294 .color-AA5{color:#F7F8FE;} + .d2-3769327294 .color-AB4{color:#EDF0FD;} + .d2-3769327294 .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}]]>i can not see the titlex diff --git a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg index 163064bd1..b89d60b5d 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + .d2-3062169964 .fill-N1{fill:#0A0F25;} + .d2-3062169964 .fill-N2{fill:#676C7E;} + .d2-3062169964 .fill-N3{fill:#9499AB;} + .d2-3062169964 .fill-N4{fill:#CFD2DD;} + .d2-3062169964 .fill-N5{fill:#DEE1EB;} + .d2-3062169964 .fill-N6{fill:#EEF1F8;} + .d2-3062169964 .fill-N7{fill:#FFFFFF;} + .d2-3062169964 .fill-B1{fill:#0D32B2;} + .d2-3062169964 .fill-B2{fill:#0D32B2;} + .d2-3062169964 .fill-B3{fill:#E3E9FD;} + .d2-3062169964 .fill-B4{fill:#E3E9FD;} + .d2-3062169964 .fill-B5{fill:#EDF0FD;} + .d2-3062169964 .fill-B6{fill:#F7F8FE;} + .d2-3062169964 .fill-AA2{fill:#4A6FF3;} + .d2-3062169964 .fill-AA4{fill:#EDF0FD;} + .d2-3062169964 .fill-AA5{fill:#F7F8FE;} + .d2-3062169964 .fill-AB4{fill:#EDF0FD;} + .d2-3062169964 .fill-AB5{fill:#F7F8FE;} + .d2-3062169964 .stroke-N1{stroke:#0A0F25;} + .d2-3062169964 .stroke-N2{stroke:#676C7E;} + .d2-3062169964 .stroke-N3{stroke:#9499AB;} + .d2-3062169964 .stroke-N4{stroke:#CFD2DD;} + .d2-3062169964 .stroke-N5{stroke:#DEE1EB;} + .d2-3062169964 .stroke-N6{stroke:#EEF1F8;} + .d2-3062169964 .stroke-N7{stroke:#FFFFFF;} + .d2-3062169964 .stroke-B1{stroke:#0D32B2;} + .d2-3062169964 .stroke-B2{stroke:#0D32B2;} + .d2-3062169964 .stroke-B3{stroke:#E3E9FD;} + .d2-3062169964 .stroke-B4{stroke:#E3E9FD;} + .d2-3062169964 .stroke-B5{stroke:#EDF0FD;} + .d2-3062169964 .stroke-B6{stroke:#F7F8FE;} + .d2-3062169964 .stroke-AA2{stroke:#4A6FF3;} + .d2-3062169964 .stroke-AA4{stroke:#EDF0FD;} + .d2-3062169964 .stroke-AA5{stroke:#F7F8FE;} + .d2-3062169964 .stroke-AB4{stroke:#EDF0FD;} + .d2-3062169964 .stroke-AB5{stroke:#F7F8FE;} + .d2-3062169964 .background-color-N1{background-color:#0A0F25;} + .d2-3062169964 .background-color-N2{background-color:#676C7E;} + .d2-3062169964 .background-color-N3{background-color:#9499AB;} + .d2-3062169964 .background-color-N4{background-color:#CFD2DD;} + .d2-3062169964 .background-color-N5{background-color:#DEE1EB;} + .d2-3062169964 .background-color-N6{background-color:#EEF1F8;} + .d2-3062169964 .background-color-N7{background-color:#FFFFFF;} + .d2-3062169964 .background-color-B1{background-color:#0D32B2;} + .d2-3062169964 .background-color-B2{background-color:#0D32B2;} + .d2-3062169964 .background-color-B3{background-color:#E3E9FD;} + .d2-3062169964 .background-color-B4{background-color:#E3E9FD;} + .d2-3062169964 .background-color-B5{background-color:#EDF0FD;} + .d2-3062169964 .background-color-B6{background-color:#F7F8FE;} + .d2-3062169964 .background-color-AA2{background-color:#4A6FF3;} + .d2-3062169964 .background-color-AA4{background-color:#EDF0FD;} + .d2-3062169964 .background-color-AA5{background-color:#F7F8FE;} + .d2-3062169964 .background-color-AB4{background-color:#EDF0FD;} + .d2-3062169964 .background-color-AB5{background-color:#F7F8FE;} + .d2-3062169964 .color-N1{color:#0A0F25;} + .d2-3062169964 .color-N2{color:#676C7E;} + .d2-3062169964 .color-N3{color:#9499AB;} + .d2-3062169964 .color-N4{color:#CFD2DD;} + .d2-3062169964 .color-N5{color:#DEE1EB;} + .d2-3062169964 .color-N6{color:#EEF1F8;} + .d2-3062169964 .color-N7{color:#FFFFFF;} + .d2-3062169964 .color-B1{color:#0D32B2;} + .d2-3062169964 .color-B2{color:#0D32B2;} + .d2-3062169964 .color-B3{color:#E3E9FD;} + .d2-3062169964 .color-B4{color:#E3E9FD;} + .d2-3062169964 .color-B5{color:#EDF0FD;} + .d2-3062169964 .color-B6{color:#F7F8FE;} + .d2-3062169964 .color-AA2{color:#4A6FF3;} + .d2-3062169964 .color-AA4{color:#EDF0FD;} + .d2-3062169964 .color-AA5{color:#F7F8FE;} + .d2-3062169964 .color-AB4{color:#EDF0FD;} + .d2-3062169964 .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}]]>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 681d0b148..4dcdeaa2d 100644 --- a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + .d2-3043315268 .fill-N1{fill:#0A0F25;} + .d2-3043315268 .fill-N2{fill:#676C7E;} + .d2-3043315268 .fill-N3{fill:#9499AB;} + .d2-3043315268 .fill-N4{fill:#CFD2DD;} + .d2-3043315268 .fill-N5{fill:#DEE1EB;} + .d2-3043315268 .fill-N6{fill:#EEF1F8;} + .d2-3043315268 .fill-N7{fill:#FFFFFF;} + .d2-3043315268 .fill-B1{fill:#0D32B2;} + .d2-3043315268 .fill-B2{fill:#0D32B2;} + .d2-3043315268 .fill-B3{fill:#E3E9FD;} + .d2-3043315268 .fill-B4{fill:#E3E9FD;} + .d2-3043315268 .fill-B5{fill:#EDF0FD;} + .d2-3043315268 .fill-B6{fill:#F7F8FE;} + .d2-3043315268 .fill-AA2{fill:#4A6FF3;} + .d2-3043315268 .fill-AA4{fill:#EDF0FD;} + .d2-3043315268 .fill-AA5{fill:#F7F8FE;} + .d2-3043315268 .fill-AB4{fill:#EDF0FD;} + .d2-3043315268 .fill-AB5{fill:#F7F8FE;} + .d2-3043315268 .stroke-N1{stroke:#0A0F25;} + .d2-3043315268 .stroke-N2{stroke:#676C7E;} + .d2-3043315268 .stroke-N3{stroke:#9499AB;} + .d2-3043315268 .stroke-N4{stroke:#CFD2DD;} + .d2-3043315268 .stroke-N5{stroke:#DEE1EB;} + .d2-3043315268 .stroke-N6{stroke:#EEF1F8;} + .d2-3043315268 .stroke-N7{stroke:#FFFFFF;} + .d2-3043315268 .stroke-B1{stroke:#0D32B2;} + .d2-3043315268 .stroke-B2{stroke:#0D32B2;} + .d2-3043315268 .stroke-B3{stroke:#E3E9FD;} + .d2-3043315268 .stroke-B4{stroke:#E3E9FD;} + .d2-3043315268 .stroke-B5{stroke:#EDF0FD;} + .d2-3043315268 .stroke-B6{stroke:#F7F8FE;} + .d2-3043315268 .stroke-AA2{stroke:#4A6FF3;} + .d2-3043315268 .stroke-AA4{stroke:#EDF0FD;} + .d2-3043315268 .stroke-AA5{stroke:#F7F8FE;} + .d2-3043315268 .stroke-AB4{stroke:#EDF0FD;} + .d2-3043315268 .stroke-AB5{stroke:#F7F8FE;} + .d2-3043315268 .background-color-N1{background-color:#0A0F25;} + .d2-3043315268 .background-color-N2{background-color:#676C7E;} + .d2-3043315268 .background-color-N3{background-color:#9499AB;} + .d2-3043315268 .background-color-N4{background-color:#CFD2DD;} + .d2-3043315268 .background-color-N5{background-color:#DEE1EB;} + .d2-3043315268 .background-color-N6{background-color:#EEF1F8;} + .d2-3043315268 .background-color-N7{background-color:#FFFFFF;} + .d2-3043315268 .background-color-B1{background-color:#0D32B2;} + .d2-3043315268 .background-color-B2{background-color:#0D32B2;} + .d2-3043315268 .background-color-B3{background-color:#E3E9FD;} + .d2-3043315268 .background-color-B4{background-color:#E3E9FD;} + .d2-3043315268 .background-color-B5{background-color:#EDF0FD;} + .d2-3043315268 .background-color-B6{background-color:#F7F8FE;} + .d2-3043315268 .background-color-AA2{background-color:#4A6FF3;} + .d2-3043315268 .background-color-AA4{background-color:#EDF0FD;} + .d2-3043315268 .background-color-AA5{background-color:#F7F8FE;} + .d2-3043315268 .background-color-AB4{background-color:#EDF0FD;} + .d2-3043315268 .background-color-AB5{background-color:#F7F8FE;} + .d2-3043315268 .color-N1{color:#0A0F25;} + .d2-3043315268 .color-N2{color:#676C7E;} + .d2-3043315268 .color-N3{color:#9499AB;} + .d2-3043315268 .color-N4{color:#CFD2DD;} + .d2-3043315268 .color-N5{color:#DEE1EB;} + .d2-3043315268 .color-N6{color:#EEF1F8;} + .d2-3043315268 .color-N7{color:#FFFFFF;} + .d2-3043315268 .color-B1{color:#0D32B2;} + .d2-3043315268 .color-B2{color:#0D32B2;} + .d2-3043315268 .color-B3{color:#E3E9FD;} + .d2-3043315268 .color-B4{color:#E3E9FD;} + .d2-3043315268 .color-B5{color:#EDF0FD;} + .d2-3043315268 .color-B6{color:#F7F8FE;} + .d2-3043315268 .color-AA2{color:#4A6FF3;} + .d2-3043315268 .color-AA4{color:#EDF0FD;} + .d2-3043315268 .color-AA5{color:#F7F8FE;} + .d2-3043315268 .color-AB4{color:#EDF0FD;} + .d2-3043315268 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 7096bd5f4..b2b2d6ec9 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-3290175475 .fill-N1{fill:#0A0F25;} + .d2-3290175475 .fill-N2{fill:#676C7E;} + .d2-3290175475 .fill-N3{fill:#9499AB;} + .d2-3290175475 .fill-N4{fill:#CFD2DD;} + .d2-3290175475 .fill-N5{fill:#DEE1EB;} + .d2-3290175475 .fill-N6{fill:#EEF1F8;} + .d2-3290175475 .fill-N7{fill:#FFFFFF;} + .d2-3290175475 .fill-B1{fill:#0D32B2;} + .d2-3290175475 .fill-B2{fill:#0D32B2;} + .d2-3290175475 .fill-B3{fill:#E3E9FD;} + .d2-3290175475 .fill-B4{fill:#E3E9FD;} + .d2-3290175475 .fill-B5{fill:#EDF0FD;} + .d2-3290175475 .fill-B6{fill:#F7F8FE;} + .d2-3290175475 .fill-AA2{fill:#4A6FF3;} + .d2-3290175475 .fill-AA4{fill:#EDF0FD;} + .d2-3290175475 .fill-AA5{fill:#F7F8FE;} + .d2-3290175475 .fill-AB4{fill:#EDF0FD;} + .d2-3290175475 .fill-AB5{fill:#F7F8FE;} + .d2-3290175475 .stroke-N1{stroke:#0A0F25;} + .d2-3290175475 .stroke-N2{stroke:#676C7E;} + .d2-3290175475 .stroke-N3{stroke:#9499AB;} + .d2-3290175475 .stroke-N4{stroke:#CFD2DD;} + .d2-3290175475 .stroke-N5{stroke:#DEE1EB;} + .d2-3290175475 .stroke-N6{stroke:#EEF1F8;} + .d2-3290175475 .stroke-N7{stroke:#FFFFFF;} + .d2-3290175475 .stroke-B1{stroke:#0D32B2;} + .d2-3290175475 .stroke-B2{stroke:#0D32B2;} + .d2-3290175475 .stroke-B3{stroke:#E3E9FD;} + .d2-3290175475 .stroke-B4{stroke:#E3E9FD;} + .d2-3290175475 .stroke-B5{stroke:#EDF0FD;} + .d2-3290175475 .stroke-B6{stroke:#F7F8FE;} + .d2-3290175475 .stroke-AA2{stroke:#4A6FF3;} + .d2-3290175475 .stroke-AA4{stroke:#EDF0FD;} + .d2-3290175475 .stroke-AA5{stroke:#F7F8FE;} + .d2-3290175475 .stroke-AB4{stroke:#EDF0FD;} + .d2-3290175475 .stroke-AB5{stroke:#F7F8FE;} + .d2-3290175475 .background-color-N1{background-color:#0A0F25;} + .d2-3290175475 .background-color-N2{background-color:#676C7E;} + .d2-3290175475 .background-color-N3{background-color:#9499AB;} + .d2-3290175475 .background-color-N4{background-color:#CFD2DD;} + .d2-3290175475 .background-color-N5{background-color:#DEE1EB;} + .d2-3290175475 .background-color-N6{background-color:#EEF1F8;} + .d2-3290175475 .background-color-N7{background-color:#FFFFFF;} + .d2-3290175475 .background-color-B1{background-color:#0D32B2;} + .d2-3290175475 .background-color-B2{background-color:#0D32B2;} + .d2-3290175475 .background-color-B3{background-color:#E3E9FD;} + .d2-3290175475 .background-color-B4{background-color:#E3E9FD;} + .d2-3290175475 .background-color-B5{background-color:#EDF0FD;} + .d2-3290175475 .background-color-B6{background-color:#F7F8FE;} + .d2-3290175475 .background-color-AA2{background-color:#4A6FF3;} + .d2-3290175475 .background-color-AA4{background-color:#EDF0FD;} + .d2-3290175475 .background-color-AA5{background-color:#F7F8FE;} + .d2-3290175475 .background-color-AB4{background-color:#EDF0FD;} + .d2-3290175475 .background-color-AB5{background-color:#F7F8FE;} + .d2-3290175475 .color-N1{color:#0A0F25;} + .d2-3290175475 .color-N2{color:#676C7E;} + .d2-3290175475 .color-N3{color:#9499AB;} + .d2-3290175475 .color-N4{color:#CFD2DD;} + .d2-3290175475 .color-N5{color:#DEE1EB;} + .d2-3290175475 .color-N6{color:#EEF1F8;} + .d2-3290175475 .color-N7{color:#FFFFFF;} + .d2-3290175475 .color-B1{color:#0D32B2;} + .d2-3290175475 .color-B2{color:#0D32B2;} + .d2-3290175475 .color-B3{color:#E3E9FD;} + .d2-3290175475 .color-B4{color:#E3E9FD;} + .d2-3290175475 .color-B5{color:#EDF0FD;} + .d2-3290175475 .color-B6{color:#F7F8FE;} + .d2-3290175475 .color-AA2{color:#4A6FF3;} + .d2-3290175475 .color-AA4{color:#EDF0FD;} + .d2-3290175475 .color-AA5{color:#F7F8FE;} + .d2-3290175475 .color-AB4{color:#EDF0FD;} + .d2-3290175475 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index df1574b1f..a037d52c3 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-854736235 .fill-N1{fill:#0A0F25;} + .d2-854736235 .fill-N2{fill:#676C7E;} + .d2-854736235 .fill-N3{fill:#9499AB;} + .d2-854736235 .fill-N4{fill:#CFD2DD;} + .d2-854736235 .fill-N5{fill:#DEE1EB;} + .d2-854736235 .fill-N6{fill:#EEF1F8;} + .d2-854736235 .fill-N7{fill:#FFFFFF;} + .d2-854736235 .fill-B1{fill:#0D32B2;} + .d2-854736235 .fill-B2{fill:#0D32B2;} + .d2-854736235 .fill-B3{fill:#E3E9FD;} + .d2-854736235 .fill-B4{fill:#E3E9FD;} + .d2-854736235 .fill-B5{fill:#EDF0FD;} + .d2-854736235 .fill-B6{fill:#F7F8FE;} + .d2-854736235 .fill-AA2{fill:#4A6FF3;} + .d2-854736235 .fill-AA4{fill:#EDF0FD;} + .d2-854736235 .fill-AA5{fill:#F7F8FE;} + .d2-854736235 .fill-AB4{fill:#EDF0FD;} + .d2-854736235 .fill-AB5{fill:#F7F8FE;} + .d2-854736235 .stroke-N1{stroke:#0A0F25;} + .d2-854736235 .stroke-N2{stroke:#676C7E;} + .d2-854736235 .stroke-N3{stroke:#9499AB;} + .d2-854736235 .stroke-N4{stroke:#CFD2DD;} + .d2-854736235 .stroke-N5{stroke:#DEE1EB;} + .d2-854736235 .stroke-N6{stroke:#EEF1F8;} + .d2-854736235 .stroke-N7{stroke:#FFFFFF;} + .d2-854736235 .stroke-B1{stroke:#0D32B2;} + .d2-854736235 .stroke-B2{stroke:#0D32B2;} + .d2-854736235 .stroke-B3{stroke:#E3E9FD;} + .d2-854736235 .stroke-B4{stroke:#E3E9FD;} + .d2-854736235 .stroke-B5{stroke:#EDF0FD;} + .d2-854736235 .stroke-B6{stroke:#F7F8FE;} + .d2-854736235 .stroke-AA2{stroke:#4A6FF3;} + .d2-854736235 .stroke-AA4{stroke:#EDF0FD;} + .d2-854736235 .stroke-AA5{stroke:#F7F8FE;} + .d2-854736235 .stroke-AB4{stroke:#EDF0FD;} + .d2-854736235 .stroke-AB5{stroke:#F7F8FE;} + .d2-854736235 .background-color-N1{background-color:#0A0F25;} + .d2-854736235 .background-color-N2{background-color:#676C7E;} + .d2-854736235 .background-color-N3{background-color:#9499AB;} + .d2-854736235 .background-color-N4{background-color:#CFD2DD;} + .d2-854736235 .background-color-N5{background-color:#DEE1EB;} + .d2-854736235 .background-color-N6{background-color:#EEF1F8;} + .d2-854736235 .background-color-N7{background-color:#FFFFFF;} + .d2-854736235 .background-color-B1{background-color:#0D32B2;} + .d2-854736235 .background-color-B2{background-color:#0D32B2;} + .d2-854736235 .background-color-B3{background-color:#E3E9FD;} + .d2-854736235 .background-color-B4{background-color:#E3E9FD;} + .d2-854736235 .background-color-B5{background-color:#EDF0FD;} + .d2-854736235 .background-color-B6{background-color:#F7F8FE;} + .d2-854736235 .background-color-AA2{background-color:#4A6FF3;} + .d2-854736235 .background-color-AA4{background-color:#EDF0FD;} + .d2-854736235 .background-color-AA5{background-color:#F7F8FE;} + .d2-854736235 .background-color-AB4{background-color:#EDF0FD;} + .d2-854736235 .background-color-AB5{background-color:#F7F8FE;} + .d2-854736235 .color-N1{color:#0A0F25;} + .d2-854736235 .color-N2{color:#676C7E;} + .d2-854736235 .color-N3{color:#9499AB;} + .d2-854736235 .color-N4{color:#CFD2DD;} + .d2-854736235 .color-N5{color:#DEE1EB;} + .d2-854736235 .color-N6{color:#EEF1F8;} + .d2-854736235 .color-N7{color:#FFFFFF;} + .d2-854736235 .color-B1{color:#0D32B2;} + .d2-854736235 .color-B2{color:#0D32B2;} + .d2-854736235 .color-B3{color:#E3E9FD;} + .d2-854736235 .color-B4{color:#E3E9FD;} + .d2-854736235 .color-B5{color:#EDF0FD;} + .d2-854736235 .color-B6{color:#F7F8FE;} + .d2-854736235 .color-AA2{color:#4A6FF3;} + .d2-854736235 .color-AA4{color:#EDF0FD;} + .d2-854736235 .color-AA5{color:#F7F8FE;} + .d2-854736235 .color-AB4{color:#EDF0FD;} + .d2-854736235 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index 8e6859fb1..5c139fd27 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-1514920926 .fill-N1{fill:#0A0F25;} + .d2-1514920926 .fill-N2{fill:#676C7E;} + .d2-1514920926 .fill-N3{fill:#9499AB;} + .d2-1514920926 .fill-N4{fill:#CFD2DD;} + .d2-1514920926 .fill-N5{fill:#DEE1EB;} + .d2-1514920926 .fill-N6{fill:#EEF1F8;} + .d2-1514920926 .fill-N7{fill:#FFFFFF;} + .d2-1514920926 .fill-B1{fill:#0D32B2;} + .d2-1514920926 .fill-B2{fill:#0D32B2;} + .d2-1514920926 .fill-B3{fill:#E3E9FD;} + .d2-1514920926 .fill-B4{fill:#E3E9FD;} + .d2-1514920926 .fill-B5{fill:#EDF0FD;} + .d2-1514920926 .fill-B6{fill:#F7F8FE;} + .d2-1514920926 .fill-AA2{fill:#4A6FF3;} + .d2-1514920926 .fill-AA4{fill:#EDF0FD;} + .d2-1514920926 .fill-AA5{fill:#F7F8FE;} + .d2-1514920926 .fill-AB4{fill:#EDF0FD;} + .d2-1514920926 .fill-AB5{fill:#F7F8FE;} + .d2-1514920926 .stroke-N1{stroke:#0A0F25;} + .d2-1514920926 .stroke-N2{stroke:#676C7E;} + .d2-1514920926 .stroke-N3{stroke:#9499AB;} + .d2-1514920926 .stroke-N4{stroke:#CFD2DD;} + .d2-1514920926 .stroke-N5{stroke:#DEE1EB;} + .d2-1514920926 .stroke-N6{stroke:#EEF1F8;} + .d2-1514920926 .stroke-N7{stroke:#FFFFFF;} + .d2-1514920926 .stroke-B1{stroke:#0D32B2;} + .d2-1514920926 .stroke-B2{stroke:#0D32B2;} + .d2-1514920926 .stroke-B3{stroke:#E3E9FD;} + .d2-1514920926 .stroke-B4{stroke:#E3E9FD;} + .d2-1514920926 .stroke-B5{stroke:#EDF0FD;} + .d2-1514920926 .stroke-B6{stroke:#F7F8FE;} + .d2-1514920926 .stroke-AA2{stroke:#4A6FF3;} + .d2-1514920926 .stroke-AA4{stroke:#EDF0FD;} + .d2-1514920926 .stroke-AA5{stroke:#F7F8FE;} + .d2-1514920926 .stroke-AB4{stroke:#EDF0FD;} + .d2-1514920926 .stroke-AB5{stroke:#F7F8FE;} + .d2-1514920926 .background-color-N1{background-color:#0A0F25;} + .d2-1514920926 .background-color-N2{background-color:#676C7E;} + .d2-1514920926 .background-color-N3{background-color:#9499AB;} + .d2-1514920926 .background-color-N4{background-color:#CFD2DD;} + .d2-1514920926 .background-color-N5{background-color:#DEE1EB;} + .d2-1514920926 .background-color-N6{background-color:#EEF1F8;} + .d2-1514920926 .background-color-N7{background-color:#FFFFFF;} + .d2-1514920926 .background-color-B1{background-color:#0D32B2;} + .d2-1514920926 .background-color-B2{background-color:#0D32B2;} + .d2-1514920926 .background-color-B3{background-color:#E3E9FD;} + .d2-1514920926 .background-color-B4{background-color:#E3E9FD;} + .d2-1514920926 .background-color-B5{background-color:#EDF0FD;} + .d2-1514920926 .background-color-B6{background-color:#F7F8FE;} + .d2-1514920926 .background-color-AA2{background-color:#4A6FF3;} + .d2-1514920926 .background-color-AA4{background-color:#EDF0FD;} + .d2-1514920926 .background-color-AA5{background-color:#F7F8FE;} + .d2-1514920926 .background-color-AB4{background-color:#EDF0FD;} + .d2-1514920926 .background-color-AB5{background-color:#F7F8FE;} + .d2-1514920926 .color-N1{color:#0A0F25;} + .d2-1514920926 .color-N2{color:#676C7E;} + .d2-1514920926 .color-N3{color:#9499AB;} + .d2-1514920926 .color-N4{color:#CFD2DD;} + .d2-1514920926 .color-N5{color:#DEE1EB;} + .d2-1514920926 .color-N6{color:#EEF1F8;} + .d2-1514920926 .color-N7{color:#FFFFFF;} + .d2-1514920926 .color-B1{color:#0D32B2;} + .d2-1514920926 .color-B2{color:#0D32B2;} + .d2-1514920926 .color-B3{color:#E3E9FD;} + .d2-1514920926 .color-B4{color:#E3E9FD;} + .d2-1514920926 .color-B5{color:#EDF0FD;} + .d2-1514920926 .color-B6{color:#F7F8FE;} + .d2-1514920926 .color-AA2{color:#4A6FF3;} + .d2-1514920926 .color-AA4{color:#EDF0FD;} + .d2-1514920926 .color-AA5{color:#F7F8FE;} + .d2-1514920926 .color-AB4{color:#EDF0FD;} + .d2-1514920926 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index b552006ab..23b4a08d8 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-1358905627 .fill-N1{fill:#0A0F25;} + .d2-1358905627 .fill-N2{fill:#676C7E;} + .d2-1358905627 .fill-N3{fill:#9499AB;} + .d2-1358905627 .fill-N4{fill:#CFD2DD;} + .d2-1358905627 .fill-N5{fill:#DEE1EB;} + .d2-1358905627 .fill-N6{fill:#EEF1F8;} + .d2-1358905627 .fill-N7{fill:#FFFFFF;} + .d2-1358905627 .fill-B1{fill:#0D32B2;} + .d2-1358905627 .fill-B2{fill:#0D32B2;} + .d2-1358905627 .fill-B3{fill:#E3E9FD;} + .d2-1358905627 .fill-B4{fill:#E3E9FD;} + .d2-1358905627 .fill-B5{fill:#EDF0FD;} + .d2-1358905627 .fill-B6{fill:#F7F8FE;} + .d2-1358905627 .fill-AA2{fill:#4A6FF3;} + .d2-1358905627 .fill-AA4{fill:#EDF0FD;} + .d2-1358905627 .fill-AA5{fill:#F7F8FE;} + .d2-1358905627 .fill-AB4{fill:#EDF0FD;} + .d2-1358905627 .fill-AB5{fill:#F7F8FE;} + .d2-1358905627 .stroke-N1{stroke:#0A0F25;} + .d2-1358905627 .stroke-N2{stroke:#676C7E;} + .d2-1358905627 .stroke-N3{stroke:#9499AB;} + .d2-1358905627 .stroke-N4{stroke:#CFD2DD;} + .d2-1358905627 .stroke-N5{stroke:#DEE1EB;} + .d2-1358905627 .stroke-N6{stroke:#EEF1F8;} + .d2-1358905627 .stroke-N7{stroke:#FFFFFF;} + .d2-1358905627 .stroke-B1{stroke:#0D32B2;} + .d2-1358905627 .stroke-B2{stroke:#0D32B2;} + .d2-1358905627 .stroke-B3{stroke:#E3E9FD;} + .d2-1358905627 .stroke-B4{stroke:#E3E9FD;} + .d2-1358905627 .stroke-B5{stroke:#EDF0FD;} + .d2-1358905627 .stroke-B6{stroke:#F7F8FE;} + .d2-1358905627 .stroke-AA2{stroke:#4A6FF3;} + .d2-1358905627 .stroke-AA4{stroke:#EDF0FD;} + .d2-1358905627 .stroke-AA5{stroke:#F7F8FE;} + .d2-1358905627 .stroke-AB4{stroke:#EDF0FD;} + .d2-1358905627 .stroke-AB5{stroke:#F7F8FE;} + .d2-1358905627 .background-color-N1{background-color:#0A0F25;} + .d2-1358905627 .background-color-N2{background-color:#676C7E;} + .d2-1358905627 .background-color-N3{background-color:#9499AB;} + .d2-1358905627 .background-color-N4{background-color:#CFD2DD;} + .d2-1358905627 .background-color-N5{background-color:#DEE1EB;} + .d2-1358905627 .background-color-N6{background-color:#EEF1F8;} + .d2-1358905627 .background-color-N7{background-color:#FFFFFF;} + .d2-1358905627 .background-color-B1{background-color:#0D32B2;} + .d2-1358905627 .background-color-B2{background-color:#0D32B2;} + .d2-1358905627 .background-color-B3{background-color:#E3E9FD;} + .d2-1358905627 .background-color-B4{background-color:#E3E9FD;} + .d2-1358905627 .background-color-B5{background-color:#EDF0FD;} + .d2-1358905627 .background-color-B6{background-color:#F7F8FE;} + .d2-1358905627 .background-color-AA2{background-color:#4A6FF3;} + .d2-1358905627 .background-color-AA4{background-color:#EDF0FD;} + .d2-1358905627 .background-color-AA5{background-color:#F7F8FE;} + .d2-1358905627 .background-color-AB4{background-color:#EDF0FD;} + .d2-1358905627 .background-color-AB5{background-color:#F7F8FE;} + .d2-1358905627 .color-N1{color:#0A0F25;} + .d2-1358905627 .color-N2{color:#676C7E;} + .d2-1358905627 .color-N3{color:#9499AB;} + .d2-1358905627 .color-N4{color:#CFD2DD;} + .d2-1358905627 .color-N5{color:#DEE1EB;} + .d2-1358905627 .color-N6{color:#EEF1F8;} + .d2-1358905627 .color-N7{color:#FFFFFF;} + .d2-1358905627 .color-B1{color:#0D32B2;} + .d2-1358905627 .color-B2{color:#0D32B2;} + .d2-1358905627 .color-B3{color:#E3E9FD;} + .d2-1358905627 .color-B4{color:#E3E9FD;} + .d2-1358905627 .color-B5{color:#EDF0FD;} + .d2-1358905627 .color-B6{color:#F7F8FE;} + .d2-1358905627 .color-AA2{color:#4A6FF3;} + .d2-1358905627 .color-AA4{color:#EDF0FD;} + .d2-1358905627 .color-AA5{color:#F7F8FE;} + .d2-1358905627 .color-AB4{color:#EDF0FD;} + .d2-1358905627 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg index 5e36fe588..55a3a0bbe 100644 --- a/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager + .d2-972852616 .fill-N1{fill:#0A0F25;} + .d2-972852616 .fill-N2{fill:#676C7E;} + .d2-972852616 .fill-N3{fill:#9499AB;} + .d2-972852616 .fill-N4{fill:#CFD2DD;} + .d2-972852616 .fill-N5{fill:#DEE1EB;} + .d2-972852616 .fill-N6{fill:#EEF1F8;} + .d2-972852616 .fill-N7{fill:#FFFFFF;} + .d2-972852616 .fill-B1{fill:#0D32B2;} + .d2-972852616 .fill-B2{fill:#0D32B2;} + .d2-972852616 .fill-B3{fill:#E3E9FD;} + .d2-972852616 .fill-B4{fill:#E3E9FD;} + .d2-972852616 .fill-B5{fill:#EDF0FD;} + .d2-972852616 .fill-B6{fill:#F7F8FE;} + .d2-972852616 .fill-AA2{fill:#4A6FF3;} + .d2-972852616 .fill-AA4{fill:#EDF0FD;} + .d2-972852616 .fill-AA5{fill:#F7F8FE;} + .d2-972852616 .fill-AB4{fill:#EDF0FD;} + .d2-972852616 .fill-AB5{fill:#F7F8FE;} + .d2-972852616 .stroke-N1{stroke:#0A0F25;} + .d2-972852616 .stroke-N2{stroke:#676C7E;} + .d2-972852616 .stroke-N3{stroke:#9499AB;} + .d2-972852616 .stroke-N4{stroke:#CFD2DD;} + .d2-972852616 .stroke-N5{stroke:#DEE1EB;} + .d2-972852616 .stroke-N6{stroke:#EEF1F8;} + .d2-972852616 .stroke-N7{stroke:#FFFFFF;} + .d2-972852616 .stroke-B1{stroke:#0D32B2;} + .d2-972852616 .stroke-B2{stroke:#0D32B2;} + .d2-972852616 .stroke-B3{stroke:#E3E9FD;} + .d2-972852616 .stroke-B4{stroke:#E3E9FD;} + .d2-972852616 .stroke-B5{stroke:#EDF0FD;} + .d2-972852616 .stroke-B6{stroke:#F7F8FE;} + .d2-972852616 .stroke-AA2{stroke:#4A6FF3;} + .d2-972852616 .stroke-AA4{stroke:#EDF0FD;} + .d2-972852616 .stroke-AA5{stroke:#F7F8FE;} + .d2-972852616 .stroke-AB4{stroke:#EDF0FD;} + .d2-972852616 .stroke-AB5{stroke:#F7F8FE;} + .d2-972852616 .background-color-N1{background-color:#0A0F25;} + .d2-972852616 .background-color-N2{background-color:#676C7E;} + .d2-972852616 .background-color-N3{background-color:#9499AB;} + .d2-972852616 .background-color-N4{background-color:#CFD2DD;} + .d2-972852616 .background-color-N5{background-color:#DEE1EB;} + .d2-972852616 .background-color-N6{background-color:#EEF1F8;} + .d2-972852616 .background-color-N7{background-color:#FFFFFF;} + .d2-972852616 .background-color-B1{background-color:#0D32B2;} + .d2-972852616 .background-color-B2{background-color:#0D32B2;} + .d2-972852616 .background-color-B3{background-color:#E3E9FD;} + .d2-972852616 .background-color-B4{background-color:#E3E9FD;} + .d2-972852616 .background-color-B5{background-color:#EDF0FD;} + .d2-972852616 .background-color-B6{background-color:#F7F8FE;} + .d2-972852616 .background-color-AA2{background-color:#4A6FF3;} + .d2-972852616 .background-color-AA4{background-color:#EDF0FD;} + .d2-972852616 .background-color-AA5{background-color:#F7F8FE;} + .d2-972852616 .background-color-AB4{background-color:#EDF0FD;} + .d2-972852616 .background-color-AB5{background-color:#F7F8FE;} + .d2-972852616 .color-N1{color:#0A0F25;} + .d2-972852616 .color-N2{color:#676C7E;} + .d2-972852616 .color-N3{color:#9499AB;} + .d2-972852616 .color-N4{color:#CFD2DD;} + .d2-972852616 .color-N5{color:#DEE1EB;} + .d2-972852616 .color-N6{color:#EEF1F8;} + .d2-972852616 .color-N7{color:#FFFFFF;} + .d2-972852616 .color-B1{color:#0D32B2;} + .d2-972852616 .color-B2{color:#0D32B2;} + .d2-972852616 .color-B3{color:#E3E9FD;} + .d2-972852616 .color-B4{color:#E3E9FD;} + .d2-972852616 .color-B5{color:#EDF0FD;} + .d2-972852616 .color-B6{color:#F7F8FE;} + .d2-972852616 .color-AA2{color:#4A6FF3;} + .d2-972852616 .color-AA4{color:#EDF0FD;} + .d2-972852616 .color-AA5{color:#F7F8FE;} + .d2-972852616 .color-AB4{color:#EDF0FD;} + .d2-972852616 .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}]]>Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager diff --git a/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg index 5e36fe588..55a3a0bbe 100644 --- a/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager + .d2-972852616 .fill-N1{fill:#0A0F25;} + .d2-972852616 .fill-N2{fill:#676C7E;} + .d2-972852616 .fill-N3{fill:#9499AB;} + .d2-972852616 .fill-N4{fill:#CFD2DD;} + .d2-972852616 .fill-N5{fill:#DEE1EB;} + .d2-972852616 .fill-N6{fill:#EEF1F8;} + .d2-972852616 .fill-N7{fill:#FFFFFF;} + .d2-972852616 .fill-B1{fill:#0D32B2;} + .d2-972852616 .fill-B2{fill:#0D32B2;} + .d2-972852616 .fill-B3{fill:#E3E9FD;} + .d2-972852616 .fill-B4{fill:#E3E9FD;} + .d2-972852616 .fill-B5{fill:#EDF0FD;} + .d2-972852616 .fill-B6{fill:#F7F8FE;} + .d2-972852616 .fill-AA2{fill:#4A6FF3;} + .d2-972852616 .fill-AA4{fill:#EDF0FD;} + .d2-972852616 .fill-AA5{fill:#F7F8FE;} + .d2-972852616 .fill-AB4{fill:#EDF0FD;} + .d2-972852616 .fill-AB5{fill:#F7F8FE;} + .d2-972852616 .stroke-N1{stroke:#0A0F25;} + .d2-972852616 .stroke-N2{stroke:#676C7E;} + .d2-972852616 .stroke-N3{stroke:#9499AB;} + .d2-972852616 .stroke-N4{stroke:#CFD2DD;} + .d2-972852616 .stroke-N5{stroke:#DEE1EB;} + .d2-972852616 .stroke-N6{stroke:#EEF1F8;} + .d2-972852616 .stroke-N7{stroke:#FFFFFF;} + .d2-972852616 .stroke-B1{stroke:#0D32B2;} + .d2-972852616 .stroke-B2{stroke:#0D32B2;} + .d2-972852616 .stroke-B3{stroke:#E3E9FD;} + .d2-972852616 .stroke-B4{stroke:#E3E9FD;} + .d2-972852616 .stroke-B5{stroke:#EDF0FD;} + .d2-972852616 .stroke-B6{stroke:#F7F8FE;} + .d2-972852616 .stroke-AA2{stroke:#4A6FF3;} + .d2-972852616 .stroke-AA4{stroke:#EDF0FD;} + .d2-972852616 .stroke-AA5{stroke:#F7F8FE;} + .d2-972852616 .stroke-AB4{stroke:#EDF0FD;} + .d2-972852616 .stroke-AB5{stroke:#F7F8FE;} + .d2-972852616 .background-color-N1{background-color:#0A0F25;} + .d2-972852616 .background-color-N2{background-color:#676C7E;} + .d2-972852616 .background-color-N3{background-color:#9499AB;} + .d2-972852616 .background-color-N4{background-color:#CFD2DD;} + .d2-972852616 .background-color-N5{background-color:#DEE1EB;} + .d2-972852616 .background-color-N6{background-color:#EEF1F8;} + .d2-972852616 .background-color-N7{background-color:#FFFFFF;} + .d2-972852616 .background-color-B1{background-color:#0D32B2;} + .d2-972852616 .background-color-B2{background-color:#0D32B2;} + .d2-972852616 .background-color-B3{background-color:#E3E9FD;} + .d2-972852616 .background-color-B4{background-color:#E3E9FD;} + .d2-972852616 .background-color-B5{background-color:#EDF0FD;} + .d2-972852616 .background-color-B6{background-color:#F7F8FE;} + .d2-972852616 .background-color-AA2{background-color:#4A6FF3;} + .d2-972852616 .background-color-AA4{background-color:#EDF0FD;} + .d2-972852616 .background-color-AA5{background-color:#F7F8FE;} + .d2-972852616 .background-color-AB4{background-color:#EDF0FD;} + .d2-972852616 .background-color-AB5{background-color:#F7F8FE;} + .d2-972852616 .color-N1{color:#0A0F25;} + .d2-972852616 .color-N2{color:#676C7E;} + .d2-972852616 .color-N3{color:#9499AB;} + .d2-972852616 .color-N4{color:#CFD2DD;} + .d2-972852616 .color-N5{color:#DEE1EB;} + .d2-972852616 .color-N6{color:#EEF1F8;} + .d2-972852616 .color-N7{color:#FFFFFF;} + .d2-972852616 .color-B1{color:#0D32B2;} + .d2-972852616 .color-B2{color:#0D32B2;} + .d2-972852616 .color-B3{color:#E3E9FD;} + .d2-972852616 .color-B4{color:#E3E9FD;} + .d2-972852616 .color-B5{color:#EDF0FD;} + .d2-972852616 .color-B6{color:#F7F8FE;} + .d2-972852616 .color-AA2{color:#4A6FF3;} + .d2-972852616 .color-AA4{color:#EDF0FD;} + .d2-972852616 .color-AA5{color:#F7F8FE;} + .d2-972852616 .color-AB4{color:#EDF0FD;} + .d2-972852616 .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}]]>Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager diff --git a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg index 54db9348e..0c0b27e9f 100644 --- a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -alphabeta gamma + .d2-4151650626 .fill-N1{fill:#0A0F25;} + .d2-4151650626 .fill-N2{fill:#676C7E;} + .d2-4151650626 .fill-N3{fill:#9499AB;} + .d2-4151650626 .fill-N4{fill:#CFD2DD;} + .d2-4151650626 .fill-N5{fill:#DEE1EB;} + .d2-4151650626 .fill-N6{fill:#EEF1F8;} + .d2-4151650626 .fill-N7{fill:#FFFFFF;} + .d2-4151650626 .fill-B1{fill:#0D32B2;} + .d2-4151650626 .fill-B2{fill:#0D32B2;} + .d2-4151650626 .fill-B3{fill:#E3E9FD;} + .d2-4151650626 .fill-B4{fill:#E3E9FD;} + .d2-4151650626 .fill-B5{fill:#EDF0FD;} + .d2-4151650626 .fill-B6{fill:#F7F8FE;} + .d2-4151650626 .fill-AA2{fill:#4A6FF3;} + .d2-4151650626 .fill-AA4{fill:#EDF0FD;} + .d2-4151650626 .fill-AA5{fill:#F7F8FE;} + .d2-4151650626 .fill-AB4{fill:#EDF0FD;} + .d2-4151650626 .fill-AB5{fill:#F7F8FE;} + .d2-4151650626 .stroke-N1{stroke:#0A0F25;} + .d2-4151650626 .stroke-N2{stroke:#676C7E;} + .d2-4151650626 .stroke-N3{stroke:#9499AB;} + .d2-4151650626 .stroke-N4{stroke:#CFD2DD;} + .d2-4151650626 .stroke-N5{stroke:#DEE1EB;} + .d2-4151650626 .stroke-N6{stroke:#EEF1F8;} + .d2-4151650626 .stroke-N7{stroke:#FFFFFF;} + .d2-4151650626 .stroke-B1{stroke:#0D32B2;} + .d2-4151650626 .stroke-B2{stroke:#0D32B2;} + .d2-4151650626 .stroke-B3{stroke:#E3E9FD;} + .d2-4151650626 .stroke-B4{stroke:#E3E9FD;} + .d2-4151650626 .stroke-B5{stroke:#EDF0FD;} + .d2-4151650626 .stroke-B6{stroke:#F7F8FE;} + .d2-4151650626 .stroke-AA2{stroke:#4A6FF3;} + .d2-4151650626 .stroke-AA4{stroke:#EDF0FD;} + .d2-4151650626 .stroke-AA5{stroke:#F7F8FE;} + .d2-4151650626 .stroke-AB4{stroke:#EDF0FD;} + .d2-4151650626 .stroke-AB5{stroke:#F7F8FE;} + .d2-4151650626 .background-color-N1{background-color:#0A0F25;} + .d2-4151650626 .background-color-N2{background-color:#676C7E;} + .d2-4151650626 .background-color-N3{background-color:#9499AB;} + .d2-4151650626 .background-color-N4{background-color:#CFD2DD;} + .d2-4151650626 .background-color-N5{background-color:#DEE1EB;} + .d2-4151650626 .background-color-N6{background-color:#EEF1F8;} + .d2-4151650626 .background-color-N7{background-color:#FFFFFF;} + .d2-4151650626 .background-color-B1{background-color:#0D32B2;} + .d2-4151650626 .background-color-B2{background-color:#0D32B2;} + .d2-4151650626 .background-color-B3{background-color:#E3E9FD;} + .d2-4151650626 .background-color-B4{background-color:#E3E9FD;} + .d2-4151650626 .background-color-B5{background-color:#EDF0FD;} + .d2-4151650626 .background-color-B6{background-color:#F7F8FE;} + .d2-4151650626 .background-color-AA2{background-color:#4A6FF3;} + .d2-4151650626 .background-color-AA4{background-color:#EDF0FD;} + .d2-4151650626 .background-color-AA5{background-color:#F7F8FE;} + .d2-4151650626 .background-color-AB4{background-color:#EDF0FD;} + .d2-4151650626 .background-color-AB5{background-color:#F7F8FE;} + .d2-4151650626 .color-N1{color:#0A0F25;} + .d2-4151650626 .color-N2{color:#676C7E;} + .d2-4151650626 .color-N3{color:#9499AB;} + .d2-4151650626 .color-N4{color:#CFD2DD;} + .d2-4151650626 .color-N5{color:#DEE1EB;} + .d2-4151650626 .color-N6{color:#EEF1F8;} + .d2-4151650626 .color-N7{color:#FFFFFF;} + .d2-4151650626 .color-B1{color:#0D32B2;} + .d2-4151650626 .color-B2{color:#0D32B2;} + .d2-4151650626 .color-B3{color:#E3E9FD;} + .d2-4151650626 .color-B4{color:#E3E9FD;} + .d2-4151650626 .color-B5{color:#EDF0FD;} + .d2-4151650626 .color-B6{color:#F7F8FE;} + .d2-4151650626 .color-AA2{color:#4A6FF3;} + .d2-4151650626 .color-AA4{color:#EDF0FD;} + .d2-4151650626 .color-AA5{color:#F7F8FE;} + .d2-4151650626 .color-AB4{color:#EDF0FD;} + .d2-4151650626 .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}]]>alphabeta gamma diff --git a/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg b/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg index 79b7e48d4..13ebf427e 100644 --- a/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -alphabeta gamma + .d2-1902179284 .fill-N1{fill:#0A0F25;} + .d2-1902179284 .fill-N2{fill:#676C7E;} + .d2-1902179284 .fill-N3{fill:#9499AB;} + .d2-1902179284 .fill-N4{fill:#CFD2DD;} + .d2-1902179284 .fill-N5{fill:#DEE1EB;} + .d2-1902179284 .fill-N6{fill:#EEF1F8;} + .d2-1902179284 .fill-N7{fill:#FFFFFF;} + .d2-1902179284 .fill-B1{fill:#0D32B2;} + .d2-1902179284 .fill-B2{fill:#0D32B2;} + .d2-1902179284 .fill-B3{fill:#E3E9FD;} + .d2-1902179284 .fill-B4{fill:#E3E9FD;} + .d2-1902179284 .fill-B5{fill:#EDF0FD;} + .d2-1902179284 .fill-B6{fill:#F7F8FE;} + .d2-1902179284 .fill-AA2{fill:#4A6FF3;} + .d2-1902179284 .fill-AA4{fill:#EDF0FD;} + .d2-1902179284 .fill-AA5{fill:#F7F8FE;} + .d2-1902179284 .fill-AB4{fill:#EDF0FD;} + .d2-1902179284 .fill-AB5{fill:#F7F8FE;} + .d2-1902179284 .stroke-N1{stroke:#0A0F25;} + .d2-1902179284 .stroke-N2{stroke:#676C7E;} + .d2-1902179284 .stroke-N3{stroke:#9499AB;} + .d2-1902179284 .stroke-N4{stroke:#CFD2DD;} + .d2-1902179284 .stroke-N5{stroke:#DEE1EB;} + .d2-1902179284 .stroke-N6{stroke:#EEF1F8;} + .d2-1902179284 .stroke-N7{stroke:#FFFFFF;} + .d2-1902179284 .stroke-B1{stroke:#0D32B2;} + .d2-1902179284 .stroke-B2{stroke:#0D32B2;} + .d2-1902179284 .stroke-B3{stroke:#E3E9FD;} + .d2-1902179284 .stroke-B4{stroke:#E3E9FD;} + .d2-1902179284 .stroke-B5{stroke:#EDF0FD;} + .d2-1902179284 .stroke-B6{stroke:#F7F8FE;} + .d2-1902179284 .stroke-AA2{stroke:#4A6FF3;} + .d2-1902179284 .stroke-AA4{stroke:#EDF0FD;} + .d2-1902179284 .stroke-AA5{stroke:#F7F8FE;} + .d2-1902179284 .stroke-AB4{stroke:#EDF0FD;} + .d2-1902179284 .stroke-AB5{stroke:#F7F8FE;} + .d2-1902179284 .background-color-N1{background-color:#0A0F25;} + .d2-1902179284 .background-color-N2{background-color:#676C7E;} + .d2-1902179284 .background-color-N3{background-color:#9499AB;} + .d2-1902179284 .background-color-N4{background-color:#CFD2DD;} + .d2-1902179284 .background-color-N5{background-color:#DEE1EB;} + .d2-1902179284 .background-color-N6{background-color:#EEF1F8;} + .d2-1902179284 .background-color-N7{background-color:#FFFFFF;} + .d2-1902179284 .background-color-B1{background-color:#0D32B2;} + .d2-1902179284 .background-color-B2{background-color:#0D32B2;} + .d2-1902179284 .background-color-B3{background-color:#E3E9FD;} + .d2-1902179284 .background-color-B4{background-color:#E3E9FD;} + .d2-1902179284 .background-color-B5{background-color:#EDF0FD;} + .d2-1902179284 .background-color-B6{background-color:#F7F8FE;} + .d2-1902179284 .background-color-AA2{background-color:#4A6FF3;} + .d2-1902179284 .background-color-AA4{background-color:#EDF0FD;} + .d2-1902179284 .background-color-AA5{background-color:#F7F8FE;} + .d2-1902179284 .background-color-AB4{background-color:#EDF0FD;} + .d2-1902179284 .background-color-AB5{background-color:#F7F8FE;} + .d2-1902179284 .color-N1{color:#0A0F25;} + .d2-1902179284 .color-N2{color:#676C7E;} + .d2-1902179284 .color-N3{color:#9499AB;} + .d2-1902179284 .color-N4{color:#CFD2DD;} + .d2-1902179284 .color-N5{color:#DEE1EB;} + .d2-1902179284 .color-N6{color:#EEF1F8;} + .d2-1902179284 .color-N7{color:#FFFFFF;} + .d2-1902179284 .color-B1{color:#0D32B2;} + .d2-1902179284 .color-B2{color:#0D32B2;} + .d2-1902179284 .color-B3{color:#E3E9FD;} + .d2-1902179284 .color-B4{color:#E3E9FD;} + .d2-1902179284 .color-B5{color:#EDF0FD;} + .d2-1902179284 .color-B6{color:#F7F8FE;} + .d2-1902179284 .color-AA2{color:#4A6FF3;} + .d2-1902179284 .color-AA4{color:#EDF0FD;} + .d2-1902179284 .color-AA5{color:#F7F8FE;} + .d2-1902179284 .color-AB4{color:#EDF0FD;} + .d2-1902179284 .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}]]>alphabeta gamma diff --git a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg index 29484d38e..da391dfaa 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + .d2-3174230406 .fill-N1{fill:#0A0F25;} + .d2-3174230406 .fill-N2{fill:#676C7E;} + .d2-3174230406 .fill-N3{fill:#9499AB;} + .d2-3174230406 .fill-N4{fill:#CFD2DD;} + .d2-3174230406 .fill-N5{fill:#DEE1EB;} + .d2-3174230406 .fill-N6{fill:#EEF1F8;} + .d2-3174230406 .fill-N7{fill:#FFFFFF;} + .d2-3174230406 .fill-B1{fill:#0D32B2;} + .d2-3174230406 .fill-B2{fill:#0D32B2;} + .d2-3174230406 .fill-B3{fill:#E3E9FD;} + .d2-3174230406 .fill-B4{fill:#E3E9FD;} + .d2-3174230406 .fill-B5{fill:#EDF0FD;} + .d2-3174230406 .fill-B6{fill:#F7F8FE;} + .d2-3174230406 .fill-AA2{fill:#4A6FF3;} + .d2-3174230406 .fill-AA4{fill:#EDF0FD;} + .d2-3174230406 .fill-AA5{fill:#F7F8FE;} + .d2-3174230406 .fill-AB4{fill:#EDF0FD;} + .d2-3174230406 .fill-AB5{fill:#F7F8FE;} + .d2-3174230406 .stroke-N1{stroke:#0A0F25;} + .d2-3174230406 .stroke-N2{stroke:#676C7E;} + .d2-3174230406 .stroke-N3{stroke:#9499AB;} + .d2-3174230406 .stroke-N4{stroke:#CFD2DD;} + .d2-3174230406 .stroke-N5{stroke:#DEE1EB;} + .d2-3174230406 .stroke-N6{stroke:#EEF1F8;} + .d2-3174230406 .stroke-N7{stroke:#FFFFFF;} + .d2-3174230406 .stroke-B1{stroke:#0D32B2;} + .d2-3174230406 .stroke-B2{stroke:#0D32B2;} + .d2-3174230406 .stroke-B3{stroke:#E3E9FD;} + .d2-3174230406 .stroke-B4{stroke:#E3E9FD;} + .d2-3174230406 .stroke-B5{stroke:#EDF0FD;} + .d2-3174230406 .stroke-B6{stroke:#F7F8FE;} + .d2-3174230406 .stroke-AA2{stroke:#4A6FF3;} + .d2-3174230406 .stroke-AA4{stroke:#EDF0FD;} + .d2-3174230406 .stroke-AA5{stroke:#F7F8FE;} + .d2-3174230406 .stroke-AB4{stroke:#EDF0FD;} + .d2-3174230406 .stroke-AB5{stroke:#F7F8FE;} + .d2-3174230406 .background-color-N1{background-color:#0A0F25;} + .d2-3174230406 .background-color-N2{background-color:#676C7E;} + .d2-3174230406 .background-color-N3{background-color:#9499AB;} + .d2-3174230406 .background-color-N4{background-color:#CFD2DD;} + .d2-3174230406 .background-color-N5{background-color:#DEE1EB;} + .d2-3174230406 .background-color-N6{background-color:#EEF1F8;} + .d2-3174230406 .background-color-N7{background-color:#FFFFFF;} + .d2-3174230406 .background-color-B1{background-color:#0D32B2;} + .d2-3174230406 .background-color-B2{background-color:#0D32B2;} + .d2-3174230406 .background-color-B3{background-color:#E3E9FD;} + .d2-3174230406 .background-color-B4{background-color:#E3E9FD;} + .d2-3174230406 .background-color-B5{background-color:#EDF0FD;} + .d2-3174230406 .background-color-B6{background-color:#F7F8FE;} + .d2-3174230406 .background-color-AA2{background-color:#4A6FF3;} + .d2-3174230406 .background-color-AA4{background-color:#EDF0FD;} + .d2-3174230406 .background-color-AA5{background-color:#F7F8FE;} + .d2-3174230406 .background-color-AB4{background-color:#EDF0FD;} + .d2-3174230406 .background-color-AB5{background-color:#F7F8FE;} + .d2-3174230406 .color-N1{color:#0A0F25;} + .d2-3174230406 .color-N2{color:#676C7E;} + .d2-3174230406 .color-N3{color:#9499AB;} + .d2-3174230406 .color-N4{color:#CFD2DD;} + .d2-3174230406 .color-N5{color:#DEE1EB;} + .d2-3174230406 .color-N6{color:#EEF1F8;} + .d2-3174230406 .color-N7{color:#FFFFFF;} + .d2-3174230406 .color-B1{color:#0D32B2;} + .d2-3174230406 .color-B2{color:#0D32B2;} + .d2-3174230406 .color-B3{color:#E3E9FD;} + .d2-3174230406 .color-B4{color:#E3E9FD;} + .d2-3174230406 .color-B5{color:#EDF0FD;} + .d2-3174230406 .color-B6{color:#F7F8FE;} + .d2-3174230406 .color-AA2{color:#4A6FF3;} + .d2-3174230406 .color-AA4{color:#EDF0FD;} + .d2-3174230406 .color-AA5{color:#F7F8FE;} + .d2-3174230406 .color-AB4{color:#EDF0FD;} + .d2-3174230406 .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}]]>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 8bceefd6f..ebbd44c93 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + .d2-1981788603 .fill-N1{fill:#0A0F25;} + .d2-1981788603 .fill-N2{fill:#676C7E;} + .d2-1981788603 .fill-N3{fill:#9499AB;} + .d2-1981788603 .fill-N4{fill:#CFD2DD;} + .d2-1981788603 .fill-N5{fill:#DEE1EB;} + .d2-1981788603 .fill-N6{fill:#EEF1F8;} + .d2-1981788603 .fill-N7{fill:#FFFFFF;} + .d2-1981788603 .fill-B1{fill:#0D32B2;} + .d2-1981788603 .fill-B2{fill:#0D32B2;} + .d2-1981788603 .fill-B3{fill:#E3E9FD;} + .d2-1981788603 .fill-B4{fill:#E3E9FD;} + .d2-1981788603 .fill-B5{fill:#EDF0FD;} + .d2-1981788603 .fill-B6{fill:#F7F8FE;} + .d2-1981788603 .fill-AA2{fill:#4A6FF3;} + .d2-1981788603 .fill-AA4{fill:#EDF0FD;} + .d2-1981788603 .fill-AA5{fill:#F7F8FE;} + .d2-1981788603 .fill-AB4{fill:#EDF0FD;} + .d2-1981788603 .fill-AB5{fill:#F7F8FE;} + .d2-1981788603 .stroke-N1{stroke:#0A0F25;} + .d2-1981788603 .stroke-N2{stroke:#676C7E;} + .d2-1981788603 .stroke-N3{stroke:#9499AB;} + .d2-1981788603 .stroke-N4{stroke:#CFD2DD;} + .d2-1981788603 .stroke-N5{stroke:#DEE1EB;} + .d2-1981788603 .stroke-N6{stroke:#EEF1F8;} + .d2-1981788603 .stroke-N7{stroke:#FFFFFF;} + .d2-1981788603 .stroke-B1{stroke:#0D32B2;} + .d2-1981788603 .stroke-B2{stroke:#0D32B2;} + .d2-1981788603 .stroke-B3{stroke:#E3E9FD;} + .d2-1981788603 .stroke-B4{stroke:#E3E9FD;} + .d2-1981788603 .stroke-B5{stroke:#EDF0FD;} + .d2-1981788603 .stroke-B6{stroke:#F7F8FE;} + .d2-1981788603 .stroke-AA2{stroke:#4A6FF3;} + .d2-1981788603 .stroke-AA4{stroke:#EDF0FD;} + .d2-1981788603 .stroke-AA5{stroke:#F7F8FE;} + .d2-1981788603 .stroke-AB4{stroke:#EDF0FD;} + .d2-1981788603 .stroke-AB5{stroke:#F7F8FE;} + .d2-1981788603 .background-color-N1{background-color:#0A0F25;} + .d2-1981788603 .background-color-N2{background-color:#676C7E;} + .d2-1981788603 .background-color-N3{background-color:#9499AB;} + .d2-1981788603 .background-color-N4{background-color:#CFD2DD;} + .d2-1981788603 .background-color-N5{background-color:#DEE1EB;} + .d2-1981788603 .background-color-N6{background-color:#EEF1F8;} + .d2-1981788603 .background-color-N7{background-color:#FFFFFF;} + .d2-1981788603 .background-color-B1{background-color:#0D32B2;} + .d2-1981788603 .background-color-B2{background-color:#0D32B2;} + .d2-1981788603 .background-color-B3{background-color:#E3E9FD;} + .d2-1981788603 .background-color-B4{background-color:#E3E9FD;} + .d2-1981788603 .background-color-B5{background-color:#EDF0FD;} + .d2-1981788603 .background-color-B6{background-color:#F7F8FE;} + .d2-1981788603 .background-color-AA2{background-color:#4A6FF3;} + .d2-1981788603 .background-color-AA4{background-color:#EDF0FD;} + .d2-1981788603 .background-color-AA5{background-color:#F7F8FE;} + .d2-1981788603 .background-color-AB4{background-color:#EDF0FD;} + .d2-1981788603 .background-color-AB5{background-color:#F7F8FE;} + .d2-1981788603 .color-N1{color:#0A0F25;} + .d2-1981788603 .color-N2{color:#676C7E;} + .d2-1981788603 .color-N3{color:#9499AB;} + .d2-1981788603 .color-N4{color:#CFD2DD;} + .d2-1981788603 .color-N5{color:#DEE1EB;} + .d2-1981788603 .color-N6{color:#EEF1F8;} + .d2-1981788603 .color-N7{color:#FFFFFF;} + .d2-1981788603 .color-B1{color:#0D32B2;} + .d2-1981788603 .color-B2{color:#0D32B2;} + .d2-1981788603 .color-B3{color:#E3E9FD;} + .d2-1981788603 .color-B4{color:#E3E9FD;} + .d2-1981788603 .color-B5{color:#EDF0FD;} + .d2-1981788603 .color-B6{color:#F7F8FE;} + .d2-1981788603 .color-AA2{color:#4A6FF3;} + .d2-1981788603 .color-AA4{color:#EDF0FD;} + .d2-1981788603 .color-AA5{color:#F7F8FE;} + .d2-1981788603 .color-AB4{color:#EDF0FD;} + .d2-1981788603 .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}]]>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 10fe55bb0..1f49d267a 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,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight + .d2-2159060023 .fill-N1{fill:#0A0F25;} + .d2-2159060023 .fill-N2{fill:#676C7E;} + .d2-2159060023 .fill-N3{fill:#9499AB;} + .d2-2159060023 .fill-N4{fill:#CFD2DD;} + .d2-2159060023 .fill-N5{fill:#DEE1EB;} + .d2-2159060023 .fill-N6{fill:#EEF1F8;} + .d2-2159060023 .fill-N7{fill:#FFFFFF;} + .d2-2159060023 .fill-B1{fill:#0D32B2;} + .d2-2159060023 .fill-B2{fill:#0D32B2;} + .d2-2159060023 .fill-B3{fill:#E3E9FD;} + .d2-2159060023 .fill-B4{fill:#E3E9FD;} + .d2-2159060023 .fill-B5{fill:#EDF0FD;} + .d2-2159060023 .fill-B6{fill:#F7F8FE;} + .d2-2159060023 .fill-AA2{fill:#4A6FF3;} + .d2-2159060023 .fill-AA4{fill:#EDF0FD;} + .d2-2159060023 .fill-AA5{fill:#F7F8FE;} + .d2-2159060023 .fill-AB4{fill:#EDF0FD;} + .d2-2159060023 .fill-AB5{fill:#F7F8FE;} + .d2-2159060023 .stroke-N1{stroke:#0A0F25;} + .d2-2159060023 .stroke-N2{stroke:#676C7E;} + .d2-2159060023 .stroke-N3{stroke:#9499AB;} + .d2-2159060023 .stroke-N4{stroke:#CFD2DD;} + .d2-2159060023 .stroke-N5{stroke:#DEE1EB;} + .d2-2159060023 .stroke-N6{stroke:#EEF1F8;} + .d2-2159060023 .stroke-N7{stroke:#FFFFFF;} + .d2-2159060023 .stroke-B1{stroke:#0D32B2;} + .d2-2159060023 .stroke-B2{stroke:#0D32B2;} + .d2-2159060023 .stroke-B3{stroke:#E3E9FD;} + .d2-2159060023 .stroke-B4{stroke:#E3E9FD;} + .d2-2159060023 .stroke-B5{stroke:#EDF0FD;} + .d2-2159060023 .stroke-B6{stroke:#F7F8FE;} + .d2-2159060023 .stroke-AA2{stroke:#4A6FF3;} + .d2-2159060023 .stroke-AA4{stroke:#EDF0FD;} + .d2-2159060023 .stroke-AA5{stroke:#F7F8FE;} + .d2-2159060023 .stroke-AB4{stroke:#EDF0FD;} + .d2-2159060023 .stroke-AB5{stroke:#F7F8FE;} + .d2-2159060023 .background-color-N1{background-color:#0A0F25;} + .d2-2159060023 .background-color-N2{background-color:#676C7E;} + .d2-2159060023 .background-color-N3{background-color:#9499AB;} + .d2-2159060023 .background-color-N4{background-color:#CFD2DD;} + .d2-2159060023 .background-color-N5{background-color:#DEE1EB;} + .d2-2159060023 .background-color-N6{background-color:#EEF1F8;} + .d2-2159060023 .background-color-N7{background-color:#FFFFFF;} + .d2-2159060023 .background-color-B1{background-color:#0D32B2;} + .d2-2159060023 .background-color-B2{background-color:#0D32B2;} + .d2-2159060023 .background-color-B3{background-color:#E3E9FD;} + .d2-2159060023 .background-color-B4{background-color:#E3E9FD;} + .d2-2159060023 .background-color-B5{background-color:#EDF0FD;} + .d2-2159060023 .background-color-B6{background-color:#F7F8FE;} + .d2-2159060023 .background-color-AA2{background-color:#4A6FF3;} + .d2-2159060023 .background-color-AA4{background-color:#EDF0FD;} + .d2-2159060023 .background-color-AA5{background-color:#F7F8FE;} + .d2-2159060023 .background-color-AB4{background-color:#EDF0FD;} + .d2-2159060023 .background-color-AB5{background-color:#F7F8FE;} + .d2-2159060023 .color-N1{color:#0A0F25;} + .d2-2159060023 .color-N2{color:#676C7E;} + .d2-2159060023 .color-N3{color:#9499AB;} + .d2-2159060023 .color-N4{color:#CFD2DD;} + .d2-2159060023 .color-N5{color:#DEE1EB;} + .d2-2159060023 .color-N6{color:#EEF1F8;} + .d2-2159060023 .color-N7{color:#FFFFFF;} + .d2-2159060023 .color-B1{color:#0D32B2;} + .d2-2159060023 .color-B2{color:#0D32B2;} + .d2-2159060023 .color-B3{color:#E3E9FD;} + .d2-2159060023 .color-B4{color:#E3E9FD;} + .d2-2159060023 .color-B5{color:#EDF0FD;} + .d2-2159060023 .color-B6{color:#F7F8FE;} + .d2-2159060023 .color-AA2{color:#4A6FF3;} + .d2-2159060023 .color-AA4{color:#EDF0FD;} + .d2-2159060023 .color-AA5{color:#F7F8FE;} + .d2-2159060023 .color-AB4{color:#EDF0FD;} + .d2-2159060023 .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}]]>ninety ninesixty fourthirty twosixteeneight 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 1b63064df..bf2cd80e1 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,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight + .d2-2746824342 .fill-N1{fill:#0A0F25;} + .d2-2746824342 .fill-N2{fill:#676C7E;} + .d2-2746824342 .fill-N3{fill:#9499AB;} + .d2-2746824342 .fill-N4{fill:#CFD2DD;} + .d2-2746824342 .fill-N5{fill:#DEE1EB;} + .d2-2746824342 .fill-N6{fill:#EEF1F8;} + .d2-2746824342 .fill-N7{fill:#FFFFFF;} + .d2-2746824342 .fill-B1{fill:#0D32B2;} + .d2-2746824342 .fill-B2{fill:#0D32B2;} + .d2-2746824342 .fill-B3{fill:#E3E9FD;} + .d2-2746824342 .fill-B4{fill:#E3E9FD;} + .d2-2746824342 .fill-B5{fill:#EDF0FD;} + .d2-2746824342 .fill-B6{fill:#F7F8FE;} + .d2-2746824342 .fill-AA2{fill:#4A6FF3;} + .d2-2746824342 .fill-AA4{fill:#EDF0FD;} + .d2-2746824342 .fill-AA5{fill:#F7F8FE;} + .d2-2746824342 .fill-AB4{fill:#EDF0FD;} + .d2-2746824342 .fill-AB5{fill:#F7F8FE;} + .d2-2746824342 .stroke-N1{stroke:#0A0F25;} + .d2-2746824342 .stroke-N2{stroke:#676C7E;} + .d2-2746824342 .stroke-N3{stroke:#9499AB;} + .d2-2746824342 .stroke-N4{stroke:#CFD2DD;} + .d2-2746824342 .stroke-N5{stroke:#DEE1EB;} + .d2-2746824342 .stroke-N6{stroke:#EEF1F8;} + .d2-2746824342 .stroke-N7{stroke:#FFFFFF;} + .d2-2746824342 .stroke-B1{stroke:#0D32B2;} + .d2-2746824342 .stroke-B2{stroke:#0D32B2;} + .d2-2746824342 .stroke-B3{stroke:#E3E9FD;} + .d2-2746824342 .stroke-B4{stroke:#E3E9FD;} + .d2-2746824342 .stroke-B5{stroke:#EDF0FD;} + .d2-2746824342 .stroke-B6{stroke:#F7F8FE;} + .d2-2746824342 .stroke-AA2{stroke:#4A6FF3;} + .d2-2746824342 .stroke-AA4{stroke:#EDF0FD;} + .d2-2746824342 .stroke-AA5{stroke:#F7F8FE;} + .d2-2746824342 .stroke-AB4{stroke:#EDF0FD;} + .d2-2746824342 .stroke-AB5{stroke:#F7F8FE;} + .d2-2746824342 .background-color-N1{background-color:#0A0F25;} + .d2-2746824342 .background-color-N2{background-color:#676C7E;} + .d2-2746824342 .background-color-N3{background-color:#9499AB;} + .d2-2746824342 .background-color-N4{background-color:#CFD2DD;} + .d2-2746824342 .background-color-N5{background-color:#DEE1EB;} + .d2-2746824342 .background-color-N6{background-color:#EEF1F8;} + .d2-2746824342 .background-color-N7{background-color:#FFFFFF;} + .d2-2746824342 .background-color-B1{background-color:#0D32B2;} + .d2-2746824342 .background-color-B2{background-color:#0D32B2;} + .d2-2746824342 .background-color-B3{background-color:#E3E9FD;} + .d2-2746824342 .background-color-B4{background-color:#E3E9FD;} + .d2-2746824342 .background-color-B5{background-color:#EDF0FD;} + .d2-2746824342 .background-color-B6{background-color:#F7F8FE;} + .d2-2746824342 .background-color-AA2{background-color:#4A6FF3;} + .d2-2746824342 .background-color-AA4{background-color:#EDF0FD;} + .d2-2746824342 .background-color-AA5{background-color:#F7F8FE;} + .d2-2746824342 .background-color-AB4{background-color:#EDF0FD;} + .d2-2746824342 .background-color-AB5{background-color:#F7F8FE;} + .d2-2746824342 .color-N1{color:#0A0F25;} + .d2-2746824342 .color-N2{color:#676C7E;} + .d2-2746824342 .color-N3{color:#9499AB;} + .d2-2746824342 .color-N4{color:#CFD2DD;} + .d2-2746824342 .color-N5{color:#DEE1EB;} + .d2-2746824342 .color-N6{color:#EEF1F8;} + .d2-2746824342 .color-N7{color:#FFFFFF;} + .d2-2746824342 .color-B1{color:#0D32B2;} + .d2-2746824342 .color-B2{color:#0D32B2;} + .d2-2746824342 .color-B3{color:#E3E9FD;} + .d2-2746824342 .color-B4{color:#E3E9FD;} + .d2-2746824342 .color-B5{color:#EDF0FD;} + .d2-2746824342 .color-B6{color:#F7F8FE;} + .d2-2746824342 .color-AA2{color:#4A6FF3;} + .d2-2746824342 .color-AA4{color:#EDF0FD;} + .d2-2746824342 .color-AA5{color:#F7F8FE;} + .d2-2746824342 .color-AB4{color:#EDF0FD;} + .d2-2746824342 .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}]]>ninety ninesixty fourthirty twosixteeneight 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 27e6d9e96..88d0cff4a 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,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight + .d2-1555523791 .fill-N1{fill:#0A0F25;} + .d2-1555523791 .fill-N2{fill:#676C7E;} + .d2-1555523791 .fill-N3{fill:#9499AB;} + .d2-1555523791 .fill-N4{fill:#CFD2DD;} + .d2-1555523791 .fill-N5{fill:#DEE1EB;} + .d2-1555523791 .fill-N6{fill:#EEF1F8;} + .d2-1555523791 .fill-N7{fill:#FFFFFF;} + .d2-1555523791 .fill-B1{fill:#0D32B2;} + .d2-1555523791 .fill-B2{fill:#0D32B2;} + .d2-1555523791 .fill-B3{fill:#E3E9FD;} + .d2-1555523791 .fill-B4{fill:#E3E9FD;} + .d2-1555523791 .fill-B5{fill:#EDF0FD;} + .d2-1555523791 .fill-B6{fill:#F7F8FE;} + .d2-1555523791 .fill-AA2{fill:#4A6FF3;} + .d2-1555523791 .fill-AA4{fill:#EDF0FD;} + .d2-1555523791 .fill-AA5{fill:#F7F8FE;} + .d2-1555523791 .fill-AB4{fill:#EDF0FD;} + .d2-1555523791 .fill-AB5{fill:#F7F8FE;} + .d2-1555523791 .stroke-N1{stroke:#0A0F25;} + .d2-1555523791 .stroke-N2{stroke:#676C7E;} + .d2-1555523791 .stroke-N3{stroke:#9499AB;} + .d2-1555523791 .stroke-N4{stroke:#CFD2DD;} + .d2-1555523791 .stroke-N5{stroke:#DEE1EB;} + .d2-1555523791 .stroke-N6{stroke:#EEF1F8;} + .d2-1555523791 .stroke-N7{stroke:#FFFFFF;} + .d2-1555523791 .stroke-B1{stroke:#0D32B2;} + .d2-1555523791 .stroke-B2{stroke:#0D32B2;} + .d2-1555523791 .stroke-B3{stroke:#E3E9FD;} + .d2-1555523791 .stroke-B4{stroke:#E3E9FD;} + .d2-1555523791 .stroke-B5{stroke:#EDF0FD;} + .d2-1555523791 .stroke-B6{stroke:#F7F8FE;} + .d2-1555523791 .stroke-AA2{stroke:#4A6FF3;} + .d2-1555523791 .stroke-AA4{stroke:#EDF0FD;} + .d2-1555523791 .stroke-AA5{stroke:#F7F8FE;} + .d2-1555523791 .stroke-AB4{stroke:#EDF0FD;} + .d2-1555523791 .stroke-AB5{stroke:#F7F8FE;} + .d2-1555523791 .background-color-N1{background-color:#0A0F25;} + .d2-1555523791 .background-color-N2{background-color:#676C7E;} + .d2-1555523791 .background-color-N3{background-color:#9499AB;} + .d2-1555523791 .background-color-N4{background-color:#CFD2DD;} + .d2-1555523791 .background-color-N5{background-color:#DEE1EB;} + .d2-1555523791 .background-color-N6{background-color:#EEF1F8;} + .d2-1555523791 .background-color-N7{background-color:#FFFFFF;} + .d2-1555523791 .background-color-B1{background-color:#0D32B2;} + .d2-1555523791 .background-color-B2{background-color:#0D32B2;} + .d2-1555523791 .background-color-B3{background-color:#E3E9FD;} + .d2-1555523791 .background-color-B4{background-color:#E3E9FD;} + .d2-1555523791 .background-color-B5{background-color:#EDF0FD;} + .d2-1555523791 .background-color-B6{background-color:#F7F8FE;} + .d2-1555523791 .background-color-AA2{background-color:#4A6FF3;} + .d2-1555523791 .background-color-AA4{background-color:#EDF0FD;} + .d2-1555523791 .background-color-AA5{background-color:#F7F8FE;} + .d2-1555523791 .background-color-AB4{background-color:#EDF0FD;} + .d2-1555523791 .background-color-AB5{background-color:#F7F8FE;} + .d2-1555523791 .color-N1{color:#0A0F25;} + .d2-1555523791 .color-N2{color:#676C7E;} + .d2-1555523791 .color-N3{color:#9499AB;} + .d2-1555523791 .color-N4{color:#CFD2DD;} + .d2-1555523791 .color-N5{color:#DEE1EB;} + .d2-1555523791 .color-N6{color:#EEF1F8;} + .d2-1555523791 .color-N7{color:#FFFFFF;} + .d2-1555523791 .color-B1{color:#0D32B2;} + .d2-1555523791 .color-B2{color:#0D32B2;} + .d2-1555523791 .color-B3{color:#E3E9FD;} + .d2-1555523791 .color-B4{color:#E3E9FD;} + .d2-1555523791 .color-B5{color:#EDF0FD;} + .d2-1555523791 .color-B6{color:#F7F8FE;} + .d2-1555523791 .color-AA2{color:#4A6FF3;} + .d2-1555523791 .color-AA4{color:#EDF0FD;} + .d2-1555523791 .color-AA5{color:#F7F8FE;} + .d2-1555523791 .color-AB4{color:#EDF0FD;} + .d2-1555523791 .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}]]>ninety ninesixty fourthirty twosixteeneight 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 1b63064df..bf2cd80e1 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,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight + .d2-2746824342 .fill-N1{fill:#0A0F25;} + .d2-2746824342 .fill-N2{fill:#676C7E;} + .d2-2746824342 .fill-N3{fill:#9499AB;} + .d2-2746824342 .fill-N4{fill:#CFD2DD;} + .d2-2746824342 .fill-N5{fill:#DEE1EB;} + .d2-2746824342 .fill-N6{fill:#EEF1F8;} + .d2-2746824342 .fill-N7{fill:#FFFFFF;} + .d2-2746824342 .fill-B1{fill:#0D32B2;} + .d2-2746824342 .fill-B2{fill:#0D32B2;} + .d2-2746824342 .fill-B3{fill:#E3E9FD;} + .d2-2746824342 .fill-B4{fill:#E3E9FD;} + .d2-2746824342 .fill-B5{fill:#EDF0FD;} + .d2-2746824342 .fill-B6{fill:#F7F8FE;} + .d2-2746824342 .fill-AA2{fill:#4A6FF3;} + .d2-2746824342 .fill-AA4{fill:#EDF0FD;} + .d2-2746824342 .fill-AA5{fill:#F7F8FE;} + .d2-2746824342 .fill-AB4{fill:#EDF0FD;} + .d2-2746824342 .fill-AB5{fill:#F7F8FE;} + .d2-2746824342 .stroke-N1{stroke:#0A0F25;} + .d2-2746824342 .stroke-N2{stroke:#676C7E;} + .d2-2746824342 .stroke-N3{stroke:#9499AB;} + .d2-2746824342 .stroke-N4{stroke:#CFD2DD;} + .d2-2746824342 .stroke-N5{stroke:#DEE1EB;} + .d2-2746824342 .stroke-N6{stroke:#EEF1F8;} + .d2-2746824342 .stroke-N7{stroke:#FFFFFF;} + .d2-2746824342 .stroke-B1{stroke:#0D32B2;} + .d2-2746824342 .stroke-B2{stroke:#0D32B2;} + .d2-2746824342 .stroke-B3{stroke:#E3E9FD;} + .d2-2746824342 .stroke-B4{stroke:#E3E9FD;} + .d2-2746824342 .stroke-B5{stroke:#EDF0FD;} + .d2-2746824342 .stroke-B6{stroke:#F7F8FE;} + .d2-2746824342 .stroke-AA2{stroke:#4A6FF3;} + .d2-2746824342 .stroke-AA4{stroke:#EDF0FD;} + .d2-2746824342 .stroke-AA5{stroke:#F7F8FE;} + .d2-2746824342 .stroke-AB4{stroke:#EDF0FD;} + .d2-2746824342 .stroke-AB5{stroke:#F7F8FE;} + .d2-2746824342 .background-color-N1{background-color:#0A0F25;} + .d2-2746824342 .background-color-N2{background-color:#676C7E;} + .d2-2746824342 .background-color-N3{background-color:#9499AB;} + .d2-2746824342 .background-color-N4{background-color:#CFD2DD;} + .d2-2746824342 .background-color-N5{background-color:#DEE1EB;} + .d2-2746824342 .background-color-N6{background-color:#EEF1F8;} + .d2-2746824342 .background-color-N7{background-color:#FFFFFF;} + .d2-2746824342 .background-color-B1{background-color:#0D32B2;} + .d2-2746824342 .background-color-B2{background-color:#0D32B2;} + .d2-2746824342 .background-color-B3{background-color:#E3E9FD;} + .d2-2746824342 .background-color-B4{background-color:#E3E9FD;} + .d2-2746824342 .background-color-B5{background-color:#EDF0FD;} + .d2-2746824342 .background-color-B6{background-color:#F7F8FE;} + .d2-2746824342 .background-color-AA2{background-color:#4A6FF3;} + .d2-2746824342 .background-color-AA4{background-color:#EDF0FD;} + .d2-2746824342 .background-color-AA5{background-color:#F7F8FE;} + .d2-2746824342 .background-color-AB4{background-color:#EDF0FD;} + .d2-2746824342 .background-color-AB5{background-color:#F7F8FE;} + .d2-2746824342 .color-N1{color:#0A0F25;} + .d2-2746824342 .color-N2{color:#676C7E;} + .d2-2746824342 .color-N3{color:#9499AB;} + .d2-2746824342 .color-N4{color:#CFD2DD;} + .d2-2746824342 .color-N5{color:#DEE1EB;} + .d2-2746824342 .color-N6{color:#EEF1F8;} + .d2-2746824342 .color-N7{color:#FFFFFF;} + .d2-2746824342 .color-B1{color:#0D32B2;} + .d2-2746824342 .color-B2{color:#0D32B2;} + .d2-2746824342 .color-B3{color:#E3E9FD;} + .d2-2746824342 .color-B4{color:#E3E9FD;} + .d2-2746824342 .color-B5{color:#EDF0FD;} + .d2-2746824342 .color-B6{color:#F7F8FE;} + .d2-2746824342 .color-AA2{color:#4A6FF3;} + .d2-2746824342 .color-AA4{color:#EDF0FD;} + .d2-2746824342 .color-AA5{color:#F7F8FE;} + .d2-2746824342 .color-AB4{color:#EDF0FD;} + .d2-2746824342 .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}]]>ninety ninesixty fourthirty twosixteeneight 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 b43037042..b6df3f7e3 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -1,34 +1,34 @@ -

    Markdown: Syntax

    @@ -1107,7 +1107,7 @@ title for the link, surrounded in quotes. For example:

    Code

    Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example:

    -
    ab +ab diff --git a/e2etests/testdata/stable/giant_markdown_test/elk/sketch.exp.svg b/e2etests/testdata/stable/giant_markdown_test/elk/sketch.exp.svg index 4a6a0a478..b5c359b5d 100644 --- a/e2etests/testdata/stable/giant_markdown_test/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -

    Markdown: Syntax

    @@ -1107,7 +1107,7 @@ title for the link, surrounded in quotes. For example:

    Code

    Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example:

    -
    ab +ab diff --git a/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg index 9e10eb592..5e521cab2 100644 --- a/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ rows 2 columns 3 (<cap)a +}]]>rows 2 columns 3 (<cap)a -rows 2 columns 3 (<cap)ab +rows 2 columns 3 (<cap)ab -rows 2 columns 3 (<cap)abc +rows 2 columns 3 (<cap)abc -rows 2 columns 3 (<cap)abcd +rows 2 columns 3 (<cap)abcd -rows 2 columns 3 (<cap)abcde +rows 2 columns 3 (<cap)abcde @@ -273,7 +273,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -282,7 +282,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -291,7 +291,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -300,7 +300,7 @@ -rows 2 columns 3 (>cap)abcdefg +rows 2 columns 3 (>cap)abcdefg @@ -310,7 +310,7 @@ -rows 2 columns 3 (>cap)abcdefgh +rows 2 columns 3 (>cap)abcdefgh @@ -321,7 +321,7 @@ -rows 2 columns 3 (>cap)abcdefghi +rows 2 columns 3 (>cap)abcdefghi @@ -333,7 +333,7 @@ -rows 2 columns 3 (>cap)abcdefghij +rows 2 columns 3 (>cap)abcdefghij @@ -346,7 +346,7 @@ -rows 2 columns 3 (>cap)abcdefghijk +rows 2 columns 3 (>cap)abcdefghijk @@ -360,7 +360,7 @@ -rows 2 columns 3 (>cap)abcdefghijkl +rows 2 columns 3 (>cap)abcdefghijkl @@ -375,7 +375,7 @@ -rows 2 columns 3 (>cap)abcdefghijkl +rows 2 columns 3 (>cap)abcdefghijkl diff --git a/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg index dcda6edf0..b65ded4ec 100644 --- a/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg @@ -1,16 +1,16 @@ rows 2 columns 3 (<cap)a +}]]>rows 2 columns 3 (<cap)a -rows 2 columns 3 (<cap)ab +rows 2 columns 3 (<cap)ab -rows 2 columns 3 (<cap)abc +rows 2 columns 3 (<cap)abc -rows 2 columns 3 (<cap)abcd +rows 2 columns 3 (<cap)abcd -rows 2 columns 3 (<cap)abcde +rows 2 columns 3 (<cap)abcde @@ -273,7 +273,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -282,7 +282,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -291,7 +291,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -300,7 +300,7 @@ -rows 2 columns 3 (>cap)abcdefg +rows 2 columns 3 (>cap)abcdefg @@ -310,7 +310,7 @@ -rows 2 columns 3 (>cap)abcdefgh +rows 2 columns 3 (>cap)abcdefgh @@ -321,7 +321,7 @@ -rows 2 columns 3 (>cap)abcdefghi +rows 2 columns 3 (>cap)abcdefghi @@ -333,7 +333,7 @@ -rows 2 columns 3 (>cap)abcdefghij +rows 2 columns 3 (>cap)abcdefghij @@ -346,7 +346,7 @@ -rows 2 columns 3 (>cap)abcdefghijk +rows 2 columns 3 (>cap)abcdefghijk @@ -360,7 +360,7 @@ -rows 2 columns 3 (>cap)abcdefghijkl +rows 2 columns 3 (>cap)abcdefghijkl @@ -375,7 +375,7 @@ -rows 2 columns 3 (>cap)abcdefghijkl +rows 2 columns 3 (>cap)abcdefghijkl diff --git a/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg index b9f3a39ed..31ad993c0 100644 --- a/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde + .d2-524743089 .fill-N1{fill:#0A0F25;} + .d2-524743089 .fill-N2{fill:#676C7E;} + .d2-524743089 .fill-N3{fill:#9499AB;} + .d2-524743089 .fill-N4{fill:#CFD2DD;} + .d2-524743089 .fill-N5{fill:#DEE1EB;} + .d2-524743089 .fill-N6{fill:#EEF1F8;} + .d2-524743089 .fill-N7{fill:#FFFFFF;} + .d2-524743089 .fill-B1{fill:#0D32B2;} + .d2-524743089 .fill-B2{fill:#0D32B2;} + .d2-524743089 .fill-B3{fill:#E3E9FD;} + .d2-524743089 .fill-B4{fill:#E3E9FD;} + .d2-524743089 .fill-B5{fill:#EDF0FD;} + .d2-524743089 .fill-B6{fill:#F7F8FE;} + .d2-524743089 .fill-AA2{fill:#4A6FF3;} + .d2-524743089 .fill-AA4{fill:#EDF0FD;} + .d2-524743089 .fill-AA5{fill:#F7F8FE;} + .d2-524743089 .fill-AB4{fill:#EDF0FD;} + .d2-524743089 .fill-AB5{fill:#F7F8FE;} + .d2-524743089 .stroke-N1{stroke:#0A0F25;} + .d2-524743089 .stroke-N2{stroke:#676C7E;} + .d2-524743089 .stroke-N3{stroke:#9499AB;} + .d2-524743089 .stroke-N4{stroke:#CFD2DD;} + .d2-524743089 .stroke-N5{stroke:#DEE1EB;} + .d2-524743089 .stroke-N6{stroke:#EEF1F8;} + .d2-524743089 .stroke-N7{stroke:#FFFFFF;} + .d2-524743089 .stroke-B1{stroke:#0D32B2;} + .d2-524743089 .stroke-B2{stroke:#0D32B2;} + .d2-524743089 .stroke-B3{stroke:#E3E9FD;} + .d2-524743089 .stroke-B4{stroke:#E3E9FD;} + .d2-524743089 .stroke-B5{stroke:#EDF0FD;} + .d2-524743089 .stroke-B6{stroke:#F7F8FE;} + .d2-524743089 .stroke-AA2{stroke:#4A6FF3;} + .d2-524743089 .stroke-AA4{stroke:#EDF0FD;} + .d2-524743089 .stroke-AA5{stroke:#F7F8FE;} + .d2-524743089 .stroke-AB4{stroke:#EDF0FD;} + .d2-524743089 .stroke-AB5{stroke:#F7F8FE;} + .d2-524743089 .background-color-N1{background-color:#0A0F25;} + .d2-524743089 .background-color-N2{background-color:#676C7E;} + .d2-524743089 .background-color-N3{background-color:#9499AB;} + .d2-524743089 .background-color-N4{background-color:#CFD2DD;} + .d2-524743089 .background-color-N5{background-color:#DEE1EB;} + .d2-524743089 .background-color-N6{background-color:#EEF1F8;} + .d2-524743089 .background-color-N7{background-color:#FFFFFF;} + .d2-524743089 .background-color-B1{background-color:#0D32B2;} + .d2-524743089 .background-color-B2{background-color:#0D32B2;} + .d2-524743089 .background-color-B3{background-color:#E3E9FD;} + .d2-524743089 .background-color-B4{background-color:#E3E9FD;} + .d2-524743089 .background-color-B5{background-color:#EDF0FD;} + .d2-524743089 .background-color-B6{background-color:#F7F8FE;} + .d2-524743089 .background-color-AA2{background-color:#4A6FF3;} + .d2-524743089 .background-color-AA4{background-color:#EDF0FD;} + .d2-524743089 .background-color-AA5{background-color:#F7F8FE;} + .d2-524743089 .background-color-AB4{background-color:#EDF0FD;} + .d2-524743089 .background-color-AB5{background-color:#F7F8FE;} + .d2-524743089 .color-N1{color:#0A0F25;} + .d2-524743089 .color-N2{color:#676C7E;} + .d2-524743089 .color-N3{color:#9499AB;} + .d2-524743089 .color-N4{color:#CFD2DD;} + .d2-524743089 .color-N5{color:#DEE1EB;} + .d2-524743089 .color-N6{color:#EEF1F8;} + .d2-524743089 .color-N7{color:#FFFFFF;} + .d2-524743089 .color-B1{color:#0D32B2;} + .d2-524743089 .color-B2{color:#0D32B2;} + .d2-524743089 .color-B3{color:#E3E9FD;} + .d2-524743089 .color-B4{color:#E3E9FD;} + .d2-524743089 .color-B5{color:#EDF0FD;} + .d2-524743089 .color-B6{color:#F7F8FE;} + .d2-524743089 .color-AA2{color:#4A6FF3;} + .d2-524743089 .color-AA4{color:#EDF0FD;} + .d2-524743089 .color-AA5{color:#F7F8FE;} + .d2-524743089 .color-AB4{color:#EDF0FD;} + .d2-524743089 .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}]]>row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde diff --git a/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg index 29c784406..2b03a9935 100644 --- a/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde + .d2-3169795098 .fill-N1{fill:#0A0F25;} + .d2-3169795098 .fill-N2{fill:#676C7E;} + .d2-3169795098 .fill-N3{fill:#9499AB;} + .d2-3169795098 .fill-N4{fill:#CFD2DD;} + .d2-3169795098 .fill-N5{fill:#DEE1EB;} + .d2-3169795098 .fill-N6{fill:#EEF1F8;} + .d2-3169795098 .fill-N7{fill:#FFFFFF;} + .d2-3169795098 .fill-B1{fill:#0D32B2;} + .d2-3169795098 .fill-B2{fill:#0D32B2;} + .d2-3169795098 .fill-B3{fill:#E3E9FD;} + .d2-3169795098 .fill-B4{fill:#E3E9FD;} + .d2-3169795098 .fill-B5{fill:#EDF0FD;} + .d2-3169795098 .fill-B6{fill:#F7F8FE;} + .d2-3169795098 .fill-AA2{fill:#4A6FF3;} + .d2-3169795098 .fill-AA4{fill:#EDF0FD;} + .d2-3169795098 .fill-AA5{fill:#F7F8FE;} + .d2-3169795098 .fill-AB4{fill:#EDF0FD;} + .d2-3169795098 .fill-AB5{fill:#F7F8FE;} + .d2-3169795098 .stroke-N1{stroke:#0A0F25;} + .d2-3169795098 .stroke-N2{stroke:#676C7E;} + .d2-3169795098 .stroke-N3{stroke:#9499AB;} + .d2-3169795098 .stroke-N4{stroke:#CFD2DD;} + .d2-3169795098 .stroke-N5{stroke:#DEE1EB;} + .d2-3169795098 .stroke-N6{stroke:#EEF1F8;} + .d2-3169795098 .stroke-N7{stroke:#FFFFFF;} + .d2-3169795098 .stroke-B1{stroke:#0D32B2;} + .d2-3169795098 .stroke-B2{stroke:#0D32B2;} + .d2-3169795098 .stroke-B3{stroke:#E3E9FD;} + .d2-3169795098 .stroke-B4{stroke:#E3E9FD;} + .d2-3169795098 .stroke-B5{stroke:#EDF0FD;} + .d2-3169795098 .stroke-B6{stroke:#F7F8FE;} + .d2-3169795098 .stroke-AA2{stroke:#4A6FF3;} + .d2-3169795098 .stroke-AA4{stroke:#EDF0FD;} + .d2-3169795098 .stroke-AA5{stroke:#F7F8FE;} + .d2-3169795098 .stroke-AB4{stroke:#EDF0FD;} + .d2-3169795098 .stroke-AB5{stroke:#F7F8FE;} + .d2-3169795098 .background-color-N1{background-color:#0A0F25;} + .d2-3169795098 .background-color-N2{background-color:#676C7E;} + .d2-3169795098 .background-color-N3{background-color:#9499AB;} + .d2-3169795098 .background-color-N4{background-color:#CFD2DD;} + .d2-3169795098 .background-color-N5{background-color:#DEE1EB;} + .d2-3169795098 .background-color-N6{background-color:#EEF1F8;} + .d2-3169795098 .background-color-N7{background-color:#FFFFFF;} + .d2-3169795098 .background-color-B1{background-color:#0D32B2;} + .d2-3169795098 .background-color-B2{background-color:#0D32B2;} + .d2-3169795098 .background-color-B3{background-color:#E3E9FD;} + .d2-3169795098 .background-color-B4{background-color:#E3E9FD;} + .d2-3169795098 .background-color-B5{background-color:#EDF0FD;} + .d2-3169795098 .background-color-B6{background-color:#F7F8FE;} + .d2-3169795098 .background-color-AA2{background-color:#4A6FF3;} + .d2-3169795098 .background-color-AA4{background-color:#EDF0FD;} + .d2-3169795098 .background-color-AA5{background-color:#F7F8FE;} + .d2-3169795098 .background-color-AB4{background-color:#EDF0FD;} + .d2-3169795098 .background-color-AB5{background-color:#F7F8FE;} + .d2-3169795098 .color-N1{color:#0A0F25;} + .d2-3169795098 .color-N2{color:#676C7E;} + .d2-3169795098 .color-N3{color:#9499AB;} + .d2-3169795098 .color-N4{color:#CFD2DD;} + .d2-3169795098 .color-N5{color:#DEE1EB;} + .d2-3169795098 .color-N6{color:#EEF1F8;} + .d2-3169795098 .color-N7{color:#FFFFFF;} + .d2-3169795098 .color-B1{color:#0D32B2;} + .d2-3169795098 .color-B2{color:#0D32B2;} + .d2-3169795098 .color-B3{color:#E3E9FD;} + .d2-3169795098 .color-B4{color:#E3E9FD;} + .d2-3169795098 .color-B5{color:#EDF0FD;} + .d2-3169795098 .color-B6{color:#F7F8FE;} + .d2-3169795098 .color-AA2{color:#4A6FF3;} + .d2-3169795098 .color-AA4{color:#EDF0FD;} + .d2-3169795098 .color-AA5{color:#F7F8FE;} + .d2-3169795098 .color-AB4{color:#EDF0FD;} + .d2-3169795098 .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}]]>row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde diff --git a/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg index c34779976..56bf7cf05 100644 --- a/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi + .d2-1904877933 .fill-N1{fill:#0A0F25;} + .d2-1904877933 .fill-N2{fill:#676C7E;} + .d2-1904877933 .fill-N3{fill:#9499AB;} + .d2-1904877933 .fill-N4{fill:#CFD2DD;} + .d2-1904877933 .fill-N5{fill:#DEE1EB;} + .d2-1904877933 .fill-N6{fill:#EEF1F8;} + .d2-1904877933 .fill-N7{fill:#FFFFFF;} + .d2-1904877933 .fill-B1{fill:#0D32B2;} + .d2-1904877933 .fill-B2{fill:#0D32B2;} + .d2-1904877933 .fill-B3{fill:#E3E9FD;} + .d2-1904877933 .fill-B4{fill:#E3E9FD;} + .d2-1904877933 .fill-B5{fill:#EDF0FD;} + .d2-1904877933 .fill-B6{fill:#F7F8FE;} + .d2-1904877933 .fill-AA2{fill:#4A6FF3;} + .d2-1904877933 .fill-AA4{fill:#EDF0FD;} + .d2-1904877933 .fill-AA5{fill:#F7F8FE;} + .d2-1904877933 .fill-AB4{fill:#EDF0FD;} + .d2-1904877933 .fill-AB5{fill:#F7F8FE;} + .d2-1904877933 .stroke-N1{stroke:#0A0F25;} + .d2-1904877933 .stroke-N2{stroke:#676C7E;} + .d2-1904877933 .stroke-N3{stroke:#9499AB;} + .d2-1904877933 .stroke-N4{stroke:#CFD2DD;} + .d2-1904877933 .stroke-N5{stroke:#DEE1EB;} + .d2-1904877933 .stroke-N6{stroke:#EEF1F8;} + .d2-1904877933 .stroke-N7{stroke:#FFFFFF;} + .d2-1904877933 .stroke-B1{stroke:#0D32B2;} + .d2-1904877933 .stroke-B2{stroke:#0D32B2;} + .d2-1904877933 .stroke-B3{stroke:#E3E9FD;} + .d2-1904877933 .stroke-B4{stroke:#E3E9FD;} + .d2-1904877933 .stroke-B5{stroke:#EDF0FD;} + .d2-1904877933 .stroke-B6{stroke:#F7F8FE;} + .d2-1904877933 .stroke-AA2{stroke:#4A6FF3;} + .d2-1904877933 .stroke-AA4{stroke:#EDF0FD;} + .d2-1904877933 .stroke-AA5{stroke:#F7F8FE;} + .d2-1904877933 .stroke-AB4{stroke:#EDF0FD;} + .d2-1904877933 .stroke-AB5{stroke:#F7F8FE;} + .d2-1904877933 .background-color-N1{background-color:#0A0F25;} + .d2-1904877933 .background-color-N2{background-color:#676C7E;} + .d2-1904877933 .background-color-N3{background-color:#9499AB;} + .d2-1904877933 .background-color-N4{background-color:#CFD2DD;} + .d2-1904877933 .background-color-N5{background-color:#DEE1EB;} + .d2-1904877933 .background-color-N6{background-color:#EEF1F8;} + .d2-1904877933 .background-color-N7{background-color:#FFFFFF;} + .d2-1904877933 .background-color-B1{background-color:#0D32B2;} + .d2-1904877933 .background-color-B2{background-color:#0D32B2;} + .d2-1904877933 .background-color-B3{background-color:#E3E9FD;} + .d2-1904877933 .background-color-B4{background-color:#E3E9FD;} + .d2-1904877933 .background-color-B5{background-color:#EDF0FD;} + .d2-1904877933 .background-color-B6{background-color:#F7F8FE;} + .d2-1904877933 .background-color-AA2{background-color:#4A6FF3;} + .d2-1904877933 .background-color-AA4{background-color:#EDF0FD;} + .d2-1904877933 .background-color-AA5{background-color:#F7F8FE;} + .d2-1904877933 .background-color-AB4{background-color:#EDF0FD;} + .d2-1904877933 .background-color-AB5{background-color:#F7F8FE;} + .d2-1904877933 .color-N1{color:#0A0F25;} + .d2-1904877933 .color-N2{color:#676C7E;} + .d2-1904877933 .color-N3{color:#9499AB;} + .d2-1904877933 .color-N4{color:#CFD2DD;} + .d2-1904877933 .color-N5{color:#DEE1EB;} + .d2-1904877933 .color-N6{color:#EEF1F8;} + .d2-1904877933 .color-N7{color:#FFFFFF;} + .d2-1904877933 .color-B1{color:#0D32B2;} + .d2-1904877933 .color-B2{color:#0D32B2;} + .d2-1904877933 .color-B3{color:#E3E9FD;} + .d2-1904877933 .color-B4{color:#E3E9FD;} + .d2-1904877933 .color-B5{color:#EDF0FD;} + .d2-1904877933 .color-B6{color:#F7F8FE;} + .d2-1904877933 .color-AA2{color:#4A6FF3;} + .d2-1904877933 .color-AA4{color:#EDF0FD;} + .d2-1904877933 .color-AA5{color:#F7F8FE;} + .d2-1904877933 .color-AB4{color:#EDF0FD;} + .d2-1904877933 .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}]]>vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi diff --git a/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg index 965d6866c..eff675c8a 100644 --- a/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi + .d2-3477418149 .fill-N1{fill:#0A0F25;} + .d2-3477418149 .fill-N2{fill:#676C7E;} + .d2-3477418149 .fill-N3{fill:#9499AB;} + .d2-3477418149 .fill-N4{fill:#CFD2DD;} + .d2-3477418149 .fill-N5{fill:#DEE1EB;} + .d2-3477418149 .fill-N6{fill:#EEF1F8;} + .d2-3477418149 .fill-N7{fill:#FFFFFF;} + .d2-3477418149 .fill-B1{fill:#0D32B2;} + .d2-3477418149 .fill-B2{fill:#0D32B2;} + .d2-3477418149 .fill-B3{fill:#E3E9FD;} + .d2-3477418149 .fill-B4{fill:#E3E9FD;} + .d2-3477418149 .fill-B5{fill:#EDF0FD;} + .d2-3477418149 .fill-B6{fill:#F7F8FE;} + .d2-3477418149 .fill-AA2{fill:#4A6FF3;} + .d2-3477418149 .fill-AA4{fill:#EDF0FD;} + .d2-3477418149 .fill-AA5{fill:#F7F8FE;} + .d2-3477418149 .fill-AB4{fill:#EDF0FD;} + .d2-3477418149 .fill-AB5{fill:#F7F8FE;} + .d2-3477418149 .stroke-N1{stroke:#0A0F25;} + .d2-3477418149 .stroke-N2{stroke:#676C7E;} + .d2-3477418149 .stroke-N3{stroke:#9499AB;} + .d2-3477418149 .stroke-N4{stroke:#CFD2DD;} + .d2-3477418149 .stroke-N5{stroke:#DEE1EB;} + .d2-3477418149 .stroke-N6{stroke:#EEF1F8;} + .d2-3477418149 .stroke-N7{stroke:#FFFFFF;} + .d2-3477418149 .stroke-B1{stroke:#0D32B2;} + .d2-3477418149 .stroke-B2{stroke:#0D32B2;} + .d2-3477418149 .stroke-B3{stroke:#E3E9FD;} + .d2-3477418149 .stroke-B4{stroke:#E3E9FD;} + .d2-3477418149 .stroke-B5{stroke:#EDF0FD;} + .d2-3477418149 .stroke-B6{stroke:#F7F8FE;} + .d2-3477418149 .stroke-AA2{stroke:#4A6FF3;} + .d2-3477418149 .stroke-AA4{stroke:#EDF0FD;} + .d2-3477418149 .stroke-AA5{stroke:#F7F8FE;} + .d2-3477418149 .stroke-AB4{stroke:#EDF0FD;} + .d2-3477418149 .stroke-AB5{stroke:#F7F8FE;} + .d2-3477418149 .background-color-N1{background-color:#0A0F25;} + .d2-3477418149 .background-color-N2{background-color:#676C7E;} + .d2-3477418149 .background-color-N3{background-color:#9499AB;} + .d2-3477418149 .background-color-N4{background-color:#CFD2DD;} + .d2-3477418149 .background-color-N5{background-color:#DEE1EB;} + .d2-3477418149 .background-color-N6{background-color:#EEF1F8;} + .d2-3477418149 .background-color-N7{background-color:#FFFFFF;} + .d2-3477418149 .background-color-B1{background-color:#0D32B2;} + .d2-3477418149 .background-color-B2{background-color:#0D32B2;} + .d2-3477418149 .background-color-B3{background-color:#E3E9FD;} + .d2-3477418149 .background-color-B4{background-color:#E3E9FD;} + .d2-3477418149 .background-color-B5{background-color:#EDF0FD;} + .d2-3477418149 .background-color-B6{background-color:#F7F8FE;} + .d2-3477418149 .background-color-AA2{background-color:#4A6FF3;} + .d2-3477418149 .background-color-AA4{background-color:#EDF0FD;} + .d2-3477418149 .background-color-AA5{background-color:#F7F8FE;} + .d2-3477418149 .background-color-AB4{background-color:#EDF0FD;} + .d2-3477418149 .background-color-AB5{background-color:#F7F8FE;} + .d2-3477418149 .color-N1{color:#0A0F25;} + .d2-3477418149 .color-N2{color:#676C7E;} + .d2-3477418149 .color-N3{color:#9499AB;} + .d2-3477418149 .color-N4{color:#CFD2DD;} + .d2-3477418149 .color-N5{color:#DEE1EB;} + .d2-3477418149 .color-N6{color:#EEF1F8;} + .d2-3477418149 .color-N7{color:#FFFFFF;} + .d2-3477418149 .color-B1{color:#0D32B2;} + .d2-3477418149 .color-B2{color:#0D32B2;} + .d2-3477418149 .color-B3{color:#E3E9FD;} + .d2-3477418149 .color-B4{color:#E3E9FD;} + .d2-3477418149 .color-B5{color:#EDF0FD;} + .d2-3477418149 .color-B6{color:#F7F8FE;} + .d2-3477418149 .color-AA2{color:#4A6FF3;} + .d2-3477418149 .color-AA4{color:#EDF0FD;} + .d2-3477418149 .color-AA5{color:#F7F8FE;} + .d2-3477418149 .color-AB4{color:#EDF0FD;} + .d2-3477418149 .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}]]>vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi diff --git a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg index d6ba08bc0..19613f529 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + .d2-447179389 .fill-N1{fill:#0A0F25;} + .d2-447179389 .fill-N2{fill:#676C7E;} + .d2-447179389 .fill-N3{fill:#9499AB;} + .d2-447179389 .fill-N4{fill:#CFD2DD;} + .d2-447179389 .fill-N5{fill:#DEE1EB;} + .d2-447179389 .fill-N6{fill:#EEF1F8;} + .d2-447179389 .fill-N7{fill:#FFFFFF;} + .d2-447179389 .fill-B1{fill:#0D32B2;} + .d2-447179389 .fill-B2{fill:#0D32B2;} + .d2-447179389 .fill-B3{fill:#E3E9FD;} + .d2-447179389 .fill-B4{fill:#E3E9FD;} + .d2-447179389 .fill-B5{fill:#EDF0FD;} + .d2-447179389 .fill-B6{fill:#F7F8FE;} + .d2-447179389 .fill-AA2{fill:#4A6FF3;} + .d2-447179389 .fill-AA4{fill:#EDF0FD;} + .d2-447179389 .fill-AA5{fill:#F7F8FE;} + .d2-447179389 .fill-AB4{fill:#EDF0FD;} + .d2-447179389 .fill-AB5{fill:#F7F8FE;} + .d2-447179389 .stroke-N1{stroke:#0A0F25;} + .d2-447179389 .stroke-N2{stroke:#676C7E;} + .d2-447179389 .stroke-N3{stroke:#9499AB;} + .d2-447179389 .stroke-N4{stroke:#CFD2DD;} + .d2-447179389 .stroke-N5{stroke:#DEE1EB;} + .d2-447179389 .stroke-N6{stroke:#EEF1F8;} + .d2-447179389 .stroke-N7{stroke:#FFFFFF;} + .d2-447179389 .stroke-B1{stroke:#0D32B2;} + .d2-447179389 .stroke-B2{stroke:#0D32B2;} + .d2-447179389 .stroke-B3{stroke:#E3E9FD;} + .d2-447179389 .stroke-B4{stroke:#E3E9FD;} + .d2-447179389 .stroke-B5{stroke:#EDF0FD;} + .d2-447179389 .stroke-B6{stroke:#F7F8FE;} + .d2-447179389 .stroke-AA2{stroke:#4A6FF3;} + .d2-447179389 .stroke-AA4{stroke:#EDF0FD;} + .d2-447179389 .stroke-AA5{stroke:#F7F8FE;} + .d2-447179389 .stroke-AB4{stroke:#EDF0FD;} + .d2-447179389 .stroke-AB5{stroke:#F7F8FE;} + .d2-447179389 .background-color-N1{background-color:#0A0F25;} + .d2-447179389 .background-color-N2{background-color:#676C7E;} + .d2-447179389 .background-color-N3{background-color:#9499AB;} + .d2-447179389 .background-color-N4{background-color:#CFD2DD;} + .d2-447179389 .background-color-N5{background-color:#DEE1EB;} + .d2-447179389 .background-color-N6{background-color:#EEF1F8;} + .d2-447179389 .background-color-N7{background-color:#FFFFFF;} + .d2-447179389 .background-color-B1{background-color:#0D32B2;} + .d2-447179389 .background-color-B2{background-color:#0D32B2;} + .d2-447179389 .background-color-B3{background-color:#E3E9FD;} + .d2-447179389 .background-color-B4{background-color:#E3E9FD;} + .d2-447179389 .background-color-B5{background-color:#EDF0FD;} + .d2-447179389 .background-color-B6{background-color:#F7F8FE;} + .d2-447179389 .background-color-AA2{background-color:#4A6FF3;} + .d2-447179389 .background-color-AA4{background-color:#EDF0FD;} + .d2-447179389 .background-color-AA5{background-color:#F7F8FE;} + .d2-447179389 .background-color-AB4{background-color:#EDF0FD;} + .d2-447179389 .background-color-AB5{background-color:#F7F8FE;} + .d2-447179389 .color-N1{color:#0A0F25;} + .d2-447179389 .color-N2{color:#676C7E;} + .d2-447179389 .color-N3{color:#9499AB;} + .d2-447179389 .color-N4{color:#CFD2DD;} + .d2-447179389 .color-N5{color:#DEE1EB;} + .d2-447179389 .color-N6{color:#EEF1F8;} + .d2-447179389 .color-N7{color:#FFFFFF;} + .d2-447179389 .color-B1{color:#0D32B2;} + .d2-447179389 .color-B2{color:#0D32B2;} + .d2-447179389 .color-B3{color:#E3E9FD;} + .d2-447179389 .color-B4{color:#E3E9FD;} + .d2-447179389 .color-B5{color:#EDF0FD;} + .d2-447179389 .color-B6{color:#F7F8FE;} + .d2-447179389 .color-AA2{color:#4A6FF3;} + .d2-447179389 .color-AA4{color:#EDF0FD;} + .d2-447179389 .color-AA5{color:#F7F8FE;} + .d2-447179389 .color-AB4{color:#EDF0FD;} + .d2-447179389 .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/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child diff --git a/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg index 9b80cd69c..077aa4dab 100644 --- a/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + .d2-941628131 .fill-N1{fill:#0A0F25;} + .d2-941628131 .fill-N2{fill:#676C7E;} + .d2-941628131 .fill-N3{fill:#9499AB;} + .d2-941628131 .fill-N4{fill:#CFD2DD;} + .d2-941628131 .fill-N5{fill:#DEE1EB;} + .d2-941628131 .fill-N6{fill:#EEF1F8;} + .d2-941628131 .fill-N7{fill:#FFFFFF;} + .d2-941628131 .fill-B1{fill:#0D32B2;} + .d2-941628131 .fill-B2{fill:#0D32B2;} + .d2-941628131 .fill-B3{fill:#E3E9FD;} + .d2-941628131 .fill-B4{fill:#E3E9FD;} + .d2-941628131 .fill-B5{fill:#EDF0FD;} + .d2-941628131 .fill-B6{fill:#F7F8FE;} + .d2-941628131 .fill-AA2{fill:#4A6FF3;} + .d2-941628131 .fill-AA4{fill:#EDF0FD;} + .d2-941628131 .fill-AA5{fill:#F7F8FE;} + .d2-941628131 .fill-AB4{fill:#EDF0FD;} + .d2-941628131 .fill-AB5{fill:#F7F8FE;} + .d2-941628131 .stroke-N1{stroke:#0A0F25;} + .d2-941628131 .stroke-N2{stroke:#676C7E;} + .d2-941628131 .stroke-N3{stroke:#9499AB;} + .d2-941628131 .stroke-N4{stroke:#CFD2DD;} + .d2-941628131 .stroke-N5{stroke:#DEE1EB;} + .d2-941628131 .stroke-N6{stroke:#EEF1F8;} + .d2-941628131 .stroke-N7{stroke:#FFFFFF;} + .d2-941628131 .stroke-B1{stroke:#0D32B2;} + .d2-941628131 .stroke-B2{stroke:#0D32B2;} + .d2-941628131 .stroke-B3{stroke:#E3E9FD;} + .d2-941628131 .stroke-B4{stroke:#E3E9FD;} + .d2-941628131 .stroke-B5{stroke:#EDF0FD;} + .d2-941628131 .stroke-B6{stroke:#F7F8FE;} + .d2-941628131 .stroke-AA2{stroke:#4A6FF3;} + .d2-941628131 .stroke-AA4{stroke:#EDF0FD;} + .d2-941628131 .stroke-AA5{stroke:#F7F8FE;} + .d2-941628131 .stroke-AB4{stroke:#EDF0FD;} + .d2-941628131 .stroke-AB5{stroke:#F7F8FE;} + .d2-941628131 .background-color-N1{background-color:#0A0F25;} + .d2-941628131 .background-color-N2{background-color:#676C7E;} + .d2-941628131 .background-color-N3{background-color:#9499AB;} + .d2-941628131 .background-color-N4{background-color:#CFD2DD;} + .d2-941628131 .background-color-N5{background-color:#DEE1EB;} + .d2-941628131 .background-color-N6{background-color:#EEF1F8;} + .d2-941628131 .background-color-N7{background-color:#FFFFFF;} + .d2-941628131 .background-color-B1{background-color:#0D32B2;} + .d2-941628131 .background-color-B2{background-color:#0D32B2;} + .d2-941628131 .background-color-B3{background-color:#E3E9FD;} + .d2-941628131 .background-color-B4{background-color:#E3E9FD;} + .d2-941628131 .background-color-B5{background-color:#EDF0FD;} + .d2-941628131 .background-color-B6{background-color:#F7F8FE;} + .d2-941628131 .background-color-AA2{background-color:#4A6FF3;} + .d2-941628131 .background-color-AA4{background-color:#EDF0FD;} + .d2-941628131 .background-color-AA5{background-color:#F7F8FE;} + .d2-941628131 .background-color-AB4{background-color:#EDF0FD;} + .d2-941628131 .background-color-AB5{background-color:#F7F8FE;} + .d2-941628131 .color-N1{color:#0A0F25;} + .d2-941628131 .color-N2{color:#676C7E;} + .d2-941628131 .color-N3{color:#9499AB;} + .d2-941628131 .color-N4{color:#CFD2DD;} + .d2-941628131 .color-N5{color:#DEE1EB;} + .d2-941628131 .color-N6{color:#EEF1F8;} + .d2-941628131 .color-N7{color:#FFFFFF;} + .d2-941628131 .color-B1{color:#0D32B2;} + .d2-941628131 .color-B2{color:#0D32B2;} + .d2-941628131 .color-B3{color:#E3E9FD;} + .d2-941628131 .color-B4{color:#E3E9FD;} + .d2-941628131 .color-B5{color:#EDF0FD;} + .d2-941628131 .color-B6{color:#F7F8FE;} + .d2-941628131 .color-AA2{color:#4A6FF3;} + .d2-941628131 .color-AA4{color:#EDF0FD;} + .d2-941628131 .color-AA5{color:#F7F8FE;} + .d2-941628131 .color-AB4{color:#EDF0FD;} + .d2-941628131 .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/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child 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 9df25acf4..ecff25769 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 @@ - + .d2-1401287448 .fill-N1{fill:#0A0F25;} + .d2-1401287448 .fill-N2{fill:#676C7E;} + .d2-1401287448 .fill-N3{fill:#9499AB;} + .d2-1401287448 .fill-N4{fill:#CFD2DD;} + .d2-1401287448 .fill-N5{fill:#DEE1EB;} + .d2-1401287448 .fill-N6{fill:#EEF1F8;} + .d2-1401287448 .fill-N7{fill:#FFFFFF;} + .d2-1401287448 .fill-B1{fill:#0D32B2;} + .d2-1401287448 .fill-B2{fill:#0D32B2;} + .d2-1401287448 .fill-B3{fill:#E3E9FD;} + .d2-1401287448 .fill-B4{fill:#E3E9FD;} + .d2-1401287448 .fill-B5{fill:#EDF0FD;} + .d2-1401287448 .fill-B6{fill:#F7F8FE;} + .d2-1401287448 .fill-AA2{fill:#4A6FF3;} + .d2-1401287448 .fill-AA4{fill:#EDF0FD;} + .d2-1401287448 .fill-AA5{fill:#F7F8FE;} + .d2-1401287448 .fill-AB4{fill:#EDF0FD;} + .d2-1401287448 .fill-AB5{fill:#F7F8FE;} + .d2-1401287448 .stroke-N1{stroke:#0A0F25;} + .d2-1401287448 .stroke-N2{stroke:#676C7E;} + .d2-1401287448 .stroke-N3{stroke:#9499AB;} + .d2-1401287448 .stroke-N4{stroke:#CFD2DD;} + .d2-1401287448 .stroke-N5{stroke:#DEE1EB;} + .d2-1401287448 .stroke-N6{stroke:#EEF1F8;} + .d2-1401287448 .stroke-N7{stroke:#FFFFFF;} + .d2-1401287448 .stroke-B1{stroke:#0D32B2;} + .d2-1401287448 .stroke-B2{stroke:#0D32B2;} + .d2-1401287448 .stroke-B3{stroke:#E3E9FD;} + .d2-1401287448 .stroke-B4{stroke:#E3E9FD;} + .d2-1401287448 .stroke-B5{stroke:#EDF0FD;} + .d2-1401287448 .stroke-B6{stroke:#F7F8FE;} + .d2-1401287448 .stroke-AA2{stroke:#4A6FF3;} + .d2-1401287448 .stroke-AA4{stroke:#EDF0FD;} + .d2-1401287448 .stroke-AA5{stroke:#F7F8FE;} + .d2-1401287448 .stroke-AB4{stroke:#EDF0FD;} + .d2-1401287448 .stroke-AB5{stroke:#F7F8FE;} + .d2-1401287448 .background-color-N1{background-color:#0A0F25;} + .d2-1401287448 .background-color-N2{background-color:#676C7E;} + .d2-1401287448 .background-color-N3{background-color:#9499AB;} + .d2-1401287448 .background-color-N4{background-color:#CFD2DD;} + .d2-1401287448 .background-color-N5{background-color:#DEE1EB;} + .d2-1401287448 .background-color-N6{background-color:#EEF1F8;} + .d2-1401287448 .background-color-N7{background-color:#FFFFFF;} + .d2-1401287448 .background-color-B1{background-color:#0D32B2;} + .d2-1401287448 .background-color-B2{background-color:#0D32B2;} + .d2-1401287448 .background-color-B3{background-color:#E3E9FD;} + .d2-1401287448 .background-color-B4{background-color:#E3E9FD;} + .d2-1401287448 .background-color-B5{background-color:#EDF0FD;} + .d2-1401287448 .background-color-B6{background-color:#F7F8FE;} + .d2-1401287448 .background-color-AA2{background-color:#4A6FF3;} + .d2-1401287448 .background-color-AA4{background-color:#EDF0FD;} + .d2-1401287448 .background-color-AA5{background-color:#F7F8FE;} + .d2-1401287448 .background-color-AB4{background-color:#EDF0FD;} + .d2-1401287448 .background-color-AB5{background-color:#F7F8FE;} + .d2-1401287448 .color-N1{color:#0A0F25;} + .d2-1401287448 .color-N2{color:#676C7E;} + .d2-1401287448 .color-N3{color:#9499AB;} + .d2-1401287448 .color-N4{color:#CFD2DD;} + .d2-1401287448 .color-N5{color:#DEE1EB;} + .d2-1401287448 .color-N6{color:#EEF1F8;} + .d2-1401287448 .color-N7{color:#FFFFFF;} + .d2-1401287448 .color-B1{color:#0D32B2;} + .d2-1401287448 .color-B2{color:#0D32B2;} + .d2-1401287448 .color-B3{color:#E3E9FD;} + .d2-1401287448 .color-B4{color:#E3E9FD;} + .d2-1401287448 .color-B5{color:#EDF0FD;} + .d2-1401287448 .color-B6{color:#F7F8FE;} + .d2-1401287448 .color-AA2{color:#4A6FF3;} + .d2-1401287448 .color-AA4{color:#EDF0FD;} + .d2-1401287448 .color-AA5{color:#F7F8FE;} + .d2-1401287448 .color-AB4{color:#EDF0FD;} + .d2-1401287448 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_large_checkered/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_large_checkered/elk/sketch.exp.svg index 9df25acf4..ecff25769 100644 --- a/e2etests/testdata/stable/grid_large_checkered/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_large_checkered/elk/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-1401287448 .fill-N1{fill:#0A0F25;} + .d2-1401287448 .fill-N2{fill:#676C7E;} + .d2-1401287448 .fill-N3{fill:#9499AB;} + .d2-1401287448 .fill-N4{fill:#CFD2DD;} + .d2-1401287448 .fill-N5{fill:#DEE1EB;} + .d2-1401287448 .fill-N6{fill:#EEF1F8;} + .d2-1401287448 .fill-N7{fill:#FFFFFF;} + .d2-1401287448 .fill-B1{fill:#0D32B2;} + .d2-1401287448 .fill-B2{fill:#0D32B2;} + .d2-1401287448 .fill-B3{fill:#E3E9FD;} + .d2-1401287448 .fill-B4{fill:#E3E9FD;} + .d2-1401287448 .fill-B5{fill:#EDF0FD;} + .d2-1401287448 .fill-B6{fill:#F7F8FE;} + .d2-1401287448 .fill-AA2{fill:#4A6FF3;} + .d2-1401287448 .fill-AA4{fill:#EDF0FD;} + .d2-1401287448 .fill-AA5{fill:#F7F8FE;} + .d2-1401287448 .fill-AB4{fill:#EDF0FD;} + .d2-1401287448 .fill-AB5{fill:#F7F8FE;} + .d2-1401287448 .stroke-N1{stroke:#0A0F25;} + .d2-1401287448 .stroke-N2{stroke:#676C7E;} + .d2-1401287448 .stroke-N3{stroke:#9499AB;} + .d2-1401287448 .stroke-N4{stroke:#CFD2DD;} + .d2-1401287448 .stroke-N5{stroke:#DEE1EB;} + .d2-1401287448 .stroke-N6{stroke:#EEF1F8;} + .d2-1401287448 .stroke-N7{stroke:#FFFFFF;} + .d2-1401287448 .stroke-B1{stroke:#0D32B2;} + .d2-1401287448 .stroke-B2{stroke:#0D32B2;} + .d2-1401287448 .stroke-B3{stroke:#E3E9FD;} + .d2-1401287448 .stroke-B4{stroke:#E3E9FD;} + .d2-1401287448 .stroke-B5{stroke:#EDF0FD;} + .d2-1401287448 .stroke-B6{stroke:#F7F8FE;} + .d2-1401287448 .stroke-AA2{stroke:#4A6FF3;} + .d2-1401287448 .stroke-AA4{stroke:#EDF0FD;} + .d2-1401287448 .stroke-AA5{stroke:#F7F8FE;} + .d2-1401287448 .stroke-AB4{stroke:#EDF0FD;} + .d2-1401287448 .stroke-AB5{stroke:#F7F8FE;} + .d2-1401287448 .background-color-N1{background-color:#0A0F25;} + .d2-1401287448 .background-color-N2{background-color:#676C7E;} + .d2-1401287448 .background-color-N3{background-color:#9499AB;} + .d2-1401287448 .background-color-N4{background-color:#CFD2DD;} + .d2-1401287448 .background-color-N5{background-color:#DEE1EB;} + .d2-1401287448 .background-color-N6{background-color:#EEF1F8;} + .d2-1401287448 .background-color-N7{background-color:#FFFFFF;} + .d2-1401287448 .background-color-B1{background-color:#0D32B2;} + .d2-1401287448 .background-color-B2{background-color:#0D32B2;} + .d2-1401287448 .background-color-B3{background-color:#E3E9FD;} + .d2-1401287448 .background-color-B4{background-color:#E3E9FD;} + .d2-1401287448 .background-color-B5{background-color:#EDF0FD;} + .d2-1401287448 .background-color-B6{background-color:#F7F8FE;} + .d2-1401287448 .background-color-AA2{background-color:#4A6FF3;} + .d2-1401287448 .background-color-AA4{background-color:#EDF0FD;} + .d2-1401287448 .background-color-AA5{background-color:#F7F8FE;} + .d2-1401287448 .background-color-AB4{background-color:#EDF0FD;} + .d2-1401287448 .background-color-AB5{background-color:#F7F8FE;} + .d2-1401287448 .color-N1{color:#0A0F25;} + .d2-1401287448 .color-N2{color:#676C7E;} + .d2-1401287448 .color-N3{color:#9499AB;} + .d2-1401287448 .color-N4{color:#CFD2DD;} + .d2-1401287448 .color-N5{color:#DEE1EB;} + .d2-1401287448 .color-N6{color:#EEF1F8;} + .d2-1401287448 .color-N7{color:#FFFFFF;} + .d2-1401287448 .color-B1{color:#0D32B2;} + .d2-1401287448 .color-B2{color:#0D32B2;} + .d2-1401287448 .color-B3{color:#E3E9FD;} + .d2-1401287448 .color-B4{color:#E3E9FD;} + .d2-1401287448 .color-B5{color:#EDF0FD;} + .d2-1401287448 .color-B6{color:#F7F8FE;} + .d2-1401287448 .color-AA2{color:#4A6FF3;} + .d2-1401287448 .color-AA4{color:#EDF0FD;} + .d2-1401287448 .color-AA5{color:#F7F8FE;} + .d2-1401287448 .color-AB4{color:#EDF0FD;} + .d2-1401287448 .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}]]> \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg index 4aa08d600..71e4ece99 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + .d2-520906461 .fill-N1{fill:#0A0F25;} + .d2-520906461 .fill-N2{fill:#676C7E;} + .d2-520906461 .fill-N3{fill:#9499AB;} + .d2-520906461 .fill-N4{fill:#CFD2DD;} + .d2-520906461 .fill-N5{fill:#DEE1EB;} + .d2-520906461 .fill-N6{fill:#EEF1F8;} + .d2-520906461 .fill-N7{fill:#FFFFFF;} + .d2-520906461 .fill-B1{fill:#0D32B2;} + .d2-520906461 .fill-B2{fill:#0D32B2;} + .d2-520906461 .fill-B3{fill:#E3E9FD;} + .d2-520906461 .fill-B4{fill:#E3E9FD;} + .d2-520906461 .fill-B5{fill:#EDF0FD;} + .d2-520906461 .fill-B6{fill:#F7F8FE;} + .d2-520906461 .fill-AA2{fill:#4A6FF3;} + .d2-520906461 .fill-AA4{fill:#EDF0FD;} + .d2-520906461 .fill-AA5{fill:#F7F8FE;} + .d2-520906461 .fill-AB4{fill:#EDF0FD;} + .d2-520906461 .fill-AB5{fill:#F7F8FE;} + .d2-520906461 .stroke-N1{stroke:#0A0F25;} + .d2-520906461 .stroke-N2{stroke:#676C7E;} + .d2-520906461 .stroke-N3{stroke:#9499AB;} + .d2-520906461 .stroke-N4{stroke:#CFD2DD;} + .d2-520906461 .stroke-N5{stroke:#DEE1EB;} + .d2-520906461 .stroke-N6{stroke:#EEF1F8;} + .d2-520906461 .stroke-N7{stroke:#FFFFFF;} + .d2-520906461 .stroke-B1{stroke:#0D32B2;} + .d2-520906461 .stroke-B2{stroke:#0D32B2;} + .d2-520906461 .stroke-B3{stroke:#E3E9FD;} + .d2-520906461 .stroke-B4{stroke:#E3E9FD;} + .d2-520906461 .stroke-B5{stroke:#EDF0FD;} + .d2-520906461 .stroke-B6{stroke:#F7F8FE;} + .d2-520906461 .stroke-AA2{stroke:#4A6FF3;} + .d2-520906461 .stroke-AA4{stroke:#EDF0FD;} + .d2-520906461 .stroke-AA5{stroke:#F7F8FE;} + .d2-520906461 .stroke-AB4{stroke:#EDF0FD;} + .d2-520906461 .stroke-AB5{stroke:#F7F8FE;} + .d2-520906461 .background-color-N1{background-color:#0A0F25;} + .d2-520906461 .background-color-N2{background-color:#676C7E;} + .d2-520906461 .background-color-N3{background-color:#9499AB;} + .d2-520906461 .background-color-N4{background-color:#CFD2DD;} + .d2-520906461 .background-color-N5{background-color:#DEE1EB;} + .d2-520906461 .background-color-N6{background-color:#EEF1F8;} + .d2-520906461 .background-color-N7{background-color:#FFFFFF;} + .d2-520906461 .background-color-B1{background-color:#0D32B2;} + .d2-520906461 .background-color-B2{background-color:#0D32B2;} + .d2-520906461 .background-color-B3{background-color:#E3E9FD;} + .d2-520906461 .background-color-B4{background-color:#E3E9FD;} + .d2-520906461 .background-color-B5{background-color:#EDF0FD;} + .d2-520906461 .background-color-B6{background-color:#F7F8FE;} + .d2-520906461 .background-color-AA2{background-color:#4A6FF3;} + .d2-520906461 .background-color-AA4{background-color:#EDF0FD;} + .d2-520906461 .background-color-AA5{background-color:#F7F8FE;} + .d2-520906461 .background-color-AB4{background-color:#EDF0FD;} + .d2-520906461 .background-color-AB5{background-color:#F7F8FE;} + .d2-520906461 .color-N1{color:#0A0F25;} + .d2-520906461 .color-N2{color:#676C7E;} + .d2-520906461 .color-N3{color:#9499AB;} + .d2-520906461 .color-N4{color:#CFD2DD;} + .d2-520906461 .color-N5{color:#DEE1EB;} + .d2-520906461 .color-N6{color:#EEF1F8;} + .d2-520906461 .color-N7{color:#FFFFFF;} + .d2-520906461 .color-B1{color:#0D32B2;} + .d2-520906461 .color-B2{color:#0D32B2;} + .d2-520906461 .color-B3{color:#E3E9FD;} + .d2-520906461 .color-B4{color:#E3E9FD;} + .d2-520906461 .color-B5{color:#EDF0FD;} + .d2-520906461 .color-B6{color:#F7F8FE;} + .d2-520906461 .color-AA2{color:#4A6FF3;} + .d2-520906461 .color-AA4{color:#EDF0FD;} + .d2-520906461 .color-AA5{color:#F7F8FE;} + .d2-520906461 .color-AB4{color:#EDF0FD;} + .d2-520906461 .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 diff --git a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg index f8aa3745b..64d35b8e0 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-937694395 .fill-N1{fill:#0A0F25;} + .d2-937694395 .fill-N2{fill:#676C7E;} + .d2-937694395 .fill-N3{fill:#9499AB;} + .d2-937694395 .fill-N4{fill:#CFD2DD;} + .d2-937694395 .fill-N5{fill:#DEE1EB;} + .d2-937694395 .fill-N6{fill:#EEF1F8;} + .d2-937694395 .fill-N7{fill:#FFFFFF;} + .d2-937694395 .fill-B1{fill:#0D32B2;} + .d2-937694395 .fill-B2{fill:#0D32B2;} + .d2-937694395 .fill-B3{fill:#E3E9FD;} + .d2-937694395 .fill-B4{fill:#E3E9FD;} + .d2-937694395 .fill-B5{fill:#EDF0FD;} + .d2-937694395 .fill-B6{fill:#F7F8FE;} + .d2-937694395 .fill-AA2{fill:#4A6FF3;} + .d2-937694395 .fill-AA4{fill:#EDF0FD;} + .d2-937694395 .fill-AA5{fill:#F7F8FE;} + .d2-937694395 .fill-AB4{fill:#EDF0FD;} + .d2-937694395 .fill-AB5{fill:#F7F8FE;} + .d2-937694395 .stroke-N1{stroke:#0A0F25;} + .d2-937694395 .stroke-N2{stroke:#676C7E;} + .d2-937694395 .stroke-N3{stroke:#9499AB;} + .d2-937694395 .stroke-N4{stroke:#CFD2DD;} + .d2-937694395 .stroke-N5{stroke:#DEE1EB;} + .d2-937694395 .stroke-N6{stroke:#EEF1F8;} + .d2-937694395 .stroke-N7{stroke:#FFFFFF;} + .d2-937694395 .stroke-B1{stroke:#0D32B2;} + .d2-937694395 .stroke-B2{stroke:#0D32B2;} + .d2-937694395 .stroke-B3{stroke:#E3E9FD;} + .d2-937694395 .stroke-B4{stroke:#E3E9FD;} + .d2-937694395 .stroke-B5{stroke:#EDF0FD;} + .d2-937694395 .stroke-B6{stroke:#F7F8FE;} + .d2-937694395 .stroke-AA2{stroke:#4A6FF3;} + .d2-937694395 .stroke-AA4{stroke:#EDF0FD;} + .d2-937694395 .stroke-AA5{stroke:#F7F8FE;} + .d2-937694395 .stroke-AB4{stroke:#EDF0FD;} + .d2-937694395 .stroke-AB5{stroke:#F7F8FE;} + .d2-937694395 .background-color-N1{background-color:#0A0F25;} + .d2-937694395 .background-color-N2{background-color:#676C7E;} + .d2-937694395 .background-color-N3{background-color:#9499AB;} + .d2-937694395 .background-color-N4{background-color:#CFD2DD;} + .d2-937694395 .background-color-N5{background-color:#DEE1EB;} + .d2-937694395 .background-color-N6{background-color:#EEF1F8;} + .d2-937694395 .background-color-N7{background-color:#FFFFFF;} + .d2-937694395 .background-color-B1{background-color:#0D32B2;} + .d2-937694395 .background-color-B2{background-color:#0D32B2;} + .d2-937694395 .background-color-B3{background-color:#E3E9FD;} + .d2-937694395 .background-color-B4{background-color:#E3E9FD;} + .d2-937694395 .background-color-B5{background-color:#EDF0FD;} + .d2-937694395 .background-color-B6{background-color:#F7F8FE;} + .d2-937694395 .background-color-AA2{background-color:#4A6FF3;} + .d2-937694395 .background-color-AA4{background-color:#EDF0FD;} + .d2-937694395 .background-color-AA5{background-color:#F7F8FE;} + .d2-937694395 .background-color-AB4{background-color:#EDF0FD;} + .d2-937694395 .background-color-AB5{background-color:#F7F8FE;} + .d2-937694395 .color-N1{color:#0A0F25;} + .d2-937694395 .color-N2{color:#676C7E;} + .d2-937694395 .color-N3{color:#9499AB;} + .d2-937694395 .color-N4{color:#CFD2DD;} + .d2-937694395 .color-N5{color:#DEE1EB;} + .d2-937694395 .color-N6{color:#EEF1F8;} + .d2-937694395 .color-N7{color:#FFFFFF;} + .d2-937694395 .color-B1{color:#0D32B2;} + .d2-937694395 .color-B2{color:#0D32B2;} + .d2-937694395 .color-B3{color:#E3E9FD;} + .d2-937694395 .color-B4{color:#E3E9FD;} + .d2-937694395 .color-B5{color:#EDF0FD;} + .d2-937694395 .color-B6{color:#F7F8FE;} + .d2-937694395 .color-AA2{color:#4A6FF3;} + .d2-937694395 .color-AA4{color:#EDF0FD;} + .d2-937694395 .color-AA5{color:#F7F8FE;} + .d2-937694395 .color-AB4{color:#EDF0FD;} + .d2-937694395 .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 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 dc48c37c1..332c4a6b4 100644 --- a/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud + .d2-616560491 .fill-N1{fill:#0A0F25;} + .d2-616560491 .fill-N2{fill:#676C7E;} + .d2-616560491 .fill-N3{fill:#9499AB;} + .d2-616560491 .fill-N4{fill:#CFD2DD;} + .d2-616560491 .fill-N5{fill:#DEE1EB;} + .d2-616560491 .fill-N6{fill:#EEF1F8;} + .d2-616560491 .fill-N7{fill:#FFFFFF;} + .d2-616560491 .fill-B1{fill:#0D32B2;} + .d2-616560491 .fill-B2{fill:#0D32B2;} + .d2-616560491 .fill-B3{fill:#E3E9FD;} + .d2-616560491 .fill-B4{fill:#E3E9FD;} + .d2-616560491 .fill-B5{fill:#EDF0FD;} + .d2-616560491 .fill-B6{fill:#F7F8FE;} + .d2-616560491 .fill-AA2{fill:#4A6FF3;} + .d2-616560491 .fill-AA4{fill:#EDF0FD;} + .d2-616560491 .fill-AA5{fill:#F7F8FE;} + .d2-616560491 .fill-AB4{fill:#EDF0FD;} + .d2-616560491 .fill-AB5{fill:#F7F8FE;} + .d2-616560491 .stroke-N1{stroke:#0A0F25;} + .d2-616560491 .stroke-N2{stroke:#676C7E;} + .d2-616560491 .stroke-N3{stroke:#9499AB;} + .d2-616560491 .stroke-N4{stroke:#CFD2DD;} + .d2-616560491 .stroke-N5{stroke:#DEE1EB;} + .d2-616560491 .stroke-N6{stroke:#EEF1F8;} + .d2-616560491 .stroke-N7{stroke:#FFFFFF;} + .d2-616560491 .stroke-B1{stroke:#0D32B2;} + .d2-616560491 .stroke-B2{stroke:#0D32B2;} + .d2-616560491 .stroke-B3{stroke:#E3E9FD;} + .d2-616560491 .stroke-B4{stroke:#E3E9FD;} + .d2-616560491 .stroke-B5{stroke:#EDF0FD;} + .d2-616560491 .stroke-B6{stroke:#F7F8FE;} + .d2-616560491 .stroke-AA2{stroke:#4A6FF3;} + .d2-616560491 .stroke-AA4{stroke:#EDF0FD;} + .d2-616560491 .stroke-AA5{stroke:#F7F8FE;} + .d2-616560491 .stroke-AB4{stroke:#EDF0FD;} + .d2-616560491 .stroke-AB5{stroke:#F7F8FE;} + .d2-616560491 .background-color-N1{background-color:#0A0F25;} + .d2-616560491 .background-color-N2{background-color:#676C7E;} + .d2-616560491 .background-color-N3{background-color:#9499AB;} + .d2-616560491 .background-color-N4{background-color:#CFD2DD;} + .d2-616560491 .background-color-N5{background-color:#DEE1EB;} + .d2-616560491 .background-color-N6{background-color:#EEF1F8;} + .d2-616560491 .background-color-N7{background-color:#FFFFFF;} + .d2-616560491 .background-color-B1{background-color:#0D32B2;} + .d2-616560491 .background-color-B2{background-color:#0D32B2;} + .d2-616560491 .background-color-B3{background-color:#E3E9FD;} + .d2-616560491 .background-color-B4{background-color:#E3E9FD;} + .d2-616560491 .background-color-B5{background-color:#EDF0FD;} + .d2-616560491 .background-color-B6{background-color:#F7F8FE;} + .d2-616560491 .background-color-AA2{background-color:#4A6FF3;} + .d2-616560491 .background-color-AA4{background-color:#EDF0FD;} + .d2-616560491 .background-color-AA5{background-color:#F7F8FE;} + .d2-616560491 .background-color-AB4{background-color:#EDF0FD;} + .d2-616560491 .background-color-AB5{background-color:#F7F8FE;} + .d2-616560491 .color-N1{color:#0A0F25;} + .d2-616560491 .color-N2{color:#676C7E;} + .d2-616560491 .color-N3{color:#9499AB;} + .d2-616560491 .color-N4{color:#CFD2DD;} + .d2-616560491 .color-N5{color:#DEE1EB;} + .d2-616560491 .color-N6{color:#EEF1F8;} + .d2-616560491 .color-N7{color:#FFFFFF;} + .d2-616560491 .color-B1{color:#0D32B2;} + .d2-616560491 .color-B2{color:#0D32B2;} + .d2-616560491 .color-B3{color:#E3E9FD;} + .d2-616560491 .color-B4{color:#E3E9FD;} + .d2-616560491 .color-B5{color:#EDF0FD;} + .d2-616560491 .color-B6{color:#F7F8FE;} + .d2-616560491 .color-AA2{color:#4A6FF3;} + .d2-616560491 .color-AA4{color:#EDF0FD;} + .d2-616560491 .color-AA5{color:#F7F8FE;} + .d2-616560491 .color-AB4{color:#EDF0FD;} + .d2-616560491 .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}]]>The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud 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 b85086ca3..1f4901ed2 100644 --- a/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud + .d2-974195226 .fill-N1{fill:#0A0F25;} + .d2-974195226 .fill-N2{fill:#676C7E;} + .d2-974195226 .fill-N3{fill:#9499AB;} + .d2-974195226 .fill-N4{fill:#CFD2DD;} + .d2-974195226 .fill-N5{fill:#DEE1EB;} + .d2-974195226 .fill-N6{fill:#EEF1F8;} + .d2-974195226 .fill-N7{fill:#FFFFFF;} + .d2-974195226 .fill-B1{fill:#0D32B2;} + .d2-974195226 .fill-B2{fill:#0D32B2;} + .d2-974195226 .fill-B3{fill:#E3E9FD;} + .d2-974195226 .fill-B4{fill:#E3E9FD;} + .d2-974195226 .fill-B5{fill:#EDF0FD;} + .d2-974195226 .fill-B6{fill:#F7F8FE;} + .d2-974195226 .fill-AA2{fill:#4A6FF3;} + .d2-974195226 .fill-AA4{fill:#EDF0FD;} + .d2-974195226 .fill-AA5{fill:#F7F8FE;} + .d2-974195226 .fill-AB4{fill:#EDF0FD;} + .d2-974195226 .fill-AB5{fill:#F7F8FE;} + .d2-974195226 .stroke-N1{stroke:#0A0F25;} + .d2-974195226 .stroke-N2{stroke:#676C7E;} + .d2-974195226 .stroke-N3{stroke:#9499AB;} + .d2-974195226 .stroke-N4{stroke:#CFD2DD;} + .d2-974195226 .stroke-N5{stroke:#DEE1EB;} + .d2-974195226 .stroke-N6{stroke:#EEF1F8;} + .d2-974195226 .stroke-N7{stroke:#FFFFFF;} + .d2-974195226 .stroke-B1{stroke:#0D32B2;} + .d2-974195226 .stroke-B2{stroke:#0D32B2;} + .d2-974195226 .stroke-B3{stroke:#E3E9FD;} + .d2-974195226 .stroke-B4{stroke:#E3E9FD;} + .d2-974195226 .stroke-B5{stroke:#EDF0FD;} + .d2-974195226 .stroke-B6{stroke:#F7F8FE;} + .d2-974195226 .stroke-AA2{stroke:#4A6FF3;} + .d2-974195226 .stroke-AA4{stroke:#EDF0FD;} + .d2-974195226 .stroke-AA5{stroke:#F7F8FE;} + .d2-974195226 .stroke-AB4{stroke:#EDF0FD;} + .d2-974195226 .stroke-AB5{stroke:#F7F8FE;} + .d2-974195226 .background-color-N1{background-color:#0A0F25;} + .d2-974195226 .background-color-N2{background-color:#676C7E;} + .d2-974195226 .background-color-N3{background-color:#9499AB;} + .d2-974195226 .background-color-N4{background-color:#CFD2DD;} + .d2-974195226 .background-color-N5{background-color:#DEE1EB;} + .d2-974195226 .background-color-N6{background-color:#EEF1F8;} + .d2-974195226 .background-color-N7{background-color:#FFFFFF;} + .d2-974195226 .background-color-B1{background-color:#0D32B2;} + .d2-974195226 .background-color-B2{background-color:#0D32B2;} + .d2-974195226 .background-color-B3{background-color:#E3E9FD;} + .d2-974195226 .background-color-B4{background-color:#E3E9FD;} + .d2-974195226 .background-color-B5{background-color:#EDF0FD;} + .d2-974195226 .background-color-B6{background-color:#F7F8FE;} + .d2-974195226 .background-color-AA2{background-color:#4A6FF3;} + .d2-974195226 .background-color-AA4{background-color:#EDF0FD;} + .d2-974195226 .background-color-AA5{background-color:#F7F8FE;} + .d2-974195226 .background-color-AB4{background-color:#EDF0FD;} + .d2-974195226 .background-color-AB5{background-color:#F7F8FE;} + .d2-974195226 .color-N1{color:#0A0F25;} + .d2-974195226 .color-N2{color:#676C7E;} + .d2-974195226 .color-N3{color:#9499AB;} + .d2-974195226 .color-N4{color:#CFD2DD;} + .d2-974195226 .color-N5{color:#DEE1EB;} + .d2-974195226 .color-N6{color:#EEF1F8;} + .d2-974195226 .color-N7{color:#FFFFFF;} + .d2-974195226 .color-B1{color:#0D32B2;} + .d2-974195226 .color-B2{color:#0D32B2;} + .d2-974195226 .color-B3{color:#E3E9FD;} + .d2-974195226 .color-B4{color:#E3E9FD;} + .d2-974195226 .color-B5{color:#EDF0FD;} + .d2-974195226 .color-B6{color:#F7F8FE;} + .d2-974195226 .color-AA2{color:#4A6FF3;} + .d2-974195226 .color-AA4{color:#EDF0FD;} + .d2-974195226 .color-AA5{color:#F7F8FE;} + .d2-974195226 .color-AB4{color:#EDF0FD;} + .d2-974195226 .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}]]>The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud diff --git a/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg index 600ac4802..d6f7f7a7a 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-3759808173 .fill-N1{fill:#0A0F25;} + .d2-3759808173 .fill-N2{fill:#676C7E;} + .d2-3759808173 .fill-N3{fill:#9499AB;} + .d2-3759808173 .fill-N4{fill:#CFD2DD;} + .d2-3759808173 .fill-N5{fill:#DEE1EB;} + .d2-3759808173 .fill-N6{fill:#EEF1F8;} + .d2-3759808173 .fill-N7{fill:#FFFFFF;} + .d2-3759808173 .fill-B1{fill:#0D32B2;} + .d2-3759808173 .fill-B2{fill:#0D32B2;} + .d2-3759808173 .fill-B3{fill:#E3E9FD;} + .d2-3759808173 .fill-B4{fill:#E3E9FD;} + .d2-3759808173 .fill-B5{fill:#EDF0FD;} + .d2-3759808173 .fill-B6{fill:#F7F8FE;} + .d2-3759808173 .fill-AA2{fill:#4A6FF3;} + .d2-3759808173 .fill-AA4{fill:#EDF0FD;} + .d2-3759808173 .fill-AA5{fill:#F7F8FE;} + .d2-3759808173 .fill-AB4{fill:#EDF0FD;} + .d2-3759808173 .fill-AB5{fill:#F7F8FE;} + .d2-3759808173 .stroke-N1{stroke:#0A0F25;} + .d2-3759808173 .stroke-N2{stroke:#676C7E;} + .d2-3759808173 .stroke-N3{stroke:#9499AB;} + .d2-3759808173 .stroke-N4{stroke:#CFD2DD;} + .d2-3759808173 .stroke-N5{stroke:#DEE1EB;} + .d2-3759808173 .stroke-N6{stroke:#EEF1F8;} + .d2-3759808173 .stroke-N7{stroke:#FFFFFF;} + .d2-3759808173 .stroke-B1{stroke:#0D32B2;} + .d2-3759808173 .stroke-B2{stroke:#0D32B2;} + .d2-3759808173 .stroke-B3{stroke:#E3E9FD;} + .d2-3759808173 .stroke-B4{stroke:#E3E9FD;} + .d2-3759808173 .stroke-B5{stroke:#EDF0FD;} + .d2-3759808173 .stroke-B6{stroke:#F7F8FE;} + .d2-3759808173 .stroke-AA2{stroke:#4A6FF3;} + .d2-3759808173 .stroke-AA4{stroke:#EDF0FD;} + .d2-3759808173 .stroke-AA5{stroke:#F7F8FE;} + .d2-3759808173 .stroke-AB4{stroke:#EDF0FD;} + .d2-3759808173 .stroke-AB5{stroke:#F7F8FE;} + .d2-3759808173 .background-color-N1{background-color:#0A0F25;} + .d2-3759808173 .background-color-N2{background-color:#676C7E;} + .d2-3759808173 .background-color-N3{background-color:#9499AB;} + .d2-3759808173 .background-color-N4{background-color:#CFD2DD;} + .d2-3759808173 .background-color-N5{background-color:#DEE1EB;} + .d2-3759808173 .background-color-N6{background-color:#EEF1F8;} + .d2-3759808173 .background-color-N7{background-color:#FFFFFF;} + .d2-3759808173 .background-color-B1{background-color:#0D32B2;} + .d2-3759808173 .background-color-B2{background-color:#0D32B2;} + .d2-3759808173 .background-color-B3{background-color:#E3E9FD;} + .d2-3759808173 .background-color-B4{background-color:#E3E9FD;} + .d2-3759808173 .background-color-B5{background-color:#EDF0FD;} + .d2-3759808173 .background-color-B6{background-color:#F7F8FE;} + .d2-3759808173 .background-color-AA2{background-color:#4A6FF3;} + .d2-3759808173 .background-color-AA4{background-color:#EDF0FD;} + .d2-3759808173 .background-color-AA5{background-color:#F7F8FE;} + .d2-3759808173 .background-color-AB4{background-color:#EDF0FD;} + .d2-3759808173 .background-color-AB5{background-color:#F7F8FE;} + .d2-3759808173 .color-N1{color:#0A0F25;} + .d2-3759808173 .color-N2{color:#676C7E;} + .d2-3759808173 .color-N3{color:#9499AB;} + .d2-3759808173 .color-N4{color:#CFD2DD;} + .d2-3759808173 .color-N5{color:#DEE1EB;} + .d2-3759808173 .color-N6{color:#EEF1F8;} + .d2-3759808173 .color-N7{color:#FFFFFF;} + .d2-3759808173 .color-B1{color:#0D32B2;} + .d2-3759808173 .color-B2{color:#0D32B2;} + .d2-3759808173 .color-B3{color:#E3E9FD;} + .d2-3759808173 .color-B4{color:#E3E9FD;} + .d2-3759808173 .color-B5{color:#EDF0FD;} + .d2-3759808173 .color-B6{color:#F7F8FE;} + .d2-3759808173 .color-AA2{color:#4A6FF3;} + .d2-3759808173 .color-AA4{color:#EDF0FD;} + .d2-3759808173 .color-AA5{color:#F7F8FE;} + .d2-3759808173 .color-AB4{color:#EDF0FD;} + .d2-3759808173 .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 diff --git a/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg index 5fe129d5e..f79971856 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-3027464303 .fill-N1{fill:#0A0F25;} + .d2-3027464303 .fill-N2{fill:#676C7E;} + .d2-3027464303 .fill-N3{fill:#9499AB;} + .d2-3027464303 .fill-N4{fill:#CFD2DD;} + .d2-3027464303 .fill-N5{fill:#DEE1EB;} + .d2-3027464303 .fill-N6{fill:#EEF1F8;} + .d2-3027464303 .fill-N7{fill:#FFFFFF;} + .d2-3027464303 .fill-B1{fill:#0D32B2;} + .d2-3027464303 .fill-B2{fill:#0D32B2;} + .d2-3027464303 .fill-B3{fill:#E3E9FD;} + .d2-3027464303 .fill-B4{fill:#E3E9FD;} + .d2-3027464303 .fill-B5{fill:#EDF0FD;} + .d2-3027464303 .fill-B6{fill:#F7F8FE;} + .d2-3027464303 .fill-AA2{fill:#4A6FF3;} + .d2-3027464303 .fill-AA4{fill:#EDF0FD;} + .d2-3027464303 .fill-AA5{fill:#F7F8FE;} + .d2-3027464303 .fill-AB4{fill:#EDF0FD;} + .d2-3027464303 .fill-AB5{fill:#F7F8FE;} + .d2-3027464303 .stroke-N1{stroke:#0A0F25;} + .d2-3027464303 .stroke-N2{stroke:#676C7E;} + .d2-3027464303 .stroke-N3{stroke:#9499AB;} + .d2-3027464303 .stroke-N4{stroke:#CFD2DD;} + .d2-3027464303 .stroke-N5{stroke:#DEE1EB;} + .d2-3027464303 .stroke-N6{stroke:#EEF1F8;} + .d2-3027464303 .stroke-N7{stroke:#FFFFFF;} + .d2-3027464303 .stroke-B1{stroke:#0D32B2;} + .d2-3027464303 .stroke-B2{stroke:#0D32B2;} + .d2-3027464303 .stroke-B3{stroke:#E3E9FD;} + .d2-3027464303 .stroke-B4{stroke:#E3E9FD;} + .d2-3027464303 .stroke-B5{stroke:#EDF0FD;} + .d2-3027464303 .stroke-B6{stroke:#F7F8FE;} + .d2-3027464303 .stroke-AA2{stroke:#4A6FF3;} + .d2-3027464303 .stroke-AA4{stroke:#EDF0FD;} + .d2-3027464303 .stroke-AA5{stroke:#F7F8FE;} + .d2-3027464303 .stroke-AB4{stroke:#EDF0FD;} + .d2-3027464303 .stroke-AB5{stroke:#F7F8FE;} + .d2-3027464303 .background-color-N1{background-color:#0A0F25;} + .d2-3027464303 .background-color-N2{background-color:#676C7E;} + .d2-3027464303 .background-color-N3{background-color:#9499AB;} + .d2-3027464303 .background-color-N4{background-color:#CFD2DD;} + .d2-3027464303 .background-color-N5{background-color:#DEE1EB;} + .d2-3027464303 .background-color-N6{background-color:#EEF1F8;} + .d2-3027464303 .background-color-N7{background-color:#FFFFFF;} + .d2-3027464303 .background-color-B1{background-color:#0D32B2;} + .d2-3027464303 .background-color-B2{background-color:#0D32B2;} + .d2-3027464303 .background-color-B3{background-color:#E3E9FD;} + .d2-3027464303 .background-color-B4{background-color:#E3E9FD;} + .d2-3027464303 .background-color-B5{background-color:#EDF0FD;} + .d2-3027464303 .background-color-B6{background-color:#F7F8FE;} + .d2-3027464303 .background-color-AA2{background-color:#4A6FF3;} + .d2-3027464303 .background-color-AA4{background-color:#EDF0FD;} + .d2-3027464303 .background-color-AA5{background-color:#F7F8FE;} + .d2-3027464303 .background-color-AB4{background-color:#EDF0FD;} + .d2-3027464303 .background-color-AB5{background-color:#F7F8FE;} + .d2-3027464303 .color-N1{color:#0A0F25;} + .d2-3027464303 .color-N2{color:#676C7E;} + .d2-3027464303 .color-N3{color:#9499AB;} + .d2-3027464303 .color-N4{color:#CFD2DD;} + .d2-3027464303 .color-N5{color:#DEE1EB;} + .d2-3027464303 .color-N6{color:#EEF1F8;} + .d2-3027464303 .color-N7{color:#FFFFFF;} + .d2-3027464303 .color-B1{color:#0D32B2;} + .d2-3027464303 .color-B2{color:#0D32B2;} + .d2-3027464303 .color-B3{color:#E3E9FD;} + .d2-3027464303 .color-B4{color:#E3E9FD;} + .d2-3027464303 .color-B5{color:#EDF0FD;} + .d2-3027464303 .color-B6{color:#F7F8FE;} + .d2-3027464303 .color-AA2{color:#4A6FF3;} + .d2-3027464303 .color-AA4{color:#EDF0FD;} + .d2-3027464303 .color-AA5{color:#F7F8FE;} + .d2-3027464303 .color-AB4{color:#EDF0FD;} + .d2-3027464303 .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 diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg index 33f6640de..24349350a 100644 --- a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1219883785 .fill-N1{fill:#0A0F25;} + .d2-1219883785 .fill-N2{fill:#676C7E;} + .d2-1219883785 .fill-N3{fill:#9499AB;} + .d2-1219883785 .fill-N4{fill:#CFD2DD;} + .d2-1219883785 .fill-N5{fill:#DEE1EB;} + .d2-1219883785 .fill-N6{fill:#EEF1F8;} + .d2-1219883785 .fill-N7{fill:#FFFFFF;} + .d2-1219883785 .fill-B1{fill:#0D32B2;} + .d2-1219883785 .fill-B2{fill:#0D32B2;} + .d2-1219883785 .fill-B3{fill:#E3E9FD;} + .d2-1219883785 .fill-B4{fill:#E3E9FD;} + .d2-1219883785 .fill-B5{fill:#EDF0FD;} + .d2-1219883785 .fill-B6{fill:#F7F8FE;} + .d2-1219883785 .fill-AA2{fill:#4A6FF3;} + .d2-1219883785 .fill-AA4{fill:#EDF0FD;} + .d2-1219883785 .fill-AA5{fill:#F7F8FE;} + .d2-1219883785 .fill-AB4{fill:#EDF0FD;} + .d2-1219883785 .fill-AB5{fill:#F7F8FE;} + .d2-1219883785 .stroke-N1{stroke:#0A0F25;} + .d2-1219883785 .stroke-N2{stroke:#676C7E;} + .d2-1219883785 .stroke-N3{stroke:#9499AB;} + .d2-1219883785 .stroke-N4{stroke:#CFD2DD;} + .d2-1219883785 .stroke-N5{stroke:#DEE1EB;} + .d2-1219883785 .stroke-N6{stroke:#EEF1F8;} + .d2-1219883785 .stroke-N7{stroke:#FFFFFF;} + .d2-1219883785 .stroke-B1{stroke:#0D32B2;} + .d2-1219883785 .stroke-B2{stroke:#0D32B2;} + .d2-1219883785 .stroke-B3{stroke:#E3E9FD;} + .d2-1219883785 .stroke-B4{stroke:#E3E9FD;} + .d2-1219883785 .stroke-B5{stroke:#EDF0FD;} + .d2-1219883785 .stroke-B6{stroke:#F7F8FE;} + .d2-1219883785 .stroke-AA2{stroke:#4A6FF3;} + .d2-1219883785 .stroke-AA4{stroke:#EDF0FD;} + .d2-1219883785 .stroke-AA5{stroke:#F7F8FE;} + .d2-1219883785 .stroke-AB4{stroke:#EDF0FD;} + .d2-1219883785 .stroke-AB5{stroke:#F7F8FE;} + .d2-1219883785 .background-color-N1{background-color:#0A0F25;} + .d2-1219883785 .background-color-N2{background-color:#676C7E;} + .d2-1219883785 .background-color-N3{background-color:#9499AB;} + .d2-1219883785 .background-color-N4{background-color:#CFD2DD;} + .d2-1219883785 .background-color-N5{background-color:#DEE1EB;} + .d2-1219883785 .background-color-N6{background-color:#EEF1F8;} + .d2-1219883785 .background-color-N7{background-color:#FFFFFF;} + .d2-1219883785 .background-color-B1{background-color:#0D32B2;} + .d2-1219883785 .background-color-B2{background-color:#0D32B2;} + .d2-1219883785 .background-color-B3{background-color:#E3E9FD;} + .d2-1219883785 .background-color-B4{background-color:#E3E9FD;} + .d2-1219883785 .background-color-B5{background-color:#EDF0FD;} + .d2-1219883785 .background-color-B6{background-color:#F7F8FE;} + .d2-1219883785 .background-color-AA2{background-color:#4A6FF3;} + .d2-1219883785 .background-color-AA4{background-color:#EDF0FD;} + .d2-1219883785 .background-color-AA5{background-color:#F7F8FE;} + .d2-1219883785 .background-color-AB4{background-color:#EDF0FD;} + .d2-1219883785 .background-color-AB5{background-color:#F7F8FE;} + .d2-1219883785 .color-N1{color:#0A0F25;} + .d2-1219883785 .color-N2{color:#676C7E;} + .d2-1219883785 .color-N3{color:#9499AB;} + .d2-1219883785 .color-N4{color:#CFD2DD;} + .d2-1219883785 .color-N5{color:#DEE1EB;} + .d2-1219883785 .color-N6{color:#EEF1F8;} + .d2-1219883785 .color-N7{color:#FFFFFF;} + .d2-1219883785 .color-B1{color:#0D32B2;} + .d2-1219883785 .color-B2{color:#0D32B2;} + .d2-1219883785 .color-B3{color:#E3E9FD;} + .d2-1219883785 .color-B4{color:#E3E9FD;} + .d2-1219883785 .color-B5{color:#EDF0FD;} + .d2-1219883785 .color-B6{color:#F7F8FE;} + .d2-1219883785 .color-AA2{color:#4A6FF3;} + .d2-1219883785 .color-AA4{color:#EDF0FD;} + .d2-1219883785 .color-AA5{color:#F7F8FE;} + .d2-1219883785 .color-AB4{color:#EDF0FD;} + .d2-1219883785 .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}]]> -hexagon +hexagon \ No newline at end of file diff --git a/e2etests/testdata/stable/hexagon_3d/elk/sketch.exp.svg b/e2etests/testdata/stable/hexagon_3d/elk/sketch.exp.svg index 4ff783733..15f3c6926 100644 --- a/e2etests/testdata/stable/hexagon_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/hexagon_3d/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-807790610 .fill-N1{fill:#0A0F25;} + .d2-807790610 .fill-N2{fill:#676C7E;} + .d2-807790610 .fill-N3{fill:#9499AB;} + .d2-807790610 .fill-N4{fill:#CFD2DD;} + .d2-807790610 .fill-N5{fill:#DEE1EB;} + .d2-807790610 .fill-N6{fill:#EEF1F8;} + .d2-807790610 .fill-N7{fill:#FFFFFF;} + .d2-807790610 .fill-B1{fill:#0D32B2;} + .d2-807790610 .fill-B2{fill:#0D32B2;} + .d2-807790610 .fill-B3{fill:#E3E9FD;} + .d2-807790610 .fill-B4{fill:#E3E9FD;} + .d2-807790610 .fill-B5{fill:#EDF0FD;} + .d2-807790610 .fill-B6{fill:#F7F8FE;} + .d2-807790610 .fill-AA2{fill:#4A6FF3;} + .d2-807790610 .fill-AA4{fill:#EDF0FD;} + .d2-807790610 .fill-AA5{fill:#F7F8FE;} + .d2-807790610 .fill-AB4{fill:#EDF0FD;} + .d2-807790610 .fill-AB5{fill:#F7F8FE;} + .d2-807790610 .stroke-N1{stroke:#0A0F25;} + .d2-807790610 .stroke-N2{stroke:#676C7E;} + .d2-807790610 .stroke-N3{stroke:#9499AB;} + .d2-807790610 .stroke-N4{stroke:#CFD2DD;} + .d2-807790610 .stroke-N5{stroke:#DEE1EB;} + .d2-807790610 .stroke-N6{stroke:#EEF1F8;} + .d2-807790610 .stroke-N7{stroke:#FFFFFF;} + .d2-807790610 .stroke-B1{stroke:#0D32B2;} + .d2-807790610 .stroke-B2{stroke:#0D32B2;} + .d2-807790610 .stroke-B3{stroke:#E3E9FD;} + .d2-807790610 .stroke-B4{stroke:#E3E9FD;} + .d2-807790610 .stroke-B5{stroke:#EDF0FD;} + .d2-807790610 .stroke-B6{stroke:#F7F8FE;} + .d2-807790610 .stroke-AA2{stroke:#4A6FF3;} + .d2-807790610 .stroke-AA4{stroke:#EDF0FD;} + .d2-807790610 .stroke-AA5{stroke:#F7F8FE;} + .d2-807790610 .stroke-AB4{stroke:#EDF0FD;} + .d2-807790610 .stroke-AB5{stroke:#F7F8FE;} + .d2-807790610 .background-color-N1{background-color:#0A0F25;} + .d2-807790610 .background-color-N2{background-color:#676C7E;} + .d2-807790610 .background-color-N3{background-color:#9499AB;} + .d2-807790610 .background-color-N4{background-color:#CFD2DD;} + .d2-807790610 .background-color-N5{background-color:#DEE1EB;} + .d2-807790610 .background-color-N6{background-color:#EEF1F8;} + .d2-807790610 .background-color-N7{background-color:#FFFFFF;} + .d2-807790610 .background-color-B1{background-color:#0D32B2;} + .d2-807790610 .background-color-B2{background-color:#0D32B2;} + .d2-807790610 .background-color-B3{background-color:#E3E9FD;} + .d2-807790610 .background-color-B4{background-color:#E3E9FD;} + .d2-807790610 .background-color-B5{background-color:#EDF0FD;} + .d2-807790610 .background-color-B6{background-color:#F7F8FE;} + .d2-807790610 .background-color-AA2{background-color:#4A6FF3;} + .d2-807790610 .background-color-AA4{background-color:#EDF0FD;} + .d2-807790610 .background-color-AA5{background-color:#F7F8FE;} + .d2-807790610 .background-color-AB4{background-color:#EDF0FD;} + .d2-807790610 .background-color-AB5{background-color:#F7F8FE;} + .d2-807790610 .color-N1{color:#0A0F25;} + .d2-807790610 .color-N2{color:#676C7E;} + .d2-807790610 .color-N3{color:#9499AB;} + .d2-807790610 .color-N4{color:#CFD2DD;} + .d2-807790610 .color-N5{color:#DEE1EB;} + .d2-807790610 .color-N6{color:#EEF1F8;} + .d2-807790610 .color-N7{color:#FFFFFF;} + .d2-807790610 .color-B1{color:#0D32B2;} + .d2-807790610 .color-B2{color:#0D32B2;} + .d2-807790610 .color-B3{color:#E3E9FD;} + .d2-807790610 .color-B4{color:#E3E9FD;} + .d2-807790610 .color-B5{color:#EDF0FD;} + .d2-807790610 .color-B6{color:#F7F8FE;} + .d2-807790610 .color-AA2{color:#4A6FF3;} + .d2-807790610 .color-AA4{color:#EDF0FD;} + .d2-807790610 .color-AA5{color:#F7F8FE;} + .d2-807790610 .color-AB4{color:#EDF0FD;} + .d2-807790610 .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}]]> -hexagon +hexagon \ No newline at end of file diff --git a/e2etests/testdata/stable/hr/dagre/sketch.exp.svg b/e2etests/testdata/stable/hr/dagre/sketch.exp.svg index 0d5b7083d..c0d37a6d0 100644 --- a/e2etests/testdata/stable/hr/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/hr/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Note: This document is itself written using Markdown; you can see the source for it by adding '.text' to the URL.

    Overview

    -
    ab +    ab diff --git a/e2etests/testdata/stable/hr/elk/sketch.exp.svg b/e2etests/testdata/stable/hr/elk/sketch.exp.svg index 656c5ec9f..70441ef9f 100644 --- a/e2etests/testdata/stable/hr/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/hr/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Note: This document is itself written using Markdown; you can see the source for it by adding '.text' to the URL.

    Overview

    -
    ab +    ab diff --git a/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg index 90c3a3b51..5e0e4f3bf 100644 --- a/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance + .d2-2539194632 .fill-N1{fill:#0A0F25;} + .d2-2539194632 .fill-N2{fill:#676C7E;} + .d2-2539194632 .fill-N3{fill:#9499AB;} + .d2-2539194632 .fill-N4{fill:#CFD2DD;} + .d2-2539194632 .fill-N5{fill:#DEE1EB;} + .d2-2539194632 .fill-N6{fill:#EEF1F8;} + .d2-2539194632 .fill-N7{fill:#FFFFFF;} + .d2-2539194632 .fill-B1{fill:#0D32B2;} + .d2-2539194632 .fill-B2{fill:#0D32B2;} + .d2-2539194632 .fill-B3{fill:#E3E9FD;} + .d2-2539194632 .fill-B4{fill:#E3E9FD;} + .d2-2539194632 .fill-B5{fill:#EDF0FD;} + .d2-2539194632 .fill-B6{fill:#F7F8FE;} + .d2-2539194632 .fill-AA2{fill:#4A6FF3;} + .d2-2539194632 .fill-AA4{fill:#EDF0FD;} + .d2-2539194632 .fill-AA5{fill:#F7F8FE;} + .d2-2539194632 .fill-AB4{fill:#EDF0FD;} + .d2-2539194632 .fill-AB5{fill:#F7F8FE;} + .d2-2539194632 .stroke-N1{stroke:#0A0F25;} + .d2-2539194632 .stroke-N2{stroke:#676C7E;} + .d2-2539194632 .stroke-N3{stroke:#9499AB;} + .d2-2539194632 .stroke-N4{stroke:#CFD2DD;} + .d2-2539194632 .stroke-N5{stroke:#DEE1EB;} + .d2-2539194632 .stroke-N6{stroke:#EEF1F8;} + .d2-2539194632 .stroke-N7{stroke:#FFFFFF;} + .d2-2539194632 .stroke-B1{stroke:#0D32B2;} + .d2-2539194632 .stroke-B2{stroke:#0D32B2;} + .d2-2539194632 .stroke-B3{stroke:#E3E9FD;} + .d2-2539194632 .stroke-B4{stroke:#E3E9FD;} + .d2-2539194632 .stroke-B5{stroke:#EDF0FD;} + .d2-2539194632 .stroke-B6{stroke:#F7F8FE;} + .d2-2539194632 .stroke-AA2{stroke:#4A6FF3;} + .d2-2539194632 .stroke-AA4{stroke:#EDF0FD;} + .d2-2539194632 .stroke-AA5{stroke:#F7F8FE;} + .d2-2539194632 .stroke-AB4{stroke:#EDF0FD;} + .d2-2539194632 .stroke-AB5{stroke:#F7F8FE;} + .d2-2539194632 .background-color-N1{background-color:#0A0F25;} + .d2-2539194632 .background-color-N2{background-color:#676C7E;} + .d2-2539194632 .background-color-N3{background-color:#9499AB;} + .d2-2539194632 .background-color-N4{background-color:#CFD2DD;} + .d2-2539194632 .background-color-N5{background-color:#DEE1EB;} + .d2-2539194632 .background-color-N6{background-color:#EEF1F8;} + .d2-2539194632 .background-color-N7{background-color:#FFFFFF;} + .d2-2539194632 .background-color-B1{background-color:#0D32B2;} + .d2-2539194632 .background-color-B2{background-color:#0D32B2;} + .d2-2539194632 .background-color-B3{background-color:#E3E9FD;} + .d2-2539194632 .background-color-B4{background-color:#E3E9FD;} + .d2-2539194632 .background-color-B5{background-color:#EDF0FD;} + .d2-2539194632 .background-color-B6{background-color:#F7F8FE;} + .d2-2539194632 .background-color-AA2{background-color:#4A6FF3;} + .d2-2539194632 .background-color-AA4{background-color:#EDF0FD;} + .d2-2539194632 .background-color-AA5{background-color:#F7F8FE;} + .d2-2539194632 .background-color-AB4{background-color:#EDF0FD;} + .d2-2539194632 .background-color-AB5{background-color:#F7F8FE;} + .d2-2539194632 .color-N1{color:#0A0F25;} + .d2-2539194632 .color-N2{color:#676C7E;} + .d2-2539194632 .color-N3{color:#9499AB;} + .d2-2539194632 .color-N4{color:#CFD2DD;} + .d2-2539194632 .color-N5{color:#DEE1EB;} + .d2-2539194632 .color-N6{color:#EEF1F8;} + .d2-2539194632 .color-N7{color:#FFFFFF;} + .d2-2539194632 .color-B1{color:#0D32B2;} + .d2-2539194632 .color-B2{color:#0D32B2;} + .d2-2539194632 .color-B3{color:#E3E9FD;} + .d2-2539194632 .color-B4{color:#E3E9FD;} + .d2-2539194632 .color-B5{color:#EDF0FD;} + .d2-2539194632 .color-B6{color:#F7F8FE;} + .d2-2539194632 .color-AA2{color:#4A6FF3;} + .d2-2539194632 .color-AA4{color:#EDF0FD;} + .d2-2539194632 .color-AA5{color:#F7F8FE;} + .d2-2539194632 .color-AB4{color:#EDF0FD;} + .d2-2539194632 .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}]]>VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance diff --git a/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg b/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg index 272267609..e45de66fb 100644 --- a/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance + .d2-3398804513 .fill-N1{fill:#0A0F25;} + .d2-3398804513 .fill-N2{fill:#676C7E;} + .d2-3398804513 .fill-N3{fill:#9499AB;} + .d2-3398804513 .fill-N4{fill:#CFD2DD;} + .d2-3398804513 .fill-N5{fill:#DEE1EB;} + .d2-3398804513 .fill-N6{fill:#EEF1F8;} + .d2-3398804513 .fill-N7{fill:#FFFFFF;} + .d2-3398804513 .fill-B1{fill:#0D32B2;} + .d2-3398804513 .fill-B2{fill:#0D32B2;} + .d2-3398804513 .fill-B3{fill:#E3E9FD;} + .d2-3398804513 .fill-B4{fill:#E3E9FD;} + .d2-3398804513 .fill-B5{fill:#EDF0FD;} + .d2-3398804513 .fill-B6{fill:#F7F8FE;} + .d2-3398804513 .fill-AA2{fill:#4A6FF3;} + .d2-3398804513 .fill-AA4{fill:#EDF0FD;} + .d2-3398804513 .fill-AA5{fill:#F7F8FE;} + .d2-3398804513 .fill-AB4{fill:#EDF0FD;} + .d2-3398804513 .fill-AB5{fill:#F7F8FE;} + .d2-3398804513 .stroke-N1{stroke:#0A0F25;} + .d2-3398804513 .stroke-N2{stroke:#676C7E;} + .d2-3398804513 .stroke-N3{stroke:#9499AB;} + .d2-3398804513 .stroke-N4{stroke:#CFD2DD;} + .d2-3398804513 .stroke-N5{stroke:#DEE1EB;} + .d2-3398804513 .stroke-N6{stroke:#EEF1F8;} + .d2-3398804513 .stroke-N7{stroke:#FFFFFF;} + .d2-3398804513 .stroke-B1{stroke:#0D32B2;} + .d2-3398804513 .stroke-B2{stroke:#0D32B2;} + .d2-3398804513 .stroke-B3{stroke:#E3E9FD;} + .d2-3398804513 .stroke-B4{stroke:#E3E9FD;} + .d2-3398804513 .stroke-B5{stroke:#EDF0FD;} + .d2-3398804513 .stroke-B6{stroke:#F7F8FE;} + .d2-3398804513 .stroke-AA2{stroke:#4A6FF3;} + .d2-3398804513 .stroke-AA4{stroke:#EDF0FD;} + .d2-3398804513 .stroke-AA5{stroke:#F7F8FE;} + .d2-3398804513 .stroke-AB4{stroke:#EDF0FD;} + .d2-3398804513 .stroke-AB5{stroke:#F7F8FE;} + .d2-3398804513 .background-color-N1{background-color:#0A0F25;} + .d2-3398804513 .background-color-N2{background-color:#676C7E;} + .d2-3398804513 .background-color-N3{background-color:#9499AB;} + .d2-3398804513 .background-color-N4{background-color:#CFD2DD;} + .d2-3398804513 .background-color-N5{background-color:#DEE1EB;} + .d2-3398804513 .background-color-N6{background-color:#EEF1F8;} + .d2-3398804513 .background-color-N7{background-color:#FFFFFF;} + .d2-3398804513 .background-color-B1{background-color:#0D32B2;} + .d2-3398804513 .background-color-B2{background-color:#0D32B2;} + .d2-3398804513 .background-color-B3{background-color:#E3E9FD;} + .d2-3398804513 .background-color-B4{background-color:#E3E9FD;} + .d2-3398804513 .background-color-B5{background-color:#EDF0FD;} + .d2-3398804513 .background-color-B6{background-color:#F7F8FE;} + .d2-3398804513 .background-color-AA2{background-color:#4A6FF3;} + .d2-3398804513 .background-color-AA4{background-color:#EDF0FD;} + .d2-3398804513 .background-color-AA5{background-color:#F7F8FE;} + .d2-3398804513 .background-color-AB4{background-color:#EDF0FD;} + .d2-3398804513 .background-color-AB5{background-color:#F7F8FE;} + .d2-3398804513 .color-N1{color:#0A0F25;} + .d2-3398804513 .color-N2{color:#676C7E;} + .d2-3398804513 .color-N3{color:#9499AB;} + .d2-3398804513 .color-N4{color:#CFD2DD;} + .d2-3398804513 .color-N5{color:#DEE1EB;} + .d2-3398804513 .color-N6{color:#EEF1F8;} + .d2-3398804513 .color-N7{color:#FFFFFF;} + .d2-3398804513 .color-B1{color:#0D32B2;} + .d2-3398804513 .color-B2{color:#0D32B2;} + .d2-3398804513 .color-B3{color:#E3E9FD;} + .d2-3398804513 .color-B4{color:#E3E9FD;} + .d2-3398804513 .color-B5{color:#EDF0FD;} + .d2-3398804513 .color-B6{color:#F7F8FE;} + .d2-3398804513 .color-AA2{color:#4A6FF3;} + .d2-3398804513 .color-AA4{color:#EDF0FD;} + .d2-3398804513 .color-AA5{color:#F7F8FE;} + .d2-3398804513 .color-AB4{color:#EDF0FD;} + .d2-3398804513 .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}]]>VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance diff --git a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg index 64ee261e2..ab98b98d1 100644 --- a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -hello + .d2-251333500 .fill-N1{fill:#0A0F25;} + .d2-251333500 .fill-N2{fill:#676C7E;} + .d2-251333500 .fill-N3{fill:#9499AB;} + .d2-251333500 .fill-N4{fill:#CFD2DD;} + .d2-251333500 .fill-N5{fill:#DEE1EB;} + .d2-251333500 .fill-N6{fill:#EEF1F8;} + .d2-251333500 .fill-N7{fill:#FFFFFF;} + .d2-251333500 .fill-B1{fill:#0D32B2;} + .d2-251333500 .fill-B2{fill:#0D32B2;} + .d2-251333500 .fill-B3{fill:#E3E9FD;} + .d2-251333500 .fill-B4{fill:#E3E9FD;} + .d2-251333500 .fill-B5{fill:#EDF0FD;} + .d2-251333500 .fill-B6{fill:#F7F8FE;} + .d2-251333500 .fill-AA2{fill:#4A6FF3;} + .d2-251333500 .fill-AA4{fill:#EDF0FD;} + .d2-251333500 .fill-AA5{fill:#F7F8FE;} + .d2-251333500 .fill-AB4{fill:#EDF0FD;} + .d2-251333500 .fill-AB5{fill:#F7F8FE;} + .d2-251333500 .stroke-N1{stroke:#0A0F25;} + .d2-251333500 .stroke-N2{stroke:#676C7E;} + .d2-251333500 .stroke-N3{stroke:#9499AB;} + .d2-251333500 .stroke-N4{stroke:#CFD2DD;} + .d2-251333500 .stroke-N5{stroke:#DEE1EB;} + .d2-251333500 .stroke-N6{stroke:#EEF1F8;} + .d2-251333500 .stroke-N7{stroke:#FFFFFF;} + .d2-251333500 .stroke-B1{stroke:#0D32B2;} + .d2-251333500 .stroke-B2{stroke:#0D32B2;} + .d2-251333500 .stroke-B3{stroke:#E3E9FD;} + .d2-251333500 .stroke-B4{stroke:#E3E9FD;} + .d2-251333500 .stroke-B5{stroke:#EDF0FD;} + .d2-251333500 .stroke-B6{stroke:#F7F8FE;} + .d2-251333500 .stroke-AA2{stroke:#4A6FF3;} + .d2-251333500 .stroke-AA4{stroke:#EDF0FD;} + .d2-251333500 .stroke-AA5{stroke:#F7F8FE;} + .d2-251333500 .stroke-AB4{stroke:#EDF0FD;} + .d2-251333500 .stroke-AB5{stroke:#F7F8FE;} + .d2-251333500 .background-color-N1{background-color:#0A0F25;} + .d2-251333500 .background-color-N2{background-color:#676C7E;} + .d2-251333500 .background-color-N3{background-color:#9499AB;} + .d2-251333500 .background-color-N4{background-color:#CFD2DD;} + .d2-251333500 .background-color-N5{background-color:#DEE1EB;} + .d2-251333500 .background-color-N6{background-color:#EEF1F8;} + .d2-251333500 .background-color-N7{background-color:#FFFFFF;} + .d2-251333500 .background-color-B1{background-color:#0D32B2;} + .d2-251333500 .background-color-B2{background-color:#0D32B2;} + .d2-251333500 .background-color-B3{background-color:#E3E9FD;} + .d2-251333500 .background-color-B4{background-color:#E3E9FD;} + .d2-251333500 .background-color-B5{background-color:#EDF0FD;} + .d2-251333500 .background-color-B6{background-color:#F7F8FE;} + .d2-251333500 .background-color-AA2{background-color:#4A6FF3;} + .d2-251333500 .background-color-AA4{background-color:#EDF0FD;} + .d2-251333500 .background-color-AA5{background-color:#F7F8FE;} + .d2-251333500 .background-color-AB4{background-color:#EDF0FD;} + .d2-251333500 .background-color-AB5{background-color:#F7F8FE;} + .d2-251333500 .color-N1{color:#0A0F25;} + .d2-251333500 .color-N2{color:#676C7E;} + .d2-251333500 .color-N3{color:#9499AB;} + .d2-251333500 .color-N4{color:#CFD2DD;} + .d2-251333500 .color-N5{color:#DEE1EB;} + .d2-251333500 .color-N6{color:#EEF1F8;} + .d2-251333500 .color-N7{color:#FFFFFF;} + .d2-251333500 .color-B1{color:#0D32B2;} + .d2-251333500 .color-B2{color:#0D32B2;} + .d2-251333500 .color-B3{color:#E3E9FD;} + .d2-251333500 .color-B4{color:#E3E9FD;} + .d2-251333500 .color-B5{color:#EDF0FD;} + .d2-251333500 .color-B6{color:#F7F8FE;} + .d2-251333500 .color-AA2{color:#4A6FF3;} + .d2-251333500 .color-AA4{color:#EDF0FD;} + .d2-251333500 .color-AA5{color:#F7F8FE;} + .d2-251333500 .color-AB4{color:#EDF0FD;} + .d2-251333500 .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}]]>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 b6029f58a..e6e5cda9b 100644 --- a/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -hello + .d2-3104756215 .fill-N1{fill:#0A0F25;} + .d2-3104756215 .fill-N2{fill:#676C7E;} + .d2-3104756215 .fill-N3{fill:#9499AB;} + .d2-3104756215 .fill-N4{fill:#CFD2DD;} + .d2-3104756215 .fill-N5{fill:#DEE1EB;} + .d2-3104756215 .fill-N6{fill:#EEF1F8;} + .d2-3104756215 .fill-N7{fill:#FFFFFF;} + .d2-3104756215 .fill-B1{fill:#0D32B2;} + .d2-3104756215 .fill-B2{fill:#0D32B2;} + .d2-3104756215 .fill-B3{fill:#E3E9FD;} + .d2-3104756215 .fill-B4{fill:#E3E9FD;} + .d2-3104756215 .fill-B5{fill:#EDF0FD;} + .d2-3104756215 .fill-B6{fill:#F7F8FE;} + .d2-3104756215 .fill-AA2{fill:#4A6FF3;} + .d2-3104756215 .fill-AA4{fill:#EDF0FD;} + .d2-3104756215 .fill-AA5{fill:#F7F8FE;} + .d2-3104756215 .fill-AB4{fill:#EDF0FD;} + .d2-3104756215 .fill-AB5{fill:#F7F8FE;} + .d2-3104756215 .stroke-N1{stroke:#0A0F25;} + .d2-3104756215 .stroke-N2{stroke:#676C7E;} + .d2-3104756215 .stroke-N3{stroke:#9499AB;} + .d2-3104756215 .stroke-N4{stroke:#CFD2DD;} + .d2-3104756215 .stroke-N5{stroke:#DEE1EB;} + .d2-3104756215 .stroke-N6{stroke:#EEF1F8;} + .d2-3104756215 .stroke-N7{stroke:#FFFFFF;} + .d2-3104756215 .stroke-B1{stroke:#0D32B2;} + .d2-3104756215 .stroke-B2{stroke:#0D32B2;} + .d2-3104756215 .stroke-B3{stroke:#E3E9FD;} + .d2-3104756215 .stroke-B4{stroke:#E3E9FD;} + .d2-3104756215 .stroke-B5{stroke:#EDF0FD;} + .d2-3104756215 .stroke-B6{stroke:#F7F8FE;} + .d2-3104756215 .stroke-AA2{stroke:#4A6FF3;} + .d2-3104756215 .stroke-AA4{stroke:#EDF0FD;} + .d2-3104756215 .stroke-AA5{stroke:#F7F8FE;} + .d2-3104756215 .stroke-AB4{stroke:#EDF0FD;} + .d2-3104756215 .stroke-AB5{stroke:#F7F8FE;} + .d2-3104756215 .background-color-N1{background-color:#0A0F25;} + .d2-3104756215 .background-color-N2{background-color:#676C7E;} + .d2-3104756215 .background-color-N3{background-color:#9499AB;} + .d2-3104756215 .background-color-N4{background-color:#CFD2DD;} + .d2-3104756215 .background-color-N5{background-color:#DEE1EB;} + .d2-3104756215 .background-color-N6{background-color:#EEF1F8;} + .d2-3104756215 .background-color-N7{background-color:#FFFFFF;} + .d2-3104756215 .background-color-B1{background-color:#0D32B2;} + .d2-3104756215 .background-color-B2{background-color:#0D32B2;} + .d2-3104756215 .background-color-B3{background-color:#E3E9FD;} + .d2-3104756215 .background-color-B4{background-color:#E3E9FD;} + .d2-3104756215 .background-color-B5{background-color:#EDF0FD;} + .d2-3104756215 .background-color-B6{background-color:#F7F8FE;} + .d2-3104756215 .background-color-AA2{background-color:#4A6FF3;} + .d2-3104756215 .background-color-AA4{background-color:#EDF0FD;} + .d2-3104756215 .background-color-AA5{background-color:#F7F8FE;} + .d2-3104756215 .background-color-AB4{background-color:#EDF0FD;} + .d2-3104756215 .background-color-AB5{background-color:#F7F8FE;} + .d2-3104756215 .color-N1{color:#0A0F25;} + .d2-3104756215 .color-N2{color:#676C7E;} + .d2-3104756215 .color-N3{color:#9499AB;} + .d2-3104756215 .color-N4{color:#CFD2DD;} + .d2-3104756215 .color-N5{color:#DEE1EB;} + .d2-3104756215 .color-N6{color:#EEF1F8;} + .d2-3104756215 .color-N7{color:#FFFFFF;} + .d2-3104756215 .color-B1{color:#0D32B2;} + .d2-3104756215 .color-B2{color:#0D32B2;} + .d2-3104756215 .color-B3{color:#E3E9FD;} + .d2-3104756215 .color-B4{color:#E3E9FD;} + .d2-3104756215 .color-B5{color:#EDF0FD;} + .d2-3104756215 .color-B6{color:#F7F8FE;} + .d2-3104756215 .color-AA2{color:#4A6FF3;} + .d2-3104756215 .color-AA4{color:#EDF0FD;} + .d2-3104756215 .color-AA5{color:#F7F8FE;} + .d2-3104756215 .color-AB4{color:#EDF0FD;} + .d2-3104756215 .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}]]>hello \ No newline at end of file diff --git a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg index fef027fed..43464eaaa 100644 --- a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + .d2-2566192971 .fill-N1{fill:#0A0F25;} + .d2-2566192971 .fill-N2{fill:#676C7E;} + .d2-2566192971 .fill-N3{fill:#9499AB;} + .d2-2566192971 .fill-N4{fill:#CFD2DD;} + .d2-2566192971 .fill-N5{fill:#DEE1EB;} + .d2-2566192971 .fill-N6{fill:#EEF1F8;} + .d2-2566192971 .fill-N7{fill:#FFFFFF;} + .d2-2566192971 .fill-B1{fill:#0D32B2;} + .d2-2566192971 .fill-B2{fill:#0D32B2;} + .d2-2566192971 .fill-B3{fill:#E3E9FD;} + .d2-2566192971 .fill-B4{fill:#E3E9FD;} + .d2-2566192971 .fill-B5{fill:#EDF0FD;} + .d2-2566192971 .fill-B6{fill:#F7F8FE;} + .d2-2566192971 .fill-AA2{fill:#4A6FF3;} + .d2-2566192971 .fill-AA4{fill:#EDF0FD;} + .d2-2566192971 .fill-AA5{fill:#F7F8FE;} + .d2-2566192971 .fill-AB4{fill:#EDF0FD;} + .d2-2566192971 .fill-AB5{fill:#F7F8FE;} + .d2-2566192971 .stroke-N1{stroke:#0A0F25;} + .d2-2566192971 .stroke-N2{stroke:#676C7E;} + .d2-2566192971 .stroke-N3{stroke:#9499AB;} + .d2-2566192971 .stroke-N4{stroke:#CFD2DD;} + .d2-2566192971 .stroke-N5{stroke:#DEE1EB;} + .d2-2566192971 .stroke-N6{stroke:#EEF1F8;} + .d2-2566192971 .stroke-N7{stroke:#FFFFFF;} + .d2-2566192971 .stroke-B1{stroke:#0D32B2;} + .d2-2566192971 .stroke-B2{stroke:#0D32B2;} + .d2-2566192971 .stroke-B3{stroke:#E3E9FD;} + .d2-2566192971 .stroke-B4{stroke:#E3E9FD;} + .d2-2566192971 .stroke-B5{stroke:#EDF0FD;} + .d2-2566192971 .stroke-B6{stroke:#F7F8FE;} + .d2-2566192971 .stroke-AA2{stroke:#4A6FF3;} + .d2-2566192971 .stroke-AA4{stroke:#EDF0FD;} + .d2-2566192971 .stroke-AA5{stroke:#F7F8FE;} + .d2-2566192971 .stroke-AB4{stroke:#EDF0FD;} + .d2-2566192971 .stroke-AB5{stroke:#F7F8FE;} + .d2-2566192971 .background-color-N1{background-color:#0A0F25;} + .d2-2566192971 .background-color-N2{background-color:#676C7E;} + .d2-2566192971 .background-color-N3{background-color:#9499AB;} + .d2-2566192971 .background-color-N4{background-color:#CFD2DD;} + .d2-2566192971 .background-color-N5{background-color:#DEE1EB;} + .d2-2566192971 .background-color-N6{background-color:#EEF1F8;} + .d2-2566192971 .background-color-N7{background-color:#FFFFFF;} + .d2-2566192971 .background-color-B1{background-color:#0D32B2;} + .d2-2566192971 .background-color-B2{background-color:#0D32B2;} + .d2-2566192971 .background-color-B3{background-color:#E3E9FD;} + .d2-2566192971 .background-color-B4{background-color:#E3E9FD;} + .d2-2566192971 .background-color-B5{background-color:#EDF0FD;} + .d2-2566192971 .background-color-B6{background-color:#F7F8FE;} + .d2-2566192971 .background-color-AA2{background-color:#4A6FF3;} + .d2-2566192971 .background-color-AA4{background-color:#EDF0FD;} + .d2-2566192971 .background-color-AA5{background-color:#F7F8FE;} + .d2-2566192971 .background-color-AB4{background-color:#EDF0FD;} + .d2-2566192971 .background-color-AB5{background-color:#F7F8FE;} + .d2-2566192971 .color-N1{color:#0A0F25;} + .d2-2566192971 .color-N2{color:#676C7E;} + .d2-2566192971 .color-N3{color:#9499AB;} + .d2-2566192971 .color-N4{color:#CFD2DD;} + .d2-2566192971 .color-N5{color:#DEE1EB;} + .d2-2566192971 .color-N6{color:#EEF1F8;} + .d2-2566192971 .color-N7{color:#FFFFFF;} + .d2-2566192971 .color-B1{color:#0D32B2;} + .d2-2566192971 .color-B2{color:#0D32B2;} + .d2-2566192971 .color-B3{color:#E3E9FD;} + .d2-2566192971 .color-B4{color:#E3E9FD;} + .d2-2566192971 .color-B5{color:#EDF0FD;} + .d2-2566192971 .color-B6{color:#F7F8FE;} + .d2-2566192971 .color-AA2{color:#4A6FF3;} + .d2-2566192971 .color-AA4{color:#EDF0FD;} + .d2-2566192971 .color-AA5{color:#F7F8FE;} + .d2-2566192971 .color-AB4{color:#EDF0FD;} + .d2-2566192971 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight diff --git a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg index 77369e2a0..d1592f19b 100644 --- a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + .d2-1426566894 .fill-N1{fill:#0A0F25;} + .d2-1426566894 .fill-N2{fill:#676C7E;} + .d2-1426566894 .fill-N3{fill:#9499AB;} + .d2-1426566894 .fill-N4{fill:#CFD2DD;} + .d2-1426566894 .fill-N5{fill:#DEE1EB;} + .d2-1426566894 .fill-N6{fill:#EEF1F8;} + .d2-1426566894 .fill-N7{fill:#FFFFFF;} + .d2-1426566894 .fill-B1{fill:#0D32B2;} + .d2-1426566894 .fill-B2{fill:#0D32B2;} + .d2-1426566894 .fill-B3{fill:#E3E9FD;} + .d2-1426566894 .fill-B4{fill:#E3E9FD;} + .d2-1426566894 .fill-B5{fill:#EDF0FD;} + .d2-1426566894 .fill-B6{fill:#F7F8FE;} + .d2-1426566894 .fill-AA2{fill:#4A6FF3;} + .d2-1426566894 .fill-AA4{fill:#EDF0FD;} + .d2-1426566894 .fill-AA5{fill:#F7F8FE;} + .d2-1426566894 .fill-AB4{fill:#EDF0FD;} + .d2-1426566894 .fill-AB5{fill:#F7F8FE;} + .d2-1426566894 .stroke-N1{stroke:#0A0F25;} + .d2-1426566894 .stroke-N2{stroke:#676C7E;} + .d2-1426566894 .stroke-N3{stroke:#9499AB;} + .d2-1426566894 .stroke-N4{stroke:#CFD2DD;} + .d2-1426566894 .stroke-N5{stroke:#DEE1EB;} + .d2-1426566894 .stroke-N6{stroke:#EEF1F8;} + .d2-1426566894 .stroke-N7{stroke:#FFFFFF;} + .d2-1426566894 .stroke-B1{stroke:#0D32B2;} + .d2-1426566894 .stroke-B2{stroke:#0D32B2;} + .d2-1426566894 .stroke-B3{stroke:#E3E9FD;} + .d2-1426566894 .stroke-B4{stroke:#E3E9FD;} + .d2-1426566894 .stroke-B5{stroke:#EDF0FD;} + .d2-1426566894 .stroke-B6{stroke:#F7F8FE;} + .d2-1426566894 .stroke-AA2{stroke:#4A6FF3;} + .d2-1426566894 .stroke-AA4{stroke:#EDF0FD;} + .d2-1426566894 .stroke-AA5{stroke:#F7F8FE;} + .d2-1426566894 .stroke-AB4{stroke:#EDF0FD;} + .d2-1426566894 .stroke-AB5{stroke:#F7F8FE;} + .d2-1426566894 .background-color-N1{background-color:#0A0F25;} + .d2-1426566894 .background-color-N2{background-color:#676C7E;} + .d2-1426566894 .background-color-N3{background-color:#9499AB;} + .d2-1426566894 .background-color-N4{background-color:#CFD2DD;} + .d2-1426566894 .background-color-N5{background-color:#DEE1EB;} + .d2-1426566894 .background-color-N6{background-color:#EEF1F8;} + .d2-1426566894 .background-color-N7{background-color:#FFFFFF;} + .d2-1426566894 .background-color-B1{background-color:#0D32B2;} + .d2-1426566894 .background-color-B2{background-color:#0D32B2;} + .d2-1426566894 .background-color-B3{background-color:#E3E9FD;} + .d2-1426566894 .background-color-B4{background-color:#E3E9FD;} + .d2-1426566894 .background-color-B5{background-color:#EDF0FD;} + .d2-1426566894 .background-color-B6{background-color:#F7F8FE;} + .d2-1426566894 .background-color-AA2{background-color:#4A6FF3;} + .d2-1426566894 .background-color-AA4{background-color:#EDF0FD;} + .d2-1426566894 .background-color-AA5{background-color:#F7F8FE;} + .d2-1426566894 .background-color-AB4{background-color:#EDF0FD;} + .d2-1426566894 .background-color-AB5{background-color:#F7F8FE;} + .d2-1426566894 .color-N1{color:#0A0F25;} + .d2-1426566894 .color-N2{color:#676C7E;} + .d2-1426566894 .color-N3{color:#9499AB;} + .d2-1426566894 .color-N4{color:#CFD2DD;} + .d2-1426566894 .color-N5{color:#DEE1EB;} + .d2-1426566894 .color-N6{color:#EEF1F8;} + .d2-1426566894 .color-N7{color:#FFFFFF;} + .d2-1426566894 .color-B1{color:#0D32B2;} + .d2-1426566894 .color-B2{color:#0D32B2;} + .d2-1426566894 .color-B3{color:#E3E9FD;} + .d2-1426566894 .color-B4{color:#E3E9FD;} + .d2-1426566894 .color-B5{color:#EDF0FD;} + .d2-1426566894 .color-B6{color:#F7F8FE;} + .d2-1426566894 .color-AA2{color:#4A6FF3;} + .d2-1426566894 .color-AA4{color:#EDF0FD;} + .d2-1426566894 .color-AA5{color:#F7F8FE;} + .d2-1426566894 .color-AB4{color:#EDF0FD;} + .d2-1426566894 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight diff --git a/e2etests/testdata/stable/images/dagre/sketch.exp.svg b/e2etests/testdata/stable/images/dagre/sketch.exp.svg index 1281a8a53..c2933d8da 100644 --- a/e2etests/testdata/stable/images/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/images/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-4027458821 .fill-N1{fill:#0A0F25;} + .d2-4027458821 .fill-N2{fill:#676C7E;} + .d2-4027458821 .fill-N3{fill:#9499AB;} + .d2-4027458821 .fill-N4{fill:#CFD2DD;} + .d2-4027458821 .fill-N5{fill:#DEE1EB;} + .d2-4027458821 .fill-N6{fill:#EEF1F8;} + .d2-4027458821 .fill-N7{fill:#FFFFFF;} + .d2-4027458821 .fill-B1{fill:#0D32B2;} + .d2-4027458821 .fill-B2{fill:#0D32B2;} + .d2-4027458821 .fill-B3{fill:#E3E9FD;} + .d2-4027458821 .fill-B4{fill:#E3E9FD;} + .d2-4027458821 .fill-B5{fill:#EDF0FD;} + .d2-4027458821 .fill-B6{fill:#F7F8FE;} + .d2-4027458821 .fill-AA2{fill:#4A6FF3;} + .d2-4027458821 .fill-AA4{fill:#EDF0FD;} + .d2-4027458821 .fill-AA5{fill:#F7F8FE;} + .d2-4027458821 .fill-AB4{fill:#EDF0FD;} + .d2-4027458821 .fill-AB5{fill:#F7F8FE;} + .d2-4027458821 .stroke-N1{stroke:#0A0F25;} + .d2-4027458821 .stroke-N2{stroke:#676C7E;} + .d2-4027458821 .stroke-N3{stroke:#9499AB;} + .d2-4027458821 .stroke-N4{stroke:#CFD2DD;} + .d2-4027458821 .stroke-N5{stroke:#DEE1EB;} + .d2-4027458821 .stroke-N6{stroke:#EEF1F8;} + .d2-4027458821 .stroke-N7{stroke:#FFFFFF;} + .d2-4027458821 .stroke-B1{stroke:#0D32B2;} + .d2-4027458821 .stroke-B2{stroke:#0D32B2;} + .d2-4027458821 .stroke-B3{stroke:#E3E9FD;} + .d2-4027458821 .stroke-B4{stroke:#E3E9FD;} + .d2-4027458821 .stroke-B5{stroke:#EDF0FD;} + .d2-4027458821 .stroke-B6{stroke:#F7F8FE;} + .d2-4027458821 .stroke-AA2{stroke:#4A6FF3;} + .d2-4027458821 .stroke-AA4{stroke:#EDF0FD;} + .d2-4027458821 .stroke-AA5{stroke:#F7F8FE;} + .d2-4027458821 .stroke-AB4{stroke:#EDF0FD;} + .d2-4027458821 .stroke-AB5{stroke:#F7F8FE;} + .d2-4027458821 .background-color-N1{background-color:#0A0F25;} + .d2-4027458821 .background-color-N2{background-color:#676C7E;} + .d2-4027458821 .background-color-N3{background-color:#9499AB;} + .d2-4027458821 .background-color-N4{background-color:#CFD2DD;} + .d2-4027458821 .background-color-N5{background-color:#DEE1EB;} + .d2-4027458821 .background-color-N6{background-color:#EEF1F8;} + .d2-4027458821 .background-color-N7{background-color:#FFFFFF;} + .d2-4027458821 .background-color-B1{background-color:#0D32B2;} + .d2-4027458821 .background-color-B2{background-color:#0D32B2;} + .d2-4027458821 .background-color-B3{background-color:#E3E9FD;} + .d2-4027458821 .background-color-B4{background-color:#E3E9FD;} + .d2-4027458821 .background-color-B5{background-color:#EDF0FD;} + .d2-4027458821 .background-color-B6{background-color:#F7F8FE;} + .d2-4027458821 .background-color-AA2{background-color:#4A6FF3;} + .d2-4027458821 .background-color-AA4{background-color:#EDF0FD;} + .d2-4027458821 .background-color-AA5{background-color:#F7F8FE;} + .d2-4027458821 .background-color-AB4{background-color:#EDF0FD;} + .d2-4027458821 .background-color-AB5{background-color:#F7F8FE;} + .d2-4027458821 .color-N1{color:#0A0F25;} + .d2-4027458821 .color-N2{color:#676C7E;} + .d2-4027458821 .color-N3{color:#9499AB;} + .d2-4027458821 .color-N4{color:#CFD2DD;} + .d2-4027458821 .color-N5{color:#DEE1EB;} + .d2-4027458821 .color-N6{color:#EEF1F8;} + .d2-4027458821 .color-N7{color:#FFFFFF;} + .d2-4027458821 .color-B1{color:#0D32B2;} + .d2-4027458821 .color-B2{color:#0D32B2;} + .d2-4027458821 .color-B3{color:#E3E9FD;} + .d2-4027458821 .color-B4{color:#E3E9FD;} + .d2-4027458821 .color-B5{color:#EDF0FD;} + .d2-4027458821 .color-B6{color:#F7F8FE;} + .d2-4027458821 .color-AA2{color:#4A6FF3;} + .d2-4027458821 .color-AA4{color:#EDF0FD;} + .d2-4027458821 .color-AA5{color:#F7F8FE;} + .d2-4027458821 .color-AB4{color:#EDF0FD;} + .d2-4027458821 .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}]]>ab diff --git a/e2etests/testdata/stable/images/elk/sketch.exp.svg b/e2etests/testdata/stable/images/elk/sketch.exp.svg index b62a2cef3..9dc831988 100644 --- a/e2etests/testdata/stable/images/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/images/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-733997694 .fill-N1{fill:#0A0F25;} + .d2-733997694 .fill-N2{fill:#676C7E;} + .d2-733997694 .fill-N3{fill:#9499AB;} + .d2-733997694 .fill-N4{fill:#CFD2DD;} + .d2-733997694 .fill-N5{fill:#DEE1EB;} + .d2-733997694 .fill-N6{fill:#EEF1F8;} + .d2-733997694 .fill-N7{fill:#FFFFFF;} + .d2-733997694 .fill-B1{fill:#0D32B2;} + .d2-733997694 .fill-B2{fill:#0D32B2;} + .d2-733997694 .fill-B3{fill:#E3E9FD;} + .d2-733997694 .fill-B4{fill:#E3E9FD;} + .d2-733997694 .fill-B5{fill:#EDF0FD;} + .d2-733997694 .fill-B6{fill:#F7F8FE;} + .d2-733997694 .fill-AA2{fill:#4A6FF3;} + .d2-733997694 .fill-AA4{fill:#EDF0FD;} + .d2-733997694 .fill-AA5{fill:#F7F8FE;} + .d2-733997694 .fill-AB4{fill:#EDF0FD;} + .d2-733997694 .fill-AB5{fill:#F7F8FE;} + .d2-733997694 .stroke-N1{stroke:#0A0F25;} + .d2-733997694 .stroke-N2{stroke:#676C7E;} + .d2-733997694 .stroke-N3{stroke:#9499AB;} + .d2-733997694 .stroke-N4{stroke:#CFD2DD;} + .d2-733997694 .stroke-N5{stroke:#DEE1EB;} + .d2-733997694 .stroke-N6{stroke:#EEF1F8;} + .d2-733997694 .stroke-N7{stroke:#FFFFFF;} + .d2-733997694 .stroke-B1{stroke:#0D32B2;} + .d2-733997694 .stroke-B2{stroke:#0D32B2;} + .d2-733997694 .stroke-B3{stroke:#E3E9FD;} + .d2-733997694 .stroke-B4{stroke:#E3E9FD;} + .d2-733997694 .stroke-B5{stroke:#EDF0FD;} + .d2-733997694 .stroke-B6{stroke:#F7F8FE;} + .d2-733997694 .stroke-AA2{stroke:#4A6FF3;} + .d2-733997694 .stroke-AA4{stroke:#EDF0FD;} + .d2-733997694 .stroke-AA5{stroke:#F7F8FE;} + .d2-733997694 .stroke-AB4{stroke:#EDF0FD;} + .d2-733997694 .stroke-AB5{stroke:#F7F8FE;} + .d2-733997694 .background-color-N1{background-color:#0A0F25;} + .d2-733997694 .background-color-N2{background-color:#676C7E;} + .d2-733997694 .background-color-N3{background-color:#9499AB;} + .d2-733997694 .background-color-N4{background-color:#CFD2DD;} + .d2-733997694 .background-color-N5{background-color:#DEE1EB;} + .d2-733997694 .background-color-N6{background-color:#EEF1F8;} + .d2-733997694 .background-color-N7{background-color:#FFFFFF;} + .d2-733997694 .background-color-B1{background-color:#0D32B2;} + .d2-733997694 .background-color-B2{background-color:#0D32B2;} + .d2-733997694 .background-color-B3{background-color:#E3E9FD;} + .d2-733997694 .background-color-B4{background-color:#E3E9FD;} + .d2-733997694 .background-color-B5{background-color:#EDF0FD;} + .d2-733997694 .background-color-B6{background-color:#F7F8FE;} + .d2-733997694 .background-color-AA2{background-color:#4A6FF3;} + .d2-733997694 .background-color-AA4{background-color:#EDF0FD;} + .d2-733997694 .background-color-AA5{background-color:#F7F8FE;} + .d2-733997694 .background-color-AB4{background-color:#EDF0FD;} + .d2-733997694 .background-color-AB5{background-color:#F7F8FE;} + .d2-733997694 .color-N1{color:#0A0F25;} + .d2-733997694 .color-N2{color:#676C7E;} + .d2-733997694 .color-N3{color:#9499AB;} + .d2-733997694 .color-N4{color:#CFD2DD;} + .d2-733997694 .color-N5{color:#DEE1EB;} + .d2-733997694 .color-N6{color:#EEF1F8;} + .d2-733997694 .color-N7{color:#FFFFFF;} + .d2-733997694 .color-B1{color:#0D32B2;} + .d2-733997694 .color-B2{color:#0D32B2;} + .d2-733997694 .color-B3{color:#E3E9FD;} + .d2-733997694 .color-B4{color:#E3E9FD;} + .d2-733997694 .color-B5{color:#EDF0FD;} + .d2-733997694 .color-B6{color:#F7F8FE;} + .d2-733997694 .color-AA2{color:#4A6FF3;} + .d2-733997694 .color-AA4{color:#EDF0FD;} + .d2-733997694 .color-AA5{color:#F7F8FE;} + .d2-733997694 .color-AB4{color:#EDF0FD;} + .d2-733997694 .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}]]>ab diff --git a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg index e927940c1..0ce6afa82 100644 --- a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + .d2-2089172870 .fill-N1{fill:#0A0F25;} + .d2-2089172870 .fill-N2{fill:#676C7E;} + .d2-2089172870 .fill-N3{fill:#9499AB;} + .d2-2089172870 .fill-N4{fill:#CFD2DD;} + .d2-2089172870 .fill-N5{fill:#DEE1EB;} + .d2-2089172870 .fill-N6{fill:#EEF1F8;} + .d2-2089172870 .fill-N7{fill:#FFFFFF;} + .d2-2089172870 .fill-B1{fill:#0D32B2;} + .d2-2089172870 .fill-B2{fill:#0D32B2;} + .d2-2089172870 .fill-B3{fill:#E3E9FD;} + .d2-2089172870 .fill-B4{fill:#E3E9FD;} + .d2-2089172870 .fill-B5{fill:#EDF0FD;} + .d2-2089172870 .fill-B6{fill:#F7F8FE;} + .d2-2089172870 .fill-AA2{fill:#4A6FF3;} + .d2-2089172870 .fill-AA4{fill:#EDF0FD;} + .d2-2089172870 .fill-AA5{fill:#F7F8FE;} + .d2-2089172870 .fill-AB4{fill:#EDF0FD;} + .d2-2089172870 .fill-AB5{fill:#F7F8FE;} + .d2-2089172870 .stroke-N1{stroke:#0A0F25;} + .d2-2089172870 .stroke-N2{stroke:#676C7E;} + .d2-2089172870 .stroke-N3{stroke:#9499AB;} + .d2-2089172870 .stroke-N4{stroke:#CFD2DD;} + .d2-2089172870 .stroke-N5{stroke:#DEE1EB;} + .d2-2089172870 .stroke-N6{stroke:#EEF1F8;} + .d2-2089172870 .stroke-N7{stroke:#FFFFFF;} + .d2-2089172870 .stroke-B1{stroke:#0D32B2;} + .d2-2089172870 .stroke-B2{stroke:#0D32B2;} + .d2-2089172870 .stroke-B3{stroke:#E3E9FD;} + .d2-2089172870 .stroke-B4{stroke:#E3E9FD;} + .d2-2089172870 .stroke-B5{stroke:#EDF0FD;} + .d2-2089172870 .stroke-B6{stroke:#F7F8FE;} + .d2-2089172870 .stroke-AA2{stroke:#4A6FF3;} + .d2-2089172870 .stroke-AA4{stroke:#EDF0FD;} + .d2-2089172870 .stroke-AA5{stroke:#F7F8FE;} + .d2-2089172870 .stroke-AB4{stroke:#EDF0FD;} + .d2-2089172870 .stroke-AB5{stroke:#F7F8FE;} + .d2-2089172870 .background-color-N1{background-color:#0A0F25;} + .d2-2089172870 .background-color-N2{background-color:#676C7E;} + .d2-2089172870 .background-color-N3{background-color:#9499AB;} + .d2-2089172870 .background-color-N4{background-color:#CFD2DD;} + .d2-2089172870 .background-color-N5{background-color:#DEE1EB;} + .d2-2089172870 .background-color-N6{background-color:#EEF1F8;} + .d2-2089172870 .background-color-N7{background-color:#FFFFFF;} + .d2-2089172870 .background-color-B1{background-color:#0D32B2;} + .d2-2089172870 .background-color-B2{background-color:#0D32B2;} + .d2-2089172870 .background-color-B3{background-color:#E3E9FD;} + .d2-2089172870 .background-color-B4{background-color:#E3E9FD;} + .d2-2089172870 .background-color-B5{background-color:#EDF0FD;} + .d2-2089172870 .background-color-B6{background-color:#F7F8FE;} + .d2-2089172870 .background-color-AA2{background-color:#4A6FF3;} + .d2-2089172870 .background-color-AA4{background-color:#EDF0FD;} + .d2-2089172870 .background-color-AA5{background-color:#F7F8FE;} + .d2-2089172870 .background-color-AB4{background-color:#EDF0FD;} + .d2-2089172870 .background-color-AB5{background-color:#F7F8FE;} + .d2-2089172870 .color-N1{color:#0A0F25;} + .d2-2089172870 .color-N2{color:#676C7E;} + .d2-2089172870 .color-N3{color:#9499AB;} + .d2-2089172870 .color-N4{color:#CFD2DD;} + .d2-2089172870 .color-N5{color:#DEE1EB;} + .d2-2089172870 .color-N6{color:#EEF1F8;} + .d2-2089172870 .color-N7{color:#FFFFFF;} + .d2-2089172870 .color-B1{color:#0D32B2;} + .d2-2089172870 .color-B2{color:#0D32B2;} + .d2-2089172870 .color-B3{color:#E3E9FD;} + .d2-2089172870 .color-B4{color:#E3E9FD;} + .d2-2089172870 .color-B5{color:#EDF0FD;} + .d2-2089172870 .color-B6{color:#F7F8FE;} + .d2-2089172870 .color-AA2{color:#4A6FF3;} + .d2-2089172870 .color-AA4{color:#EDF0FD;} + .d2-2089172870 .color-AA5{color:#F7F8FE;} + .d2-2089172870 .color-AB4{color:#EDF0FD;} + .d2-2089172870 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index be895ab76..5a5059dff 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + .d2-526369625 .fill-N1{fill:#0A0F25;} + .d2-526369625 .fill-N2{fill:#676C7E;} + .d2-526369625 .fill-N3{fill:#9499AB;} + .d2-526369625 .fill-N4{fill:#CFD2DD;} + .d2-526369625 .fill-N5{fill:#DEE1EB;} + .d2-526369625 .fill-N6{fill:#EEF1F8;} + .d2-526369625 .fill-N7{fill:#FFFFFF;} + .d2-526369625 .fill-B1{fill:#0D32B2;} + .d2-526369625 .fill-B2{fill:#0D32B2;} + .d2-526369625 .fill-B3{fill:#E3E9FD;} + .d2-526369625 .fill-B4{fill:#E3E9FD;} + .d2-526369625 .fill-B5{fill:#EDF0FD;} + .d2-526369625 .fill-B6{fill:#F7F8FE;} + .d2-526369625 .fill-AA2{fill:#4A6FF3;} + .d2-526369625 .fill-AA4{fill:#EDF0FD;} + .d2-526369625 .fill-AA5{fill:#F7F8FE;} + .d2-526369625 .fill-AB4{fill:#EDF0FD;} + .d2-526369625 .fill-AB5{fill:#F7F8FE;} + .d2-526369625 .stroke-N1{stroke:#0A0F25;} + .d2-526369625 .stroke-N2{stroke:#676C7E;} + .d2-526369625 .stroke-N3{stroke:#9499AB;} + .d2-526369625 .stroke-N4{stroke:#CFD2DD;} + .d2-526369625 .stroke-N5{stroke:#DEE1EB;} + .d2-526369625 .stroke-N6{stroke:#EEF1F8;} + .d2-526369625 .stroke-N7{stroke:#FFFFFF;} + .d2-526369625 .stroke-B1{stroke:#0D32B2;} + .d2-526369625 .stroke-B2{stroke:#0D32B2;} + .d2-526369625 .stroke-B3{stroke:#E3E9FD;} + .d2-526369625 .stroke-B4{stroke:#E3E9FD;} + .d2-526369625 .stroke-B5{stroke:#EDF0FD;} + .d2-526369625 .stroke-B6{stroke:#F7F8FE;} + .d2-526369625 .stroke-AA2{stroke:#4A6FF3;} + .d2-526369625 .stroke-AA4{stroke:#EDF0FD;} + .d2-526369625 .stroke-AA5{stroke:#F7F8FE;} + .d2-526369625 .stroke-AB4{stroke:#EDF0FD;} + .d2-526369625 .stroke-AB5{stroke:#F7F8FE;} + .d2-526369625 .background-color-N1{background-color:#0A0F25;} + .d2-526369625 .background-color-N2{background-color:#676C7E;} + .d2-526369625 .background-color-N3{background-color:#9499AB;} + .d2-526369625 .background-color-N4{background-color:#CFD2DD;} + .d2-526369625 .background-color-N5{background-color:#DEE1EB;} + .d2-526369625 .background-color-N6{background-color:#EEF1F8;} + .d2-526369625 .background-color-N7{background-color:#FFFFFF;} + .d2-526369625 .background-color-B1{background-color:#0D32B2;} + .d2-526369625 .background-color-B2{background-color:#0D32B2;} + .d2-526369625 .background-color-B3{background-color:#E3E9FD;} + .d2-526369625 .background-color-B4{background-color:#E3E9FD;} + .d2-526369625 .background-color-B5{background-color:#EDF0FD;} + .d2-526369625 .background-color-B6{background-color:#F7F8FE;} + .d2-526369625 .background-color-AA2{background-color:#4A6FF3;} + .d2-526369625 .background-color-AA4{background-color:#EDF0FD;} + .d2-526369625 .background-color-AA5{background-color:#F7F8FE;} + .d2-526369625 .background-color-AB4{background-color:#EDF0FD;} + .d2-526369625 .background-color-AB5{background-color:#F7F8FE;} + .d2-526369625 .color-N1{color:#0A0F25;} + .d2-526369625 .color-N2{color:#676C7E;} + .d2-526369625 .color-N3{color:#9499AB;} + .d2-526369625 .color-N4{color:#CFD2DD;} + .d2-526369625 .color-N5{color:#DEE1EB;} + .d2-526369625 .color-N6{color:#EEF1F8;} + .d2-526369625 .color-N7{color:#FFFFFF;} + .d2-526369625 .color-B1{color:#0D32B2;} + .d2-526369625 .color-B2{color:#0D32B2;} + .d2-526369625 .color-B3{color:#E3E9FD;} + .d2-526369625 .color-B4{color:#E3E9FD;} + .d2-526369625 .color-B5{color:#EDF0FD;} + .d2-526369625 .color-B6{color:#F7F8FE;} + .d2-526369625 .color-AA2{color:#4A6FF3;} + .d2-526369625 .color-AA4{color:#EDF0FD;} + .d2-526369625 .color-AA5{color:#F7F8FE;} + .d2-526369625 .color-AB4{color:#EDF0FD;} + .d2-526369625 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 diff --git a/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg b/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg index ff9e7cdde..9aa21b001 100644 --- a/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -workerprofits + .d2-1582627981 .fill-N1{fill:#0A0F25;} + .d2-1582627981 .fill-N2{fill:#676C7E;} + .d2-1582627981 .fill-N3{fill:#9499AB;} + .d2-1582627981 .fill-N4{fill:#CFD2DD;} + .d2-1582627981 .fill-N5{fill:#DEE1EB;} + .d2-1582627981 .fill-N6{fill:#EEF1F8;} + .d2-1582627981 .fill-N7{fill:#FFFFFF;} + .d2-1582627981 .fill-B1{fill:#0D32B2;} + .d2-1582627981 .fill-B2{fill:#0D32B2;} + .d2-1582627981 .fill-B3{fill:#E3E9FD;} + .d2-1582627981 .fill-B4{fill:#E3E9FD;} + .d2-1582627981 .fill-B5{fill:#EDF0FD;} + .d2-1582627981 .fill-B6{fill:#F7F8FE;} + .d2-1582627981 .fill-AA2{fill:#4A6FF3;} + .d2-1582627981 .fill-AA4{fill:#EDF0FD;} + .d2-1582627981 .fill-AA5{fill:#F7F8FE;} + .d2-1582627981 .fill-AB4{fill:#EDF0FD;} + .d2-1582627981 .fill-AB5{fill:#F7F8FE;} + .d2-1582627981 .stroke-N1{stroke:#0A0F25;} + .d2-1582627981 .stroke-N2{stroke:#676C7E;} + .d2-1582627981 .stroke-N3{stroke:#9499AB;} + .d2-1582627981 .stroke-N4{stroke:#CFD2DD;} + .d2-1582627981 .stroke-N5{stroke:#DEE1EB;} + .d2-1582627981 .stroke-N6{stroke:#EEF1F8;} + .d2-1582627981 .stroke-N7{stroke:#FFFFFF;} + .d2-1582627981 .stroke-B1{stroke:#0D32B2;} + .d2-1582627981 .stroke-B2{stroke:#0D32B2;} + .d2-1582627981 .stroke-B3{stroke:#E3E9FD;} + .d2-1582627981 .stroke-B4{stroke:#E3E9FD;} + .d2-1582627981 .stroke-B5{stroke:#EDF0FD;} + .d2-1582627981 .stroke-B6{stroke:#F7F8FE;} + .d2-1582627981 .stroke-AA2{stroke:#4A6FF3;} + .d2-1582627981 .stroke-AA4{stroke:#EDF0FD;} + .d2-1582627981 .stroke-AA5{stroke:#F7F8FE;} + .d2-1582627981 .stroke-AB4{stroke:#EDF0FD;} + .d2-1582627981 .stroke-AB5{stroke:#F7F8FE;} + .d2-1582627981 .background-color-N1{background-color:#0A0F25;} + .d2-1582627981 .background-color-N2{background-color:#676C7E;} + .d2-1582627981 .background-color-N3{background-color:#9499AB;} + .d2-1582627981 .background-color-N4{background-color:#CFD2DD;} + .d2-1582627981 .background-color-N5{background-color:#DEE1EB;} + .d2-1582627981 .background-color-N6{background-color:#EEF1F8;} + .d2-1582627981 .background-color-N7{background-color:#FFFFFF;} + .d2-1582627981 .background-color-B1{background-color:#0D32B2;} + .d2-1582627981 .background-color-B2{background-color:#0D32B2;} + .d2-1582627981 .background-color-B3{background-color:#E3E9FD;} + .d2-1582627981 .background-color-B4{background-color:#E3E9FD;} + .d2-1582627981 .background-color-B5{background-color:#EDF0FD;} + .d2-1582627981 .background-color-B6{background-color:#F7F8FE;} + .d2-1582627981 .background-color-AA2{background-color:#4A6FF3;} + .d2-1582627981 .background-color-AA4{background-color:#EDF0FD;} + .d2-1582627981 .background-color-AA5{background-color:#F7F8FE;} + .d2-1582627981 .background-color-AB4{background-color:#EDF0FD;} + .d2-1582627981 .background-color-AB5{background-color:#F7F8FE;} + .d2-1582627981 .color-N1{color:#0A0F25;} + .d2-1582627981 .color-N2{color:#676C7E;} + .d2-1582627981 .color-N3{color:#9499AB;} + .d2-1582627981 .color-N4{color:#CFD2DD;} + .d2-1582627981 .color-N5{color:#DEE1EB;} + .d2-1582627981 .color-N6{color:#EEF1F8;} + .d2-1582627981 .color-N7{color:#FFFFFF;} + .d2-1582627981 .color-B1{color:#0D32B2;} + .d2-1582627981 .color-B2{color:#0D32B2;} + .d2-1582627981 .color-B3{color:#E3E9FD;} + .d2-1582627981 .color-B4{color:#E3E9FD;} + .d2-1582627981 .color-B5{color:#EDF0FD;} + .d2-1582627981 .color-B6{color:#F7F8FE;} + .d2-1582627981 .color-AA2{color:#4A6FF3;} + .d2-1582627981 .color-AA4{color:#EDF0FD;} + .d2-1582627981 .color-AA5{color:#F7F8FE;} + .d2-1582627981 .color-AB4{color:#EDF0FD;} + .d2-1582627981 .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}]]>workerprofits diff --git a/e2etests/testdata/stable/label-near/elk/sketch.exp.svg b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg index c86741a3d..a8b8e7430 100644 --- a/e2etests/testdata/stable/label-near/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -workerprofits + .d2-1457220000 .fill-N1{fill:#0A0F25;} + .d2-1457220000 .fill-N2{fill:#676C7E;} + .d2-1457220000 .fill-N3{fill:#9499AB;} + .d2-1457220000 .fill-N4{fill:#CFD2DD;} + .d2-1457220000 .fill-N5{fill:#DEE1EB;} + .d2-1457220000 .fill-N6{fill:#EEF1F8;} + .d2-1457220000 .fill-N7{fill:#FFFFFF;} + .d2-1457220000 .fill-B1{fill:#0D32B2;} + .d2-1457220000 .fill-B2{fill:#0D32B2;} + .d2-1457220000 .fill-B3{fill:#E3E9FD;} + .d2-1457220000 .fill-B4{fill:#E3E9FD;} + .d2-1457220000 .fill-B5{fill:#EDF0FD;} + .d2-1457220000 .fill-B6{fill:#F7F8FE;} + .d2-1457220000 .fill-AA2{fill:#4A6FF3;} + .d2-1457220000 .fill-AA4{fill:#EDF0FD;} + .d2-1457220000 .fill-AA5{fill:#F7F8FE;} + .d2-1457220000 .fill-AB4{fill:#EDF0FD;} + .d2-1457220000 .fill-AB5{fill:#F7F8FE;} + .d2-1457220000 .stroke-N1{stroke:#0A0F25;} + .d2-1457220000 .stroke-N2{stroke:#676C7E;} + .d2-1457220000 .stroke-N3{stroke:#9499AB;} + .d2-1457220000 .stroke-N4{stroke:#CFD2DD;} + .d2-1457220000 .stroke-N5{stroke:#DEE1EB;} + .d2-1457220000 .stroke-N6{stroke:#EEF1F8;} + .d2-1457220000 .stroke-N7{stroke:#FFFFFF;} + .d2-1457220000 .stroke-B1{stroke:#0D32B2;} + .d2-1457220000 .stroke-B2{stroke:#0D32B2;} + .d2-1457220000 .stroke-B3{stroke:#E3E9FD;} + .d2-1457220000 .stroke-B4{stroke:#E3E9FD;} + .d2-1457220000 .stroke-B5{stroke:#EDF0FD;} + .d2-1457220000 .stroke-B6{stroke:#F7F8FE;} + .d2-1457220000 .stroke-AA2{stroke:#4A6FF3;} + .d2-1457220000 .stroke-AA4{stroke:#EDF0FD;} + .d2-1457220000 .stroke-AA5{stroke:#F7F8FE;} + .d2-1457220000 .stroke-AB4{stroke:#EDF0FD;} + .d2-1457220000 .stroke-AB5{stroke:#F7F8FE;} + .d2-1457220000 .background-color-N1{background-color:#0A0F25;} + .d2-1457220000 .background-color-N2{background-color:#676C7E;} + .d2-1457220000 .background-color-N3{background-color:#9499AB;} + .d2-1457220000 .background-color-N4{background-color:#CFD2DD;} + .d2-1457220000 .background-color-N5{background-color:#DEE1EB;} + .d2-1457220000 .background-color-N6{background-color:#EEF1F8;} + .d2-1457220000 .background-color-N7{background-color:#FFFFFF;} + .d2-1457220000 .background-color-B1{background-color:#0D32B2;} + .d2-1457220000 .background-color-B2{background-color:#0D32B2;} + .d2-1457220000 .background-color-B3{background-color:#E3E9FD;} + .d2-1457220000 .background-color-B4{background-color:#E3E9FD;} + .d2-1457220000 .background-color-B5{background-color:#EDF0FD;} + .d2-1457220000 .background-color-B6{background-color:#F7F8FE;} + .d2-1457220000 .background-color-AA2{background-color:#4A6FF3;} + .d2-1457220000 .background-color-AA4{background-color:#EDF0FD;} + .d2-1457220000 .background-color-AA5{background-color:#F7F8FE;} + .d2-1457220000 .background-color-AB4{background-color:#EDF0FD;} + .d2-1457220000 .background-color-AB5{background-color:#F7F8FE;} + .d2-1457220000 .color-N1{color:#0A0F25;} + .d2-1457220000 .color-N2{color:#676C7E;} + .d2-1457220000 .color-N3{color:#9499AB;} + .d2-1457220000 .color-N4{color:#CFD2DD;} + .d2-1457220000 .color-N5{color:#DEE1EB;} + .d2-1457220000 .color-N6{color:#EEF1F8;} + .d2-1457220000 .color-N7{color:#FFFFFF;} + .d2-1457220000 .color-B1{color:#0D32B2;} + .d2-1457220000 .color-B2{color:#0D32B2;} + .d2-1457220000 .color-B3{color:#E3E9FD;} + .d2-1457220000 .color-B4{color:#E3E9FD;} + .d2-1457220000 .color-B5{color:#EDF0FD;} + .d2-1457220000 .color-B6{color:#F7F8FE;} + .d2-1457220000 .color-AA2{color:#4A6FF3;} + .d2-1457220000 .color-AA4{color:#EDF0FD;} + .d2-1457220000 .color-AA5{color:#F7F8FE;} + .d2-1457220000 .color-AB4{color:#EDF0FD;} + .d2-1457220000 .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}]]>workerprofits diff --git a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg index f0ad88477..785a1c370 100644 --- a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + .d2-1304341604 .fill-N1{fill:#0A0F25;} + .d2-1304341604 .fill-N2{fill:#676C7E;} + .d2-1304341604 .fill-N3{fill:#9499AB;} + .d2-1304341604 .fill-N4{fill:#CFD2DD;} + .d2-1304341604 .fill-N5{fill:#DEE1EB;} + .d2-1304341604 .fill-N6{fill:#EEF1F8;} + .d2-1304341604 .fill-N7{fill:#FFFFFF;} + .d2-1304341604 .fill-B1{fill:#0D32B2;} + .d2-1304341604 .fill-B2{fill:#0D32B2;} + .d2-1304341604 .fill-B3{fill:#E3E9FD;} + .d2-1304341604 .fill-B4{fill:#E3E9FD;} + .d2-1304341604 .fill-B5{fill:#EDF0FD;} + .d2-1304341604 .fill-B6{fill:#F7F8FE;} + .d2-1304341604 .fill-AA2{fill:#4A6FF3;} + .d2-1304341604 .fill-AA4{fill:#EDF0FD;} + .d2-1304341604 .fill-AA5{fill:#F7F8FE;} + .d2-1304341604 .fill-AB4{fill:#EDF0FD;} + .d2-1304341604 .fill-AB5{fill:#F7F8FE;} + .d2-1304341604 .stroke-N1{stroke:#0A0F25;} + .d2-1304341604 .stroke-N2{stroke:#676C7E;} + .d2-1304341604 .stroke-N3{stroke:#9499AB;} + .d2-1304341604 .stroke-N4{stroke:#CFD2DD;} + .d2-1304341604 .stroke-N5{stroke:#DEE1EB;} + .d2-1304341604 .stroke-N6{stroke:#EEF1F8;} + .d2-1304341604 .stroke-N7{stroke:#FFFFFF;} + .d2-1304341604 .stroke-B1{stroke:#0D32B2;} + .d2-1304341604 .stroke-B2{stroke:#0D32B2;} + .d2-1304341604 .stroke-B3{stroke:#E3E9FD;} + .d2-1304341604 .stroke-B4{stroke:#E3E9FD;} + .d2-1304341604 .stroke-B5{stroke:#EDF0FD;} + .d2-1304341604 .stroke-B6{stroke:#F7F8FE;} + .d2-1304341604 .stroke-AA2{stroke:#4A6FF3;} + .d2-1304341604 .stroke-AA4{stroke:#EDF0FD;} + .d2-1304341604 .stroke-AA5{stroke:#F7F8FE;} + .d2-1304341604 .stroke-AB4{stroke:#EDF0FD;} + .d2-1304341604 .stroke-AB5{stroke:#F7F8FE;} + .d2-1304341604 .background-color-N1{background-color:#0A0F25;} + .d2-1304341604 .background-color-N2{background-color:#676C7E;} + .d2-1304341604 .background-color-N3{background-color:#9499AB;} + .d2-1304341604 .background-color-N4{background-color:#CFD2DD;} + .d2-1304341604 .background-color-N5{background-color:#DEE1EB;} + .d2-1304341604 .background-color-N6{background-color:#EEF1F8;} + .d2-1304341604 .background-color-N7{background-color:#FFFFFF;} + .d2-1304341604 .background-color-B1{background-color:#0D32B2;} + .d2-1304341604 .background-color-B2{background-color:#0D32B2;} + .d2-1304341604 .background-color-B3{background-color:#E3E9FD;} + .d2-1304341604 .background-color-B4{background-color:#E3E9FD;} + .d2-1304341604 .background-color-B5{background-color:#EDF0FD;} + .d2-1304341604 .background-color-B6{background-color:#F7F8FE;} + .d2-1304341604 .background-color-AA2{background-color:#4A6FF3;} + .d2-1304341604 .background-color-AA4{background-color:#EDF0FD;} + .d2-1304341604 .background-color-AA5{background-color:#F7F8FE;} + .d2-1304341604 .background-color-AB4{background-color:#EDF0FD;} + .d2-1304341604 .background-color-AB5{background-color:#F7F8FE;} + .d2-1304341604 .color-N1{color:#0A0F25;} + .d2-1304341604 .color-N2{color:#676C7E;} + .d2-1304341604 .color-N3{color:#9499AB;} + .d2-1304341604 .color-N4{color:#CFD2DD;} + .d2-1304341604 .color-N5{color:#DEE1EB;} + .d2-1304341604 .color-N6{color:#EEF1F8;} + .d2-1304341604 .color-N7{color:#FFFFFF;} + .d2-1304341604 .color-B1{color:#0D32B2;} + .d2-1304341604 .color-B2{color:#0D32B2;} + .d2-1304341604 .color-B3{color:#E3E9FD;} + .d2-1304341604 .color-B4{color:#E3E9FD;} + .d2-1304341604 .color-B5{color:#EDF0FD;} + .d2-1304341604 .color-B6{color:#F7F8FE;} + .d2-1304341604 .color-AA2{color:#4A6FF3;} + .d2-1304341604 .color-AA4{color:#EDF0FD;} + .d2-1304341604 .color-AA5{color:#F7F8FE;} + .d2-1304341604 .color-AB4{color:#EDF0FD;} + .d2-1304341604 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight diff --git a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg index fd860e6f1..67fe3c104 100644 --- a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + .d2-215275305 .fill-N1{fill:#0A0F25;} + .d2-215275305 .fill-N2{fill:#676C7E;} + .d2-215275305 .fill-N3{fill:#9499AB;} + .d2-215275305 .fill-N4{fill:#CFD2DD;} + .d2-215275305 .fill-N5{fill:#DEE1EB;} + .d2-215275305 .fill-N6{fill:#EEF1F8;} + .d2-215275305 .fill-N7{fill:#FFFFFF;} + .d2-215275305 .fill-B1{fill:#0D32B2;} + .d2-215275305 .fill-B2{fill:#0D32B2;} + .d2-215275305 .fill-B3{fill:#E3E9FD;} + .d2-215275305 .fill-B4{fill:#E3E9FD;} + .d2-215275305 .fill-B5{fill:#EDF0FD;} + .d2-215275305 .fill-B6{fill:#F7F8FE;} + .d2-215275305 .fill-AA2{fill:#4A6FF3;} + .d2-215275305 .fill-AA4{fill:#EDF0FD;} + .d2-215275305 .fill-AA5{fill:#F7F8FE;} + .d2-215275305 .fill-AB4{fill:#EDF0FD;} + .d2-215275305 .fill-AB5{fill:#F7F8FE;} + .d2-215275305 .stroke-N1{stroke:#0A0F25;} + .d2-215275305 .stroke-N2{stroke:#676C7E;} + .d2-215275305 .stroke-N3{stroke:#9499AB;} + .d2-215275305 .stroke-N4{stroke:#CFD2DD;} + .d2-215275305 .stroke-N5{stroke:#DEE1EB;} + .d2-215275305 .stroke-N6{stroke:#EEF1F8;} + .d2-215275305 .stroke-N7{stroke:#FFFFFF;} + .d2-215275305 .stroke-B1{stroke:#0D32B2;} + .d2-215275305 .stroke-B2{stroke:#0D32B2;} + .d2-215275305 .stroke-B3{stroke:#E3E9FD;} + .d2-215275305 .stroke-B4{stroke:#E3E9FD;} + .d2-215275305 .stroke-B5{stroke:#EDF0FD;} + .d2-215275305 .stroke-B6{stroke:#F7F8FE;} + .d2-215275305 .stroke-AA2{stroke:#4A6FF3;} + .d2-215275305 .stroke-AA4{stroke:#EDF0FD;} + .d2-215275305 .stroke-AA5{stroke:#F7F8FE;} + .d2-215275305 .stroke-AB4{stroke:#EDF0FD;} + .d2-215275305 .stroke-AB5{stroke:#F7F8FE;} + .d2-215275305 .background-color-N1{background-color:#0A0F25;} + .d2-215275305 .background-color-N2{background-color:#676C7E;} + .d2-215275305 .background-color-N3{background-color:#9499AB;} + .d2-215275305 .background-color-N4{background-color:#CFD2DD;} + .d2-215275305 .background-color-N5{background-color:#DEE1EB;} + .d2-215275305 .background-color-N6{background-color:#EEF1F8;} + .d2-215275305 .background-color-N7{background-color:#FFFFFF;} + .d2-215275305 .background-color-B1{background-color:#0D32B2;} + .d2-215275305 .background-color-B2{background-color:#0D32B2;} + .d2-215275305 .background-color-B3{background-color:#E3E9FD;} + .d2-215275305 .background-color-B4{background-color:#E3E9FD;} + .d2-215275305 .background-color-B5{background-color:#EDF0FD;} + .d2-215275305 .background-color-B6{background-color:#F7F8FE;} + .d2-215275305 .background-color-AA2{background-color:#4A6FF3;} + .d2-215275305 .background-color-AA4{background-color:#EDF0FD;} + .d2-215275305 .background-color-AA5{background-color:#F7F8FE;} + .d2-215275305 .background-color-AB4{background-color:#EDF0FD;} + .d2-215275305 .background-color-AB5{background-color:#F7F8FE;} + .d2-215275305 .color-N1{color:#0A0F25;} + .d2-215275305 .color-N2{color:#676C7E;} + .d2-215275305 .color-N3{color:#9499AB;} + .d2-215275305 .color-N4{color:#CFD2DD;} + .d2-215275305 .color-N5{color:#DEE1EB;} + .d2-215275305 .color-N6{color:#EEF1F8;} + .d2-215275305 .color-N7{color:#FFFFFF;} + .d2-215275305 .color-B1{color:#0D32B2;} + .d2-215275305 .color-B2{color:#0D32B2;} + .d2-215275305 .color-B3{color:#E3E9FD;} + .d2-215275305 .color-B4{color:#E3E9FD;} + .d2-215275305 .color-B5{color:#EDF0FD;} + .d2-215275305 .color-B6{color:#F7F8FE;} + .d2-215275305 .color-AA2{color:#4A6FF3;} + .d2-215275305 .color-AA4{color:#EDF0FD;} + .d2-215275305 .color-AA5{color:#F7F8FE;} + .d2-215275305 .color-AB4{color:#EDF0FD;} + .d2-215275305 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index c820225ee..83f9eb680 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + .d2-2164096773 .fill-N1{fill:#0A0F25;} + .d2-2164096773 .fill-N2{fill:#676C7E;} + .d2-2164096773 .fill-N3{fill:#9499AB;} + .d2-2164096773 .fill-N4{fill:#CFD2DD;} + .d2-2164096773 .fill-N5{fill:#DEE1EB;} + .d2-2164096773 .fill-N6{fill:#EEF1F8;} + .d2-2164096773 .fill-N7{fill:#FFFFFF;} + .d2-2164096773 .fill-B1{fill:#0D32B2;} + .d2-2164096773 .fill-B2{fill:#0D32B2;} + .d2-2164096773 .fill-B3{fill:#E3E9FD;} + .d2-2164096773 .fill-B4{fill:#E3E9FD;} + .d2-2164096773 .fill-B5{fill:#EDF0FD;} + .d2-2164096773 .fill-B6{fill:#F7F8FE;} + .d2-2164096773 .fill-AA2{fill:#4A6FF3;} + .d2-2164096773 .fill-AA4{fill:#EDF0FD;} + .d2-2164096773 .fill-AA5{fill:#F7F8FE;} + .d2-2164096773 .fill-AB4{fill:#EDF0FD;} + .d2-2164096773 .fill-AB5{fill:#F7F8FE;} + .d2-2164096773 .stroke-N1{stroke:#0A0F25;} + .d2-2164096773 .stroke-N2{stroke:#676C7E;} + .d2-2164096773 .stroke-N3{stroke:#9499AB;} + .d2-2164096773 .stroke-N4{stroke:#CFD2DD;} + .d2-2164096773 .stroke-N5{stroke:#DEE1EB;} + .d2-2164096773 .stroke-N6{stroke:#EEF1F8;} + .d2-2164096773 .stroke-N7{stroke:#FFFFFF;} + .d2-2164096773 .stroke-B1{stroke:#0D32B2;} + .d2-2164096773 .stroke-B2{stroke:#0D32B2;} + .d2-2164096773 .stroke-B3{stroke:#E3E9FD;} + .d2-2164096773 .stroke-B4{stroke:#E3E9FD;} + .d2-2164096773 .stroke-B5{stroke:#EDF0FD;} + .d2-2164096773 .stroke-B6{stroke:#F7F8FE;} + .d2-2164096773 .stroke-AA2{stroke:#4A6FF3;} + .d2-2164096773 .stroke-AA4{stroke:#EDF0FD;} + .d2-2164096773 .stroke-AA5{stroke:#F7F8FE;} + .d2-2164096773 .stroke-AB4{stroke:#EDF0FD;} + .d2-2164096773 .stroke-AB5{stroke:#F7F8FE;} + .d2-2164096773 .background-color-N1{background-color:#0A0F25;} + .d2-2164096773 .background-color-N2{background-color:#676C7E;} + .d2-2164096773 .background-color-N3{background-color:#9499AB;} + .d2-2164096773 .background-color-N4{background-color:#CFD2DD;} + .d2-2164096773 .background-color-N5{background-color:#DEE1EB;} + .d2-2164096773 .background-color-N6{background-color:#EEF1F8;} + .d2-2164096773 .background-color-N7{background-color:#FFFFFF;} + .d2-2164096773 .background-color-B1{background-color:#0D32B2;} + .d2-2164096773 .background-color-B2{background-color:#0D32B2;} + .d2-2164096773 .background-color-B3{background-color:#E3E9FD;} + .d2-2164096773 .background-color-B4{background-color:#E3E9FD;} + .d2-2164096773 .background-color-B5{background-color:#EDF0FD;} + .d2-2164096773 .background-color-B6{background-color:#F7F8FE;} + .d2-2164096773 .background-color-AA2{background-color:#4A6FF3;} + .d2-2164096773 .background-color-AA4{background-color:#EDF0FD;} + .d2-2164096773 .background-color-AA5{background-color:#F7F8FE;} + .d2-2164096773 .background-color-AB4{background-color:#EDF0FD;} + .d2-2164096773 .background-color-AB5{background-color:#F7F8FE;} + .d2-2164096773 .color-N1{color:#0A0F25;} + .d2-2164096773 .color-N2{color:#676C7E;} + .d2-2164096773 .color-N3{color:#9499AB;} + .d2-2164096773 .color-N4{color:#CFD2DD;} + .d2-2164096773 .color-N5{color:#DEE1EB;} + .d2-2164096773 .color-N6{color:#EEF1F8;} + .d2-2164096773 .color-N7{color:#FFFFFF;} + .d2-2164096773 .color-B1{color:#0D32B2;} + .d2-2164096773 .color-B2{color:#0D32B2;} + .d2-2164096773 .color-B3{color:#E3E9FD;} + .d2-2164096773 .color-B4{color:#E3E9FD;} + .d2-2164096773 .color-B5{color:#EDF0FD;} + .d2-2164096773 .color-B6{color:#F7F8FE;} + .d2-2164096773 .color-AA2{color:#4A6FF3;} + .d2-2164096773 .color-AA4{color:#EDF0FD;} + .d2-2164096773 .color-AA5{color:#F7F8FE;} + .d2-2164096773 .color-AB4{color:#EDF0FD;} + .d2-2164096773 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index efde26a5c..18d46c628 100644 --- a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + .d2-3038672767 .fill-N1{fill:#0A0F25;} + .d2-3038672767 .fill-N2{fill:#676C7E;} + .d2-3038672767 .fill-N3{fill:#9499AB;} + .d2-3038672767 .fill-N4{fill:#CFD2DD;} + .d2-3038672767 .fill-N5{fill:#DEE1EB;} + .d2-3038672767 .fill-N6{fill:#EEF1F8;} + .d2-3038672767 .fill-N7{fill:#FFFFFF;} + .d2-3038672767 .fill-B1{fill:#0D32B2;} + .d2-3038672767 .fill-B2{fill:#0D32B2;} + .d2-3038672767 .fill-B3{fill:#E3E9FD;} + .d2-3038672767 .fill-B4{fill:#E3E9FD;} + .d2-3038672767 .fill-B5{fill:#EDF0FD;} + .d2-3038672767 .fill-B6{fill:#F7F8FE;} + .d2-3038672767 .fill-AA2{fill:#4A6FF3;} + .d2-3038672767 .fill-AA4{fill:#EDF0FD;} + .d2-3038672767 .fill-AA5{fill:#F7F8FE;} + .d2-3038672767 .fill-AB4{fill:#EDF0FD;} + .d2-3038672767 .fill-AB5{fill:#F7F8FE;} + .d2-3038672767 .stroke-N1{stroke:#0A0F25;} + .d2-3038672767 .stroke-N2{stroke:#676C7E;} + .d2-3038672767 .stroke-N3{stroke:#9499AB;} + .d2-3038672767 .stroke-N4{stroke:#CFD2DD;} + .d2-3038672767 .stroke-N5{stroke:#DEE1EB;} + .d2-3038672767 .stroke-N6{stroke:#EEF1F8;} + .d2-3038672767 .stroke-N7{stroke:#FFFFFF;} + .d2-3038672767 .stroke-B1{stroke:#0D32B2;} + .d2-3038672767 .stroke-B2{stroke:#0D32B2;} + .d2-3038672767 .stroke-B3{stroke:#E3E9FD;} + .d2-3038672767 .stroke-B4{stroke:#E3E9FD;} + .d2-3038672767 .stroke-B5{stroke:#EDF0FD;} + .d2-3038672767 .stroke-B6{stroke:#F7F8FE;} + .d2-3038672767 .stroke-AA2{stroke:#4A6FF3;} + .d2-3038672767 .stroke-AA4{stroke:#EDF0FD;} + .d2-3038672767 .stroke-AA5{stroke:#F7F8FE;} + .d2-3038672767 .stroke-AB4{stroke:#EDF0FD;} + .d2-3038672767 .stroke-AB5{stroke:#F7F8FE;} + .d2-3038672767 .background-color-N1{background-color:#0A0F25;} + .d2-3038672767 .background-color-N2{background-color:#676C7E;} + .d2-3038672767 .background-color-N3{background-color:#9499AB;} + .d2-3038672767 .background-color-N4{background-color:#CFD2DD;} + .d2-3038672767 .background-color-N5{background-color:#DEE1EB;} + .d2-3038672767 .background-color-N6{background-color:#EEF1F8;} + .d2-3038672767 .background-color-N7{background-color:#FFFFFF;} + .d2-3038672767 .background-color-B1{background-color:#0D32B2;} + .d2-3038672767 .background-color-B2{background-color:#0D32B2;} + .d2-3038672767 .background-color-B3{background-color:#E3E9FD;} + .d2-3038672767 .background-color-B4{background-color:#E3E9FD;} + .d2-3038672767 .background-color-B5{background-color:#EDF0FD;} + .d2-3038672767 .background-color-B6{background-color:#F7F8FE;} + .d2-3038672767 .background-color-AA2{background-color:#4A6FF3;} + .d2-3038672767 .background-color-AA4{background-color:#EDF0FD;} + .d2-3038672767 .background-color-AA5{background-color:#F7F8FE;} + .d2-3038672767 .background-color-AB4{background-color:#EDF0FD;} + .d2-3038672767 .background-color-AB5{background-color:#F7F8FE;} + .d2-3038672767 .color-N1{color:#0A0F25;} + .d2-3038672767 .color-N2{color:#676C7E;} + .d2-3038672767 .color-N3{color:#9499AB;} + .d2-3038672767 .color-N4{color:#CFD2DD;} + .d2-3038672767 .color-N5{color:#DEE1EB;} + .d2-3038672767 .color-N6{color:#EEF1F8;} + .d2-3038672767 .color-N7{color:#FFFFFF;} + .d2-3038672767 .color-B1{color:#0D32B2;} + .d2-3038672767 .color-B2{color:#0D32B2;} + .d2-3038672767 .color-B3{color:#E3E9FD;} + .d2-3038672767 .color-B4{color:#E3E9FD;} + .d2-3038672767 .color-B5{color:#EDF0FD;} + .d2-3038672767 .color-B6{color:#F7F8FE;} + .d2-3038672767 .color-AA2{color:#4A6FF3;} + .d2-3038672767 .color-AA4{color:#EDF0FD;} + .d2-3038672767 .color-AA5{color:#F7F8FE;} + .d2-3038672767 .color-AB4{color:#EDF0FD;} + .d2-3038672767 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv diff --git a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg index 2b5d037c8..9c8a2bd9f 100644 --- a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -mixed togethersugarsolution we get +mixed togethersugarsolution we get diff --git a/e2etests/testdata/stable/latex/elk/sketch.exp.svg b/e2etests/testdata/stable/latex/elk/sketch.exp.svg index 3b92bef9e..8237b7e42 100644 --- a/e2etests/testdata/stable/latex/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -mixed togethersugarsolution we get +mixed togethersugarsolution we get diff --git a/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg b/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg index 6192ebc96..d1c5b7839 100644 --- a/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzlegendfoobar +xyzlegendfoobar diff --git a/e2etests/testdata/stable/legend_with_near_key/elk/sketch.exp.svg b/e2etests/testdata/stable/legend_with_near_key/elk/sketch.exp.svg index c76e3efcf..6b0554909 100644 --- a/e2etests/testdata/stable/legend_with_near_key/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/legend_with_near_key/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzlegendfoobar +xyzlegendfoobar diff --git a/e2etests/testdata/stable/li1/dagre/sketch.exp.svg b/e2etests/testdata/stable/li1/dagre/sketch.exp.svg index eac21f09c..3c64ad0c1 100644 --- a/e2etests/testdata/stable/li1/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/li1/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -
      @@ -848,7 +848,7 @@
    -
    ab +ab diff --git a/e2etests/testdata/stable/li1/elk/sketch.exp.svg b/e2etests/testdata/stable/li1/elk/sketch.exp.svg index 6de444ce9..8e4dda0ba 100644 --- a/e2etests/testdata/stable/li1/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/li1/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -
      @@ -848,7 +848,7 @@
    -
    ab +ab diff --git a/e2etests/testdata/stable/li2/dagre/sketch.exp.svg b/e2etests/testdata/stable/li2/dagre/sketch.exp.svg index fe8ae13be..445d6d35e 100644 --- a/e2etests/testdata/stable/li2/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/li2/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -
      @@ -851,7 +851,7 @@
    -
    ab +ab diff --git a/e2etests/testdata/stable/li2/elk/sketch.exp.svg b/e2etests/testdata/stable/li2/elk/sketch.exp.svg index 5c46047c2..60490ce32 100644 --- a/e2etests/testdata/stable/li2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/li2/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -
      @@ -851,7 +851,7 @@
    -
    ab +ab diff --git a/e2etests/testdata/stable/li3/dagre/sketch.exp.svg b/e2etests/testdata/stable/li3/dagre/sketch.exp.svg index 6a7482931..f2428754b 100644 --- a/e2etests/testdata/stable/li3/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/li3/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -
      @@ -869,7 +869,7 @@
    -
    ab +ab diff --git a/e2etests/testdata/stable/li3/elk/sketch.exp.svg b/e2etests/testdata/stable/li3/elk/sketch.exp.svg index 46377adea..63484b9dd 100644 --- a/e2etests/testdata/stable/li3/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/li3/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -
      @@ -869,7 +869,7 @@
    -
    ab +ab diff --git a/e2etests/testdata/stable/li4/dagre/sketch.exp.svg b/e2etests/testdata/stable/li4/dagre/sketch.exp.svg index 1c8e8a5cd..408b5101a 100644 --- a/e2etests/testdata/stable/li4/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/li4/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    List items may consist of multiple paragraphs. Each subsequent @@ -874,7 +874,7 @@ sit amet, consectetuer adipiscing elit.

    Another item in the same list.

    -
    ab +ab diff --git a/e2etests/testdata/stable/li4/elk/sketch.exp.svg b/e2etests/testdata/stable/li4/elk/sketch.exp.svg index 1e67ec7b7..95c7d1d0e 100644 --- a/e2etests/testdata/stable/li4/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/li4/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    List items may consist of multiple paragraphs. Each subsequent @@ -874,7 +874,7 @@ sit amet, consectetuer adipiscing elit.

    Another item in the same list.

    -
    ab +ab diff --git a/e2etests/testdata/stable/links/dagre/sketch.exp.svg b/e2etests/testdata/stable/links/dagre/sketch.exp.svg index 99559d2ef..8f6f74bc8 100644 --- a/e2etests/testdata/stable/links/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/links/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + .d2-3606605273 .fill-N1{fill:#0A0F25;} + .d2-3606605273 .fill-N2{fill:#676C7E;} + .d2-3606605273 .fill-N3{fill:#9499AB;} + .d2-3606605273 .fill-N4{fill:#CFD2DD;} + .d2-3606605273 .fill-N5{fill:#DEE1EB;} + .d2-3606605273 .fill-N6{fill:#EEF1F8;} + .d2-3606605273 .fill-N7{fill:#FFFFFF;} + .d2-3606605273 .fill-B1{fill:#0D32B2;} + .d2-3606605273 .fill-B2{fill:#0D32B2;} + .d2-3606605273 .fill-B3{fill:#E3E9FD;} + .d2-3606605273 .fill-B4{fill:#E3E9FD;} + .d2-3606605273 .fill-B5{fill:#EDF0FD;} + .d2-3606605273 .fill-B6{fill:#F7F8FE;} + .d2-3606605273 .fill-AA2{fill:#4A6FF3;} + .d2-3606605273 .fill-AA4{fill:#EDF0FD;} + .d2-3606605273 .fill-AA5{fill:#F7F8FE;} + .d2-3606605273 .fill-AB4{fill:#EDF0FD;} + .d2-3606605273 .fill-AB5{fill:#F7F8FE;} + .d2-3606605273 .stroke-N1{stroke:#0A0F25;} + .d2-3606605273 .stroke-N2{stroke:#676C7E;} + .d2-3606605273 .stroke-N3{stroke:#9499AB;} + .d2-3606605273 .stroke-N4{stroke:#CFD2DD;} + .d2-3606605273 .stroke-N5{stroke:#DEE1EB;} + .d2-3606605273 .stroke-N6{stroke:#EEF1F8;} + .d2-3606605273 .stroke-N7{stroke:#FFFFFF;} + .d2-3606605273 .stroke-B1{stroke:#0D32B2;} + .d2-3606605273 .stroke-B2{stroke:#0D32B2;} + .d2-3606605273 .stroke-B3{stroke:#E3E9FD;} + .d2-3606605273 .stroke-B4{stroke:#E3E9FD;} + .d2-3606605273 .stroke-B5{stroke:#EDF0FD;} + .d2-3606605273 .stroke-B6{stroke:#F7F8FE;} + .d2-3606605273 .stroke-AA2{stroke:#4A6FF3;} + .d2-3606605273 .stroke-AA4{stroke:#EDF0FD;} + .d2-3606605273 .stroke-AA5{stroke:#F7F8FE;} + .d2-3606605273 .stroke-AB4{stroke:#EDF0FD;} + .d2-3606605273 .stroke-AB5{stroke:#F7F8FE;} + .d2-3606605273 .background-color-N1{background-color:#0A0F25;} + .d2-3606605273 .background-color-N2{background-color:#676C7E;} + .d2-3606605273 .background-color-N3{background-color:#9499AB;} + .d2-3606605273 .background-color-N4{background-color:#CFD2DD;} + .d2-3606605273 .background-color-N5{background-color:#DEE1EB;} + .d2-3606605273 .background-color-N6{background-color:#EEF1F8;} + .d2-3606605273 .background-color-N7{background-color:#FFFFFF;} + .d2-3606605273 .background-color-B1{background-color:#0D32B2;} + .d2-3606605273 .background-color-B2{background-color:#0D32B2;} + .d2-3606605273 .background-color-B3{background-color:#E3E9FD;} + .d2-3606605273 .background-color-B4{background-color:#E3E9FD;} + .d2-3606605273 .background-color-B5{background-color:#EDF0FD;} + .d2-3606605273 .background-color-B6{background-color:#F7F8FE;} + .d2-3606605273 .background-color-AA2{background-color:#4A6FF3;} + .d2-3606605273 .background-color-AA4{background-color:#EDF0FD;} + .d2-3606605273 .background-color-AA5{background-color:#F7F8FE;} + .d2-3606605273 .background-color-AB4{background-color:#EDF0FD;} + .d2-3606605273 .background-color-AB5{background-color:#F7F8FE;} + .d2-3606605273 .color-N1{color:#0A0F25;} + .d2-3606605273 .color-N2{color:#676C7E;} + .d2-3606605273 .color-N3{color:#9499AB;} + .d2-3606605273 .color-N4{color:#CFD2DD;} + .d2-3606605273 .color-N5{color:#DEE1EB;} + .d2-3606605273 .color-N6{color:#EEF1F8;} + .d2-3606605273 .color-N7{color:#FFFFFF;} + .d2-3606605273 .color-B1{color:#0D32B2;} + .d2-3606605273 .color-B2{color:#0D32B2;} + .d2-3606605273 .color-B3{color:#E3E9FD;} + .d2-3606605273 .color-B4{color:#E3E9FD;} + .d2-3606605273 .color-B5{color:#EDF0FD;} + .d2-3606605273 .color-B6{color:#F7F8FE;} + .d2-3606605273 .color-AA2{color:#4A6FF3;} + .d2-3606605273 .color-AA4{color:#EDF0FD;} + .d2-3606605273 .color-AA5{color:#F7F8FE;} + .d2-3606605273 .color-AB4{color:#EDF0FD;} + .d2-3606605273 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -129,7 +129,7 @@ - + diff --git a/e2etests/testdata/stable/links/elk/sketch.exp.svg b/e2etests/testdata/stable/links/elk/sketch.exp.svg index d083e0023..eb4d4fe24 100644 --- a/e2etests/testdata/stable/links/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/links/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + .d2-2493258333 .fill-N1{fill:#0A0F25;} + .d2-2493258333 .fill-N2{fill:#676C7E;} + .d2-2493258333 .fill-N3{fill:#9499AB;} + .d2-2493258333 .fill-N4{fill:#CFD2DD;} + .d2-2493258333 .fill-N5{fill:#DEE1EB;} + .d2-2493258333 .fill-N6{fill:#EEF1F8;} + .d2-2493258333 .fill-N7{fill:#FFFFFF;} + .d2-2493258333 .fill-B1{fill:#0D32B2;} + .d2-2493258333 .fill-B2{fill:#0D32B2;} + .d2-2493258333 .fill-B3{fill:#E3E9FD;} + .d2-2493258333 .fill-B4{fill:#E3E9FD;} + .d2-2493258333 .fill-B5{fill:#EDF0FD;} + .d2-2493258333 .fill-B6{fill:#F7F8FE;} + .d2-2493258333 .fill-AA2{fill:#4A6FF3;} + .d2-2493258333 .fill-AA4{fill:#EDF0FD;} + .d2-2493258333 .fill-AA5{fill:#F7F8FE;} + .d2-2493258333 .fill-AB4{fill:#EDF0FD;} + .d2-2493258333 .fill-AB5{fill:#F7F8FE;} + .d2-2493258333 .stroke-N1{stroke:#0A0F25;} + .d2-2493258333 .stroke-N2{stroke:#676C7E;} + .d2-2493258333 .stroke-N3{stroke:#9499AB;} + .d2-2493258333 .stroke-N4{stroke:#CFD2DD;} + .d2-2493258333 .stroke-N5{stroke:#DEE1EB;} + .d2-2493258333 .stroke-N6{stroke:#EEF1F8;} + .d2-2493258333 .stroke-N7{stroke:#FFFFFF;} + .d2-2493258333 .stroke-B1{stroke:#0D32B2;} + .d2-2493258333 .stroke-B2{stroke:#0D32B2;} + .d2-2493258333 .stroke-B3{stroke:#E3E9FD;} + .d2-2493258333 .stroke-B4{stroke:#E3E9FD;} + .d2-2493258333 .stroke-B5{stroke:#EDF0FD;} + .d2-2493258333 .stroke-B6{stroke:#F7F8FE;} + .d2-2493258333 .stroke-AA2{stroke:#4A6FF3;} + .d2-2493258333 .stroke-AA4{stroke:#EDF0FD;} + .d2-2493258333 .stroke-AA5{stroke:#F7F8FE;} + .d2-2493258333 .stroke-AB4{stroke:#EDF0FD;} + .d2-2493258333 .stroke-AB5{stroke:#F7F8FE;} + .d2-2493258333 .background-color-N1{background-color:#0A0F25;} + .d2-2493258333 .background-color-N2{background-color:#676C7E;} + .d2-2493258333 .background-color-N3{background-color:#9499AB;} + .d2-2493258333 .background-color-N4{background-color:#CFD2DD;} + .d2-2493258333 .background-color-N5{background-color:#DEE1EB;} + .d2-2493258333 .background-color-N6{background-color:#EEF1F8;} + .d2-2493258333 .background-color-N7{background-color:#FFFFFF;} + .d2-2493258333 .background-color-B1{background-color:#0D32B2;} + .d2-2493258333 .background-color-B2{background-color:#0D32B2;} + .d2-2493258333 .background-color-B3{background-color:#E3E9FD;} + .d2-2493258333 .background-color-B4{background-color:#E3E9FD;} + .d2-2493258333 .background-color-B5{background-color:#EDF0FD;} + .d2-2493258333 .background-color-B6{background-color:#F7F8FE;} + .d2-2493258333 .background-color-AA2{background-color:#4A6FF3;} + .d2-2493258333 .background-color-AA4{background-color:#EDF0FD;} + .d2-2493258333 .background-color-AA5{background-color:#F7F8FE;} + .d2-2493258333 .background-color-AB4{background-color:#EDF0FD;} + .d2-2493258333 .background-color-AB5{background-color:#F7F8FE;} + .d2-2493258333 .color-N1{color:#0A0F25;} + .d2-2493258333 .color-N2{color:#676C7E;} + .d2-2493258333 .color-N3{color:#9499AB;} + .d2-2493258333 .color-N4{color:#CFD2DD;} + .d2-2493258333 .color-N5{color:#DEE1EB;} + .d2-2493258333 .color-N6{color:#EEF1F8;} + .d2-2493258333 .color-N7{color:#FFFFFF;} + .d2-2493258333 .color-B1{color:#0D32B2;} + .d2-2493258333 .color-B2{color:#0D32B2;} + .d2-2493258333 .color-B3{color:#E3E9FD;} + .d2-2493258333 .color-B4{color:#E3E9FD;} + .d2-2493258333 .color-B5{color:#EDF0FD;} + .d2-2493258333 .color-B6{color:#F7F8FE;} + .d2-2493258333 .color-AA2{color:#4A6FF3;} + .d2-2493258333 .color-AA4{color:#EDF0FD;} + .d2-2493258333 .color-AA5{color:#F7F8FE;} + .d2-2493258333 .color-AB4{color:#EDF0FD;} + .d2-2493258333 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -129,7 +129,7 @@ - + diff --git a/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg b/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg index 0acf668dd..f95878ff3 100644 --- a/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Markdown: Syntax

    -
    ab +ab diff --git a/e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg b/e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg index b9d215241..2ab2a16e0 100644 --- a/e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Markdown: Syntax

    -
    ab +ab diff --git a/e2etests/testdata/stable/markdown/dagre/sketch.exp.svg b/e2etests/testdata/stable/markdown/dagre/sketch.exp.svg index b54233499..1be25ca15 100644 --- a/e2etests/testdata/stable/markdown/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Every frustum longs to be a cone

    @@ -851,7 +851,7 @@

    Festivity Level 1: Your guests are chatting amiably with each other.

    test strikethrough test

    -
    xy +xy diff --git a/e2etests/testdata/stable/markdown/elk/sketch.exp.svg b/e2etests/testdata/stable/markdown/elk/sketch.exp.svg index bbb62a718..7643631d7 100644 --- a/e2etests/testdata/stable/markdown/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Every frustum longs to be a cone

    @@ -851,7 +851,7 @@

    Festivity Level 1: Your guests are chatting amiably with each other.

    test strikethrough test

    -
    xy +xy diff --git a/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg b/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg index acc7784b5..59fa6f516 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -container

    they did it in style

    @@ -845,7 +845,7 @@ }

    walk into a bar.

    -
     + diff --git a/e2etests/testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg b/e2etests/testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg index 963a357d3..30cc0c6ac 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -container

    they did it in style

    @@ -845,7 +845,7 @@ }

    walk into a bar.

    -
     + diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg index 21acb7fa4..484eac670 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

    -
     + diff --git a/e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg b/e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg index d6a72bc2f..fa13f85fc 100644 --- a/e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

    -
     + diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg index 7811a780a..9b5ba819d 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

    -
     + diff --git a/e2etests/testdata/stable/md_backslash_newline/elk/sketch.exp.svg b/e2etests/testdata/stable/md_backslash_newline/elk/sketch.exp.svg index cbd1805b9..1fab8695a 100644 --- a/e2etests/testdata/stable/md_backslash_newline/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_backslash_newline/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

    -
     + diff --git a/e2etests/testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg index 9620a9111..b7ed16d62 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -
    {
@@ -848,7 +848,7 @@
 	of: "json",
 }
    -
    ab +ab diff --git a/e2etests/testdata/stable/md_code_block_fenced/elk/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_fenced/elk/sketch.exp.svg index 2ca4b7916..9db82831a 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_block_fenced/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -
    {
@@ -848,7 +848,7 @@
 	of: "json",
 }
    -
    ab +ab diff --git a/e2etests/testdata/stable/md_code_block_indented/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_indented/dagre/sketch.exp.svg index 7926a9473..ac3862e6b 100644 --- a/e2etests/testdata/stable/md_code_block_indented/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_block_indented/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    a line of text and an

    @@ -849,7 +849,7 @@ of: "json", } -
    ab +ab diff --git a/e2etests/testdata/stable/md_code_block_indented/elk/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_indented/elk/sketch.exp.svg index e485594bb..0725c1876 100644 --- a/e2etests/testdata/stable/md_code_block_indented/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_block_indented/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    a line of text and an

    @@ -849,7 +849,7 @@ of: "json", } -
    ab +ab diff --git a/e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg index 6a380deca..1745044a5 100644 --- a/e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    code

    -
    ab +ab diff --git a/e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg b/e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg index 93a584677..33ac5d360 100644 --- a/e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    code

    -
    ab +ab diff --git a/e2etests/testdata/stable/md_fontsize_10/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_fontsize_10/dagre/sketch.exp.svg index 7e07b9f19..a8975578e 100644 --- a/e2etests/testdata/stable/md_fontsize_10/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_fontsize_10/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Every frustum longs to be a cone

    @@ -851,7 +851,7 @@

    Festivity Level 1: Your guests are chatting amiably with each other.

    test strikethrough test

    -
    xy +xy diff --git a/e2etests/testdata/stable/md_fontsize_10/elk/sketch.exp.svg b/e2etests/testdata/stable/md_fontsize_10/elk/sketch.exp.svg index 7fdb22c36..7e32d0a77 100644 --- a/e2etests/testdata/stable/md_fontsize_10/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_fontsize_10/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Every frustum longs to be a cone

    @@ -851,7 +851,7 @@

    Festivity Level 1: Your guests are chatting amiably with each other.

    test strikethrough test

    -
    xy +xy diff --git a/e2etests/testdata/stable/mono-edge/dagre/sketch.exp.svg b/e2etests/testdata/stable/mono-edge/dagre/sketch.exp.svg index a1a117793..9af1d9031 100644 --- a/e2etests/testdata/stable/mono-edge/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-edge/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -xy hi + .d2-1588848796 .fill-N1{fill:#0A0F25;} + .d2-1588848796 .fill-N2{fill:#676C7E;} + .d2-1588848796 .fill-N3{fill:#9499AB;} + .d2-1588848796 .fill-N4{fill:#CFD2DD;} + .d2-1588848796 .fill-N5{fill:#DEE1EB;} + .d2-1588848796 .fill-N6{fill:#EEF1F8;} + .d2-1588848796 .fill-N7{fill:#FFFFFF;} + .d2-1588848796 .fill-B1{fill:#0D32B2;} + .d2-1588848796 .fill-B2{fill:#0D32B2;} + .d2-1588848796 .fill-B3{fill:#E3E9FD;} + .d2-1588848796 .fill-B4{fill:#E3E9FD;} + .d2-1588848796 .fill-B5{fill:#EDF0FD;} + .d2-1588848796 .fill-B6{fill:#F7F8FE;} + .d2-1588848796 .fill-AA2{fill:#4A6FF3;} + .d2-1588848796 .fill-AA4{fill:#EDF0FD;} + .d2-1588848796 .fill-AA5{fill:#F7F8FE;} + .d2-1588848796 .fill-AB4{fill:#EDF0FD;} + .d2-1588848796 .fill-AB5{fill:#F7F8FE;} + .d2-1588848796 .stroke-N1{stroke:#0A0F25;} + .d2-1588848796 .stroke-N2{stroke:#676C7E;} + .d2-1588848796 .stroke-N3{stroke:#9499AB;} + .d2-1588848796 .stroke-N4{stroke:#CFD2DD;} + .d2-1588848796 .stroke-N5{stroke:#DEE1EB;} + .d2-1588848796 .stroke-N6{stroke:#EEF1F8;} + .d2-1588848796 .stroke-N7{stroke:#FFFFFF;} + .d2-1588848796 .stroke-B1{stroke:#0D32B2;} + .d2-1588848796 .stroke-B2{stroke:#0D32B2;} + .d2-1588848796 .stroke-B3{stroke:#E3E9FD;} + .d2-1588848796 .stroke-B4{stroke:#E3E9FD;} + .d2-1588848796 .stroke-B5{stroke:#EDF0FD;} + .d2-1588848796 .stroke-B6{stroke:#F7F8FE;} + .d2-1588848796 .stroke-AA2{stroke:#4A6FF3;} + .d2-1588848796 .stroke-AA4{stroke:#EDF0FD;} + .d2-1588848796 .stroke-AA5{stroke:#F7F8FE;} + .d2-1588848796 .stroke-AB4{stroke:#EDF0FD;} + .d2-1588848796 .stroke-AB5{stroke:#F7F8FE;} + .d2-1588848796 .background-color-N1{background-color:#0A0F25;} + .d2-1588848796 .background-color-N2{background-color:#676C7E;} + .d2-1588848796 .background-color-N3{background-color:#9499AB;} + .d2-1588848796 .background-color-N4{background-color:#CFD2DD;} + .d2-1588848796 .background-color-N5{background-color:#DEE1EB;} + .d2-1588848796 .background-color-N6{background-color:#EEF1F8;} + .d2-1588848796 .background-color-N7{background-color:#FFFFFF;} + .d2-1588848796 .background-color-B1{background-color:#0D32B2;} + .d2-1588848796 .background-color-B2{background-color:#0D32B2;} + .d2-1588848796 .background-color-B3{background-color:#E3E9FD;} + .d2-1588848796 .background-color-B4{background-color:#E3E9FD;} + .d2-1588848796 .background-color-B5{background-color:#EDF0FD;} + .d2-1588848796 .background-color-B6{background-color:#F7F8FE;} + .d2-1588848796 .background-color-AA2{background-color:#4A6FF3;} + .d2-1588848796 .background-color-AA4{background-color:#EDF0FD;} + .d2-1588848796 .background-color-AA5{background-color:#F7F8FE;} + .d2-1588848796 .background-color-AB4{background-color:#EDF0FD;} + .d2-1588848796 .background-color-AB5{background-color:#F7F8FE;} + .d2-1588848796 .color-N1{color:#0A0F25;} + .d2-1588848796 .color-N2{color:#676C7E;} + .d2-1588848796 .color-N3{color:#9499AB;} + .d2-1588848796 .color-N4{color:#CFD2DD;} + .d2-1588848796 .color-N5{color:#DEE1EB;} + .d2-1588848796 .color-N6{color:#EEF1F8;} + .d2-1588848796 .color-N7{color:#FFFFFF;} + .d2-1588848796 .color-B1{color:#0D32B2;} + .d2-1588848796 .color-B2{color:#0D32B2;} + .d2-1588848796 .color-B3{color:#E3E9FD;} + .d2-1588848796 .color-B4{color:#E3E9FD;} + .d2-1588848796 .color-B5{color:#EDF0FD;} + .d2-1588848796 .color-B6{color:#F7F8FE;} + .d2-1588848796 .color-AA2{color:#4A6FF3;} + .d2-1588848796 .color-AA4{color:#EDF0FD;} + .d2-1588848796 .color-AA5{color:#F7F8FE;} + .d2-1588848796 .color-AB4{color:#EDF0FD;} + .d2-1588848796 .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 hi diff --git a/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg index 52ca1324a..b35c3006a 100644 --- a/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -xy hi + .d2-2882779651 .fill-N1{fill:#0A0F25;} + .d2-2882779651 .fill-N2{fill:#676C7E;} + .d2-2882779651 .fill-N3{fill:#9499AB;} + .d2-2882779651 .fill-N4{fill:#CFD2DD;} + .d2-2882779651 .fill-N5{fill:#DEE1EB;} + .d2-2882779651 .fill-N6{fill:#EEF1F8;} + .d2-2882779651 .fill-N7{fill:#FFFFFF;} + .d2-2882779651 .fill-B1{fill:#0D32B2;} + .d2-2882779651 .fill-B2{fill:#0D32B2;} + .d2-2882779651 .fill-B3{fill:#E3E9FD;} + .d2-2882779651 .fill-B4{fill:#E3E9FD;} + .d2-2882779651 .fill-B5{fill:#EDF0FD;} + .d2-2882779651 .fill-B6{fill:#F7F8FE;} + .d2-2882779651 .fill-AA2{fill:#4A6FF3;} + .d2-2882779651 .fill-AA4{fill:#EDF0FD;} + .d2-2882779651 .fill-AA5{fill:#F7F8FE;} + .d2-2882779651 .fill-AB4{fill:#EDF0FD;} + .d2-2882779651 .fill-AB5{fill:#F7F8FE;} + .d2-2882779651 .stroke-N1{stroke:#0A0F25;} + .d2-2882779651 .stroke-N2{stroke:#676C7E;} + .d2-2882779651 .stroke-N3{stroke:#9499AB;} + .d2-2882779651 .stroke-N4{stroke:#CFD2DD;} + .d2-2882779651 .stroke-N5{stroke:#DEE1EB;} + .d2-2882779651 .stroke-N6{stroke:#EEF1F8;} + .d2-2882779651 .stroke-N7{stroke:#FFFFFF;} + .d2-2882779651 .stroke-B1{stroke:#0D32B2;} + .d2-2882779651 .stroke-B2{stroke:#0D32B2;} + .d2-2882779651 .stroke-B3{stroke:#E3E9FD;} + .d2-2882779651 .stroke-B4{stroke:#E3E9FD;} + .d2-2882779651 .stroke-B5{stroke:#EDF0FD;} + .d2-2882779651 .stroke-B6{stroke:#F7F8FE;} + .d2-2882779651 .stroke-AA2{stroke:#4A6FF3;} + .d2-2882779651 .stroke-AA4{stroke:#EDF0FD;} + .d2-2882779651 .stroke-AA5{stroke:#F7F8FE;} + .d2-2882779651 .stroke-AB4{stroke:#EDF0FD;} + .d2-2882779651 .stroke-AB5{stroke:#F7F8FE;} + .d2-2882779651 .background-color-N1{background-color:#0A0F25;} + .d2-2882779651 .background-color-N2{background-color:#676C7E;} + .d2-2882779651 .background-color-N3{background-color:#9499AB;} + .d2-2882779651 .background-color-N4{background-color:#CFD2DD;} + .d2-2882779651 .background-color-N5{background-color:#DEE1EB;} + .d2-2882779651 .background-color-N6{background-color:#EEF1F8;} + .d2-2882779651 .background-color-N7{background-color:#FFFFFF;} + .d2-2882779651 .background-color-B1{background-color:#0D32B2;} + .d2-2882779651 .background-color-B2{background-color:#0D32B2;} + .d2-2882779651 .background-color-B3{background-color:#E3E9FD;} + .d2-2882779651 .background-color-B4{background-color:#E3E9FD;} + .d2-2882779651 .background-color-B5{background-color:#EDF0FD;} + .d2-2882779651 .background-color-B6{background-color:#F7F8FE;} + .d2-2882779651 .background-color-AA2{background-color:#4A6FF3;} + .d2-2882779651 .background-color-AA4{background-color:#EDF0FD;} + .d2-2882779651 .background-color-AA5{background-color:#F7F8FE;} + .d2-2882779651 .background-color-AB4{background-color:#EDF0FD;} + .d2-2882779651 .background-color-AB5{background-color:#F7F8FE;} + .d2-2882779651 .color-N1{color:#0A0F25;} + .d2-2882779651 .color-N2{color:#676C7E;} + .d2-2882779651 .color-N3{color:#9499AB;} + .d2-2882779651 .color-N4{color:#CFD2DD;} + .d2-2882779651 .color-N5{color:#DEE1EB;} + .d2-2882779651 .color-N6{color:#EEF1F8;} + .d2-2882779651 .color-N7{color:#FFFFFF;} + .d2-2882779651 .color-B1{color:#0D32B2;} + .d2-2882779651 .color-B2{color:#0D32B2;} + .d2-2882779651 .color-B3{color:#E3E9FD;} + .d2-2882779651 .color-B4{color:#E3E9FD;} + .d2-2882779651 .color-B5{color:#EDF0FD;} + .d2-2882779651 .color-B6{color:#F7F8FE;} + .d2-2882779651 .color-AA2{color:#4A6FF3;} + .d2-2882779651 .color-AA4{color:#EDF0FD;} + .d2-2882779651 .color-AA5{color:#F7F8FE;} + .d2-2882779651 .color-AB4{color:#EDF0FD;} + .d2-2882779651 .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 hi diff --git a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg index be7ea9b7d..c1298eb7b 100644 --- a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -SATELLITESTRANSMITTER SENDSENDSEND + .d2-1948806370 .fill-N1{fill:#0A0F25;} + .d2-1948806370 .fill-N2{fill:#676C7E;} + .d2-1948806370 .fill-N3{fill:#9499AB;} + .d2-1948806370 .fill-N4{fill:#CFD2DD;} + .d2-1948806370 .fill-N5{fill:#DEE1EB;} + .d2-1948806370 .fill-N6{fill:#EEF1F8;} + .d2-1948806370 .fill-N7{fill:#FFFFFF;} + .d2-1948806370 .fill-B1{fill:#0D32B2;} + .d2-1948806370 .fill-B2{fill:#0D32B2;} + .d2-1948806370 .fill-B3{fill:#E3E9FD;} + .d2-1948806370 .fill-B4{fill:#E3E9FD;} + .d2-1948806370 .fill-B5{fill:#EDF0FD;} + .d2-1948806370 .fill-B6{fill:#F7F8FE;} + .d2-1948806370 .fill-AA2{fill:#4A6FF3;} + .d2-1948806370 .fill-AA4{fill:#EDF0FD;} + .d2-1948806370 .fill-AA5{fill:#F7F8FE;} + .d2-1948806370 .fill-AB4{fill:#EDF0FD;} + .d2-1948806370 .fill-AB5{fill:#F7F8FE;} + .d2-1948806370 .stroke-N1{stroke:#0A0F25;} + .d2-1948806370 .stroke-N2{stroke:#676C7E;} + .d2-1948806370 .stroke-N3{stroke:#9499AB;} + .d2-1948806370 .stroke-N4{stroke:#CFD2DD;} + .d2-1948806370 .stroke-N5{stroke:#DEE1EB;} + .d2-1948806370 .stroke-N6{stroke:#EEF1F8;} + .d2-1948806370 .stroke-N7{stroke:#FFFFFF;} + .d2-1948806370 .stroke-B1{stroke:#0D32B2;} + .d2-1948806370 .stroke-B2{stroke:#0D32B2;} + .d2-1948806370 .stroke-B3{stroke:#E3E9FD;} + .d2-1948806370 .stroke-B4{stroke:#E3E9FD;} + .d2-1948806370 .stroke-B5{stroke:#EDF0FD;} + .d2-1948806370 .stroke-B6{stroke:#F7F8FE;} + .d2-1948806370 .stroke-AA2{stroke:#4A6FF3;} + .d2-1948806370 .stroke-AA4{stroke:#EDF0FD;} + .d2-1948806370 .stroke-AA5{stroke:#F7F8FE;} + .d2-1948806370 .stroke-AB4{stroke:#EDF0FD;} + .d2-1948806370 .stroke-AB5{stroke:#F7F8FE;} + .d2-1948806370 .background-color-N1{background-color:#0A0F25;} + .d2-1948806370 .background-color-N2{background-color:#676C7E;} + .d2-1948806370 .background-color-N3{background-color:#9499AB;} + .d2-1948806370 .background-color-N4{background-color:#CFD2DD;} + .d2-1948806370 .background-color-N5{background-color:#DEE1EB;} + .d2-1948806370 .background-color-N6{background-color:#EEF1F8;} + .d2-1948806370 .background-color-N7{background-color:#FFFFFF;} + .d2-1948806370 .background-color-B1{background-color:#0D32B2;} + .d2-1948806370 .background-color-B2{background-color:#0D32B2;} + .d2-1948806370 .background-color-B3{background-color:#E3E9FD;} + .d2-1948806370 .background-color-B4{background-color:#E3E9FD;} + .d2-1948806370 .background-color-B5{background-color:#EDF0FD;} + .d2-1948806370 .background-color-B6{background-color:#F7F8FE;} + .d2-1948806370 .background-color-AA2{background-color:#4A6FF3;} + .d2-1948806370 .background-color-AA4{background-color:#EDF0FD;} + .d2-1948806370 .background-color-AA5{background-color:#F7F8FE;} + .d2-1948806370 .background-color-AB4{background-color:#EDF0FD;} + .d2-1948806370 .background-color-AB5{background-color:#F7F8FE;} + .d2-1948806370 .color-N1{color:#0A0F25;} + .d2-1948806370 .color-N2{color:#676C7E;} + .d2-1948806370 .color-N3{color:#9499AB;} + .d2-1948806370 .color-N4{color:#CFD2DD;} + .d2-1948806370 .color-N5{color:#DEE1EB;} + .d2-1948806370 .color-N6{color:#EEF1F8;} + .d2-1948806370 .color-N7{color:#FFFFFF;} + .d2-1948806370 .color-B1{color:#0D32B2;} + .d2-1948806370 .color-B2{color:#0D32B2;} + .d2-1948806370 .color-B3{color:#E3E9FD;} + .d2-1948806370 .color-B4{color:#E3E9FD;} + .d2-1948806370 .color-B5{color:#EDF0FD;} + .d2-1948806370 .color-B6{color:#F7F8FE;} + .d2-1948806370 .color-AA2{color:#4A6FF3;} + .d2-1948806370 .color-AA4{color:#EDF0FD;} + .d2-1948806370 .color-AA5{color:#F7F8FE;} + .d2-1948806370 .color-AB4{color:#EDF0FD;} + .d2-1948806370 .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}]]>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 6fe750ebb..b6d0598a8 100644 --- a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -SATELLITESTRANSMITTER SENDSENDSEND + .d2-1412428584 .fill-N1{fill:#0A0F25;} + .d2-1412428584 .fill-N2{fill:#676C7E;} + .d2-1412428584 .fill-N3{fill:#9499AB;} + .d2-1412428584 .fill-N4{fill:#CFD2DD;} + .d2-1412428584 .fill-N5{fill:#DEE1EB;} + .d2-1412428584 .fill-N6{fill:#EEF1F8;} + .d2-1412428584 .fill-N7{fill:#FFFFFF;} + .d2-1412428584 .fill-B1{fill:#0D32B2;} + .d2-1412428584 .fill-B2{fill:#0D32B2;} + .d2-1412428584 .fill-B3{fill:#E3E9FD;} + .d2-1412428584 .fill-B4{fill:#E3E9FD;} + .d2-1412428584 .fill-B5{fill:#EDF0FD;} + .d2-1412428584 .fill-B6{fill:#F7F8FE;} + .d2-1412428584 .fill-AA2{fill:#4A6FF3;} + .d2-1412428584 .fill-AA4{fill:#EDF0FD;} + .d2-1412428584 .fill-AA5{fill:#F7F8FE;} + .d2-1412428584 .fill-AB4{fill:#EDF0FD;} + .d2-1412428584 .fill-AB5{fill:#F7F8FE;} + .d2-1412428584 .stroke-N1{stroke:#0A0F25;} + .d2-1412428584 .stroke-N2{stroke:#676C7E;} + .d2-1412428584 .stroke-N3{stroke:#9499AB;} + .d2-1412428584 .stroke-N4{stroke:#CFD2DD;} + .d2-1412428584 .stroke-N5{stroke:#DEE1EB;} + .d2-1412428584 .stroke-N6{stroke:#EEF1F8;} + .d2-1412428584 .stroke-N7{stroke:#FFFFFF;} + .d2-1412428584 .stroke-B1{stroke:#0D32B2;} + .d2-1412428584 .stroke-B2{stroke:#0D32B2;} + .d2-1412428584 .stroke-B3{stroke:#E3E9FD;} + .d2-1412428584 .stroke-B4{stroke:#E3E9FD;} + .d2-1412428584 .stroke-B5{stroke:#EDF0FD;} + .d2-1412428584 .stroke-B6{stroke:#F7F8FE;} + .d2-1412428584 .stroke-AA2{stroke:#4A6FF3;} + .d2-1412428584 .stroke-AA4{stroke:#EDF0FD;} + .d2-1412428584 .stroke-AA5{stroke:#F7F8FE;} + .d2-1412428584 .stroke-AB4{stroke:#EDF0FD;} + .d2-1412428584 .stroke-AB5{stroke:#F7F8FE;} + .d2-1412428584 .background-color-N1{background-color:#0A0F25;} + .d2-1412428584 .background-color-N2{background-color:#676C7E;} + .d2-1412428584 .background-color-N3{background-color:#9499AB;} + .d2-1412428584 .background-color-N4{background-color:#CFD2DD;} + .d2-1412428584 .background-color-N5{background-color:#DEE1EB;} + .d2-1412428584 .background-color-N6{background-color:#EEF1F8;} + .d2-1412428584 .background-color-N7{background-color:#FFFFFF;} + .d2-1412428584 .background-color-B1{background-color:#0D32B2;} + .d2-1412428584 .background-color-B2{background-color:#0D32B2;} + .d2-1412428584 .background-color-B3{background-color:#E3E9FD;} + .d2-1412428584 .background-color-B4{background-color:#E3E9FD;} + .d2-1412428584 .background-color-B5{background-color:#EDF0FD;} + .d2-1412428584 .background-color-B6{background-color:#F7F8FE;} + .d2-1412428584 .background-color-AA2{background-color:#4A6FF3;} + .d2-1412428584 .background-color-AA4{background-color:#EDF0FD;} + .d2-1412428584 .background-color-AA5{background-color:#F7F8FE;} + .d2-1412428584 .background-color-AB4{background-color:#EDF0FD;} + .d2-1412428584 .background-color-AB5{background-color:#F7F8FE;} + .d2-1412428584 .color-N1{color:#0A0F25;} + .d2-1412428584 .color-N2{color:#676C7E;} + .d2-1412428584 .color-N3{color:#9499AB;} + .d2-1412428584 .color-N4{color:#CFD2DD;} + .d2-1412428584 .color-N5{color:#DEE1EB;} + .d2-1412428584 .color-N6{color:#EEF1F8;} + .d2-1412428584 .color-N7{color:#FFFFFF;} + .d2-1412428584 .color-B1{color:#0D32B2;} + .d2-1412428584 .color-B2{color:#0D32B2;} + .d2-1412428584 .color-B3{color:#E3E9FD;} + .d2-1412428584 .color-B4{color:#E3E9FD;} + .d2-1412428584 .color-B5{color:#EDF0FD;} + .d2-1412428584 .color-B6{color:#F7F8FE;} + .d2-1412428584 .color-AA2{color:#4A6FF3;} + .d2-1412428584 .color-AA4{color:#EDF0FD;} + .d2-1412428584 .color-AA5{color:#F7F8FE;} + .d2-1412428584 .color-AB4{color:#EDF0FD;} + .d2-1412428584 .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}]]>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 b982a400a..17f4bebb0 100644 --- a/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -thisgoesmultiple lines + .d2-759444024 .fill-N1{fill:#0A0F25;} + .d2-759444024 .fill-N2{fill:#676C7E;} + .d2-759444024 .fill-N3{fill:#9499AB;} + .d2-759444024 .fill-N4{fill:#CFD2DD;} + .d2-759444024 .fill-N5{fill:#DEE1EB;} + .d2-759444024 .fill-N6{fill:#EEF1F8;} + .d2-759444024 .fill-N7{fill:#FFFFFF;} + .d2-759444024 .fill-B1{fill:#0D32B2;} + .d2-759444024 .fill-B2{fill:#0D32B2;} + .d2-759444024 .fill-B3{fill:#E3E9FD;} + .d2-759444024 .fill-B4{fill:#E3E9FD;} + .d2-759444024 .fill-B5{fill:#EDF0FD;} + .d2-759444024 .fill-B6{fill:#F7F8FE;} + .d2-759444024 .fill-AA2{fill:#4A6FF3;} + .d2-759444024 .fill-AA4{fill:#EDF0FD;} + .d2-759444024 .fill-AA5{fill:#F7F8FE;} + .d2-759444024 .fill-AB4{fill:#EDF0FD;} + .d2-759444024 .fill-AB5{fill:#F7F8FE;} + .d2-759444024 .stroke-N1{stroke:#0A0F25;} + .d2-759444024 .stroke-N2{stroke:#676C7E;} + .d2-759444024 .stroke-N3{stroke:#9499AB;} + .d2-759444024 .stroke-N4{stroke:#CFD2DD;} + .d2-759444024 .stroke-N5{stroke:#DEE1EB;} + .d2-759444024 .stroke-N6{stroke:#EEF1F8;} + .d2-759444024 .stroke-N7{stroke:#FFFFFF;} + .d2-759444024 .stroke-B1{stroke:#0D32B2;} + .d2-759444024 .stroke-B2{stroke:#0D32B2;} + .d2-759444024 .stroke-B3{stroke:#E3E9FD;} + .d2-759444024 .stroke-B4{stroke:#E3E9FD;} + .d2-759444024 .stroke-B5{stroke:#EDF0FD;} + .d2-759444024 .stroke-B6{stroke:#F7F8FE;} + .d2-759444024 .stroke-AA2{stroke:#4A6FF3;} + .d2-759444024 .stroke-AA4{stroke:#EDF0FD;} + .d2-759444024 .stroke-AA5{stroke:#F7F8FE;} + .d2-759444024 .stroke-AB4{stroke:#EDF0FD;} + .d2-759444024 .stroke-AB5{stroke:#F7F8FE;} + .d2-759444024 .background-color-N1{background-color:#0A0F25;} + .d2-759444024 .background-color-N2{background-color:#676C7E;} + .d2-759444024 .background-color-N3{background-color:#9499AB;} + .d2-759444024 .background-color-N4{background-color:#CFD2DD;} + .d2-759444024 .background-color-N5{background-color:#DEE1EB;} + .d2-759444024 .background-color-N6{background-color:#EEF1F8;} + .d2-759444024 .background-color-N7{background-color:#FFFFFF;} + .d2-759444024 .background-color-B1{background-color:#0D32B2;} + .d2-759444024 .background-color-B2{background-color:#0D32B2;} + .d2-759444024 .background-color-B3{background-color:#E3E9FD;} + .d2-759444024 .background-color-B4{background-color:#E3E9FD;} + .d2-759444024 .background-color-B5{background-color:#EDF0FD;} + .d2-759444024 .background-color-B6{background-color:#F7F8FE;} + .d2-759444024 .background-color-AA2{background-color:#4A6FF3;} + .d2-759444024 .background-color-AA4{background-color:#EDF0FD;} + .d2-759444024 .background-color-AA5{background-color:#F7F8FE;} + .d2-759444024 .background-color-AB4{background-color:#EDF0FD;} + .d2-759444024 .background-color-AB5{background-color:#F7F8FE;} + .d2-759444024 .color-N1{color:#0A0F25;} + .d2-759444024 .color-N2{color:#676C7E;} + .d2-759444024 .color-N3{color:#9499AB;} + .d2-759444024 .color-N4{color:#CFD2DD;} + .d2-759444024 .color-N5{color:#DEE1EB;} + .d2-759444024 .color-N6{color:#EEF1F8;} + .d2-759444024 .color-N7{color:#FFFFFF;} + .d2-759444024 .color-B1{color:#0D32B2;} + .d2-759444024 .color-B2{color:#0D32B2;} + .d2-759444024 .color-B3{color:#E3E9FD;} + .d2-759444024 .color-B4{color:#E3E9FD;} + .d2-759444024 .color-B5{color:#EDF0FD;} + .d2-759444024 .color-B6{color:#F7F8FE;} + .d2-759444024 .color-AA2{color:#4A6FF3;} + .d2-759444024 .color-AA4{color:#EDF0FD;} + .d2-759444024 .color-AA5{color:#F7F8FE;} + .d2-759444024 .color-AB4{color:#EDF0FD;} + .d2-759444024 .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}]]>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 812590c78..f6165b192 100644 --- a/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -thisgoesmultiple lines + .d2-1968289800 .fill-N1{fill:#0A0F25;} + .d2-1968289800 .fill-N2{fill:#676C7E;} + .d2-1968289800 .fill-N3{fill:#9499AB;} + .d2-1968289800 .fill-N4{fill:#CFD2DD;} + .d2-1968289800 .fill-N5{fill:#DEE1EB;} + .d2-1968289800 .fill-N6{fill:#EEF1F8;} + .d2-1968289800 .fill-N7{fill:#FFFFFF;} + .d2-1968289800 .fill-B1{fill:#0D32B2;} + .d2-1968289800 .fill-B2{fill:#0D32B2;} + .d2-1968289800 .fill-B3{fill:#E3E9FD;} + .d2-1968289800 .fill-B4{fill:#E3E9FD;} + .d2-1968289800 .fill-B5{fill:#EDF0FD;} + .d2-1968289800 .fill-B6{fill:#F7F8FE;} + .d2-1968289800 .fill-AA2{fill:#4A6FF3;} + .d2-1968289800 .fill-AA4{fill:#EDF0FD;} + .d2-1968289800 .fill-AA5{fill:#F7F8FE;} + .d2-1968289800 .fill-AB4{fill:#EDF0FD;} + .d2-1968289800 .fill-AB5{fill:#F7F8FE;} + .d2-1968289800 .stroke-N1{stroke:#0A0F25;} + .d2-1968289800 .stroke-N2{stroke:#676C7E;} + .d2-1968289800 .stroke-N3{stroke:#9499AB;} + .d2-1968289800 .stroke-N4{stroke:#CFD2DD;} + .d2-1968289800 .stroke-N5{stroke:#DEE1EB;} + .d2-1968289800 .stroke-N6{stroke:#EEF1F8;} + .d2-1968289800 .stroke-N7{stroke:#FFFFFF;} + .d2-1968289800 .stroke-B1{stroke:#0D32B2;} + .d2-1968289800 .stroke-B2{stroke:#0D32B2;} + .d2-1968289800 .stroke-B3{stroke:#E3E9FD;} + .d2-1968289800 .stroke-B4{stroke:#E3E9FD;} + .d2-1968289800 .stroke-B5{stroke:#EDF0FD;} + .d2-1968289800 .stroke-B6{stroke:#F7F8FE;} + .d2-1968289800 .stroke-AA2{stroke:#4A6FF3;} + .d2-1968289800 .stroke-AA4{stroke:#EDF0FD;} + .d2-1968289800 .stroke-AA5{stroke:#F7F8FE;} + .d2-1968289800 .stroke-AB4{stroke:#EDF0FD;} + .d2-1968289800 .stroke-AB5{stroke:#F7F8FE;} + .d2-1968289800 .background-color-N1{background-color:#0A0F25;} + .d2-1968289800 .background-color-N2{background-color:#676C7E;} + .d2-1968289800 .background-color-N3{background-color:#9499AB;} + .d2-1968289800 .background-color-N4{background-color:#CFD2DD;} + .d2-1968289800 .background-color-N5{background-color:#DEE1EB;} + .d2-1968289800 .background-color-N6{background-color:#EEF1F8;} + .d2-1968289800 .background-color-N7{background-color:#FFFFFF;} + .d2-1968289800 .background-color-B1{background-color:#0D32B2;} + .d2-1968289800 .background-color-B2{background-color:#0D32B2;} + .d2-1968289800 .background-color-B3{background-color:#E3E9FD;} + .d2-1968289800 .background-color-B4{background-color:#E3E9FD;} + .d2-1968289800 .background-color-B5{background-color:#EDF0FD;} + .d2-1968289800 .background-color-B6{background-color:#F7F8FE;} + .d2-1968289800 .background-color-AA2{background-color:#4A6FF3;} + .d2-1968289800 .background-color-AA4{background-color:#EDF0FD;} + .d2-1968289800 .background-color-AA5{background-color:#F7F8FE;} + .d2-1968289800 .background-color-AB4{background-color:#EDF0FD;} + .d2-1968289800 .background-color-AB5{background-color:#F7F8FE;} + .d2-1968289800 .color-N1{color:#0A0F25;} + .d2-1968289800 .color-N2{color:#676C7E;} + .d2-1968289800 .color-N3{color:#9499AB;} + .d2-1968289800 .color-N4{color:#CFD2DD;} + .d2-1968289800 .color-N5{color:#DEE1EB;} + .d2-1968289800 .color-N6{color:#EEF1F8;} + .d2-1968289800 .color-N7{color:#FFFFFF;} + .d2-1968289800 .color-B1{color:#0D32B2;} + .d2-1968289800 .color-B2{color:#0D32B2;} + .d2-1968289800 .color-B3{color:#E3E9FD;} + .d2-1968289800 .color-B4{color:#E3E9FD;} + .d2-1968289800 .color-B5{color:#EDF0FD;} + .d2-1968289800 .color-B6{color:#F7F8FE;} + .d2-1968289800 .color-AA2{color:#4A6FF3;} + .d2-1968289800 .color-AA4{color:#EDF0FD;} + .d2-1968289800 .color-AA5{color:#F7F8FE;} + .d2-1968289800 .color-AB4{color:#EDF0FD;} + .d2-1968289800 .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}]]>thisgoesmultiple lines \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg index 0666910d5..01b11bd3f 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -outerstartendvolume groupvolume definitionvolume + .d2-2094625675 .fill-N1{fill:#0A0F25;} + .d2-2094625675 .fill-N2{fill:#676C7E;} + .d2-2094625675 .fill-N3{fill:#9499AB;} + .d2-2094625675 .fill-N4{fill:#CFD2DD;} + .d2-2094625675 .fill-N5{fill:#DEE1EB;} + .d2-2094625675 .fill-N6{fill:#EEF1F8;} + .d2-2094625675 .fill-N7{fill:#FFFFFF;} + .d2-2094625675 .fill-B1{fill:#0D32B2;} + .d2-2094625675 .fill-B2{fill:#0D32B2;} + .d2-2094625675 .fill-B3{fill:#E3E9FD;} + .d2-2094625675 .fill-B4{fill:#E3E9FD;} + .d2-2094625675 .fill-B5{fill:#EDF0FD;} + .d2-2094625675 .fill-B6{fill:#F7F8FE;} + .d2-2094625675 .fill-AA2{fill:#4A6FF3;} + .d2-2094625675 .fill-AA4{fill:#EDF0FD;} + .d2-2094625675 .fill-AA5{fill:#F7F8FE;} + .d2-2094625675 .fill-AB4{fill:#EDF0FD;} + .d2-2094625675 .fill-AB5{fill:#F7F8FE;} + .d2-2094625675 .stroke-N1{stroke:#0A0F25;} + .d2-2094625675 .stroke-N2{stroke:#676C7E;} + .d2-2094625675 .stroke-N3{stroke:#9499AB;} + .d2-2094625675 .stroke-N4{stroke:#CFD2DD;} + .d2-2094625675 .stroke-N5{stroke:#DEE1EB;} + .d2-2094625675 .stroke-N6{stroke:#EEF1F8;} + .d2-2094625675 .stroke-N7{stroke:#FFFFFF;} + .d2-2094625675 .stroke-B1{stroke:#0D32B2;} + .d2-2094625675 .stroke-B2{stroke:#0D32B2;} + .d2-2094625675 .stroke-B3{stroke:#E3E9FD;} + .d2-2094625675 .stroke-B4{stroke:#E3E9FD;} + .d2-2094625675 .stroke-B5{stroke:#EDF0FD;} + .d2-2094625675 .stroke-B6{stroke:#F7F8FE;} + .d2-2094625675 .stroke-AA2{stroke:#4A6FF3;} + .d2-2094625675 .stroke-AA4{stroke:#EDF0FD;} + .d2-2094625675 .stroke-AA5{stroke:#F7F8FE;} + .d2-2094625675 .stroke-AB4{stroke:#EDF0FD;} + .d2-2094625675 .stroke-AB5{stroke:#F7F8FE;} + .d2-2094625675 .background-color-N1{background-color:#0A0F25;} + .d2-2094625675 .background-color-N2{background-color:#676C7E;} + .d2-2094625675 .background-color-N3{background-color:#9499AB;} + .d2-2094625675 .background-color-N4{background-color:#CFD2DD;} + .d2-2094625675 .background-color-N5{background-color:#DEE1EB;} + .d2-2094625675 .background-color-N6{background-color:#EEF1F8;} + .d2-2094625675 .background-color-N7{background-color:#FFFFFF;} + .d2-2094625675 .background-color-B1{background-color:#0D32B2;} + .d2-2094625675 .background-color-B2{background-color:#0D32B2;} + .d2-2094625675 .background-color-B3{background-color:#E3E9FD;} + .d2-2094625675 .background-color-B4{background-color:#E3E9FD;} + .d2-2094625675 .background-color-B5{background-color:#EDF0FD;} + .d2-2094625675 .background-color-B6{background-color:#F7F8FE;} + .d2-2094625675 .background-color-AA2{background-color:#4A6FF3;} + .d2-2094625675 .background-color-AA4{background-color:#EDF0FD;} + .d2-2094625675 .background-color-AA5{background-color:#F7F8FE;} + .d2-2094625675 .background-color-AB4{background-color:#EDF0FD;} + .d2-2094625675 .background-color-AB5{background-color:#F7F8FE;} + .d2-2094625675 .color-N1{color:#0A0F25;} + .d2-2094625675 .color-N2{color:#676C7E;} + .d2-2094625675 .color-N3{color:#9499AB;} + .d2-2094625675 .color-N4{color:#CFD2DD;} + .d2-2094625675 .color-N5{color:#DEE1EB;} + .d2-2094625675 .color-N6{color:#EEF1F8;} + .d2-2094625675 .color-N7{color:#FFFFFF;} + .d2-2094625675 .color-B1{color:#0D32B2;} + .d2-2094625675 .color-B2{color:#0D32B2;} + .d2-2094625675 .color-B3{color:#E3E9FD;} + .d2-2094625675 .color-B4{color:#E3E9FD;} + .d2-2094625675 .color-B5{color:#EDF0FD;} + .d2-2094625675 .color-B6{color:#F7F8FE;} + .d2-2094625675 .color-AA2{color:#4A6FF3;} + .d2-2094625675 .color-AA4{color:#EDF0FD;} + .d2-2094625675 .color-AA5{color:#F7F8FE;} + .d2-2094625675 .color-AB4{color:#EDF0FD;} + .d2-2094625675 .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}]]>outerstartendvolume groupvolume definitionvolume diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg index 898e888bf..aeaa59580 100644 --- a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -outerstartendvolume groupvolume definitionvolume + .d2-4187716189 .fill-N1{fill:#0A0F25;} + .d2-4187716189 .fill-N2{fill:#676C7E;} + .d2-4187716189 .fill-N3{fill:#9499AB;} + .d2-4187716189 .fill-N4{fill:#CFD2DD;} + .d2-4187716189 .fill-N5{fill:#DEE1EB;} + .d2-4187716189 .fill-N6{fill:#EEF1F8;} + .d2-4187716189 .fill-N7{fill:#FFFFFF;} + .d2-4187716189 .fill-B1{fill:#0D32B2;} + .d2-4187716189 .fill-B2{fill:#0D32B2;} + .d2-4187716189 .fill-B3{fill:#E3E9FD;} + .d2-4187716189 .fill-B4{fill:#E3E9FD;} + .d2-4187716189 .fill-B5{fill:#EDF0FD;} + .d2-4187716189 .fill-B6{fill:#F7F8FE;} + .d2-4187716189 .fill-AA2{fill:#4A6FF3;} + .d2-4187716189 .fill-AA4{fill:#EDF0FD;} + .d2-4187716189 .fill-AA5{fill:#F7F8FE;} + .d2-4187716189 .fill-AB4{fill:#EDF0FD;} + .d2-4187716189 .fill-AB5{fill:#F7F8FE;} + .d2-4187716189 .stroke-N1{stroke:#0A0F25;} + .d2-4187716189 .stroke-N2{stroke:#676C7E;} + .d2-4187716189 .stroke-N3{stroke:#9499AB;} + .d2-4187716189 .stroke-N4{stroke:#CFD2DD;} + .d2-4187716189 .stroke-N5{stroke:#DEE1EB;} + .d2-4187716189 .stroke-N6{stroke:#EEF1F8;} + .d2-4187716189 .stroke-N7{stroke:#FFFFFF;} + .d2-4187716189 .stroke-B1{stroke:#0D32B2;} + .d2-4187716189 .stroke-B2{stroke:#0D32B2;} + .d2-4187716189 .stroke-B3{stroke:#E3E9FD;} + .d2-4187716189 .stroke-B4{stroke:#E3E9FD;} + .d2-4187716189 .stroke-B5{stroke:#EDF0FD;} + .d2-4187716189 .stroke-B6{stroke:#F7F8FE;} + .d2-4187716189 .stroke-AA2{stroke:#4A6FF3;} + .d2-4187716189 .stroke-AA4{stroke:#EDF0FD;} + .d2-4187716189 .stroke-AA5{stroke:#F7F8FE;} + .d2-4187716189 .stroke-AB4{stroke:#EDF0FD;} + .d2-4187716189 .stroke-AB5{stroke:#F7F8FE;} + .d2-4187716189 .background-color-N1{background-color:#0A0F25;} + .d2-4187716189 .background-color-N2{background-color:#676C7E;} + .d2-4187716189 .background-color-N3{background-color:#9499AB;} + .d2-4187716189 .background-color-N4{background-color:#CFD2DD;} + .d2-4187716189 .background-color-N5{background-color:#DEE1EB;} + .d2-4187716189 .background-color-N6{background-color:#EEF1F8;} + .d2-4187716189 .background-color-N7{background-color:#FFFFFF;} + .d2-4187716189 .background-color-B1{background-color:#0D32B2;} + .d2-4187716189 .background-color-B2{background-color:#0D32B2;} + .d2-4187716189 .background-color-B3{background-color:#E3E9FD;} + .d2-4187716189 .background-color-B4{background-color:#E3E9FD;} + .d2-4187716189 .background-color-B5{background-color:#EDF0FD;} + .d2-4187716189 .background-color-B6{background-color:#F7F8FE;} + .d2-4187716189 .background-color-AA2{background-color:#4A6FF3;} + .d2-4187716189 .background-color-AA4{background-color:#EDF0FD;} + .d2-4187716189 .background-color-AA5{background-color:#F7F8FE;} + .d2-4187716189 .background-color-AB4{background-color:#EDF0FD;} + .d2-4187716189 .background-color-AB5{background-color:#F7F8FE;} + .d2-4187716189 .color-N1{color:#0A0F25;} + .d2-4187716189 .color-N2{color:#676C7E;} + .d2-4187716189 .color-N3{color:#9499AB;} + .d2-4187716189 .color-N4{color:#CFD2DD;} + .d2-4187716189 .color-N5{color:#DEE1EB;} + .d2-4187716189 .color-N6{color:#EEF1F8;} + .d2-4187716189 .color-N7{color:#FFFFFF;} + .d2-4187716189 .color-B1{color:#0D32B2;} + .d2-4187716189 .color-B2{color:#0D32B2;} + .d2-4187716189 .color-B3{color:#E3E9FD;} + .d2-4187716189 .color-B4{color:#E3E9FD;} + .d2-4187716189 .color-B5{color:#EDF0FD;} + .d2-4187716189 .color-B6{color:#F7F8FE;} + .d2-4187716189 .color-AA2{color:#4A6FF3;} + .d2-4187716189 .color-AA4{color:#EDF0FD;} + .d2-4187716189 .color-AA5{color:#F7F8FE;} + .d2-4187716189 .color-AB4{color:#EDF0FD;} + .d2-4187716189 .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}]]>outerstartendvolume groupvolume definitionvolume diff --git a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg index 9826d481c..f6e4cca90 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 + .d2-4084110625 .fill-N1{fill:#0A0F25;} + .d2-4084110625 .fill-N2{fill:#676C7E;} + .d2-4084110625 .fill-N3{fill:#9499AB;} + .d2-4084110625 .fill-N4{fill:#CFD2DD;} + .d2-4084110625 .fill-N5{fill:#DEE1EB;} + .d2-4084110625 .fill-N6{fill:#EEF1F8;} + .d2-4084110625 .fill-N7{fill:#FFFFFF;} + .d2-4084110625 .fill-B1{fill:#0D32B2;} + .d2-4084110625 .fill-B2{fill:#0D32B2;} + .d2-4084110625 .fill-B3{fill:#E3E9FD;} + .d2-4084110625 .fill-B4{fill:#E3E9FD;} + .d2-4084110625 .fill-B5{fill:#EDF0FD;} + .d2-4084110625 .fill-B6{fill:#F7F8FE;} + .d2-4084110625 .fill-AA2{fill:#4A6FF3;} + .d2-4084110625 .fill-AA4{fill:#EDF0FD;} + .d2-4084110625 .fill-AA5{fill:#F7F8FE;} + .d2-4084110625 .fill-AB4{fill:#EDF0FD;} + .d2-4084110625 .fill-AB5{fill:#F7F8FE;} + .d2-4084110625 .stroke-N1{stroke:#0A0F25;} + .d2-4084110625 .stroke-N2{stroke:#676C7E;} + .d2-4084110625 .stroke-N3{stroke:#9499AB;} + .d2-4084110625 .stroke-N4{stroke:#CFD2DD;} + .d2-4084110625 .stroke-N5{stroke:#DEE1EB;} + .d2-4084110625 .stroke-N6{stroke:#EEF1F8;} + .d2-4084110625 .stroke-N7{stroke:#FFFFFF;} + .d2-4084110625 .stroke-B1{stroke:#0D32B2;} + .d2-4084110625 .stroke-B2{stroke:#0D32B2;} + .d2-4084110625 .stroke-B3{stroke:#E3E9FD;} + .d2-4084110625 .stroke-B4{stroke:#E3E9FD;} + .d2-4084110625 .stroke-B5{stroke:#EDF0FD;} + .d2-4084110625 .stroke-B6{stroke:#F7F8FE;} + .d2-4084110625 .stroke-AA2{stroke:#4A6FF3;} + .d2-4084110625 .stroke-AA4{stroke:#EDF0FD;} + .d2-4084110625 .stroke-AA5{stroke:#F7F8FE;} + .d2-4084110625 .stroke-AB4{stroke:#EDF0FD;} + .d2-4084110625 .stroke-AB5{stroke:#F7F8FE;} + .d2-4084110625 .background-color-N1{background-color:#0A0F25;} + .d2-4084110625 .background-color-N2{background-color:#676C7E;} + .d2-4084110625 .background-color-N3{background-color:#9499AB;} + .d2-4084110625 .background-color-N4{background-color:#CFD2DD;} + .d2-4084110625 .background-color-N5{background-color:#DEE1EB;} + .d2-4084110625 .background-color-N6{background-color:#EEF1F8;} + .d2-4084110625 .background-color-N7{background-color:#FFFFFF;} + .d2-4084110625 .background-color-B1{background-color:#0D32B2;} + .d2-4084110625 .background-color-B2{background-color:#0D32B2;} + .d2-4084110625 .background-color-B3{background-color:#E3E9FD;} + .d2-4084110625 .background-color-B4{background-color:#E3E9FD;} + .d2-4084110625 .background-color-B5{background-color:#EDF0FD;} + .d2-4084110625 .background-color-B6{background-color:#F7F8FE;} + .d2-4084110625 .background-color-AA2{background-color:#4A6FF3;} + .d2-4084110625 .background-color-AA4{background-color:#EDF0FD;} + .d2-4084110625 .background-color-AA5{background-color:#F7F8FE;} + .d2-4084110625 .background-color-AB4{background-color:#EDF0FD;} + .d2-4084110625 .background-color-AB5{background-color:#F7F8FE;} + .d2-4084110625 .color-N1{color:#0A0F25;} + .d2-4084110625 .color-N2{color:#676C7E;} + .d2-4084110625 .color-N3{color:#9499AB;} + .d2-4084110625 .color-N4{color:#CFD2DD;} + .d2-4084110625 .color-N5{color:#DEE1EB;} + .d2-4084110625 .color-N6{color:#EEF1F8;} + .d2-4084110625 .color-N7{color:#FFFFFF;} + .d2-4084110625 .color-B1{color:#0D32B2;} + .d2-4084110625 .color-B2{color:#0D32B2;} + .d2-4084110625 .color-B3{color:#E3E9FD;} + .d2-4084110625 .color-B4{color:#E3E9FD;} + .d2-4084110625 .color-B5{color:#EDF0FD;} + .d2-4084110625 .color-B6{color:#F7F8FE;} + .d2-4084110625 .color-AA2{color:#4A6FF3;} + .d2-4084110625 .color-AA4{color:#EDF0FD;} + .d2-4084110625 .color-AA5{color:#F7F8FE;} + .d2-4084110625 .color-AB4{color:#EDF0FD;} + .d2-4084110625 .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}]]>n1n2n3 n4n5 @@ -114,7 +114,7 @@ a -b +b diff --git a/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg index 9ecadf3b3..156b603ed 100644 --- a/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 + .d2-2199715291 .fill-N1{fill:#0A0F25;} + .d2-2199715291 .fill-N2{fill:#676C7E;} + .d2-2199715291 .fill-N3{fill:#9499AB;} + .d2-2199715291 .fill-N4{fill:#CFD2DD;} + .d2-2199715291 .fill-N5{fill:#DEE1EB;} + .d2-2199715291 .fill-N6{fill:#EEF1F8;} + .d2-2199715291 .fill-N7{fill:#FFFFFF;} + .d2-2199715291 .fill-B1{fill:#0D32B2;} + .d2-2199715291 .fill-B2{fill:#0D32B2;} + .d2-2199715291 .fill-B3{fill:#E3E9FD;} + .d2-2199715291 .fill-B4{fill:#E3E9FD;} + .d2-2199715291 .fill-B5{fill:#EDF0FD;} + .d2-2199715291 .fill-B6{fill:#F7F8FE;} + .d2-2199715291 .fill-AA2{fill:#4A6FF3;} + .d2-2199715291 .fill-AA4{fill:#EDF0FD;} + .d2-2199715291 .fill-AA5{fill:#F7F8FE;} + .d2-2199715291 .fill-AB4{fill:#EDF0FD;} + .d2-2199715291 .fill-AB5{fill:#F7F8FE;} + .d2-2199715291 .stroke-N1{stroke:#0A0F25;} + .d2-2199715291 .stroke-N2{stroke:#676C7E;} + .d2-2199715291 .stroke-N3{stroke:#9499AB;} + .d2-2199715291 .stroke-N4{stroke:#CFD2DD;} + .d2-2199715291 .stroke-N5{stroke:#DEE1EB;} + .d2-2199715291 .stroke-N6{stroke:#EEF1F8;} + .d2-2199715291 .stroke-N7{stroke:#FFFFFF;} + .d2-2199715291 .stroke-B1{stroke:#0D32B2;} + .d2-2199715291 .stroke-B2{stroke:#0D32B2;} + .d2-2199715291 .stroke-B3{stroke:#E3E9FD;} + .d2-2199715291 .stroke-B4{stroke:#E3E9FD;} + .d2-2199715291 .stroke-B5{stroke:#EDF0FD;} + .d2-2199715291 .stroke-B6{stroke:#F7F8FE;} + .d2-2199715291 .stroke-AA2{stroke:#4A6FF3;} + .d2-2199715291 .stroke-AA4{stroke:#EDF0FD;} + .d2-2199715291 .stroke-AA5{stroke:#F7F8FE;} + .d2-2199715291 .stroke-AB4{stroke:#EDF0FD;} + .d2-2199715291 .stroke-AB5{stroke:#F7F8FE;} + .d2-2199715291 .background-color-N1{background-color:#0A0F25;} + .d2-2199715291 .background-color-N2{background-color:#676C7E;} + .d2-2199715291 .background-color-N3{background-color:#9499AB;} + .d2-2199715291 .background-color-N4{background-color:#CFD2DD;} + .d2-2199715291 .background-color-N5{background-color:#DEE1EB;} + .d2-2199715291 .background-color-N6{background-color:#EEF1F8;} + .d2-2199715291 .background-color-N7{background-color:#FFFFFF;} + .d2-2199715291 .background-color-B1{background-color:#0D32B2;} + .d2-2199715291 .background-color-B2{background-color:#0D32B2;} + .d2-2199715291 .background-color-B3{background-color:#E3E9FD;} + .d2-2199715291 .background-color-B4{background-color:#E3E9FD;} + .d2-2199715291 .background-color-B5{background-color:#EDF0FD;} + .d2-2199715291 .background-color-B6{background-color:#F7F8FE;} + .d2-2199715291 .background-color-AA2{background-color:#4A6FF3;} + .d2-2199715291 .background-color-AA4{background-color:#EDF0FD;} + .d2-2199715291 .background-color-AA5{background-color:#F7F8FE;} + .d2-2199715291 .background-color-AB4{background-color:#EDF0FD;} + .d2-2199715291 .background-color-AB5{background-color:#F7F8FE;} + .d2-2199715291 .color-N1{color:#0A0F25;} + .d2-2199715291 .color-N2{color:#676C7E;} + .d2-2199715291 .color-N3{color:#9499AB;} + .d2-2199715291 .color-N4{color:#CFD2DD;} + .d2-2199715291 .color-N5{color:#DEE1EB;} + .d2-2199715291 .color-N6{color:#EEF1F8;} + .d2-2199715291 .color-N7{color:#FFFFFF;} + .d2-2199715291 .color-B1{color:#0D32B2;} + .d2-2199715291 .color-B2{color:#0D32B2;} + .d2-2199715291 .color-B3{color:#E3E9FD;} + .d2-2199715291 .color-B4{color:#E3E9FD;} + .d2-2199715291 .color-B5{color:#EDF0FD;} + .d2-2199715291 .color-B6{color:#F7F8FE;} + .d2-2199715291 .color-AA2{color:#4A6FF3;} + .d2-2199715291 .color-AA4{color:#EDF0FD;} + .d2-2199715291 .color-AA5{color:#F7F8FE;} + .d2-2199715291 .color-AB4{color:#EDF0FD;} + .d2-2199715291 .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}]]>n1n2n3 n4n5 @@ -114,7 +114,7 @@ a -b +b diff --git a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg index 776d3dd8e..7138209cf 100644 --- a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 + .d2-3651601834 .fill-N1{fill:#0A0F25;} + .d2-3651601834 .fill-N2{fill:#676C7E;} + .d2-3651601834 .fill-N3{fill:#9499AB;} + .d2-3651601834 .fill-N4{fill:#CFD2DD;} + .d2-3651601834 .fill-N5{fill:#DEE1EB;} + .d2-3651601834 .fill-N6{fill:#EEF1F8;} + .d2-3651601834 .fill-N7{fill:#FFFFFF;} + .d2-3651601834 .fill-B1{fill:#0D32B2;} + .d2-3651601834 .fill-B2{fill:#0D32B2;} + .d2-3651601834 .fill-B3{fill:#E3E9FD;} + .d2-3651601834 .fill-B4{fill:#E3E9FD;} + .d2-3651601834 .fill-B5{fill:#EDF0FD;} + .d2-3651601834 .fill-B6{fill:#F7F8FE;} + .d2-3651601834 .fill-AA2{fill:#4A6FF3;} + .d2-3651601834 .fill-AA4{fill:#EDF0FD;} + .d2-3651601834 .fill-AA5{fill:#F7F8FE;} + .d2-3651601834 .fill-AB4{fill:#EDF0FD;} + .d2-3651601834 .fill-AB5{fill:#F7F8FE;} + .d2-3651601834 .stroke-N1{stroke:#0A0F25;} + .d2-3651601834 .stroke-N2{stroke:#676C7E;} + .d2-3651601834 .stroke-N3{stroke:#9499AB;} + .d2-3651601834 .stroke-N4{stroke:#CFD2DD;} + .d2-3651601834 .stroke-N5{stroke:#DEE1EB;} + .d2-3651601834 .stroke-N6{stroke:#EEF1F8;} + .d2-3651601834 .stroke-N7{stroke:#FFFFFF;} + .d2-3651601834 .stroke-B1{stroke:#0D32B2;} + .d2-3651601834 .stroke-B2{stroke:#0D32B2;} + .d2-3651601834 .stroke-B3{stroke:#E3E9FD;} + .d2-3651601834 .stroke-B4{stroke:#E3E9FD;} + .d2-3651601834 .stroke-B5{stroke:#EDF0FD;} + .d2-3651601834 .stroke-B6{stroke:#F7F8FE;} + .d2-3651601834 .stroke-AA2{stroke:#4A6FF3;} + .d2-3651601834 .stroke-AA4{stroke:#EDF0FD;} + .d2-3651601834 .stroke-AA5{stroke:#F7F8FE;} + .d2-3651601834 .stroke-AB4{stroke:#EDF0FD;} + .d2-3651601834 .stroke-AB5{stroke:#F7F8FE;} + .d2-3651601834 .background-color-N1{background-color:#0A0F25;} + .d2-3651601834 .background-color-N2{background-color:#676C7E;} + .d2-3651601834 .background-color-N3{background-color:#9499AB;} + .d2-3651601834 .background-color-N4{background-color:#CFD2DD;} + .d2-3651601834 .background-color-N5{background-color:#DEE1EB;} + .d2-3651601834 .background-color-N6{background-color:#EEF1F8;} + .d2-3651601834 .background-color-N7{background-color:#FFFFFF;} + .d2-3651601834 .background-color-B1{background-color:#0D32B2;} + .d2-3651601834 .background-color-B2{background-color:#0D32B2;} + .d2-3651601834 .background-color-B3{background-color:#E3E9FD;} + .d2-3651601834 .background-color-B4{background-color:#E3E9FD;} + .d2-3651601834 .background-color-B5{background-color:#EDF0FD;} + .d2-3651601834 .background-color-B6{background-color:#F7F8FE;} + .d2-3651601834 .background-color-AA2{background-color:#4A6FF3;} + .d2-3651601834 .background-color-AA4{background-color:#EDF0FD;} + .d2-3651601834 .background-color-AA5{background-color:#F7F8FE;} + .d2-3651601834 .background-color-AB4{background-color:#EDF0FD;} + .d2-3651601834 .background-color-AB5{background-color:#F7F8FE;} + .d2-3651601834 .color-N1{color:#0A0F25;} + .d2-3651601834 .color-N2{color:#676C7E;} + .d2-3651601834 .color-N3{color:#9499AB;} + .d2-3651601834 .color-N4{color:#CFD2DD;} + .d2-3651601834 .color-N5{color:#DEE1EB;} + .d2-3651601834 .color-N6{color:#EEF1F8;} + .d2-3651601834 .color-N7{color:#FFFFFF;} + .d2-3651601834 .color-B1{color:#0D32B2;} + .d2-3651601834 .color-B2{color:#0D32B2;} + .d2-3651601834 .color-B3{color:#E3E9FD;} + .d2-3651601834 .color-B4{color:#E3E9FD;} + .d2-3651601834 .color-B5{color:#EDF0FD;} + .d2-3651601834 .color-B6{color:#F7F8FE;} + .d2-3651601834 .color-AA2{color:#4A6FF3;} + .d2-3651601834 .color-AA4{color:#EDF0FD;} + .d2-3651601834 .color-AA5{color:#F7F8FE;} + .d2-3651601834 .color-AB4{color:#EDF0FD;} + .d2-3651601834 .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}]]>n1n2n3 n4n5 @@ -114,7 +114,7 @@ a -b +b diff --git a/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg index 32c63658c..c437719a3 100644 --- a/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 + .d2-4159279222 .fill-N1{fill:#0A0F25;} + .d2-4159279222 .fill-N2{fill:#676C7E;} + .d2-4159279222 .fill-N3{fill:#9499AB;} + .d2-4159279222 .fill-N4{fill:#CFD2DD;} + .d2-4159279222 .fill-N5{fill:#DEE1EB;} + .d2-4159279222 .fill-N6{fill:#EEF1F8;} + .d2-4159279222 .fill-N7{fill:#FFFFFF;} + .d2-4159279222 .fill-B1{fill:#0D32B2;} + .d2-4159279222 .fill-B2{fill:#0D32B2;} + .d2-4159279222 .fill-B3{fill:#E3E9FD;} + .d2-4159279222 .fill-B4{fill:#E3E9FD;} + .d2-4159279222 .fill-B5{fill:#EDF0FD;} + .d2-4159279222 .fill-B6{fill:#F7F8FE;} + .d2-4159279222 .fill-AA2{fill:#4A6FF3;} + .d2-4159279222 .fill-AA4{fill:#EDF0FD;} + .d2-4159279222 .fill-AA5{fill:#F7F8FE;} + .d2-4159279222 .fill-AB4{fill:#EDF0FD;} + .d2-4159279222 .fill-AB5{fill:#F7F8FE;} + .d2-4159279222 .stroke-N1{stroke:#0A0F25;} + .d2-4159279222 .stroke-N2{stroke:#676C7E;} + .d2-4159279222 .stroke-N3{stroke:#9499AB;} + .d2-4159279222 .stroke-N4{stroke:#CFD2DD;} + .d2-4159279222 .stroke-N5{stroke:#DEE1EB;} + .d2-4159279222 .stroke-N6{stroke:#EEF1F8;} + .d2-4159279222 .stroke-N7{stroke:#FFFFFF;} + .d2-4159279222 .stroke-B1{stroke:#0D32B2;} + .d2-4159279222 .stroke-B2{stroke:#0D32B2;} + .d2-4159279222 .stroke-B3{stroke:#E3E9FD;} + .d2-4159279222 .stroke-B4{stroke:#E3E9FD;} + .d2-4159279222 .stroke-B5{stroke:#EDF0FD;} + .d2-4159279222 .stroke-B6{stroke:#F7F8FE;} + .d2-4159279222 .stroke-AA2{stroke:#4A6FF3;} + .d2-4159279222 .stroke-AA4{stroke:#EDF0FD;} + .d2-4159279222 .stroke-AA5{stroke:#F7F8FE;} + .d2-4159279222 .stroke-AB4{stroke:#EDF0FD;} + .d2-4159279222 .stroke-AB5{stroke:#F7F8FE;} + .d2-4159279222 .background-color-N1{background-color:#0A0F25;} + .d2-4159279222 .background-color-N2{background-color:#676C7E;} + .d2-4159279222 .background-color-N3{background-color:#9499AB;} + .d2-4159279222 .background-color-N4{background-color:#CFD2DD;} + .d2-4159279222 .background-color-N5{background-color:#DEE1EB;} + .d2-4159279222 .background-color-N6{background-color:#EEF1F8;} + .d2-4159279222 .background-color-N7{background-color:#FFFFFF;} + .d2-4159279222 .background-color-B1{background-color:#0D32B2;} + .d2-4159279222 .background-color-B2{background-color:#0D32B2;} + .d2-4159279222 .background-color-B3{background-color:#E3E9FD;} + .d2-4159279222 .background-color-B4{background-color:#E3E9FD;} + .d2-4159279222 .background-color-B5{background-color:#EDF0FD;} + .d2-4159279222 .background-color-B6{background-color:#F7F8FE;} + .d2-4159279222 .background-color-AA2{background-color:#4A6FF3;} + .d2-4159279222 .background-color-AA4{background-color:#EDF0FD;} + .d2-4159279222 .background-color-AA5{background-color:#F7F8FE;} + .d2-4159279222 .background-color-AB4{background-color:#EDF0FD;} + .d2-4159279222 .background-color-AB5{background-color:#F7F8FE;} + .d2-4159279222 .color-N1{color:#0A0F25;} + .d2-4159279222 .color-N2{color:#676C7E;} + .d2-4159279222 .color-N3{color:#9499AB;} + .d2-4159279222 .color-N4{color:#CFD2DD;} + .d2-4159279222 .color-N5{color:#DEE1EB;} + .d2-4159279222 .color-N6{color:#EEF1F8;} + .d2-4159279222 .color-N7{color:#FFFFFF;} + .d2-4159279222 .color-B1{color:#0D32B2;} + .d2-4159279222 .color-B2{color:#0D32B2;} + .d2-4159279222 .color-B3{color:#E3E9FD;} + .d2-4159279222 .color-B4{color:#E3E9FD;} + .d2-4159279222 .color-B5{color:#EDF0FD;} + .d2-4159279222 .color-B6{color:#F7F8FE;} + .d2-4159279222 .color-AA2{color:#4A6FF3;} + .d2-4159279222 .color-AA4{color:#EDF0FD;} + .d2-4159279222 .color-AA5{color:#F7F8FE;} + .d2-4159279222 .color-AB4{color:#EDF0FD;} + .d2-4159279222 .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}]]>n1n2n3 n4n5 @@ -114,7 +114,7 @@ a -b +b diff --git a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg index 382929df9..fa5259889 100644 --- a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -あ + .d2-3820037296 .fill-N1{fill:#0A0F25;} + .d2-3820037296 .fill-N2{fill:#676C7E;} + .d2-3820037296 .fill-N3{fill:#9499AB;} + .d2-3820037296 .fill-N4{fill:#CFD2DD;} + .d2-3820037296 .fill-N5{fill:#DEE1EB;} + .d2-3820037296 .fill-N6{fill:#EEF1F8;} + .d2-3820037296 .fill-N7{fill:#FFFFFF;} + .d2-3820037296 .fill-B1{fill:#0D32B2;} + .d2-3820037296 .fill-B2{fill:#0D32B2;} + .d2-3820037296 .fill-B3{fill:#E3E9FD;} + .d2-3820037296 .fill-B4{fill:#E3E9FD;} + .d2-3820037296 .fill-B5{fill:#EDF0FD;} + .d2-3820037296 .fill-B6{fill:#F7F8FE;} + .d2-3820037296 .fill-AA2{fill:#4A6FF3;} + .d2-3820037296 .fill-AA4{fill:#EDF0FD;} + .d2-3820037296 .fill-AA5{fill:#F7F8FE;} + .d2-3820037296 .fill-AB4{fill:#EDF0FD;} + .d2-3820037296 .fill-AB5{fill:#F7F8FE;} + .d2-3820037296 .stroke-N1{stroke:#0A0F25;} + .d2-3820037296 .stroke-N2{stroke:#676C7E;} + .d2-3820037296 .stroke-N3{stroke:#9499AB;} + .d2-3820037296 .stroke-N4{stroke:#CFD2DD;} + .d2-3820037296 .stroke-N5{stroke:#DEE1EB;} + .d2-3820037296 .stroke-N6{stroke:#EEF1F8;} + .d2-3820037296 .stroke-N7{stroke:#FFFFFF;} + .d2-3820037296 .stroke-B1{stroke:#0D32B2;} + .d2-3820037296 .stroke-B2{stroke:#0D32B2;} + .d2-3820037296 .stroke-B3{stroke:#E3E9FD;} + .d2-3820037296 .stroke-B4{stroke:#E3E9FD;} + .d2-3820037296 .stroke-B5{stroke:#EDF0FD;} + .d2-3820037296 .stroke-B6{stroke:#F7F8FE;} + .d2-3820037296 .stroke-AA2{stroke:#4A6FF3;} + .d2-3820037296 .stroke-AA4{stroke:#EDF0FD;} + .d2-3820037296 .stroke-AA5{stroke:#F7F8FE;} + .d2-3820037296 .stroke-AB4{stroke:#EDF0FD;} + .d2-3820037296 .stroke-AB5{stroke:#F7F8FE;} + .d2-3820037296 .background-color-N1{background-color:#0A0F25;} + .d2-3820037296 .background-color-N2{background-color:#676C7E;} + .d2-3820037296 .background-color-N3{background-color:#9499AB;} + .d2-3820037296 .background-color-N4{background-color:#CFD2DD;} + .d2-3820037296 .background-color-N5{background-color:#DEE1EB;} + .d2-3820037296 .background-color-N6{background-color:#EEF1F8;} + .d2-3820037296 .background-color-N7{background-color:#FFFFFF;} + .d2-3820037296 .background-color-B1{background-color:#0D32B2;} + .d2-3820037296 .background-color-B2{background-color:#0D32B2;} + .d2-3820037296 .background-color-B3{background-color:#E3E9FD;} + .d2-3820037296 .background-color-B4{background-color:#E3E9FD;} + .d2-3820037296 .background-color-B5{background-color:#EDF0FD;} + .d2-3820037296 .background-color-B6{background-color:#F7F8FE;} + .d2-3820037296 .background-color-AA2{background-color:#4A6FF3;} + .d2-3820037296 .background-color-AA4{background-color:#EDF0FD;} + .d2-3820037296 .background-color-AA5{background-color:#F7F8FE;} + .d2-3820037296 .background-color-AB4{background-color:#EDF0FD;} + .d2-3820037296 .background-color-AB5{background-color:#F7F8FE;} + .d2-3820037296 .color-N1{color:#0A0F25;} + .d2-3820037296 .color-N2{color:#676C7E;} + .d2-3820037296 .color-N3{color:#9499AB;} + .d2-3820037296 .color-N4{color:#CFD2DD;} + .d2-3820037296 .color-N5{color:#DEE1EB;} + .d2-3820037296 .color-N6{color:#EEF1F8;} + .d2-3820037296 .color-N7{color:#FFFFFF;} + .d2-3820037296 .color-B1{color:#0D32B2;} + .d2-3820037296 .color-B2{color:#0D32B2;} + .d2-3820037296 .color-B3{color:#E3E9FD;} + .d2-3820037296 .color-B4{color:#E3E9FD;} + .d2-3820037296 .color-B5{color:#EDF0FD;} + .d2-3820037296 .color-B6{color:#F7F8FE;} + .d2-3820037296 .color-AA2{color:#4A6FF3;} + .d2-3820037296 .color-AA4{color:#EDF0FD;} + .d2-3820037296 .color-AA5{color:#F7F8FE;} + .d2-3820037296 .color-AB4{color:#EDF0FD;} + .d2-3820037296 .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}]]>あ \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg index ebfe55bf5..a2ddc524c 100644 --- a/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -あ + .d2-3750212857 .fill-N1{fill:#0A0F25;} + .d2-3750212857 .fill-N2{fill:#676C7E;} + .d2-3750212857 .fill-N3{fill:#9499AB;} + .d2-3750212857 .fill-N4{fill:#CFD2DD;} + .d2-3750212857 .fill-N5{fill:#DEE1EB;} + .d2-3750212857 .fill-N6{fill:#EEF1F8;} + .d2-3750212857 .fill-N7{fill:#FFFFFF;} + .d2-3750212857 .fill-B1{fill:#0D32B2;} + .d2-3750212857 .fill-B2{fill:#0D32B2;} + .d2-3750212857 .fill-B3{fill:#E3E9FD;} + .d2-3750212857 .fill-B4{fill:#E3E9FD;} + .d2-3750212857 .fill-B5{fill:#EDF0FD;} + .d2-3750212857 .fill-B6{fill:#F7F8FE;} + .d2-3750212857 .fill-AA2{fill:#4A6FF3;} + .d2-3750212857 .fill-AA4{fill:#EDF0FD;} + .d2-3750212857 .fill-AA5{fill:#F7F8FE;} + .d2-3750212857 .fill-AB4{fill:#EDF0FD;} + .d2-3750212857 .fill-AB5{fill:#F7F8FE;} + .d2-3750212857 .stroke-N1{stroke:#0A0F25;} + .d2-3750212857 .stroke-N2{stroke:#676C7E;} + .d2-3750212857 .stroke-N3{stroke:#9499AB;} + .d2-3750212857 .stroke-N4{stroke:#CFD2DD;} + .d2-3750212857 .stroke-N5{stroke:#DEE1EB;} + .d2-3750212857 .stroke-N6{stroke:#EEF1F8;} + .d2-3750212857 .stroke-N7{stroke:#FFFFFF;} + .d2-3750212857 .stroke-B1{stroke:#0D32B2;} + .d2-3750212857 .stroke-B2{stroke:#0D32B2;} + .d2-3750212857 .stroke-B3{stroke:#E3E9FD;} + .d2-3750212857 .stroke-B4{stroke:#E3E9FD;} + .d2-3750212857 .stroke-B5{stroke:#EDF0FD;} + .d2-3750212857 .stroke-B6{stroke:#F7F8FE;} + .d2-3750212857 .stroke-AA2{stroke:#4A6FF3;} + .d2-3750212857 .stroke-AA4{stroke:#EDF0FD;} + .d2-3750212857 .stroke-AA5{stroke:#F7F8FE;} + .d2-3750212857 .stroke-AB4{stroke:#EDF0FD;} + .d2-3750212857 .stroke-AB5{stroke:#F7F8FE;} + .d2-3750212857 .background-color-N1{background-color:#0A0F25;} + .d2-3750212857 .background-color-N2{background-color:#676C7E;} + .d2-3750212857 .background-color-N3{background-color:#9499AB;} + .d2-3750212857 .background-color-N4{background-color:#CFD2DD;} + .d2-3750212857 .background-color-N5{background-color:#DEE1EB;} + .d2-3750212857 .background-color-N6{background-color:#EEF1F8;} + .d2-3750212857 .background-color-N7{background-color:#FFFFFF;} + .d2-3750212857 .background-color-B1{background-color:#0D32B2;} + .d2-3750212857 .background-color-B2{background-color:#0D32B2;} + .d2-3750212857 .background-color-B3{background-color:#E3E9FD;} + .d2-3750212857 .background-color-B4{background-color:#E3E9FD;} + .d2-3750212857 .background-color-B5{background-color:#EDF0FD;} + .d2-3750212857 .background-color-B6{background-color:#F7F8FE;} + .d2-3750212857 .background-color-AA2{background-color:#4A6FF3;} + .d2-3750212857 .background-color-AA4{background-color:#EDF0FD;} + .d2-3750212857 .background-color-AA5{background-color:#F7F8FE;} + .d2-3750212857 .background-color-AB4{background-color:#EDF0FD;} + .d2-3750212857 .background-color-AB5{background-color:#F7F8FE;} + .d2-3750212857 .color-N1{color:#0A0F25;} + .d2-3750212857 .color-N2{color:#676C7E;} + .d2-3750212857 .color-N3{color:#9499AB;} + .d2-3750212857 .color-N4{color:#CFD2DD;} + .d2-3750212857 .color-N5{color:#DEE1EB;} + .d2-3750212857 .color-N6{color:#EEF1F8;} + .d2-3750212857 .color-N7{color:#FFFFFF;} + .d2-3750212857 .color-B1{color:#0D32B2;} + .d2-3750212857 .color-B2{color:#0D32B2;} + .d2-3750212857 .color-B3{color:#E3E9FD;} + .d2-3750212857 .color-B4{color:#E3E9FD;} + .d2-3750212857 .color-B5{color:#EDF0FD;} + .d2-3750212857 .color-B6{color:#F7F8FE;} + .d2-3750212857 .color-AA2{color:#4A6FF3;} + .d2-3750212857 .color-AA4{color:#EDF0FD;} + .d2-3750212857 .color-AA5{color:#F7F8FE;} + .d2-3750212857 .color-AB4{color:#EDF0FD;} + .d2-3750212857 .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}]]>あ \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg index 2e3a8d6fa..2649fd642 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstuvw + .d2-2062740197 .fill-N1{fill:#0A0F25;} + .d2-2062740197 .fill-N2{fill:#676C7E;} + .d2-2062740197 .fill-N3{fill:#9499AB;} + .d2-2062740197 .fill-N4{fill:#CFD2DD;} + .d2-2062740197 .fill-N5{fill:#DEE1EB;} + .d2-2062740197 .fill-N6{fill:#EEF1F8;} + .d2-2062740197 .fill-N7{fill:#FFFFFF;} + .d2-2062740197 .fill-B1{fill:#0D32B2;} + .d2-2062740197 .fill-B2{fill:#0D32B2;} + .d2-2062740197 .fill-B3{fill:#E3E9FD;} + .d2-2062740197 .fill-B4{fill:#E3E9FD;} + .d2-2062740197 .fill-B5{fill:#EDF0FD;} + .d2-2062740197 .fill-B6{fill:#F7F8FE;} + .d2-2062740197 .fill-AA2{fill:#4A6FF3;} + .d2-2062740197 .fill-AA4{fill:#EDF0FD;} + .d2-2062740197 .fill-AA5{fill:#F7F8FE;} + .d2-2062740197 .fill-AB4{fill:#EDF0FD;} + .d2-2062740197 .fill-AB5{fill:#F7F8FE;} + .d2-2062740197 .stroke-N1{stroke:#0A0F25;} + .d2-2062740197 .stroke-N2{stroke:#676C7E;} + .d2-2062740197 .stroke-N3{stroke:#9499AB;} + .d2-2062740197 .stroke-N4{stroke:#CFD2DD;} + .d2-2062740197 .stroke-N5{stroke:#DEE1EB;} + .d2-2062740197 .stroke-N6{stroke:#EEF1F8;} + .d2-2062740197 .stroke-N7{stroke:#FFFFFF;} + .d2-2062740197 .stroke-B1{stroke:#0D32B2;} + .d2-2062740197 .stroke-B2{stroke:#0D32B2;} + .d2-2062740197 .stroke-B3{stroke:#E3E9FD;} + .d2-2062740197 .stroke-B4{stroke:#E3E9FD;} + .d2-2062740197 .stroke-B5{stroke:#EDF0FD;} + .d2-2062740197 .stroke-B6{stroke:#F7F8FE;} + .d2-2062740197 .stroke-AA2{stroke:#4A6FF3;} + .d2-2062740197 .stroke-AA4{stroke:#EDF0FD;} + .d2-2062740197 .stroke-AA5{stroke:#F7F8FE;} + .d2-2062740197 .stroke-AB4{stroke:#EDF0FD;} + .d2-2062740197 .stroke-AB5{stroke:#F7F8FE;} + .d2-2062740197 .background-color-N1{background-color:#0A0F25;} + .d2-2062740197 .background-color-N2{background-color:#676C7E;} + .d2-2062740197 .background-color-N3{background-color:#9499AB;} + .d2-2062740197 .background-color-N4{background-color:#CFD2DD;} + .d2-2062740197 .background-color-N5{background-color:#DEE1EB;} + .d2-2062740197 .background-color-N6{background-color:#EEF1F8;} + .d2-2062740197 .background-color-N7{background-color:#FFFFFF;} + .d2-2062740197 .background-color-B1{background-color:#0D32B2;} + .d2-2062740197 .background-color-B2{background-color:#0D32B2;} + .d2-2062740197 .background-color-B3{background-color:#E3E9FD;} + .d2-2062740197 .background-color-B4{background-color:#E3E9FD;} + .d2-2062740197 .background-color-B5{background-color:#EDF0FD;} + .d2-2062740197 .background-color-B6{background-color:#F7F8FE;} + .d2-2062740197 .background-color-AA2{background-color:#4A6FF3;} + .d2-2062740197 .background-color-AA4{background-color:#EDF0FD;} + .d2-2062740197 .background-color-AA5{background-color:#F7F8FE;} + .d2-2062740197 .background-color-AB4{background-color:#EDF0FD;} + .d2-2062740197 .background-color-AB5{background-color:#F7F8FE;} + .d2-2062740197 .color-N1{color:#0A0F25;} + .d2-2062740197 .color-N2{color:#676C7E;} + .d2-2062740197 .color-N3{color:#9499AB;} + .d2-2062740197 .color-N4{color:#CFD2DD;} + .d2-2062740197 .color-N5{color:#DEE1EB;} + .d2-2062740197 .color-N6{color:#EEF1F8;} + .d2-2062740197 .color-N7{color:#FFFFFF;} + .d2-2062740197 .color-B1{color:#0D32B2;} + .d2-2062740197 .color-B2{color:#0D32B2;} + .d2-2062740197 .color-B3{color:#E3E9FD;} + .d2-2062740197 .color-B4{color:#E3E9FD;} + .d2-2062740197 .color-B5{color:#EDF0FD;} + .d2-2062740197 .color-B6{color:#F7F8FE;} + .d2-2062740197 .color-AA2{color:#4A6FF3;} + .d2-2062740197 .color-AA4{color:#EDF0FD;} + .d2-2062740197 .color-AA5{color:#F7F8FE;} + .d2-2062740197 .color-AB4{color:#EDF0FD;} + .d2-2062740197 .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}]]>abcdefghijklmnopqrstuvw diff --git a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg index 4fd4656b2..81abca198 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstuvw + .d2-183457136 .fill-N1{fill:#0A0F25;} + .d2-183457136 .fill-N2{fill:#676C7E;} + .d2-183457136 .fill-N3{fill:#9499AB;} + .d2-183457136 .fill-N4{fill:#CFD2DD;} + .d2-183457136 .fill-N5{fill:#DEE1EB;} + .d2-183457136 .fill-N6{fill:#EEF1F8;} + .d2-183457136 .fill-N7{fill:#FFFFFF;} + .d2-183457136 .fill-B1{fill:#0D32B2;} + .d2-183457136 .fill-B2{fill:#0D32B2;} + .d2-183457136 .fill-B3{fill:#E3E9FD;} + .d2-183457136 .fill-B4{fill:#E3E9FD;} + .d2-183457136 .fill-B5{fill:#EDF0FD;} + .d2-183457136 .fill-B6{fill:#F7F8FE;} + .d2-183457136 .fill-AA2{fill:#4A6FF3;} + .d2-183457136 .fill-AA4{fill:#EDF0FD;} + .d2-183457136 .fill-AA5{fill:#F7F8FE;} + .d2-183457136 .fill-AB4{fill:#EDF0FD;} + .d2-183457136 .fill-AB5{fill:#F7F8FE;} + .d2-183457136 .stroke-N1{stroke:#0A0F25;} + .d2-183457136 .stroke-N2{stroke:#676C7E;} + .d2-183457136 .stroke-N3{stroke:#9499AB;} + .d2-183457136 .stroke-N4{stroke:#CFD2DD;} + .d2-183457136 .stroke-N5{stroke:#DEE1EB;} + .d2-183457136 .stroke-N6{stroke:#EEF1F8;} + .d2-183457136 .stroke-N7{stroke:#FFFFFF;} + .d2-183457136 .stroke-B1{stroke:#0D32B2;} + .d2-183457136 .stroke-B2{stroke:#0D32B2;} + .d2-183457136 .stroke-B3{stroke:#E3E9FD;} + .d2-183457136 .stroke-B4{stroke:#E3E9FD;} + .d2-183457136 .stroke-B5{stroke:#EDF0FD;} + .d2-183457136 .stroke-B6{stroke:#F7F8FE;} + .d2-183457136 .stroke-AA2{stroke:#4A6FF3;} + .d2-183457136 .stroke-AA4{stroke:#EDF0FD;} + .d2-183457136 .stroke-AA5{stroke:#F7F8FE;} + .d2-183457136 .stroke-AB4{stroke:#EDF0FD;} + .d2-183457136 .stroke-AB5{stroke:#F7F8FE;} + .d2-183457136 .background-color-N1{background-color:#0A0F25;} + .d2-183457136 .background-color-N2{background-color:#676C7E;} + .d2-183457136 .background-color-N3{background-color:#9499AB;} + .d2-183457136 .background-color-N4{background-color:#CFD2DD;} + .d2-183457136 .background-color-N5{background-color:#DEE1EB;} + .d2-183457136 .background-color-N6{background-color:#EEF1F8;} + .d2-183457136 .background-color-N7{background-color:#FFFFFF;} + .d2-183457136 .background-color-B1{background-color:#0D32B2;} + .d2-183457136 .background-color-B2{background-color:#0D32B2;} + .d2-183457136 .background-color-B3{background-color:#E3E9FD;} + .d2-183457136 .background-color-B4{background-color:#E3E9FD;} + .d2-183457136 .background-color-B5{background-color:#EDF0FD;} + .d2-183457136 .background-color-B6{background-color:#F7F8FE;} + .d2-183457136 .background-color-AA2{background-color:#4A6FF3;} + .d2-183457136 .background-color-AA4{background-color:#EDF0FD;} + .d2-183457136 .background-color-AA5{background-color:#F7F8FE;} + .d2-183457136 .background-color-AB4{background-color:#EDF0FD;} + .d2-183457136 .background-color-AB5{background-color:#F7F8FE;} + .d2-183457136 .color-N1{color:#0A0F25;} + .d2-183457136 .color-N2{color:#676C7E;} + .d2-183457136 .color-N3{color:#9499AB;} + .d2-183457136 .color-N4{color:#CFD2DD;} + .d2-183457136 .color-N5{color:#DEE1EB;} + .d2-183457136 .color-N6{color:#EEF1F8;} + .d2-183457136 .color-N7{color:#FFFFFF;} + .d2-183457136 .color-B1{color:#0D32B2;} + .d2-183457136 .color-B2{color:#0D32B2;} + .d2-183457136 .color-B3{color:#E3E9FD;} + .d2-183457136 .color-B4{color:#E3E9FD;} + .d2-183457136 .color-B5{color:#EDF0FD;} + .d2-183457136 .color-B6{color:#F7F8FE;} + .d2-183457136 .color-AA2{color:#4A6FF3;} + .d2-183457136 .color-AA4{color:#EDF0FD;} + .d2-183457136 .color-AA5{color:#F7F8FE;} + .d2-183457136 .color-AB4{color:#EDF0FD;} + .d2-183457136 .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}]]>abcdefghijklmnopqrstuvw diff --git a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg index 68131993e..a2573e00f 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstu + .d2-2756959702 .fill-N1{fill:#0A0F25;} + .d2-2756959702 .fill-N2{fill:#676C7E;} + .d2-2756959702 .fill-N3{fill:#9499AB;} + .d2-2756959702 .fill-N4{fill:#CFD2DD;} + .d2-2756959702 .fill-N5{fill:#DEE1EB;} + .d2-2756959702 .fill-N6{fill:#EEF1F8;} + .d2-2756959702 .fill-N7{fill:#FFFFFF;} + .d2-2756959702 .fill-B1{fill:#0D32B2;} + .d2-2756959702 .fill-B2{fill:#0D32B2;} + .d2-2756959702 .fill-B3{fill:#E3E9FD;} + .d2-2756959702 .fill-B4{fill:#E3E9FD;} + .d2-2756959702 .fill-B5{fill:#EDF0FD;} + .d2-2756959702 .fill-B6{fill:#F7F8FE;} + .d2-2756959702 .fill-AA2{fill:#4A6FF3;} + .d2-2756959702 .fill-AA4{fill:#EDF0FD;} + .d2-2756959702 .fill-AA5{fill:#F7F8FE;} + .d2-2756959702 .fill-AB4{fill:#EDF0FD;} + .d2-2756959702 .fill-AB5{fill:#F7F8FE;} + .d2-2756959702 .stroke-N1{stroke:#0A0F25;} + .d2-2756959702 .stroke-N2{stroke:#676C7E;} + .d2-2756959702 .stroke-N3{stroke:#9499AB;} + .d2-2756959702 .stroke-N4{stroke:#CFD2DD;} + .d2-2756959702 .stroke-N5{stroke:#DEE1EB;} + .d2-2756959702 .stroke-N6{stroke:#EEF1F8;} + .d2-2756959702 .stroke-N7{stroke:#FFFFFF;} + .d2-2756959702 .stroke-B1{stroke:#0D32B2;} + .d2-2756959702 .stroke-B2{stroke:#0D32B2;} + .d2-2756959702 .stroke-B3{stroke:#E3E9FD;} + .d2-2756959702 .stroke-B4{stroke:#E3E9FD;} + .d2-2756959702 .stroke-B5{stroke:#EDF0FD;} + .d2-2756959702 .stroke-B6{stroke:#F7F8FE;} + .d2-2756959702 .stroke-AA2{stroke:#4A6FF3;} + .d2-2756959702 .stroke-AA4{stroke:#EDF0FD;} + .d2-2756959702 .stroke-AA5{stroke:#F7F8FE;} + .d2-2756959702 .stroke-AB4{stroke:#EDF0FD;} + .d2-2756959702 .stroke-AB5{stroke:#F7F8FE;} + .d2-2756959702 .background-color-N1{background-color:#0A0F25;} + .d2-2756959702 .background-color-N2{background-color:#676C7E;} + .d2-2756959702 .background-color-N3{background-color:#9499AB;} + .d2-2756959702 .background-color-N4{background-color:#CFD2DD;} + .d2-2756959702 .background-color-N5{background-color:#DEE1EB;} + .d2-2756959702 .background-color-N6{background-color:#EEF1F8;} + .d2-2756959702 .background-color-N7{background-color:#FFFFFF;} + .d2-2756959702 .background-color-B1{background-color:#0D32B2;} + .d2-2756959702 .background-color-B2{background-color:#0D32B2;} + .d2-2756959702 .background-color-B3{background-color:#E3E9FD;} + .d2-2756959702 .background-color-B4{background-color:#E3E9FD;} + .d2-2756959702 .background-color-B5{background-color:#EDF0FD;} + .d2-2756959702 .background-color-B6{background-color:#F7F8FE;} + .d2-2756959702 .background-color-AA2{background-color:#4A6FF3;} + .d2-2756959702 .background-color-AA4{background-color:#EDF0FD;} + .d2-2756959702 .background-color-AA5{background-color:#F7F8FE;} + .d2-2756959702 .background-color-AB4{background-color:#EDF0FD;} + .d2-2756959702 .background-color-AB5{background-color:#F7F8FE;} + .d2-2756959702 .color-N1{color:#0A0F25;} + .d2-2756959702 .color-N2{color:#676C7E;} + .d2-2756959702 .color-N3{color:#9499AB;} + .d2-2756959702 .color-N4{color:#CFD2DD;} + .d2-2756959702 .color-N5{color:#DEE1EB;} + .d2-2756959702 .color-N6{color:#EEF1F8;} + .d2-2756959702 .color-N7{color:#FFFFFF;} + .d2-2756959702 .color-B1{color:#0D32B2;} + .d2-2756959702 .color-B2{color:#0D32B2;} + .d2-2756959702 .color-B3{color:#E3E9FD;} + .d2-2756959702 .color-B4{color:#E3E9FD;} + .d2-2756959702 .color-B5{color:#EDF0FD;} + .d2-2756959702 .color-B6{color:#F7F8FE;} + .d2-2756959702 .color-AA2{color:#4A6FF3;} + .d2-2756959702 .color-AA4{color:#EDF0FD;} + .d2-2756959702 .color-AA5{color:#F7F8FE;} + .d2-2756959702 .color-AB4{color:#EDF0FD;} + .d2-2756959702 .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}]]>abcdefghijklmnopqrstu diff --git a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg index dc3afc551..47a7200ff 100644 --- a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstu + .d2-502227939 .fill-N1{fill:#0A0F25;} + .d2-502227939 .fill-N2{fill:#676C7E;} + .d2-502227939 .fill-N3{fill:#9499AB;} + .d2-502227939 .fill-N4{fill:#CFD2DD;} + .d2-502227939 .fill-N5{fill:#DEE1EB;} + .d2-502227939 .fill-N6{fill:#EEF1F8;} + .d2-502227939 .fill-N7{fill:#FFFFFF;} + .d2-502227939 .fill-B1{fill:#0D32B2;} + .d2-502227939 .fill-B2{fill:#0D32B2;} + .d2-502227939 .fill-B3{fill:#E3E9FD;} + .d2-502227939 .fill-B4{fill:#E3E9FD;} + .d2-502227939 .fill-B5{fill:#EDF0FD;} + .d2-502227939 .fill-B6{fill:#F7F8FE;} + .d2-502227939 .fill-AA2{fill:#4A6FF3;} + .d2-502227939 .fill-AA4{fill:#EDF0FD;} + .d2-502227939 .fill-AA5{fill:#F7F8FE;} + .d2-502227939 .fill-AB4{fill:#EDF0FD;} + .d2-502227939 .fill-AB5{fill:#F7F8FE;} + .d2-502227939 .stroke-N1{stroke:#0A0F25;} + .d2-502227939 .stroke-N2{stroke:#676C7E;} + .d2-502227939 .stroke-N3{stroke:#9499AB;} + .d2-502227939 .stroke-N4{stroke:#CFD2DD;} + .d2-502227939 .stroke-N5{stroke:#DEE1EB;} + .d2-502227939 .stroke-N6{stroke:#EEF1F8;} + .d2-502227939 .stroke-N7{stroke:#FFFFFF;} + .d2-502227939 .stroke-B1{stroke:#0D32B2;} + .d2-502227939 .stroke-B2{stroke:#0D32B2;} + .d2-502227939 .stroke-B3{stroke:#E3E9FD;} + .d2-502227939 .stroke-B4{stroke:#E3E9FD;} + .d2-502227939 .stroke-B5{stroke:#EDF0FD;} + .d2-502227939 .stroke-B6{stroke:#F7F8FE;} + .d2-502227939 .stroke-AA2{stroke:#4A6FF3;} + .d2-502227939 .stroke-AA4{stroke:#EDF0FD;} + .d2-502227939 .stroke-AA5{stroke:#F7F8FE;} + .d2-502227939 .stroke-AB4{stroke:#EDF0FD;} + .d2-502227939 .stroke-AB5{stroke:#F7F8FE;} + .d2-502227939 .background-color-N1{background-color:#0A0F25;} + .d2-502227939 .background-color-N2{background-color:#676C7E;} + .d2-502227939 .background-color-N3{background-color:#9499AB;} + .d2-502227939 .background-color-N4{background-color:#CFD2DD;} + .d2-502227939 .background-color-N5{background-color:#DEE1EB;} + .d2-502227939 .background-color-N6{background-color:#EEF1F8;} + .d2-502227939 .background-color-N7{background-color:#FFFFFF;} + .d2-502227939 .background-color-B1{background-color:#0D32B2;} + .d2-502227939 .background-color-B2{background-color:#0D32B2;} + .d2-502227939 .background-color-B3{background-color:#E3E9FD;} + .d2-502227939 .background-color-B4{background-color:#E3E9FD;} + .d2-502227939 .background-color-B5{background-color:#EDF0FD;} + .d2-502227939 .background-color-B6{background-color:#F7F8FE;} + .d2-502227939 .background-color-AA2{background-color:#4A6FF3;} + .d2-502227939 .background-color-AA4{background-color:#EDF0FD;} + .d2-502227939 .background-color-AA5{background-color:#F7F8FE;} + .d2-502227939 .background-color-AB4{background-color:#EDF0FD;} + .d2-502227939 .background-color-AB5{background-color:#F7F8FE;} + .d2-502227939 .color-N1{color:#0A0F25;} + .d2-502227939 .color-N2{color:#676C7E;} + .d2-502227939 .color-N3{color:#9499AB;} + .d2-502227939 .color-N4{color:#CFD2DD;} + .d2-502227939 .color-N5{color:#DEE1EB;} + .d2-502227939 .color-N6{color:#EEF1F8;} + .d2-502227939 .color-N7{color:#FFFFFF;} + .d2-502227939 .color-B1{color:#0D32B2;} + .d2-502227939 .color-B2{color:#0D32B2;} + .d2-502227939 .color-B3{color:#E3E9FD;} + .d2-502227939 .color-B4{color:#E3E9FD;} + .d2-502227939 .color-B5{color:#EDF0FD;} + .d2-502227939 .color-B6{color:#F7F8FE;} + .d2-502227939 .color-AA2{color:#4A6FF3;} + .d2-502227939 .color-AA4{color:#EDF0FD;} + .d2-502227939 .color-AA5{color:#F7F8FE;} + .d2-502227939 .color-AB4{color:#EDF0FD;} + .d2-502227939 .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}]]>abcdefghijklmnopqrstu diff --git a/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg b/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg index 2be2e10b2..aaa7666ee 100644 --- a/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xyz + .d2-4054177818 .fill-N1{fill:#0A0F25;} + .d2-4054177818 .fill-N2{fill:#676C7E;} + .d2-4054177818 .fill-N3{fill:#9499AB;} + .d2-4054177818 .fill-N4{fill:#CFD2DD;} + .d2-4054177818 .fill-N5{fill:#DEE1EB;} + .d2-4054177818 .fill-N6{fill:#EEF1F8;} + .d2-4054177818 .fill-N7{fill:#FFFFFF;} + .d2-4054177818 .fill-B1{fill:#0D32B2;} + .d2-4054177818 .fill-B2{fill:#0D32B2;} + .d2-4054177818 .fill-B3{fill:#E3E9FD;} + .d2-4054177818 .fill-B4{fill:#E3E9FD;} + .d2-4054177818 .fill-B5{fill:#EDF0FD;} + .d2-4054177818 .fill-B6{fill:#F7F8FE;} + .d2-4054177818 .fill-AA2{fill:#4A6FF3;} + .d2-4054177818 .fill-AA4{fill:#EDF0FD;} + .d2-4054177818 .fill-AA5{fill:#F7F8FE;} + .d2-4054177818 .fill-AB4{fill:#EDF0FD;} + .d2-4054177818 .fill-AB5{fill:#F7F8FE;} + .d2-4054177818 .stroke-N1{stroke:#0A0F25;} + .d2-4054177818 .stroke-N2{stroke:#676C7E;} + .d2-4054177818 .stroke-N3{stroke:#9499AB;} + .d2-4054177818 .stroke-N4{stroke:#CFD2DD;} + .d2-4054177818 .stroke-N5{stroke:#DEE1EB;} + .d2-4054177818 .stroke-N6{stroke:#EEF1F8;} + .d2-4054177818 .stroke-N7{stroke:#FFFFFF;} + .d2-4054177818 .stroke-B1{stroke:#0D32B2;} + .d2-4054177818 .stroke-B2{stroke:#0D32B2;} + .d2-4054177818 .stroke-B3{stroke:#E3E9FD;} + .d2-4054177818 .stroke-B4{stroke:#E3E9FD;} + .d2-4054177818 .stroke-B5{stroke:#EDF0FD;} + .d2-4054177818 .stroke-B6{stroke:#F7F8FE;} + .d2-4054177818 .stroke-AA2{stroke:#4A6FF3;} + .d2-4054177818 .stroke-AA4{stroke:#EDF0FD;} + .d2-4054177818 .stroke-AA5{stroke:#F7F8FE;} + .d2-4054177818 .stroke-AB4{stroke:#EDF0FD;} + .d2-4054177818 .stroke-AB5{stroke:#F7F8FE;} + .d2-4054177818 .background-color-N1{background-color:#0A0F25;} + .d2-4054177818 .background-color-N2{background-color:#676C7E;} + .d2-4054177818 .background-color-N3{background-color:#9499AB;} + .d2-4054177818 .background-color-N4{background-color:#CFD2DD;} + .d2-4054177818 .background-color-N5{background-color:#DEE1EB;} + .d2-4054177818 .background-color-N6{background-color:#EEF1F8;} + .d2-4054177818 .background-color-N7{background-color:#FFFFFF;} + .d2-4054177818 .background-color-B1{background-color:#0D32B2;} + .d2-4054177818 .background-color-B2{background-color:#0D32B2;} + .d2-4054177818 .background-color-B3{background-color:#E3E9FD;} + .d2-4054177818 .background-color-B4{background-color:#E3E9FD;} + .d2-4054177818 .background-color-B5{background-color:#EDF0FD;} + .d2-4054177818 .background-color-B6{background-color:#F7F8FE;} + .d2-4054177818 .background-color-AA2{background-color:#4A6FF3;} + .d2-4054177818 .background-color-AA4{background-color:#EDF0FD;} + .d2-4054177818 .background-color-AA5{background-color:#F7F8FE;} + .d2-4054177818 .background-color-AB4{background-color:#EDF0FD;} + .d2-4054177818 .background-color-AB5{background-color:#F7F8FE;} + .d2-4054177818 .color-N1{color:#0A0F25;} + .d2-4054177818 .color-N2{color:#676C7E;} + .d2-4054177818 .color-N3{color:#9499AB;} + .d2-4054177818 .color-N4{color:#CFD2DD;} + .d2-4054177818 .color-N5{color:#DEE1EB;} + .d2-4054177818 .color-N6{color:#EEF1F8;} + .d2-4054177818 .color-N7{color:#FFFFFF;} + .d2-4054177818 .color-B1{color:#0D32B2;} + .d2-4054177818 .color-B2{color:#0D32B2;} + .d2-4054177818 .color-B3{color:#E3E9FD;} + .d2-4054177818 .color-B4{color:#E3E9FD;} + .d2-4054177818 .color-B5{color:#EDF0FD;} + .d2-4054177818 .color-B6{color:#F7F8FE;} + .d2-4054177818 .color-AA2{color:#4A6FF3;} + .d2-4054177818 .color-AA4{color:#EDF0FD;} + .d2-4054177818 .color-AA5{color:#F7F8FE;} + .d2-4054177818 .color-AB4{color:#EDF0FD;} + .d2-4054177818 .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}]]>xyz diff --git a/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg b/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg index 2be2e10b2..aaa7666ee 100644 --- a/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xyz + .d2-4054177818 .fill-N1{fill:#0A0F25;} + .d2-4054177818 .fill-N2{fill:#676C7E;} + .d2-4054177818 .fill-N3{fill:#9499AB;} + .d2-4054177818 .fill-N4{fill:#CFD2DD;} + .d2-4054177818 .fill-N5{fill:#DEE1EB;} + .d2-4054177818 .fill-N6{fill:#EEF1F8;} + .d2-4054177818 .fill-N7{fill:#FFFFFF;} + .d2-4054177818 .fill-B1{fill:#0D32B2;} + .d2-4054177818 .fill-B2{fill:#0D32B2;} + .d2-4054177818 .fill-B3{fill:#E3E9FD;} + .d2-4054177818 .fill-B4{fill:#E3E9FD;} + .d2-4054177818 .fill-B5{fill:#EDF0FD;} + .d2-4054177818 .fill-B6{fill:#F7F8FE;} + .d2-4054177818 .fill-AA2{fill:#4A6FF3;} + .d2-4054177818 .fill-AA4{fill:#EDF0FD;} + .d2-4054177818 .fill-AA5{fill:#F7F8FE;} + .d2-4054177818 .fill-AB4{fill:#EDF0FD;} + .d2-4054177818 .fill-AB5{fill:#F7F8FE;} + .d2-4054177818 .stroke-N1{stroke:#0A0F25;} + .d2-4054177818 .stroke-N2{stroke:#676C7E;} + .d2-4054177818 .stroke-N3{stroke:#9499AB;} + .d2-4054177818 .stroke-N4{stroke:#CFD2DD;} + .d2-4054177818 .stroke-N5{stroke:#DEE1EB;} + .d2-4054177818 .stroke-N6{stroke:#EEF1F8;} + .d2-4054177818 .stroke-N7{stroke:#FFFFFF;} + .d2-4054177818 .stroke-B1{stroke:#0D32B2;} + .d2-4054177818 .stroke-B2{stroke:#0D32B2;} + .d2-4054177818 .stroke-B3{stroke:#E3E9FD;} + .d2-4054177818 .stroke-B4{stroke:#E3E9FD;} + .d2-4054177818 .stroke-B5{stroke:#EDF0FD;} + .d2-4054177818 .stroke-B6{stroke:#F7F8FE;} + .d2-4054177818 .stroke-AA2{stroke:#4A6FF3;} + .d2-4054177818 .stroke-AA4{stroke:#EDF0FD;} + .d2-4054177818 .stroke-AA5{stroke:#F7F8FE;} + .d2-4054177818 .stroke-AB4{stroke:#EDF0FD;} + .d2-4054177818 .stroke-AB5{stroke:#F7F8FE;} + .d2-4054177818 .background-color-N1{background-color:#0A0F25;} + .d2-4054177818 .background-color-N2{background-color:#676C7E;} + .d2-4054177818 .background-color-N3{background-color:#9499AB;} + .d2-4054177818 .background-color-N4{background-color:#CFD2DD;} + .d2-4054177818 .background-color-N5{background-color:#DEE1EB;} + .d2-4054177818 .background-color-N6{background-color:#EEF1F8;} + .d2-4054177818 .background-color-N7{background-color:#FFFFFF;} + .d2-4054177818 .background-color-B1{background-color:#0D32B2;} + .d2-4054177818 .background-color-B2{background-color:#0D32B2;} + .d2-4054177818 .background-color-B3{background-color:#E3E9FD;} + .d2-4054177818 .background-color-B4{background-color:#E3E9FD;} + .d2-4054177818 .background-color-B5{background-color:#EDF0FD;} + .d2-4054177818 .background-color-B6{background-color:#F7F8FE;} + .d2-4054177818 .background-color-AA2{background-color:#4A6FF3;} + .d2-4054177818 .background-color-AA4{background-color:#EDF0FD;} + .d2-4054177818 .background-color-AA5{background-color:#F7F8FE;} + .d2-4054177818 .background-color-AB4{background-color:#EDF0FD;} + .d2-4054177818 .background-color-AB5{background-color:#F7F8FE;} + .d2-4054177818 .color-N1{color:#0A0F25;} + .d2-4054177818 .color-N2{color:#676C7E;} + .d2-4054177818 .color-N3{color:#9499AB;} + .d2-4054177818 .color-N4{color:#CFD2DD;} + .d2-4054177818 .color-N5{color:#DEE1EB;} + .d2-4054177818 .color-N6{color:#EEF1F8;} + .d2-4054177818 .color-N7{color:#FFFFFF;} + .d2-4054177818 .color-B1{color:#0D32B2;} + .d2-4054177818 .color-B2{color:#0D32B2;} + .d2-4054177818 .color-B3{color:#E3E9FD;} + .d2-4054177818 .color-B4{color:#E3E9FD;} + .d2-4054177818 .color-B5{color:#EDF0FD;} + .d2-4054177818 .color-B6{color:#F7F8FE;} + .d2-4054177818 .color-AA2{color:#4A6FF3;} + .d2-4054177818 .color-AA4{color:#EDF0FD;} + .d2-4054177818 .color-AA5{color:#F7F8FE;} + .d2-4054177818 .color-AB4{color:#EDF0FD;} + .d2-4054177818 .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}]]>xyz 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 38b240041..006077180 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,16 +1,16 @@ -zaxybabcdbabcdabcdaccd + .d2-470005247 .fill-N1{fill:#0A0F25;} + .d2-470005247 .fill-N2{fill:#676C7E;} + .d2-470005247 .fill-N3{fill:#9499AB;} + .d2-470005247 .fill-N4{fill:#CFD2DD;} + .d2-470005247 .fill-N5{fill:#DEE1EB;} + .d2-470005247 .fill-N6{fill:#EEF1F8;} + .d2-470005247 .fill-N7{fill:#FFFFFF;} + .d2-470005247 .fill-B1{fill:#0D32B2;} + .d2-470005247 .fill-B2{fill:#0D32B2;} + .d2-470005247 .fill-B3{fill:#E3E9FD;} + .d2-470005247 .fill-B4{fill:#E3E9FD;} + .d2-470005247 .fill-B5{fill:#EDF0FD;} + .d2-470005247 .fill-B6{fill:#F7F8FE;} + .d2-470005247 .fill-AA2{fill:#4A6FF3;} + .d2-470005247 .fill-AA4{fill:#EDF0FD;} + .d2-470005247 .fill-AA5{fill:#F7F8FE;} + .d2-470005247 .fill-AB4{fill:#EDF0FD;} + .d2-470005247 .fill-AB5{fill:#F7F8FE;} + .d2-470005247 .stroke-N1{stroke:#0A0F25;} + .d2-470005247 .stroke-N2{stroke:#676C7E;} + .d2-470005247 .stroke-N3{stroke:#9499AB;} + .d2-470005247 .stroke-N4{stroke:#CFD2DD;} + .d2-470005247 .stroke-N5{stroke:#DEE1EB;} + .d2-470005247 .stroke-N6{stroke:#EEF1F8;} + .d2-470005247 .stroke-N7{stroke:#FFFFFF;} + .d2-470005247 .stroke-B1{stroke:#0D32B2;} + .d2-470005247 .stroke-B2{stroke:#0D32B2;} + .d2-470005247 .stroke-B3{stroke:#E3E9FD;} + .d2-470005247 .stroke-B4{stroke:#E3E9FD;} + .d2-470005247 .stroke-B5{stroke:#EDF0FD;} + .d2-470005247 .stroke-B6{stroke:#F7F8FE;} + .d2-470005247 .stroke-AA2{stroke:#4A6FF3;} + .d2-470005247 .stroke-AA4{stroke:#EDF0FD;} + .d2-470005247 .stroke-AA5{stroke:#F7F8FE;} + .d2-470005247 .stroke-AB4{stroke:#EDF0FD;} + .d2-470005247 .stroke-AB5{stroke:#F7F8FE;} + .d2-470005247 .background-color-N1{background-color:#0A0F25;} + .d2-470005247 .background-color-N2{background-color:#676C7E;} + .d2-470005247 .background-color-N3{background-color:#9499AB;} + .d2-470005247 .background-color-N4{background-color:#CFD2DD;} + .d2-470005247 .background-color-N5{background-color:#DEE1EB;} + .d2-470005247 .background-color-N6{background-color:#EEF1F8;} + .d2-470005247 .background-color-N7{background-color:#FFFFFF;} + .d2-470005247 .background-color-B1{background-color:#0D32B2;} + .d2-470005247 .background-color-B2{background-color:#0D32B2;} + .d2-470005247 .background-color-B3{background-color:#E3E9FD;} + .d2-470005247 .background-color-B4{background-color:#E3E9FD;} + .d2-470005247 .background-color-B5{background-color:#EDF0FD;} + .d2-470005247 .background-color-B6{background-color:#F7F8FE;} + .d2-470005247 .background-color-AA2{background-color:#4A6FF3;} + .d2-470005247 .background-color-AA4{background-color:#EDF0FD;} + .d2-470005247 .background-color-AA5{background-color:#F7F8FE;} + .d2-470005247 .background-color-AB4{background-color:#EDF0FD;} + .d2-470005247 .background-color-AB5{background-color:#F7F8FE;} + .d2-470005247 .color-N1{color:#0A0F25;} + .d2-470005247 .color-N2{color:#676C7E;} + .d2-470005247 .color-N3{color:#9499AB;} + .d2-470005247 .color-N4{color:#CFD2DD;} + .d2-470005247 .color-N5{color:#DEE1EB;} + .d2-470005247 .color-N6{color:#EEF1F8;} + .d2-470005247 .color-N7{color:#FFFFFF;} + .d2-470005247 .color-B1{color:#0D32B2;} + .d2-470005247 .color-B2{color:#0D32B2;} + .d2-470005247 .color-B3{color:#E3E9FD;} + .d2-470005247 .color-B4{color:#E3E9FD;} + .d2-470005247 .color-B5{color:#EDF0FD;} + .d2-470005247 .color-B6{color:#F7F8FE;} + .d2-470005247 .color-AA2{color:#4A6FF3;} + .d2-470005247 .color-AA4{color:#EDF0FD;} + .d2-470005247 .color-AA5{color:#F7F8FE;} + .d2-470005247 .color-AB4{color:#EDF0FD;} + .d2-470005247 .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}]]>zaxybabcdbabcdabcdaccd 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 e0331ed78..535aecf9d 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,16 +1,16 @@ -zaxybabcdbabcdabcdaccd + .d2-2612941080 .fill-N1{fill:#0A0F25;} + .d2-2612941080 .fill-N2{fill:#676C7E;} + .d2-2612941080 .fill-N3{fill:#9499AB;} + .d2-2612941080 .fill-N4{fill:#CFD2DD;} + .d2-2612941080 .fill-N5{fill:#DEE1EB;} + .d2-2612941080 .fill-N6{fill:#EEF1F8;} + .d2-2612941080 .fill-N7{fill:#FFFFFF;} + .d2-2612941080 .fill-B1{fill:#0D32B2;} + .d2-2612941080 .fill-B2{fill:#0D32B2;} + .d2-2612941080 .fill-B3{fill:#E3E9FD;} + .d2-2612941080 .fill-B4{fill:#E3E9FD;} + .d2-2612941080 .fill-B5{fill:#EDF0FD;} + .d2-2612941080 .fill-B6{fill:#F7F8FE;} + .d2-2612941080 .fill-AA2{fill:#4A6FF3;} + .d2-2612941080 .fill-AA4{fill:#EDF0FD;} + .d2-2612941080 .fill-AA5{fill:#F7F8FE;} + .d2-2612941080 .fill-AB4{fill:#EDF0FD;} + .d2-2612941080 .fill-AB5{fill:#F7F8FE;} + .d2-2612941080 .stroke-N1{stroke:#0A0F25;} + .d2-2612941080 .stroke-N2{stroke:#676C7E;} + .d2-2612941080 .stroke-N3{stroke:#9499AB;} + .d2-2612941080 .stroke-N4{stroke:#CFD2DD;} + .d2-2612941080 .stroke-N5{stroke:#DEE1EB;} + .d2-2612941080 .stroke-N6{stroke:#EEF1F8;} + .d2-2612941080 .stroke-N7{stroke:#FFFFFF;} + .d2-2612941080 .stroke-B1{stroke:#0D32B2;} + .d2-2612941080 .stroke-B2{stroke:#0D32B2;} + .d2-2612941080 .stroke-B3{stroke:#E3E9FD;} + .d2-2612941080 .stroke-B4{stroke:#E3E9FD;} + .d2-2612941080 .stroke-B5{stroke:#EDF0FD;} + .d2-2612941080 .stroke-B6{stroke:#F7F8FE;} + .d2-2612941080 .stroke-AA2{stroke:#4A6FF3;} + .d2-2612941080 .stroke-AA4{stroke:#EDF0FD;} + .d2-2612941080 .stroke-AA5{stroke:#F7F8FE;} + .d2-2612941080 .stroke-AB4{stroke:#EDF0FD;} + .d2-2612941080 .stroke-AB5{stroke:#F7F8FE;} + .d2-2612941080 .background-color-N1{background-color:#0A0F25;} + .d2-2612941080 .background-color-N2{background-color:#676C7E;} + .d2-2612941080 .background-color-N3{background-color:#9499AB;} + .d2-2612941080 .background-color-N4{background-color:#CFD2DD;} + .d2-2612941080 .background-color-N5{background-color:#DEE1EB;} + .d2-2612941080 .background-color-N6{background-color:#EEF1F8;} + .d2-2612941080 .background-color-N7{background-color:#FFFFFF;} + .d2-2612941080 .background-color-B1{background-color:#0D32B2;} + .d2-2612941080 .background-color-B2{background-color:#0D32B2;} + .d2-2612941080 .background-color-B3{background-color:#E3E9FD;} + .d2-2612941080 .background-color-B4{background-color:#E3E9FD;} + .d2-2612941080 .background-color-B5{background-color:#EDF0FD;} + .d2-2612941080 .background-color-B6{background-color:#F7F8FE;} + .d2-2612941080 .background-color-AA2{background-color:#4A6FF3;} + .d2-2612941080 .background-color-AA4{background-color:#EDF0FD;} + .d2-2612941080 .background-color-AA5{background-color:#F7F8FE;} + .d2-2612941080 .background-color-AB4{background-color:#EDF0FD;} + .d2-2612941080 .background-color-AB5{background-color:#F7F8FE;} + .d2-2612941080 .color-N1{color:#0A0F25;} + .d2-2612941080 .color-N2{color:#676C7E;} + .d2-2612941080 .color-N3{color:#9499AB;} + .d2-2612941080 .color-N4{color:#CFD2DD;} + .d2-2612941080 .color-N5{color:#DEE1EB;} + .d2-2612941080 .color-N6{color:#EEF1F8;} + .d2-2612941080 .color-N7{color:#FFFFFF;} + .d2-2612941080 .color-B1{color:#0D32B2;} + .d2-2612941080 .color-B2{color:#0D32B2;} + .d2-2612941080 .color-B3{color:#E3E9FD;} + .d2-2612941080 .color-B4{color:#E3E9FD;} + .d2-2612941080 .color-B5{color:#EDF0FD;} + .d2-2612941080 .color-B6{color:#F7F8FE;} + .d2-2612941080 .color-AA2{color:#4A6FF3;} + .d2-2612941080 .color-AA4{color:#EDF0FD;} + .d2-2612941080 .color-AA5{color:#F7F8FE;} + .d2-2612941080 .color-AB4{color:#EDF0FD;} + .d2-2612941080 .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}]]>zaxybabcdbabcdabcdaccd 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 be3d28dc0..ef6626d8c 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,13 +1,13 @@ -

    Service-Cluster Provisioning ("Outside view")

    -
     +     \ No newline at end of file diff --git a/e2etests/testdata/stable/near_keys_for_container/elk/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container/elk/sketch.exp.svg index be3d28dc0..ef6626d8c 100644 --- a/e2etests/testdata/stable/near_keys_for_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -

    Service-Cluster Provisioning ("Outside view")

    -
     +     \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg index fe5eef34f..703d67e71 100644 --- a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aaccbbdd + .d2-461144874 .fill-N1{fill:#0A0F25;} + .d2-461144874 .fill-N2{fill:#676C7E;} + .d2-461144874 .fill-N3{fill:#9499AB;} + .d2-461144874 .fill-N4{fill:#CFD2DD;} + .d2-461144874 .fill-N5{fill:#DEE1EB;} + .d2-461144874 .fill-N6{fill:#EEF1F8;} + .d2-461144874 .fill-N7{fill:#FFFFFF;} + .d2-461144874 .fill-B1{fill:#0D32B2;} + .d2-461144874 .fill-B2{fill:#0D32B2;} + .d2-461144874 .fill-B3{fill:#E3E9FD;} + .d2-461144874 .fill-B4{fill:#E3E9FD;} + .d2-461144874 .fill-B5{fill:#EDF0FD;} + .d2-461144874 .fill-B6{fill:#F7F8FE;} + .d2-461144874 .fill-AA2{fill:#4A6FF3;} + .d2-461144874 .fill-AA4{fill:#EDF0FD;} + .d2-461144874 .fill-AA5{fill:#F7F8FE;} + .d2-461144874 .fill-AB4{fill:#EDF0FD;} + .d2-461144874 .fill-AB5{fill:#F7F8FE;} + .d2-461144874 .stroke-N1{stroke:#0A0F25;} + .d2-461144874 .stroke-N2{stroke:#676C7E;} + .d2-461144874 .stroke-N3{stroke:#9499AB;} + .d2-461144874 .stroke-N4{stroke:#CFD2DD;} + .d2-461144874 .stroke-N5{stroke:#DEE1EB;} + .d2-461144874 .stroke-N6{stroke:#EEF1F8;} + .d2-461144874 .stroke-N7{stroke:#FFFFFF;} + .d2-461144874 .stroke-B1{stroke:#0D32B2;} + .d2-461144874 .stroke-B2{stroke:#0D32B2;} + .d2-461144874 .stroke-B3{stroke:#E3E9FD;} + .d2-461144874 .stroke-B4{stroke:#E3E9FD;} + .d2-461144874 .stroke-B5{stroke:#EDF0FD;} + .d2-461144874 .stroke-B6{stroke:#F7F8FE;} + .d2-461144874 .stroke-AA2{stroke:#4A6FF3;} + .d2-461144874 .stroke-AA4{stroke:#EDF0FD;} + .d2-461144874 .stroke-AA5{stroke:#F7F8FE;} + .d2-461144874 .stroke-AB4{stroke:#EDF0FD;} + .d2-461144874 .stroke-AB5{stroke:#F7F8FE;} + .d2-461144874 .background-color-N1{background-color:#0A0F25;} + .d2-461144874 .background-color-N2{background-color:#676C7E;} + .d2-461144874 .background-color-N3{background-color:#9499AB;} + .d2-461144874 .background-color-N4{background-color:#CFD2DD;} + .d2-461144874 .background-color-N5{background-color:#DEE1EB;} + .d2-461144874 .background-color-N6{background-color:#EEF1F8;} + .d2-461144874 .background-color-N7{background-color:#FFFFFF;} + .d2-461144874 .background-color-B1{background-color:#0D32B2;} + .d2-461144874 .background-color-B2{background-color:#0D32B2;} + .d2-461144874 .background-color-B3{background-color:#E3E9FD;} + .d2-461144874 .background-color-B4{background-color:#E3E9FD;} + .d2-461144874 .background-color-B5{background-color:#EDF0FD;} + .d2-461144874 .background-color-B6{background-color:#F7F8FE;} + .d2-461144874 .background-color-AA2{background-color:#4A6FF3;} + .d2-461144874 .background-color-AA4{background-color:#EDF0FD;} + .d2-461144874 .background-color-AA5{background-color:#F7F8FE;} + .d2-461144874 .background-color-AB4{background-color:#EDF0FD;} + .d2-461144874 .background-color-AB5{background-color:#F7F8FE;} + .d2-461144874 .color-N1{color:#0A0F25;} + .d2-461144874 .color-N2{color:#676C7E;} + .d2-461144874 .color-N3{color:#9499AB;} + .d2-461144874 .color-N4{color:#CFD2DD;} + .d2-461144874 .color-N5{color:#DEE1EB;} + .d2-461144874 .color-N6{color:#EEF1F8;} + .d2-461144874 .color-N7{color:#FFFFFF;} + .d2-461144874 .color-B1{color:#0D32B2;} + .d2-461144874 .color-B2{color:#0D32B2;} + .d2-461144874 .color-B3{color:#E3E9FD;} + .d2-461144874 .color-B4{color:#E3E9FD;} + .d2-461144874 .color-B5{color:#EDF0FD;} + .d2-461144874 .color-B6{color:#F7F8FE;} + .d2-461144874 .color-AA2{color:#4A6FF3;} + .d2-461144874 .color-AA4{color:#EDF0FD;} + .d2-461144874 .color-AA5{color:#F7F8FE;} + .d2-461144874 .color-AB4{color:#EDF0FD;} + .d2-461144874 .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}]]>aaccbbdd diff --git a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg index c4b9c397b..ea0469ee1 100644 --- a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aaccbbdd + .d2-384993329 .fill-N1{fill:#0A0F25;} + .d2-384993329 .fill-N2{fill:#676C7E;} + .d2-384993329 .fill-N3{fill:#9499AB;} + .d2-384993329 .fill-N4{fill:#CFD2DD;} + .d2-384993329 .fill-N5{fill:#DEE1EB;} + .d2-384993329 .fill-N6{fill:#EEF1F8;} + .d2-384993329 .fill-N7{fill:#FFFFFF;} + .d2-384993329 .fill-B1{fill:#0D32B2;} + .d2-384993329 .fill-B2{fill:#0D32B2;} + .d2-384993329 .fill-B3{fill:#E3E9FD;} + .d2-384993329 .fill-B4{fill:#E3E9FD;} + .d2-384993329 .fill-B5{fill:#EDF0FD;} + .d2-384993329 .fill-B6{fill:#F7F8FE;} + .d2-384993329 .fill-AA2{fill:#4A6FF3;} + .d2-384993329 .fill-AA4{fill:#EDF0FD;} + .d2-384993329 .fill-AA5{fill:#F7F8FE;} + .d2-384993329 .fill-AB4{fill:#EDF0FD;} + .d2-384993329 .fill-AB5{fill:#F7F8FE;} + .d2-384993329 .stroke-N1{stroke:#0A0F25;} + .d2-384993329 .stroke-N2{stroke:#676C7E;} + .d2-384993329 .stroke-N3{stroke:#9499AB;} + .d2-384993329 .stroke-N4{stroke:#CFD2DD;} + .d2-384993329 .stroke-N5{stroke:#DEE1EB;} + .d2-384993329 .stroke-N6{stroke:#EEF1F8;} + .d2-384993329 .stroke-N7{stroke:#FFFFFF;} + .d2-384993329 .stroke-B1{stroke:#0D32B2;} + .d2-384993329 .stroke-B2{stroke:#0D32B2;} + .d2-384993329 .stroke-B3{stroke:#E3E9FD;} + .d2-384993329 .stroke-B4{stroke:#E3E9FD;} + .d2-384993329 .stroke-B5{stroke:#EDF0FD;} + .d2-384993329 .stroke-B6{stroke:#F7F8FE;} + .d2-384993329 .stroke-AA2{stroke:#4A6FF3;} + .d2-384993329 .stroke-AA4{stroke:#EDF0FD;} + .d2-384993329 .stroke-AA5{stroke:#F7F8FE;} + .d2-384993329 .stroke-AB4{stroke:#EDF0FD;} + .d2-384993329 .stroke-AB5{stroke:#F7F8FE;} + .d2-384993329 .background-color-N1{background-color:#0A0F25;} + .d2-384993329 .background-color-N2{background-color:#676C7E;} + .d2-384993329 .background-color-N3{background-color:#9499AB;} + .d2-384993329 .background-color-N4{background-color:#CFD2DD;} + .d2-384993329 .background-color-N5{background-color:#DEE1EB;} + .d2-384993329 .background-color-N6{background-color:#EEF1F8;} + .d2-384993329 .background-color-N7{background-color:#FFFFFF;} + .d2-384993329 .background-color-B1{background-color:#0D32B2;} + .d2-384993329 .background-color-B2{background-color:#0D32B2;} + .d2-384993329 .background-color-B3{background-color:#E3E9FD;} + .d2-384993329 .background-color-B4{background-color:#E3E9FD;} + .d2-384993329 .background-color-B5{background-color:#EDF0FD;} + .d2-384993329 .background-color-B6{background-color:#F7F8FE;} + .d2-384993329 .background-color-AA2{background-color:#4A6FF3;} + .d2-384993329 .background-color-AA4{background-color:#EDF0FD;} + .d2-384993329 .background-color-AA5{background-color:#F7F8FE;} + .d2-384993329 .background-color-AB4{background-color:#EDF0FD;} + .d2-384993329 .background-color-AB5{background-color:#F7F8FE;} + .d2-384993329 .color-N1{color:#0A0F25;} + .d2-384993329 .color-N2{color:#676C7E;} + .d2-384993329 .color-N3{color:#9499AB;} + .d2-384993329 .color-N4{color:#CFD2DD;} + .d2-384993329 .color-N5{color:#DEE1EB;} + .d2-384993329 .color-N6{color:#EEF1F8;} + .d2-384993329 .color-N7{color:#FFFFFF;} + .d2-384993329 .color-B1{color:#0D32B2;} + .d2-384993329 .color-B2{color:#0D32B2;} + .d2-384993329 .color-B3{color:#E3E9FD;} + .d2-384993329 .color-B4{color:#E3E9FD;} + .d2-384993329 .color-B5{color:#EDF0FD;} + .d2-384993329 .color-B6{color:#F7F8FE;} + .d2-384993329 .color-AA2{color:#4A6FF3;} + .d2-384993329 .color-AA4{color:#EDF0FD;} + .d2-384993329 .color-AA5{color:#F7F8FE;} + .d2-384993329 .color-AB4{color:#EDF0FD;} + .d2-384993329 .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}]]>aaccbbdd diff --git a/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg index ec8f5f5af..dacd2f249 100644 --- a/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -12Foo Bazhello + .d2-1160589039 .fill-N1{fill:#0A0F25;} + .d2-1160589039 .fill-N2{fill:#676C7E;} + .d2-1160589039 .fill-N3{fill:#9499AB;} + .d2-1160589039 .fill-N4{fill:#CFD2DD;} + .d2-1160589039 .fill-N5{fill:#DEE1EB;} + .d2-1160589039 .fill-N6{fill:#EEF1F8;} + .d2-1160589039 .fill-N7{fill:#FFFFFF;} + .d2-1160589039 .fill-B1{fill:#0D32B2;} + .d2-1160589039 .fill-B2{fill:#0D32B2;} + .d2-1160589039 .fill-B3{fill:#E3E9FD;} + .d2-1160589039 .fill-B4{fill:#E3E9FD;} + .d2-1160589039 .fill-B5{fill:#EDF0FD;} + .d2-1160589039 .fill-B6{fill:#F7F8FE;} + .d2-1160589039 .fill-AA2{fill:#4A6FF3;} + .d2-1160589039 .fill-AA4{fill:#EDF0FD;} + .d2-1160589039 .fill-AA5{fill:#F7F8FE;} + .d2-1160589039 .fill-AB4{fill:#EDF0FD;} + .d2-1160589039 .fill-AB5{fill:#F7F8FE;} + .d2-1160589039 .stroke-N1{stroke:#0A0F25;} + .d2-1160589039 .stroke-N2{stroke:#676C7E;} + .d2-1160589039 .stroke-N3{stroke:#9499AB;} + .d2-1160589039 .stroke-N4{stroke:#CFD2DD;} + .d2-1160589039 .stroke-N5{stroke:#DEE1EB;} + .d2-1160589039 .stroke-N6{stroke:#EEF1F8;} + .d2-1160589039 .stroke-N7{stroke:#FFFFFF;} + .d2-1160589039 .stroke-B1{stroke:#0D32B2;} + .d2-1160589039 .stroke-B2{stroke:#0D32B2;} + .d2-1160589039 .stroke-B3{stroke:#E3E9FD;} + .d2-1160589039 .stroke-B4{stroke:#E3E9FD;} + .d2-1160589039 .stroke-B5{stroke:#EDF0FD;} + .d2-1160589039 .stroke-B6{stroke:#F7F8FE;} + .d2-1160589039 .stroke-AA2{stroke:#4A6FF3;} + .d2-1160589039 .stroke-AA4{stroke:#EDF0FD;} + .d2-1160589039 .stroke-AA5{stroke:#F7F8FE;} + .d2-1160589039 .stroke-AB4{stroke:#EDF0FD;} + .d2-1160589039 .stroke-AB5{stroke:#F7F8FE;} + .d2-1160589039 .background-color-N1{background-color:#0A0F25;} + .d2-1160589039 .background-color-N2{background-color:#676C7E;} + .d2-1160589039 .background-color-N3{background-color:#9499AB;} + .d2-1160589039 .background-color-N4{background-color:#CFD2DD;} + .d2-1160589039 .background-color-N5{background-color:#DEE1EB;} + .d2-1160589039 .background-color-N6{background-color:#EEF1F8;} + .d2-1160589039 .background-color-N7{background-color:#FFFFFF;} + .d2-1160589039 .background-color-B1{background-color:#0D32B2;} + .d2-1160589039 .background-color-B2{background-color:#0D32B2;} + .d2-1160589039 .background-color-B3{background-color:#E3E9FD;} + .d2-1160589039 .background-color-B4{background-color:#E3E9FD;} + .d2-1160589039 .background-color-B5{background-color:#EDF0FD;} + .d2-1160589039 .background-color-B6{background-color:#F7F8FE;} + .d2-1160589039 .background-color-AA2{background-color:#4A6FF3;} + .d2-1160589039 .background-color-AA4{background-color:#EDF0FD;} + .d2-1160589039 .background-color-AA5{background-color:#F7F8FE;} + .d2-1160589039 .background-color-AB4{background-color:#EDF0FD;} + .d2-1160589039 .background-color-AB5{background-color:#F7F8FE;} + .d2-1160589039 .color-N1{color:#0A0F25;} + .d2-1160589039 .color-N2{color:#676C7E;} + .d2-1160589039 .color-N3{color:#9499AB;} + .d2-1160589039 .color-N4{color:#CFD2DD;} + .d2-1160589039 .color-N5{color:#DEE1EB;} + .d2-1160589039 .color-N6{color:#EEF1F8;} + .d2-1160589039 .color-N7{color:#FFFFFF;} + .d2-1160589039 .color-B1{color:#0D32B2;} + .d2-1160589039 .color-B2{color:#0D32B2;} + .d2-1160589039 .color-B3{color:#E3E9FD;} + .d2-1160589039 .color-B4{color:#E3E9FD;} + .d2-1160589039 .color-B5{color:#EDF0FD;} + .d2-1160589039 .color-B6{color:#F7F8FE;} + .d2-1160589039 .color-AA2{color:#4A6FF3;} + .d2-1160589039 .color-AA4{color:#EDF0FD;} + .d2-1160589039 .color-AA5{color:#F7F8FE;} + .d2-1160589039 .color-AB4{color:#EDF0FD;} + .d2-1160589039 .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}]]>12Foo Bazhello diff --git a/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg index d3d6b64ac..abf2605a4 100644 --- a/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -12Foo Bazhello + .d2-1005771847 .fill-N1{fill:#0A0F25;} + .d2-1005771847 .fill-N2{fill:#676C7E;} + .d2-1005771847 .fill-N3{fill:#9499AB;} + .d2-1005771847 .fill-N4{fill:#CFD2DD;} + .d2-1005771847 .fill-N5{fill:#DEE1EB;} + .d2-1005771847 .fill-N6{fill:#EEF1F8;} + .d2-1005771847 .fill-N7{fill:#FFFFFF;} + .d2-1005771847 .fill-B1{fill:#0D32B2;} + .d2-1005771847 .fill-B2{fill:#0D32B2;} + .d2-1005771847 .fill-B3{fill:#E3E9FD;} + .d2-1005771847 .fill-B4{fill:#E3E9FD;} + .d2-1005771847 .fill-B5{fill:#EDF0FD;} + .d2-1005771847 .fill-B6{fill:#F7F8FE;} + .d2-1005771847 .fill-AA2{fill:#4A6FF3;} + .d2-1005771847 .fill-AA4{fill:#EDF0FD;} + .d2-1005771847 .fill-AA5{fill:#F7F8FE;} + .d2-1005771847 .fill-AB4{fill:#EDF0FD;} + .d2-1005771847 .fill-AB5{fill:#F7F8FE;} + .d2-1005771847 .stroke-N1{stroke:#0A0F25;} + .d2-1005771847 .stroke-N2{stroke:#676C7E;} + .d2-1005771847 .stroke-N3{stroke:#9499AB;} + .d2-1005771847 .stroke-N4{stroke:#CFD2DD;} + .d2-1005771847 .stroke-N5{stroke:#DEE1EB;} + .d2-1005771847 .stroke-N6{stroke:#EEF1F8;} + .d2-1005771847 .stroke-N7{stroke:#FFFFFF;} + .d2-1005771847 .stroke-B1{stroke:#0D32B2;} + .d2-1005771847 .stroke-B2{stroke:#0D32B2;} + .d2-1005771847 .stroke-B3{stroke:#E3E9FD;} + .d2-1005771847 .stroke-B4{stroke:#E3E9FD;} + .d2-1005771847 .stroke-B5{stroke:#EDF0FD;} + .d2-1005771847 .stroke-B6{stroke:#F7F8FE;} + .d2-1005771847 .stroke-AA2{stroke:#4A6FF3;} + .d2-1005771847 .stroke-AA4{stroke:#EDF0FD;} + .d2-1005771847 .stroke-AA5{stroke:#F7F8FE;} + .d2-1005771847 .stroke-AB4{stroke:#EDF0FD;} + .d2-1005771847 .stroke-AB5{stroke:#F7F8FE;} + .d2-1005771847 .background-color-N1{background-color:#0A0F25;} + .d2-1005771847 .background-color-N2{background-color:#676C7E;} + .d2-1005771847 .background-color-N3{background-color:#9499AB;} + .d2-1005771847 .background-color-N4{background-color:#CFD2DD;} + .d2-1005771847 .background-color-N5{background-color:#DEE1EB;} + .d2-1005771847 .background-color-N6{background-color:#EEF1F8;} + .d2-1005771847 .background-color-N7{background-color:#FFFFFF;} + .d2-1005771847 .background-color-B1{background-color:#0D32B2;} + .d2-1005771847 .background-color-B2{background-color:#0D32B2;} + .d2-1005771847 .background-color-B3{background-color:#E3E9FD;} + .d2-1005771847 .background-color-B4{background-color:#E3E9FD;} + .d2-1005771847 .background-color-B5{background-color:#EDF0FD;} + .d2-1005771847 .background-color-B6{background-color:#F7F8FE;} + .d2-1005771847 .background-color-AA2{background-color:#4A6FF3;} + .d2-1005771847 .background-color-AA4{background-color:#EDF0FD;} + .d2-1005771847 .background-color-AA5{background-color:#F7F8FE;} + .d2-1005771847 .background-color-AB4{background-color:#EDF0FD;} + .d2-1005771847 .background-color-AB5{background-color:#F7F8FE;} + .d2-1005771847 .color-N1{color:#0A0F25;} + .d2-1005771847 .color-N2{color:#676C7E;} + .d2-1005771847 .color-N3{color:#9499AB;} + .d2-1005771847 .color-N4{color:#CFD2DD;} + .d2-1005771847 .color-N5{color:#DEE1EB;} + .d2-1005771847 .color-N6{color:#EEF1F8;} + .d2-1005771847 .color-N7{color:#FFFFFF;} + .d2-1005771847 .color-B1{color:#0D32B2;} + .d2-1005771847 .color-B2{color:#0D32B2;} + .d2-1005771847 .color-B3{color:#E3E9FD;} + .d2-1005771847 .color-B4{color:#E3E9FD;} + .d2-1005771847 .color-B5{color:#EDF0FD;} + .d2-1005771847 .color-B6{color:#F7F8FE;} + .d2-1005771847 .color-AA2{color:#4A6FF3;} + .d2-1005771847 .color-AA4{color:#EDF0FD;} + .d2-1005771847 .color-AA5{color:#F7F8FE;} + .d2-1005771847 .color-AB4{color:#EDF0FD;} + .d2-1005771847 .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}]]>12Foo Bazhello 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 73d05da70..9c3d1d942 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh + .d2-4157992462 .fill-N1{fill:#0A0F25;} + .d2-4157992462 .fill-N2{fill:#676C7E;} + .d2-4157992462 .fill-N3{fill:#9499AB;} + .d2-4157992462 .fill-N4{fill:#CFD2DD;} + .d2-4157992462 .fill-N5{fill:#DEE1EB;} + .d2-4157992462 .fill-N6{fill:#EEF1F8;} + .d2-4157992462 .fill-N7{fill:#FFFFFF;} + .d2-4157992462 .fill-B1{fill:#0D32B2;} + .d2-4157992462 .fill-B2{fill:#0D32B2;} + .d2-4157992462 .fill-B3{fill:#E3E9FD;} + .d2-4157992462 .fill-B4{fill:#E3E9FD;} + .d2-4157992462 .fill-B5{fill:#EDF0FD;} + .d2-4157992462 .fill-B6{fill:#F7F8FE;} + .d2-4157992462 .fill-AA2{fill:#4A6FF3;} + .d2-4157992462 .fill-AA4{fill:#EDF0FD;} + .d2-4157992462 .fill-AA5{fill:#F7F8FE;} + .d2-4157992462 .fill-AB4{fill:#EDF0FD;} + .d2-4157992462 .fill-AB5{fill:#F7F8FE;} + .d2-4157992462 .stroke-N1{stroke:#0A0F25;} + .d2-4157992462 .stroke-N2{stroke:#676C7E;} + .d2-4157992462 .stroke-N3{stroke:#9499AB;} + .d2-4157992462 .stroke-N4{stroke:#CFD2DD;} + .d2-4157992462 .stroke-N5{stroke:#DEE1EB;} + .d2-4157992462 .stroke-N6{stroke:#EEF1F8;} + .d2-4157992462 .stroke-N7{stroke:#FFFFFF;} + .d2-4157992462 .stroke-B1{stroke:#0D32B2;} + .d2-4157992462 .stroke-B2{stroke:#0D32B2;} + .d2-4157992462 .stroke-B3{stroke:#E3E9FD;} + .d2-4157992462 .stroke-B4{stroke:#E3E9FD;} + .d2-4157992462 .stroke-B5{stroke:#EDF0FD;} + .d2-4157992462 .stroke-B6{stroke:#F7F8FE;} + .d2-4157992462 .stroke-AA2{stroke:#4A6FF3;} + .d2-4157992462 .stroke-AA4{stroke:#EDF0FD;} + .d2-4157992462 .stroke-AA5{stroke:#F7F8FE;} + .d2-4157992462 .stroke-AB4{stroke:#EDF0FD;} + .d2-4157992462 .stroke-AB5{stroke:#F7F8FE;} + .d2-4157992462 .background-color-N1{background-color:#0A0F25;} + .d2-4157992462 .background-color-N2{background-color:#676C7E;} + .d2-4157992462 .background-color-N3{background-color:#9499AB;} + .d2-4157992462 .background-color-N4{background-color:#CFD2DD;} + .d2-4157992462 .background-color-N5{background-color:#DEE1EB;} + .d2-4157992462 .background-color-N6{background-color:#EEF1F8;} + .d2-4157992462 .background-color-N7{background-color:#FFFFFF;} + .d2-4157992462 .background-color-B1{background-color:#0D32B2;} + .d2-4157992462 .background-color-B2{background-color:#0D32B2;} + .d2-4157992462 .background-color-B3{background-color:#E3E9FD;} + .d2-4157992462 .background-color-B4{background-color:#E3E9FD;} + .d2-4157992462 .background-color-B5{background-color:#EDF0FD;} + .d2-4157992462 .background-color-B6{background-color:#F7F8FE;} + .d2-4157992462 .background-color-AA2{background-color:#4A6FF3;} + .d2-4157992462 .background-color-AA4{background-color:#EDF0FD;} + .d2-4157992462 .background-color-AA5{background-color:#F7F8FE;} + .d2-4157992462 .background-color-AB4{background-color:#EDF0FD;} + .d2-4157992462 .background-color-AB5{background-color:#F7F8FE;} + .d2-4157992462 .color-N1{color:#0A0F25;} + .d2-4157992462 .color-N2{color:#676C7E;} + .d2-4157992462 .color-N3{color:#9499AB;} + .d2-4157992462 .color-N4{color:#CFD2DD;} + .d2-4157992462 .color-N5{color:#DEE1EB;} + .d2-4157992462 .color-N6{color:#EEF1F8;} + .d2-4157992462 .color-N7{color:#FFFFFF;} + .d2-4157992462 .color-B1{color:#0D32B2;} + .d2-4157992462 .color-B2{color:#0D32B2;} + .d2-4157992462 .color-B3{color:#E3E9FD;} + .d2-4157992462 .color-B4{color:#E3E9FD;} + .d2-4157992462 .color-B5{color:#EDF0FD;} + .d2-4157992462 .color-B6{color:#F7F8FE;} + .d2-4157992462 .color-AA2{color:#4A6FF3;} + .d2-4157992462 .color-AA4{color:#EDF0FD;} + .d2-4157992462 .color-AA5{color:#F7F8FE;} + .d2-4157992462 .color-AB4{color:#EDF0FD;} + .d2-4157992462 .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}]]>acdefgbh 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 da488b682..468abe272 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh + .d2-1784891775 .fill-N1{fill:#0A0F25;} + .d2-1784891775 .fill-N2{fill:#676C7E;} + .d2-1784891775 .fill-N3{fill:#9499AB;} + .d2-1784891775 .fill-N4{fill:#CFD2DD;} + .d2-1784891775 .fill-N5{fill:#DEE1EB;} + .d2-1784891775 .fill-N6{fill:#EEF1F8;} + .d2-1784891775 .fill-N7{fill:#FFFFFF;} + .d2-1784891775 .fill-B1{fill:#0D32B2;} + .d2-1784891775 .fill-B2{fill:#0D32B2;} + .d2-1784891775 .fill-B3{fill:#E3E9FD;} + .d2-1784891775 .fill-B4{fill:#E3E9FD;} + .d2-1784891775 .fill-B5{fill:#EDF0FD;} + .d2-1784891775 .fill-B6{fill:#F7F8FE;} + .d2-1784891775 .fill-AA2{fill:#4A6FF3;} + .d2-1784891775 .fill-AA4{fill:#EDF0FD;} + .d2-1784891775 .fill-AA5{fill:#F7F8FE;} + .d2-1784891775 .fill-AB4{fill:#EDF0FD;} + .d2-1784891775 .fill-AB5{fill:#F7F8FE;} + .d2-1784891775 .stroke-N1{stroke:#0A0F25;} + .d2-1784891775 .stroke-N2{stroke:#676C7E;} + .d2-1784891775 .stroke-N3{stroke:#9499AB;} + .d2-1784891775 .stroke-N4{stroke:#CFD2DD;} + .d2-1784891775 .stroke-N5{stroke:#DEE1EB;} + .d2-1784891775 .stroke-N6{stroke:#EEF1F8;} + .d2-1784891775 .stroke-N7{stroke:#FFFFFF;} + .d2-1784891775 .stroke-B1{stroke:#0D32B2;} + .d2-1784891775 .stroke-B2{stroke:#0D32B2;} + .d2-1784891775 .stroke-B3{stroke:#E3E9FD;} + .d2-1784891775 .stroke-B4{stroke:#E3E9FD;} + .d2-1784891775 .stroke-B5{stroke:#EDF0FD;} + .d2-1784891775 .stroke-B6{stroke:#F7F8FE;} + .d2-1784891775 .stroke-AA2{stroke:#4A6FF3;} + .d2-1784891775 .stroke-AA4{stroke:#EDF0FD;} + .d2-1784891775 .stroke-AA5{stroke:#F7F8FE;} + .d2-1784891775 .stroke-AB4{stroke:#EDF0FD;} + .d2-1784891775 .stroke-AB5{stroke:#F7F8FE;} + .d2-1784891775 .background-color-N1{background-color:#0A0F25;} + .d2-1784891775 .background-color-N2{background-color:#676C7E;} + .d2-1784891775 .background-color-N3{background-color:#9499AB;} + .d2-1784891775 .background-color-N4{background-color:#CFD2DD;} + .d2-1784891775 .background-color-N5{background-color:#DEE1EB;} + .d2-1784891775 .background-color-N6{background-color:#EEF1F8;} + .d2-1784891775 .background-color-N7{background-color:#FFFFFF;} + .d2-1784891775 .background-color-B1{background-color:#0D32B2;} + .d2-1784891775 .background-color-B2{background-color:#0D32B2;} + .d2-1784891775 .background-color-B3{background-color:#E3E9FD;} + .d2-1784891775 .background-color-B4{background-color:#E3E9FD;} + .d2-1784891775 .background-color-B5{background-color:#EDF0FD;} + .d2-1784891775 .background-color-B6{background-color:#F7F8FE;} + .d2-1784891775 .background-color-AA2{background-color:#4A6FF3;} + .d2-1784891775 .background-color-AA4{background-color:#EDF0FD;} + .d2-1784891775 .background-color-AA5{background-color:#F7F8FE;} + .d2-1784891775 .background-color-AB4{background-color:#EDF0FD;} + .d2-1784891775 .background-color-AB5{background-color:#F7F8FE;} + .d2-1784891775 .color-N1{color:#0A0F25;} + .d2-1784891775 .color-N2{color:#676C7E;} + .d2-1784891775 .color-N3{color:#9499AB;} + .d2-1784891775 .color-N4{color:#CFD2DD;} + .d2-1784891775 .color-N5{color:#DEE1EB;} + .d2-1784891775 .color-N6{color:#EEF1F8;} + .d2-1784891775 .color-N7{color:#FFFFFF;} + .d2-1784891775 .color-B1{color:#0D32B2;} + .d2-1784891775 .color-B2{color:#0D32B2;} + .d2-1784891775 .color-B3{color:#E3E9FD;} + .d2-1784891775 .color-B4{color:#E3E9FD;} + .d2-1784891775 .color-B5{color:#EDF0FD;} + .d2-1784891775 .color-B6{color:#F7F8FE;} + .d2-1784891775 .color-AA2{color:#4A6FF3;} + .d2-1784891775 .color-AA4{color:#EDF0FD;} + .d2-1784891775 .color-AA5{color:#F7F8FE;} + .d2-1784891775 .color-AB4{color:#EDF0FD;} + .d2-1784891775 .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}]]>acdefgbh 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 cd8cf2502..810f02f6c 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,16 +1,16 @@ -top2abcbottomstartend + .d2-3393164995 .fill-N1{fill:#0A0F25;} + .d2-3393164995 .fill-N2{fill:#676C7E;} + .d2-3393164995 .fill-N3{fill:#9499AB;} + .d2-3393164995 .fill-N4{fill:#CFD2DD;} + .d2-3393164995 .fill-N5{fill:#DEE1EB;} + .d2-3393164995 .fill-N6{fill:#EEF1F8;} + .d2-3393164995 .fill-N7{fill:#FFFFFF;} + .d2-3393164995 .fill-B1{fill:#0D32B2;} + .d2-3393164995 .fill-B2{fill:#0D32B2;} + .d2-3393164995 .fill-B3{fill:#E3E9FD;} + .d2-3393164995 .fill-B4{fill:#E3E9FD;} + .d2-3393164995 .fill-B5{fill:#EDF0FD;} + .d2-3393164995 .fill-B6{fill:#F7F8FE;} + .d2-3393164995 .fill-AA2{fill:#4A6FF3;} + .d2-3393164995 .fill-AA4{fill:#EDF0FD;} + .d2-3393164995 .fill-AA5{fill:#F7F8FE;} + .d2-3393164995 .fill-AB4{fill:#EDF0FD;} + .d2-3393164995 .fill-AB5{fill:#F7F8FE;} + .d2-3393164995 .stroke-N1{stroke:#0A0F25;} + .d2-3393164995 .stroke-N2{stroke:#676C7E;} + .d2-3393164995 .stroke-N3{stroke:#9499AB;} + .d2-3393164995 .stroke-N4{stroke:#CFD2DD;} + .d2-3393164995 .stroke-N5{stroke:#DEE1EB;} + .d2-3393164995 .stroke-N6{stroke:#EEF1F8;} + .d2-3393164995 .stroke-N7{stroke:#FFFFFF;} + .d2-3393164995 .stroke-B1{stroke:#0D32B2;} + .d2-3393164995 .stroke-B2{stroke:#0D32B2;} + .d2-3393164995 .stroke-B3{stroke:#E3E9FD;} + .d2-3393164995 .stroke-B4{stroke:#E3E9FD;} + .d2-3393164995 .stroke-B5{stroke:#EDF0FD;} + .d2-3393164995 .stroke-B6{stroke:#F7F8FE;} + .d2-3393164995 .stroke-AA2{stroke:#4A6FF3;} + .d2-3393164995 .stroke-AA4{stroke:#EDF0FD;} + .d2-3393164995 .stroke-AA5{stroke:#F7F8FE;} + .d2-3393164995 .stroke-AB4{stroke:#EDF0FD;} + .d2-3393164995 .stroke-AB5{stroke:#F7F8FE;} + .d2-3393164995 .background-color-N1{background-color:#0A0F25;} + .d2-3393164995 .background-color-N2{background-color:#676C7E;} + .d2-3393164995 .background-color-N3{background-color:#9499AB;} + .d2-3393164995 .background-color-N4{background-color:#CFD2DD;} + .d2-3393164995 .background-color-N5{background-color:#DEE1EB;} + .d2-3393164995 .background-color-N6{background-color:#EEF1F8;} + .d2-3393164995 .background-color-N7{background-color:#FFFFFF;} + .d2-3393164995 .background-color-B1{background-color:#0D32B2;} + .d2-3393164995 .background-color-B2{background-color:#0D32B2;} + .d2-3393164995 .background-color-B3{background-color:#E3E9FD;} + .d2-3393164995 .background-color-B4{background-color:#E3E9FD;} + .d2-3393164995 .background-color-B5{background-color:#EDF0FD;} + .d2-3393164995 .background-color-B6{background-color:#F7F8FE;} + .d2-3393164995 .background-color-AA2{background-color:#4A6FF3;} + .d2-3393164995 .background-color-AA4{background-color:#EDF0FD;} + .d2-3393164995 .background-color-AA5{background-color:#F7F8FE;} + .d2-3393164995 .background-color-AB4{background-color:#EDF0FD;} + .d2-3393164995 .background-color-AB5{background-color:#F7F8FE;} + .d2-3393164995 .color-N1{color:#0A0F25;} + .d2-3393164995 .color-N2{color:#676C7E;} + .d2-3393164995 .color-N3{color:#9499AB;} + .d2-3393164995 .color-N4{color:#CFD2DD;} + .d2-3393164995 .color-N5{color:#DEE1EB;} + .d2-3393164995 .color-N6{color:#EEF1F8;} + .d2-3393164995 .color-N7{color:#FFFFFF;} + .d2-3393164995 .color-B1{color:#0D32B2;} + .d2-3393164995 .color-B2{color:#0D32B2;} + .d2-3393164995 .color-B3{color:#E3E9FD;} + .d2-3393164995 .color-B4{color:#E3E9FD;} + .d2-3393164995 .color-B5{color:#EDF0FD;} + .d2-3393164995 .color-B6{color:#F7F8FE;} + .d2-3393164995 .color-AA2{color:#4A6FF3;} + .d2-3393164995 .color-AA4{color:#EDF0FD;} + .d2-3393164995 .color-AA5{color:#F7F8FE;} + .d2-3393164995 .color-AB4{color:#EDF0FD;} + .d2-3393164995 .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}]]>top2abcbottomstartend 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 fb3e61d11..f4695c4d2 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,16 +1,16 @@ -top2abcbottomstartend + .d2-1048954117 .fill-N1{fill:#0A0F25;} + .d2-1048954117 .fill-N2{fill:#676C7E;} + .d2-1048954117 .fill-N3{fill:#9499AB;} + .d2-1048954117 .fill-N4{fill:#CFD2DD;} + .d2-1048954117 .fill-N5{fill:#DEE1EB;} + .d2-1048954117 .fill-N6{fill:#EEF1F8;} + .d2-1048954117 .fill-N7{fill:#FFFFFF;} + .d2-1048954117 .fill-B1{fill:#0D32B2;} + .d2-1048954117 .fill-B2{fill:#0D32B2;} + .d2-1048954117 .fill-B3{fill:#E3E9FD;} + .d2-1048954117 .fill-B4{fill:#E3E9FD;} + .d2-1048954117 .fill-B5{fill:#EDF0FD;} + .d2-1048954117 .fill-B6{fill:#F7F8FE;} + .d2-1048954117 .fill-AA2{fill:#4A6FF3;} + .d2-1048954117 .fill-AA4{fill:#EDF0FD;} + .d2-1048954117 .fill-AA5{fill:#F7F8FE;} + .d2-1048954117 .fill-AB4{fill:#EDF0FD;} + .d2-1048954117 .fill-AB5{fill:#F7F8FE;} + .d2-1048954117 .stroke-N1{stroke:#0A0F25;} + .d2-1048954117 .stroke-N2{stroke:#676C7E;} + .d2-1048954117 .stroke-N3{stroke:#9499AB;} + .d2-1048954117 .stroke-N4{stroke:#CFD2DD;} + .d2-1048954117 .stroke-N5{stroke:#DEE1EB;} + .d2-1048954117 .stroke-N6{stroke:#EEF1F8;} + .d2-1048954117 .stroke-N7{stroke:#FFFFFF;} + .d2-1048954117 .stroke-B1{stroke:#0D32B2;} + .d2-1048954117 .stroke-B2{stroke:#0D32B2;} + .d2-1048954117 .stroke-B3{stroke:#E3E9FD;} + .d2-1048954117 .stroke-B4{stroke:#E3E9FD;} + .d2-1048954117 .stroke-B5{stroke:#EDF0FD;} + .d2-1048954117 .stroke-B6{stroke:#F7F8FE;} + .d2-1048954117 .stroke-AA2{stroke:#4A6FF3;} + .d2-1048954117 .stroke-AA4{stroke:#EDF0FD;} + .d2-1048954117 .stroke-AA5{stroke:#F7F8FE;} + .d2-1048954117 .stroke-AB4{stroke:#EDF0FD;} + .d2-1048954117 .stroke-AB5{stroke:#F7F8FE;} + .d2-1048954117 .background-color-N1{background-color:#0A0F25;} + .d2-1048954117 .background-color-N2{background-color:#676C7E;} + .d2-1048954117 .background-color-N3{background-color:#9499AB;} + .d2-1048954117 .background-color-N4{background-color:#CFD2DD;} + .d2-1048954117 .background-color-N5{background-color:#DEE1EB;} + .d2-1048954117 .background-color-N6{background-color:#EEF1F8;} + .d2-1048954117 .background-color-N7{background-color:#FFFFFF;} + .d2-1048954117 .background-color-B1{background-color:#0D32B2;} + .d2-1048954117 .background-color-B2{background-color:#0D32B2;} + .d2-1048954117 .background-color-B3{background-color:#E3E9FD;} + .d2-1048954117 .background-color-B4{background-color:#E3E9FD;} + .d2-1048954117 .background-color-B5{background-color:#EDF0FD;} + .d2-1048954117 .background-color-B6{background-color:#F7F8FE;} + .d2-1048954117 .background-color-AA2{background-color:#4A6FF3;} + .d2-1048954117 .background-color-AA4{background-color:#EDF0FD;} + .d2-1048954117 .background-color-AA5{background-color:#F7F8FE;} + .d2-1048954117 .background-color-AB4{background-color:#EDF0FD;} + .d2-1048954117 .background-color-AB5{background-color:#F7F8FE;} + .d2-1048954117 .color-N1{color:#0A0F25;} + .d2-1048954117 .color-N2{color:#676C7E;} + .d2-1048954117 .color-N3{color:#9499AB;} + .d2-1048954117 .color-N4{color:#CFD2DD;} + .d2-1048954117 .color-N5{color:#DEE1EB;} + .d2-1048954117 .color-N6{color:#EEF1F8;} + .d2-1048954117 .color-N7{color:#FFFFFF;} + .d2-1048954117 .color-B1{color:#0D32B2;} + .d2-1048954117 .color-B2{color:#0D32B2;} + .d2-1048954117 .color-B3{color:#E3E9FD;} + .d2-1048954117 .color-B4{color:#E3E9FD;} + .d2-1048954117 .color-B5{color:#EDF0FD;} + .d2-1048954117 .color-B6{color:#F7F8FE;} + .d2-1048954117 .color-AA2{color:#4A6FF3;} + .d2-1048954117 .color-AA4{color:#EDF0FD;} + .d2-1048954117 .color-AA5{color:#F7F8FE;} + .d2-1048954117 .color-AB4{color:#EDF0FD;} + .d2-1048954117 .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}]]>top2abcbottomstartend diff --git a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg index 663dbd281..1e74832c4 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle + .d2-467777836 .fill-N1{fill:#0A0F25;} + .d2-467777836 .fill-N2{fill:#676C7E;} + .d2-467777836 .fill-N3{fill:#9499AB;} + .d2-467777836 .fill-N4{fill:#CFD2DD;} + .d2-467777836 .fill-N5{fill:#DEE1EB;} + .d2-467777836 .fill-N6{fill:#EEF1F8;} + .d2-467777836 .fill-N7{fill:#FFFFFF;} + .d2-467777836 .fill-B1{fill:#0D32B2;} + .d2-467777836 .fill-B2{fill:#0D32B2;} + .d2-467777836 .fill-B3{fill:#E3E9FD;} + .d2-467777836 .fill-B4{fill:#E3E9FD;} + .d2-467777836 .fill-B5{fill:#EDF0FD;} + .d2-467777836 .fill-B6{fill:#F7F8FE;} + .d2-467777836 .fill-AA2{fill:#4A6FF3;} + .d2-467777836 .fill-AA4{fill:#EDF0FD;} + .d2-467777836 .fill-AA5{fill:#F7F8FE;} + .d2-467777836 .fill-AB4{fill:#EDF0FD;} + .d2-467777836 .fill-AB5{fill:#F7F8FE;} + .d2-467777836 .stroke-N1{stroke:#0A0F25;} + .d2-467777836 .stroke-N2{stroke:#676C7E;} + .d2-467777836 .stroke-N3{stroke:#9499AB;} + .d2-467777836 .stroke-N4{stroke:#CFD2DD;} + .d2-467777836 .stroke-N5{stroke:#DEE1EB;} + .d2-467777836 .stroke-N6{stroke:#EEF1F8;} + .d2-467777836 .stroke-N7{stroke:#FFFFFF;} + .d2-467777836 .stroke-B1{stroke:#0D32B2;} + .d2-467777836 .stroke-B2{stroke:#0D32B2;} + .d2-467777836 .stroke-B3{stroke:#E3E9FD;} + .d2-467777836 .stroke-B4{stroke:#E3E9FD;} + .d2-467777836 .stroke-B5{stroke:#EDF0FD;} + .d2-467777836 .stroke-B6{stroke:#F7F8FE;} + .d2-467777836 .stroke-AA2{stroke:#4A6FF3;} + .d2-467777836 .stroke-AA4{stroke:#EDF0FD;} + .d2-467777836 .stroke-AA5{stroke:#F7F8FE;} + .d2-467777836 .stroke-AB4{stroke:#EDF0FD;} + .d2-467777836 .stroke-AB5{stroke:#F7F8FE;} + .d2-467777836 .background-color-N1{background-color:#0A0F25;} + .d2-467777836 .background-color-N2{background-color:#676C7E;} + .d2-467777836 .background-color-N3{background-color:#9499AB;} + .d2-467777836 .background-color-N4{background-color:#CFD2DD;} + .d2-467777836 .background-color-N5{background-color:#DEE1EB;} + .d2-467777836 .background-color-N6{background-color:#EEF1F8;} + .d2-467777836 .background-color-N7{background-color:#FFFFFF;} + .d2-467777836 .background-color-B1{background-color:#0D32B2;} + .d2-467777836 .background-color-B2{background-color:#0D32B2;} + .d2-467777836 .background-color-B3{background-color:#E3E9FD;} + .d2-467777836 .background-color-B4{background-color:#E3E9FD;} + .d2-467777836 .background-color-B5{background-color:#EDF0FD;} + .d2-467777836 .background-color-B6{background-color:#F7F8FE;} + .d2-467777836 .background-color-AA2{background-color:#4A6FF3;} + .d2-467777836 .background-color-AA4{background-color:#EDF0FD;} + .d2-467777836 .background-color-AA5{background-color:#F7F8FE;} + .d2-467777836 .background-color-AB4{background-color:#EDF0FD;} + .d2-467777836 .background-color-AB5{background-color:#F7F8FE;} + .d2-467777836 .color-N1{color:#0A0F25;} + .d2-467777836 .color-N2{color:#676C7E;} + .d2-467777836 .color-N3{color:#9499AB;} + .d2-467777836 .color-N4{color:#CFD2DD;} + .d2-467777836 .color-N5{color:#DEE1EB;} + .d2-467777836 .color-N6{color:#EEF1F8;} + .d2-467777836 .color-N7{color:#FFFFFF;} + .d2-467777836 .color-B1{color:#0D32B2;} + .d2-467777836 .color-B2{color:#0D32B2;} + .d2-467777836 .color-B3{color:#E3E9FD;} + .d2-467777836 .color-B4{color:#E3E9FD;} + .d2-467777836 .color-B5{color:#EDF0FD;} + .d2-467777836 .color-B6{color:#F7F8FE;} + .d2-467777836 .color-AA2{color:#4A6FF3;} + .d2-467777836 .color-AA4{color:#EDF0FD;} + .d2-467777836 .color-AA5{color:#F7F8FE;} + .d2-467777836 .color-AB4{color:#EDF0FD;} + .d2-467777836 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle diff --git a/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg index 6b85de771..ffeca84e2 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle + .d2-1996782705 .fill-N1{fill:#0A0F25;} + .d2-1996782705 .fill-N2{fill:#676C7E;} + .d2-1996782705 .fill-N3{fill:#9499AB;} + .d2-1996782705 .fill-N4{fill:#CFD2DD;} + .d2-1996782705 .fill-N5{fill:#DEE1EB;} + .d2-1996782705 .fill-N6{fill:#EEF1F8;} + .d2-1996782705 .fill-N7{fill:#FFFFFF;} + .d2-1996782705 .fill-B1{fill:#0D32B2;} + .d2-1996782705 .fill-B2{fill:#0D32B2;} + .d2-1996782705 .fill-B3{fill:#E3E9FD;} + .d2-1996782705 .fill-B4{fill:#E3E9FD;} + .d2-1996782705 .fill-B5{fill:#EDF0FD;} + .d2-1996782705 .fill-B6{fill:#F7F8FE;} + .d2-1996782705 .fill-AA2{fill:#4A6FF3;} + .d2-1996782705 .fill-AA4{fill:#EDF0FD;} + .d2-1996782705 .fill-AA5{fill:#F7F8FE;} + .d2-1996782705 .fill-AB4{fill:#EDF0FD;} + .d2-1996782705 .fill-AB5{fill:#F7F8FE;} + .d2-1996782705 .stroke-N1{stroke:#0A0F25;} + .d2-1996782705 .stroke-N2{stroke:#676C7E;} + .d2-1996782705 .stroke-N3{stroke:#9499AB;} + .d2-1996782705 .stroke-N4{stroke:#CFD2DD;} + .d2-1996782705 .stroke-N5{stroke:#DEE1EB;} + .d2-1996782705 .stroke-N6{stroke:#EEF1F8;} + .d2-1996782705 .stroke-N7{stroke:#FFFFFF;} + .d2-1996782705 .stroke-B1{stroke:#0D32B2;} + .d2-1996782705 .stroke-B2{stroke:#0D32B2;} + .d2-1996782705 .stroke-B3{stroke:#E3E9FD;} + .d2-1996782705 .stroke-B4{stroke:#E3E9FD;} + .d2-1996782705 .stroke-B5{stroke:#EDF0FD;} + .d2-1996782705 .stroke-B6{stroke:#F7F8FE;} + .d2-1996782705 .stroke-AA2{stroke:#4A6FF3;} + .d2-1996782705 .stroke-AA4{stroke:#EDF0FD;} + .d2-1996782705 .stroke-AA5{stroke:#F7F8FE;} + .d2-1996782705 .stroke-AB4{stroke:#EDF0FD;} + .d2-1996782705 .stroke-AB5{stroke:#F7F8FE;} + .d2-1996782705 .background-color-N1{background-color:#0A0F25;} + .d2-1996782705 .background-color-N2{background-color:#676C7E;} + .d2-1996782705 .background-color-N3{background-color:#9499AB;} + .d2-1996782705 .background-color-N4{background-color:#CFD2DD;} + .d2-1996782705 .background-color-N5{background-color:#DEE1EB;} + .d2-1996782705 .background-color-N6{background-color:#EEF1F8;} + .d2-1996782705 .background-color-N7{background-color:#FFFFFF;} + .d2-1996782705 .background-color-B1{background-color:#0D32B2;} + .d2-1996782705 .background-color-B2{background-color:#0D32B2;} + .d2-1996782705 .background-color-B3{background-color:#E3E9FD;} + .d2-1996782705 .background-color-B4{background-color:#E3E9FD;} + .d2-1996782705 .background-color-B5{background-color:#EDF0FD;} + .d2-1996782705 .background-color-B6{background-color:#F7F8FE;} + .d2-1996782705 .background-color-AA2{background-color:#4A6FF3;} + .d2-1996782705 .background-color-AA4{background-color:#EDF0FD;} + .d2-1996782705 .background-color-AA5{background-color:#F7F8FE;} + .d2-1996782705 .background-color-AB4{background-color:#EDF0FD;} + .d2-1996782705 .background-color-AB5{background-color:#F7F8FE;} + .d2-1996782705 .color-N1{color:#0A0F25;} + .d2-1996782705 .color-N2{color:#676C7E;} + .d2-1996782705 .color-N3{color:#9499AB;} + .d2-1996782705 .color-N4{color:#CFD2DD;} + .d2-1996782705 .color-N5{color:#DEE1EB;} + .d2-1996782705 .color-N6{color:#EEF1F8;} + .d2-1996782705 .color-N7{color:#FFFFFF;} + .d2-1996782705 .color-B1{color:#0D32B2;} + .d2-1996782705 .color-B2{color:#0D32B2;} + .d2-1996782705 .color-B3{color:#E3E9FD;} + .d2-1996782705 .color-B4{color:#E3E9FD;} + .d2-1996782705 .color-B5{color:#EDF0FD;} + .d2-1996782705 .color-B6{color:#F7F8FE;} + .d2-1996782705 .color-AA2{color:#4A6FF3;} + .d2-1996782705 .color-AA4{color:#EDF0FD;} + .d2-1996782705 .color-AA5{color:#F7F8FE;} + .d2-1996782705 .color-AB4{color:#EDF0FD;} + .d2-1996782705 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle diff --git a/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg b/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg index b0c390ff4..254db9585 100644 --- a/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ --------------------------------------------------------------------------------------------------------------------------------12345 + .d2-2188249131 .fill-N1{fill:#0A0F25;} + .d2-2188249131 .fill-N2{fill:#676C7E;} + .d2-2188249131 .fill-N3{fill:#9499AB;} + .d2-2188249131 .fill-N4{fill:#CFD2DD;} + .d2-2188249131 .fill-N5{fill:#DEE1EB;} + .d2-2188249131 .fill-N6{fill:#EEF1F8;} + .d2-2188249131 .fill-N7{fill:#FFFFFF;} + .d2-2188249131 .fill-B1{fill:#0D32B2;} + .d2-2188249131 .fill-B2{fill:#0D32B2;} + .d2-2188249131 .fill-B3{fill:#E3E9FD;} + .d2-2188249131 .fill-B4{fill:#E3E9FD;} + .d2-2188249131 .fill-B5{fill:#EDF0FD;} + .d2-2188249131 .fill-B6{fill:#F7F8FE;} + .d2-2188249131 .fill-AA2{fill:#4A6FF3;} + .d2-2188249131 .fill-AA4{fill:#EDF0FD;} + .d2-2188249131 .fill-AA5{fill:#F7F8FE;} + .d2-2188249131 .fill-AB4{fill:#EDF0FD;} + .d2-2188249131 .fill-AB5{fill:#F7F8FE;} + .d2-2188249131 .stroke-N1{stroke:#0A0F25;} + .d2-2188249131 .stroke-N2{stroke:#676C7E;} + .d2-2188249131 .stroke-N3{stroke:#9499AB;} + .d2-2188249131 .stroke-N4{stroke:#CFD2DD;} + .d2-2188249131 .stroke-N5{stroke:#DEE1EB;} + .d2-2188249131 .stroke-N6{stroke:#EEF1F8;} + .d2-2188249131 .stroke-N7{stroke:#FFFFFF;} + .d2-2188249131 .stroke-B1{stroke:#0D32B2;} + .d2-2188249131 .stroke-B2{stroke:#0D32B2;} + .d2-2188249131 .stroke-B3{stroke:#E3E9FD;} + .d2-2188249131 .stroke-B4{stroke:#E3E9FD;} + .d2-2188249131 .stroke-B5{stroke:#EDF0FD;} + .d2-2188249131 .stroke-B6{stroke:#F7F8FE;} + .d2-2188249131 .stroke-AA2{stroke:#4A6FF3;} + .d2-2188249131 .stroke-AA4{stroke:#EDF0FD;} + .d2-2188249131 .stroke-AA5{stroke:#F7F8FE;} + .d2-2188249131 .stroke-AB4{stroke:#EDF0FD;} + .d2-2188249131 .stroke-AB5{stroke:#F7F8FE;} + .d2-2188249131 .background-color-N1{background-color:#0A0F25;} + .d2-2188249131 .background-color-N2{background-color:#676C7E;} + .d2-2188249131 .background-color-N3{background-color:#9499AB;} + .d2-2188249131 .background-color-N4{background-color:#CFD2DD;} + .d2-2188249131 .background-color-N5{background-color:#DEE1EB;} + .d2-2188249131 .background-color-N6{background-color:#EEF1F8;} + .d2-2188249131 .background-color-N7{background-color:#FFFFFF;} + .d2-2188249131 .background-color-B1{background-color:#0D32B2;} + .d2-2188249131 .background-color-B2{background-color:#0D32B2;} + .d2-2188249131 .background-color-B3{background-color:#E3E9FD;} + .d2-2188249131 .background-color-B4{background-color:#E3E9FD;} + .d2-2188249131 .background-color-B5{background-color:#EDF0FD;} + .d2-2188249131 .background-color-B6{background-color:#F7F8FE;} + .d2-2188249131 .background-color-AA2{background-color:#4A6FF3;} + .d2-2188249131 .background-color-AA4{background-color:#EDF0FD;} + .d2-2188249131 .background-color-AA5{background-color:#F7F8FE;} + .d2-2188249131 .background-color-AB4{background-color:#EDF0FD;} + .d2-2188249131 .background-color-AB5{background-color:#F7F8FE;} + .d2-2188249131 .color-N1{color:#0A0F25;} + .d2-2188249131 .color-N2{color:#676C7E;} + .d2-2188249131 .color-N3{color:#9499AB;} + .d2-2188249131 .color-N4{color:#CFD2DD;} + .d2-2188249131 .color-N5{color:#DEE1EB;} + .d2-2188249131 .color-N6{color:#EEF1F8;} + .d2-2188249131 .color-N7{color:#FFFFFF;} + .d2-2188249131 .color-B1{color:#0D32B2;} + .d2-2188249131 .color-B2{color:#0D32B2;} + .d2-2188249131 .color-B3{color:#E3E9FD;} + .d2-2188249131 .color-B4{color:#E3E9FD;} + .d2-2188249131 .color-B5{color:#EDF0FD;} + .d2-2188249131 .color-B6{color:#F7F8FE;} + .d2-2188249131 .color-AA2{color:#4A6FF3;} + .d2-2188249131 .color-AA4{color:#EDF0FD;} + .d2-2188249131 .color-AA5{color:#F7F8FE;} + .d2-2188249131 .color-AB4{color:#EDF0FD;} + .d2-2188249131 .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}]]>-------------------------------------------------------------------------------------------------------------------------------12345 diff --git a/e2etests/testdata/stable/ovals/elk/sketch.exp.svg b/e2etests/testdata/stable/ovals/elk/sketch.exp.svg index 90a4f9150..727ad3f4d 100644 --- a/e2etests/testdata/stable/ovals/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ovals/elk/sketch.exp.svg @@ -1,9 +1,9 @@ --------------------------------------------------------------------------------------------------------------------------------12345 + .d2-2072620018 .fill-N1{fill:#0A0F25;} + .d2-2072620018 .fill-N2{fill:#676C7E;} + .d2-2072620018 .fill-N3{fill:#9499AB;} + .d2-2072620018 .fill-N4{fill:#CFD2DD;} + .d2-2072620018 .fill-N5{fill:#DEE1EB;} + .d2-2072620018 .fill-N6{fill:#EEF1F8;} + .d2-2072620018 .fill-N7{fill:#FFFFFF;} + .d2-2072620018 .fill-B1{fill:#0D32B2;} + .d2-2072620018 .fill-B2{fill:#0D32B2;} + .d2-2072620018 .fill-B3{fill:#E3E9FD;} + .d2-2072620018 .fill-B4{fill:#E3E9FD;} + .d2-2072620018 .fill-B5{fill:#EDF0FD;} + .d2-2072620018 .fill-B6{fill:#F7F8FE;} + .d2-2072620018 .fill-AA2{fill:#4A6FF3;} + .d2-2072620018 .fill-AA4{fill:#EDF0FD;} + .d2-2072620018 .fill-AA5{fill:#F7F8FE;} + .d2-2072620018 .fill-AB4{fill:#EDF0FD;} + .d2-2072620018 .fill-AB5{fill:#F7F8FE;} + .d2-2072620018 .stroke-N1{stroke:#0A0F25;} + .d2-2072620018 .stroke-N2{stroke:#676C7E;} + .d2-2072620018 .stroke-N3{stroke:#9499AB;} + .d2-2072620018 .stroke-N4{stroke:#CFD2DD;} + .d2-2072620018 .stroke-N5{stroke:#DEE1EB;} + .d2-2072620018 .stroke-N6{stroke:#EEF1F8;} + .d2-2072620018 .stroke-N7{stroke:#FFFFFF;} + .d2-2072620018 .stroke-B1{stroke:#0D32B2;} + .d2-2072620018 .stroke-B2{stroke:#0D32B2;} + .d2-2072620018 .stroke-B3{stroke:#E3E9FD;} + .d2-2072620018 .stroke-B4{stroke:#E3E9FD;} + .d2-2072620018 .stroke-B5{stroke:#EDF0FD;} + .d2-2072620018 .stroke-B6{stroke:#F7F8FE;} + .d2-2072620018 .stroke-AA2{stroke:#4A6FF3;} + .d2-2072620018 .stroke-AA4{stroke:#EDF0FD;} + .d2-2072620018 .stroke-AA5{stroke:#F7F8FE;} + .d2-2072620018 .stroke-AB4{stroke:#EDF0FD;} + .d2-2072620018 .stroke-AB5{stroke:#F7F8FE;} + .d2-2072620018 .background-color-N1{background-color:#0A0F25;} + .d2-2072620018 .background-color-N2{background-color:#676C7E;} + .d2-2072620018 .background-color-N3{background-color:#9499AB;} + .d2-2072620018 .background-color-N4{background-color:#CFD2DD;} + .d2-2072620018 .background-color-N5{background-color:#DEE1EB;} + .d2-2072620018 .background-color-N6{background-color:#EEF1F8;} + .d2-2072620018 .background-color-N7{background-color:#FFFFFF;} + .d2-2072620018 .background-color-B1{background-color:#0D32B2;} + .d2-2072620018 .background-color-B2{background-color:#0D32B2;} + .d2-2072620018 .background-color-B3{background-color:#E3E9FD;} + .d2-2072620018 .background-color-B4{background-color:#E3E9FD;} + .d2-2072620018 .background-color-B5{background-color:#EDF0FD;} + .d2-2072620018 .background-color-B6{background-color:#F7F8FE;} + .d2-2072620018 .background-color-AA2{background-color:#4A6FF3;} + .d2-2072620018 .background-color-AA4{background-color:#EDF0FD;} + .d2-2072620018 .background-color-AA5{background-color:#F7F8FE;} + .d2-2072620018 .background-color-AB4{background-color:#EDF0FD;} + .d2-2072620018 .background-color-AB5{background-color:#F7F8FE;} + .d2-2072620018 .color-N1{color:#0A0F25;} + .d2-2072620018 .color-N2{color:#676C7E;} + .d2-2072620018 .color-N3{color:#9499AB;} + .d2-2072620018 .color-N4{color:#CFD2DD;} + .d2-2072620018 .color-N5{color:#DEE1EB;} + .d2-2072620018 .color-N6{color:#EEF1F8;} + .d2-2072620018 .color-N7{color:#FFFFFF;} + .d2-2072620018 .color-B1{color:#0D32B2;} + .d2-2072620018 .color-B2{color:#0D32B2;} + .d2-2072620018 .color-B3{color:#E3E9FD;} + .d2-2072620018 .color-B4{color:#E3E9FD;} + .d2-2072620018 .color-B5{color:#EDF0FD;} + .d2-2072620018 .color-B6{color:#F7F8FE;} + .d2-2072620018 .color-AA2{color:#4A6FF3;} + .d2-2072620018 .color-AA4{color:#EDF0FD;} + .d2-2072620018 .color-AA5{color:#F7F8FE;} + .d2-2072620018 .color-AB4{color:#EDF0FD;} + .d2-2072620018 .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}]]>-------------------------------------------------------------------------------------------------------------------------------12345 diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg index be030ed08..33ead3e9f 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff + .d2-1567359250 .fill-N1{fill:#0A0F25;} + .d2-1567359250 .fill-N2{fill:#676C7E;} + .d2-1567359250 .fill-N3{fill:#9499AB;} + .d2-1567359250 .fill-N4{fill:#CFD2DD;} + .d2-1567359250 .fill-N5{fill:#DEE1EB;} + .d2-1567359250 .fill-N6{fill:#EEF1F8;} + .d2-1567359250 .fill-N7{fill:#FFFFFF;} + .d2-1567359250 .fill-B1{fill:#0D32B2;} + .d2-1567359250 .fill-B2{fill:#0D32B2;} + .d2-1567359250 .fill-B3{fill:#E3E9FD;} + .d2-1567359250 .fill-B4{fill:#E3E9FD;} + .d2-1567359250 .fill-B5{fill:#EDF0FD;} + .d2-1567359250 .fill-B6{fill:#F7F8FE;} + .d2-1567359250 .fill-AA2{fill:#4A6FF3;} + .d2-1567359250 .fill-AA4{fill:#EDF0FD;} + .d2-1567359250 .fill-AA5{fill:#F7F8FE;} + .d2-1567359250 .fill-AB4{fill:#EDF0FD;} + .d2-1567359250 .fill-AB5{fill:#F7F8FE;} + .d2-1567359250 .stroke-N1{stroke:#0A0F25;} + .d2-1567359250 .stroke-N2{stroke:#676C7E;} + .d2-1567359250 .stroke-N3{stroke:#9499AB;} + .d2-1567359250 .stroke-N4{stroke:#CFD2DD;} + .d2-1567359250 .stroke-N5{stroke:#DEE1EB;} + .d2-1567359250 .stroke-N6{stroke:#EEF1F8;} + .d2-1567359250 .stroke-N7{stroke:#FFFFFF;} + .d2-1567359250 .stroke-B1{stroke:#0D32B2;} + .d2-1567359250 .stroke-B2{stroke:#0D32B2;} + .d2-1567359250 .stroke-B3{stroke:#E3E9FD;} + .d2-1567359250 .stroke-B4{stroke:#E3E9FD;} + .d2-1567359250 .stroke-B5{stroke:#EDF0FD;} + .d2-1567359250 .stroke-B6{stroke:#F7F8FE;} + .d2-1567359250 .stroke-AA2{stroke:#4A6FF3;} + .d2-1567359250 .stroke-AA4{stroke:#EDF0FD;} + .d2-1567359250 .stroke-AA5{stroke:#F7F8FE;} + .d2-1567359250 .stroke-AB4{stroke:#EDF0FD;} + .d2-1567359250 .stroke-AB5{stroke:#F7F8FE;} + .d2-1567359250 .background-color-N1{background-color:#0A0F25;} + .d2-1567359250 .background-color-N2{background-color:#676C7E;} + .d2-1567359250 .background-color-N3{background-color:#9499AB;} + .d2-1567359250 .background-color-N4{background-color:#CFD2DD;} + .d2-1567359250 .background-color-N5{background-color:#DEE1EB;} + .d2-1567359250 .background-color-N6{background-color:#EEF1F8;} + .d2-1567359250 .background-color-N7{background-color:#FFFFFF;} + .d2-1567359250 .background-color-B1{background-color:#0D32B2;} + .d2-1567359250 .background-color-B2{background-color:#0D32B2;} + .d2-1567359250 .background-color-B3{background-color:#E3E9FD;} + .d2-1567359250 .background-color-B4{background-color:#E3E9FD;} + .d2-1567359250 .background-color-B5{background-color:#EDF0FD;} + .d2-1567359250 .background-color-B6{background-color:#F7F8FE;} + .d2-1567359250 .background-color-AA2{background-color:#4A6FF3;} + .d2-1567359250 .background-color-AA4{background-color:#EDF0FD;} + .d2-1567359250 .background-color-AA5{background-color:#F7F8FE;} + .d2-1567359250 .background-color-AB4{background-color:#EDF0FD;} + .d2-1567359250 .background-color-AB5{background-color:#F7F8FE;} + .d2-1567359250 .color-N1{color:#0A0F25;} + .d2-1567359250 .color-N2{color:#676C7E;} + .d2-1567359250 .color-N3{color:#9499AB;} + .d2-1567359250 .color-N4{color:#CFD2DD;} + .d2-1567359250 .color-N5{color:#DEE1EB;} + .d2-1567359250 .color-N6{color:#EEF1F8;} + .d2-1567359250 .color-N7{color:#FFFFFF;} + .d2-1567359250 .color-B1{color:#0D32B2;} + .d2-1567359250 .color-B2{color:#0D32B2;} + .d2-1567359250 .color-B3{color:#E3E9FD;} + .d2-1567359250 .color-B4{color:#E3E9FD;} + .d2-1567359250 .color-B5{color:#EDF0FD;} + .d2-1567359250 .color-B6{color:#F7F8FE;} + .d2-1567359250 .color-AA2{color:#4A6FF3;} + .d2-1567359250 .color-AA4{color:#EDF0FD;} + .d2-1567359250 .color-AA5{color:#F7F8FE;} + .d2-1567359250 .color-AB4{color:#EDF0FD;} + .d2-1567359250 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg index 5e036f3a1..feb9c1517 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff + .d2-2198081080 .fill-N1{fill:#0A0F25;} + .d2-2198081080 .fill-N2{fill:#676C7E;} + .d2-2198081080 .fill-N3{fill:#9499AB;} + .d2-2198081080 .fill-N4{fill:#CFD2DD;} + .d2-2198081080 .fill-N5{fill:#DEE1EB;} + .d2-2198081080 .fill-N6{fill:#EEF1F8;} + .d2-2198081080 .fill-N7{fill:#FFFFFF;} + .d2-2198081080 .fill-B1{fill:#0D32B2;} + .d2-2198081080 .fill-B2{fill:#0D32B2;} + .d2-2198081080 .fill-B3{fill:#E3E9FD;} + .d2-2198081080 .fill-B4{fill:#E3E9FD;} + .d2-2198081080 .fill-B5{fill:#EDF0FD;} + .d2-2198081080 .fill-B6{fill:#F7F8FE;} + .d2-2198081080 .fill-AA2{fill:#4A6FF3;} + .d2-2198081080 .fill-AA4{fill:#EDF0FD;} + .d2-2198081080 .fill-AA5{fill:#F7F8FE;} + .d2-2198081080 .fill-AB4{fill:#EDF0FD;} + .d2-2198081080 .fill-AB5{fill:#F7F8FE;} + .d2-2198081080 .stroke-N1{stroke:#0A0F25;} + .d2-2198081080 .stroke-N2{stroke:#676C7E;} + .d2-2198081080 .stroke-N3{stroke:#9499AB;} + .d2-2198081080 .stroke-N4{stroke:#CFD2DD;} + .d2-2198081080 .stroke-N5{stroke:#DEE1EB;} + .d2-2198081080 .stroke-N6{stroke:#EEF1F8;} + .d2-2198081080 .stroke-N7{stroke:#FFFFFF;} + .d2-2198081080 .stroke-B1{stroke:#0D32B2;} + .d2-2198081080 .stroke-B2{stroke:#0D32B2;} + .d2-2198081080 .stroke-B3{stroke:#E3E9FD;} + .d2-2198081080 .stroke-B4{stroke:#E3E9FD;} + .d2-2198081080 .stroke-B5{stroke:#EDF0FD;} + .d2-2198081080 .stroke-B6{stroke:#F7F8FE;} + .d2-2198081080 .stroke-AA2{stroke:#4A6FF3;} + .d2-2198081080 .stroke-AA4{stroke:#EDF0FD;} + .d2-2198081080 .stroke-AA5{stroke:#F7F8FE;} + .d2-2198081080 .stroke-AB4{stroke:#EDF0FD;} + .d2-2198081080 .stroke-AB5{stroke:#F7F8FE;} + .d2-2198081080 .background-color-N1{background-color:#0A0F25;} + .d2-2198081080 .background-color-N2{background-color:#676C7E;} + .d2-2198081080 .background-color-N3{background-color:#9499AB;} + .d2-2198081080 .background-color-N4{background-color:#CFD2DD;} + .d2-2198081080 .background-color-N5{background-color:#DEE1EB;} + .d2-2198081080 .background-color-N6{background-color:#EEF1F8;} + .d2-2198081080 .background-color-N7{background-color:#FFFFFF;} + .d2-2198081080 .background-color-B1{background-color:#0D32B2;} + .d2-2198081080 .background-color-B2{background-color:#0D32B2;} + .d2-2198081080 .background-color-B3{background-color:#E3E9FD;} + .d2-2198081080 .background-color-B4{background-color:#E3E9FD;} + .d2-2198081080 .background-color-B5{background-color:#EDF0FD;} + .d2-2198081080 .background-color-B6{background-color:#F7F8FE;} + .d2-2198081080 .background-color-AA2{background-color:#4A6FF3;} + .d2-2198081080 .background-color-AA4{background-color:#EDF0FD;} + .d2-2198081080 .background-color-AA5{background-color:#F7F8FE;} + .d2-2198081080 .background-color-AB4{background-color:#EDF0FD;} + .d2-2198081080 .background-color-AB5{background-color:#F7F8FE;} + .d2-2198081080 .color-N1{color:#0A0F25;} + .d2-2198081080 .color-N2{color:#676C7E;} + .d2-2198081080 .color-N3{color:#9499AB;} + .d2-2198081080 .color-N4{color:#CFD2DD;} + .d2-2198081080 .color-N5{color:#DEE1EB;} + .d2-2198081080 .color-N6{color:#EEF1F8;} + .d2-2198081080 .color-N7{color:#FFFFFF;} + .d2-2198081080 .color-B1{color:#0D32B2;} + .d2-2198081080 .color-B2{color:#0D32B2;} + .d2-2198081080 .color-B3{color:#E3E9FD;} + .d2-2198081080 .color-B4{color:#E3E9FD;} + .d2-2198081080 .color-B5{color:#EDF0FD;} + .d2-2198081080 .color-B6{color:#F7F8FE;} + .d2-2198081080 .color-AA2{color:#4A6FF3;} + .d2-2198081080 .color-AA4{color:#EDF0FD;} + .d2-2198081080 .color-AA5{color:#F7F8FE;} + .d2-2198081080 .color-AB4{color:#EDF0FD;} + .d2-2198081080 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff 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 b046fa67f..06faeb033 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,23 +1,23 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + .d2-824629014 .fill-N1{fill:#0A0F25;} + .d2-824629014 .fill-N2{fill:#676C7E;} + .d2-824629014 .fill-N3{fill:#9499AB;} + .d2-824629014 .fill-N4{fill:#CFD2DD;} + .d2-824629014 .fill-N5{fill:#DEE1EB;} + .d2-824629014 .fill-N6{fill:#EEF1F8;} + .d2-824629014 .fill-N7{fill:#FFFFFF;} + .d2-824629014 .fill-B1{fill:#0D32B2;} + .d2-824629014 .fill-B2{fill:#0D32B2;} + .d2-824629014 .fill-B3{fill:#E3E9FD;} + .d2-824629014 .fill-B4{fill:#E3E9FD;} + .d2-824629014 .fill-B5{fill:#EDF0FD;} + .d2-824629014 .fill-B6{fill:#F7F8FE;} + .d2-824629014 .fill-AA2{fill:#4A6FF3;} + .d2-824629014 .fill-AA4{fill:#EDF0FD;} + .d2-824629014 .fill-AA5{fill:#F7F8FE;} + .d2-824629014 .fill-AB4{fill:#EDF0FD;} + .d2-824629014 .fill-AB5{fill:#F7F8FE;} + .d2-824629014 .stroke-N1{stroke:#0A0F25;} + .d2-824629014 .stroke-N2{stroke:#676C7E;} + .d2-824629014 .stroke-N3{stroke:#9499AB;} + .d2-824629014 .stroke-N4{stroke:#CFD2DD;} + .d2-824629014 .stroke-N5{stroke:#DEE1EB;} + .d2-824629014 .stroke-N6{stroke:#EEF1F8;} + .d2-824629014 .stroke-N7{stroke:#FFFFFF;} + .d2-824629014 .stroke-B1{stroke:#0D32B2;} + .d2-824629014 .stroke-B2{stroke:#0D32B2;} + .d2-824629014 .stroke-B3{stroke:#E3E9FD;} + .d2-824629014 .stroke-B4{stroke:#E3E9FD;} + .d2-824629014 .stroke-B5{stroke:#EDF0FD;} + .d2-824629014 .stroke-B6{stroke:#F7F8FE;} + .d2-824629014 .stroke-AA2{stroke:#4A6FF3;} + .d2-824629014 .stroke-AA4{stroke:#EDF0FD;} + .d2-824629014 .stroke-AA5{stroke:#F7F8FE;} + .d2-824629014 .stroke-AB4{stroke:#EDF0FD;} + .d2-824629014 .stroke-AB5{stroke:#F7F8FE;} + .d2-824629014 .background-color-N1{background-color:#0A0F25;} + .d2-824629014 .background-color-N2{background-color:#676C7E;} + .d2-824629014 .background-color-N3{background-color:#9499AB;} + .d2-824629014 .background-color-N4{background-color:#CFD2DD;} + .d2-824629014 .background-color-N5{background-color:#DEE1EB;} + .d2-824629014 .background-color-N6{background-color:#EEF1F8;} + .d2-824629014 .background-color-N7{background-color:#FFFFFF;} + .d2-824629014 .background-color-B1{background-color:#0D32B2;} + .d2-824629014 .background-color-B2{background-color:#0D32B2;} + .d2-824629014 .background-color-B3{background-color:#E3E9FD;} + .d2-824629014 .background-color-B4{background-color:#E3E9FD;} + .d2-824629014 .background-color-B5{background-color:#EDF0FD;} + .d2-824629014 .background-color-B6{background-color:#F7F8FE;} + .d2-824629014 .background-color-AA2{background-color:#4A6FF3;} + .d2-824629014 .background-color-AA4{background-color:#EDF0FD;} + .d2-824629014 .background-color-AA5{background-color:#F7F8FE;} + .d2-824629014 .background-color-AB4{background-color:#EDF0FD;} + .d2-824629014 .background-color-AB5{background-color:#F7F8FE;} + .d2-824629014 .color-N1{color:#0A0F25;} + .d2-824629014 .color-N2{color:#676C7E;} + .d2-824629014 .color-N3{color:#9499AB;} + .d2-824629014 .color-N4{color:#CFD2DD;} + .d2-824629014 .color-N5{color:#DEE1EB;} + .d2-824629014 .color-N6{color:#EEF1F8;} + .d2-824629014 .color-N7{color:#FFFFFF;} + .d2-824629014 .color-B1{color:#0D32B2;} + .d2-824629014 .color-B2{color:#0D32B2;} + .d2-824629014 .color-B3{color:#E3E9FD;} + .d2-824629014 .color-B4{color:#E3E9FD;} + .d2-824629014 .color-B5{color:#EDF0FD;} + .d2-824629014 .color-B6{color:#F7F8FE;} + .d2-824629014 .color-AA2{color:#4A6FF3;} + .d2-824629014 .color-AA4{color:#EDF0FD;} + .d2-824629014 .color-AA5{color:#F7F8FE;} + .d2-824629014 .color-AB4{color:#EDF0FD;} + .d2-824629014 .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}]]>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 18e461bae..524a23854 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,23 +1,23 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + .d2-3062410854 .fill-N1{fill:#0A0F25;} + .d2-3062410854 .fill-N2{fill:#676C7E;} + .d2-3062410854 .fill-N3{fill:#9499AB;} + .d2-3062410854 .fill-N4{fill:#CFD2DD;} + .d2-3062410854 .fill-N5{fill:#DEE1EB;} + .d2-3062410854 .fill-N6{fill:#EEF1F8;} + .d2-3062410854 .fill-N7{fill:#FFFFFF;} + .d2-3062410854 .fill-B1{fill:#0D32B2;} + .d2-3062410854 .fill-B2{fill:#0D32B2;} + .d2-3062410854 .fill-B3{fill:#E3E9FD;} + .d2-3062410854 .fill-B4{fill:#E3E9FD;} + .d2-3062410854 .fill-B5{fill:#EDF0FD;} + .d2-3062410854 .fill-B6{fill:#F7F8FE;} + .d2-3062410854 .fill-AA2{fill:#4A6FF3;} + .d2-3062410854 .fill-AA4{fill:#EDF0FD;} + .d2-3062410854 .fill-AA5{fill:#F7F8FE;} + .d2-3062410854 .fill-AB4{fill:#EDF0FD;} + .d2-3062410854 .fill-AB5{fill:#F7F8FE;} + .d2-3062410854 .stroke-N1{stroke:#0A0F25;} + .d2-3062410854 .stroke-N2{stroke:#676C7E;} + .d2-3062410854 .stroke-N3{stroke:#9499AB;} + .d2-3062410854 .stroke-N4{stroke:#CFD2DD;} + .d2-3062410854 .stroke-N5{stroke:#DEE1EB;} + .d2-3062410854 .stroke-N6{stroke:#EEF1F8;} + .d2-3062410854 .stroke-N7{stroke:#FFFFFF;} + .d2-3062410854 .stroke-B1{stroke:#0D32B2;} + .d2-3062410854 .stroke-B2{stroke:#0D32B2;} + .d2-3062410854 .stroke-B3{stroke:#E3E9FD;} + .d2-3062410854 .stroke-B4{stroke:#E3E9FD;} + .d2-3062410854 .stroke-B5{stroke:#EDF0FD;} + .d2-3062410854 .stroke-B6{stroke:#F7F8FE;} + .d2-3062410854 .stroke-AA2{stroke:#4A6FF3;} + .d2-3062410854 .stroke-AA4{stroke:#EDF0FD;} + .d2-3062410854 .stroke-AA5{stroke:#F7F8FE;} + .d2-3062410854 .stroke-AB4{stroke:#EDF0FD;} + .d2-3062410854 .stroke-AB5{stroke:#F7F8FE;} + .d2-3062410854 .background-color-N1{background-color:#0A0F25;} + .d2-3062410854 .background-color-N2{background-color:#676C7E;} + .d2-3062410854 .background-color-N3{background-color:#9499AB;} + .d2-3062410854 .background-color-N4{background-color:#CFD2DD;} + .d2-3062410854 .background-color-N5{background-color:#DEE1EB;} + .d2-3062410854 .background-color-N6{background-color:#EEF1F8;} + .d2-3062410854 .background-color-N7{background-color:#FFFFFF;} + .d2-3062410854 .background-color-B1{background-color:#0D32B2;} + .d2-3062410854 .background-color-B2{background-color:#0D32B2;} + .d2-3062410854 .background-color-B3{background-color:#E3E9FD;} + .d2-3062410854 .background-color-B4{background-color:#E3E9FD;} + .d2-3062410854 .background-color-B5{background-color:#EDF0FD;} + .d2-3062410854 .background-color-B6{background-color:#F7F8FE;} + .d2-3062410854 .background-color-AA2{background-color:#4A6FF3;} + .d2-3062410854 .background-color-AA4{background-color:#EDF0FD;} + .d2-3062410854 .background-color-AA5{background-color:#F7F8FE;} + .d2-3062410854 .background-color-AB4{background-color:#EDF0FD;} + .d2-3062410854 .background-color-AB5{background-color:#F7F8FE;} + .d2-3062410854 .color-N1{color:#0A0F25;} + .d2-3062410854 .color-N2{color:#676C7E;} + .d2-3062410854 .color-N3{color:#9499AB;} + .d2-3062410854 .color-N4{color:#CFD2DD;} + .d2-3062410854 .color-N5{color:#DEE1EB;} + .d2-3062410854 .color-N6{color:#EEF1F8;} + .d2-3062410854 .color-N7{color:#FFFFFF;} + .d2-3062410854 .color-B1{color:#0D32B2;} + .d2-3062410854 .color-B2{color:#0D32B2;} + .d2-3062410854 .color-B3{color:#E3E9FD;} + .d2-3062410854 .color-B4{color:#E3E9FD;} + .d2-3062410854 .color-B5{color:#EDF0FD;} + .d2-3062410854 .color-B6{color:#F7F8FE;} + .d2-3062410854 .color-AA2{color:#4A6FF3;} + .d2-3062410854 .color-AA4{color:#EDF0FD;} + .d2-3062410854 .color-AA5{color:#F7F8FE;} + .d2-3062410854 .color-AB4{color:#EDF0FD;} + .d2-3062410854 .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}]]>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 a83caeafd..1696d2af0 100644 --- a/e2etests/testdata/stable/p/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/p/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines. (A blank line is any line that looks like a blank line -- a line containing nothing but spaces or tabs is considered blank.) Normal paragraphs should not be indented with spaces or tabs.

    -
    ab +ab diff --git a/e2etests/testdata/stable/p/elk/sketch.exp.svg b/e2etests/testdata/stable/p/elk/sketch.exp.svg index 72c5b586c..9ecd07f59 100644 --- a/e2etests/testdata/stable/p/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/p/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines. (A blank line is any line that looks like a blank line -- a line containing nothing but spaces or tabs is considered blank.) Normal paragraphs should not be indented with spaces or tabs.

    -
    ab +ab diff --git a/e2etests/testdata/stable/people/dagre/sketch.exp.svg b/e2etests/testdata/stable/people/dagre/sketch.exp.svg index a1d557fed..d36be5bb3 100644 --- a/e2etests/testdata/stable/people/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/people/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ --------------------------------------------------------------------------------------------------------------------------------12345 + .d2-2582981398 .fill-N1{fill:#0A0F25;} + .d2-2582981398 .fill-N2{fill:#676C7E;} + .d2-2582981398 .fill-N3{fill:#9499AB;} + .d2-2582981398 .fill-N4{fill:#CFD2DD;} + .d2-2582981398 .fill-N5{fill:#DEE1EB;} + .d2-2582981398 .fill-N6{fill:#EEF1F8;} + .d2-2582981398 .fill-N7{fill:#FFFFFF;} + .d2-2582981398 .fill-B1{fill:#0D32B2;} + .d2-2582981398 .fill-B2{fill:#0D32B2;} + .d2-2582981398 .fill-B3{fill:#E3E9FD;} + .d2-2582981398 .fill-B4{fill:#E3E9FD;} + .d2-2582981398 .fill-B5{fill:#EDF0FD;} + .d2-2582981398 .fill-B6{fill:#F7F8FE;} + .d2-2582981398 .fill-AA2{fill:#4A6FF3;} + .d2-2582981398 .fill-AA4{fill:#EDF0FD;} + .d2-2582981398 .fill-AA5{fill:#F7F8FE;} + .d2-2582981398 .fill-AB4{fill:#EDF0FD;} + .d2-2582981398 .fill-AB5{fill:#F7F8FE;} + .d2-2582981398 .stroke-N1{stroke:#0A0F25;} + .d2-2582981398 .stroke-N2{stroke:#676C7E;} + .d2-2582981398 .stroke-N3{stroke:#9499AB;} + .d2-2582981398 .stroke-N4{stroke:#CFD2DD;} + .d2-2582981398 .stroke-N5{stroke:#DEE1EB;} + .d2-2582981398 .stroke-N6{stroke:#EEF1F8;} + .d2-2582981398 .stroke-N7{stroke:#FFFFFF;} + .d2-2582981398 .stroke-B1{stroke:#0D32B2;} + .d2-2582981398 .stroke-B2{stroke:#0D32B2;} + .d2-2582981398 .stroke-B3{stroke:#E3E9FD;} + .d2-2582981398 .stroke-B4{stroke:#E3E9FD;} + .d2-2582981398 .stroke-B5{stroke:#EDF0FD;} + .d2-2582981398 .stroke-B6{stroke:#F7F8FE;} + .d2-2582981398 .stroke-AA2{stroke:#4A6FF3;} + .d2-2582981398 .stroke-AA4{stroke:#EDF0FD;} + .d2-2582981398 .stroke-AA5{stroke:#F7F8FE;} + .d2-2582981398 .stroke-AB4{stroke:#EDF0FD;} + .d2-2582981398 .stroke-AB5{stroke:#F7F8FE;} + .d2-2582981398 .background-color-N1{background-color:#0A0F25;} + .d2-2582981398 .background-color-N2{background-color:#676C7E;} + .d2-2582981398 .background-color-N3{background-color:#9499AB;} + .d2-2582981398 .background-color-N4{background-color:#CFD2DD;} + .d2-2582981398 .background-color-N5{background-color:#DEE1EB;} + .d2-2582981398 .background-color-N6{background-color:#EEF1F8;} + .d2-2582981398 .background-color-N7{background-color:#FFFFFF;} + .d2-2582981398 .background-color-B1{background-color:#0D32B2;} + .d2-2582981398 .background-color-B2{background-color:#0D32B2;} + .d2-2582981398 .background-color-B3{background-color:#E3E9FD;} + .d2-2582981398 .background-color-B4{background-color:#E3E9FD;} + .d2-2582981398 .background-color-B5{background-color:#EDF0FD;} + .d2-2582981398 .background-color-B6{background-color:#F7F8FE;} + .d2-2582981398 .background-color-AA2{background-color:#4A6FF3;} + .d2-2582981398 .background-color-AA4{background-color:#EDF0FD;} + .d2-2582981398 .background-color-AA5{background-color:#F7F8FE;} + .d2-2582981398 .background-color-AB4{background-color:#EDF0FD;} + .d2-2582981398 .background-color-AB5{background-color:#F7F8FE;} + .d2-2582981398 .color-N1{color:#0A0F25;} + .d2-2582981398 .color-N2{color:#676C7E;} + .d2-2582981398 .color-N3{color:#9499AB;} + .d2-2582981398 .color-N4{color:#CFD2DD;} + .d2-2582981398 .color-N5{color:#DEE1EB;} + .d2-2582981398 .color-N6{color:#EEF1F8;} + .d2-2582981398 .color-N7{color:#FFFFFF;} + .d2-2582981398 .color-B1{color:#0D32B2;} + .d2-2582981398 .color-B2{color:#0D32B2;} + .d2-2582981398 .color-B3{color:#E3E9FD;} + .d2-2582981398 .color-B4{color:#E3E9FD;} + .d2-2582981398 .color-B5{color:#EDF0FD;} + .d2-2582981398 .color-B6{color:#F7F8FE;} + .d2-2582981398 .color-AA2{color:#4A6FF3;} + .d2-2582981398 .color-AA4{color:#EDF0FD;} + .d2-2582981398 .color-AA5{color:#F7F8FE;} + .d2-2582981398 .color-AB4{color:#EDF0FD;} + .d2-2582981398 .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}]]>-------------------------------------------------------------------------------------------------------------------------------12345 diff --git a/e2etests/testdata/stable/people/elk/sketch.exp.svg b/e2etests/testdata/stable/people/elk/sketch.exp.svg index aefb2806e..47affd2cc 100644 --- a/e2etests/testdata/stable/people/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/people/elk/sketch.exp.svg @@ -1,9 +1,9 @@ --------------------------------------------------------------------------------------------------------------------------------12345 + .d2-2535413882 .fill-N1{fill:#0A0F25;} + .d2-2535413882 .fill-N2{fill:#676C7E;} + .d2-2535413882 .fill-N3{fill:#9499AB;} + .d2-2535413882 .fill-N4{fill:#CFD2DD;} + .d2-2535413882 .fill-N5{fill:#DEE1EB;} + .d2-2535413882 .fill-N6{fill:#EEF1F8;} + .d2-2535413882 .fill-N7{fill:#FFFFFF;} + .d2-2535413882 .fill-B1{fill:#0D32B2;} + .d2-2535413882 .fill-B2{fill:#0D32B2;} + .d2-2535413882 .fill-B3{fill:#E3E9FD;} + .d2-2535413882 .fill-B4{fill:#E3E9FD;} + .d2-2535413882 .fill-B5{fill:#EDF0FD;} + .d2-2535413882 .fill-B6{fill:#F7F8FE;} + .d2-2535413882 .fill-AA2{fill:#4A6FF3;} + .d2-2535413882 .fill-AA4{fill:#EDF0FD;} + .d2-2535413882 .fill-AA5{fill:#F7F8FE;} + .d2-2535413882 .fill-AB4{fill:#EDF0FD;} + .d2-2535413882 .fill-AB5{fill:#F7F8FE;} + .d2-2535413882 .stroke-N1{stroke:#0A0F25;} + .d2-2535413882 .stroke-N2{stroke:#676C7E;} + .d2-2535413882 .stroke-N3{stroke:#9499AB;} + .d2-2535413882 .stroke-N4{stroke:#CFD2DD;} + .d2-2535413882 .stroke-N5{stroke:#DEE1EB;} + .d2-2535413882 .stroke-N6{stroke:#EEF1F8;} + .d2-2535413882 .stroke-N7{stroke:#FFFFFF;} + .d2-2535413882 .stroke-B1{stroke:#0D32B2;} + .d2-2535413882 .stroke-B2{stroke:#0D32B2;} + .d2-2535413882 .stroke-B3{stroke:#E3E9FD;} + .d2-2535413882 .stroke-B4{stroke:#E3E9FD;} + .d2-2535413882 .stroke-B5{stroke:#EDF0FD;} + .d2-2535413882 .stroke-B6{stroke:#F7F8FE;} + .d2-2535413882 .stroke-AA2{stroke:#4A6FF3;} + .d2-2535413882 .stroke-AA4{stroke:#EDF0FD;} + .d2-2535413882 .stroke-AA5{stroke:#F7F8FE;} + .d2-2535413882 .stroke-AB4{stroke:#EDF0FD;} + .d2-2535413882 .stroke-AB5{stroke:#F7F8FE;} + .d2-2535413882 .background-color-N1{background-color:#0A0F25;} + .d2-2535413882 .background-color-N2{background-color:#676C7E;} + .d2-2535413882 .background-color-N3{background-color:#9499AB;} + .d2-2535413882 .background-color-N4{background-color:#CFD2DD;} + .d2-2535413882 .background-color-N5{background-color:#DEE1EB;} + .d2-2535413882 .background-color-N6{background-color:#EEF1F8;} + .d2-2535413882 .background-color-N7{background-color:#FFFFFF;} + .d2-2535413882 .background-color-B1{background-color:#0D32B2;} + .d2-2535413882 .background-color-B2{background-color:#0D32B2;} + .d2-2535413882 .background-color-B3{background-color:#E3E9FD;} + .d2-2535413882 .background-color-B4{background-color:#E3E9FD;} + .d2-2535413882 .background-color-B5{background-color:#EDF0FD;} + .d2-2535413882 .background-color-B6{background-color:#F7F8FE;} + .d2-2535413882 .background-color-AA2{background-color:#4A6FF3;} + .d2-2535413882 .background-color-AA4{background-color:#EDF0FD;} + .d2-2535413882 .background-color-AA5{background-color:#F7F8FE;} + .d2-2535413882 .background-color-AB4{background-color:#EDF0FD;} + .d2-2535413882 .background-color-AB5{background-color:#F7F8FE;} + .d2-2535413882 .color-N1{color:#0A0F25;} + .d2-2535413882 .color-N2{color:#676C7E;} + .d2-2535413882 .color-N3{color:#9499AB;} + .d2-2535413882 .color-N4{color:#CFD2DD;} + .d2-2535413882 .color-N5{color:#DEE1EB;} + .d2-2535413882 .color-N6{color:#EEF1F8;} + .d2-2535413882 .color-N7{color:#FFFFFF;} + .d2-2535413882 .color-B1{color:#0D32B2;} + .d2-2535413882 .color-B2{color:#0D32B2;} + .d2-2535413882 .color-B3{color:#E3E9FD;} + .d2-2535413882 .color-B4{color:#E3E9FD;} + .d2-2535413882 .color-B5{color:#EDF0FD;} + .d2-2535413882 .color-B6{color:#F7F8FE;} + .d2-2535413882 .color-AA2{color:#4A6FF3;} + .d2-2535413882 .color-AA4{color:#EDF0FD;} + .d2-2535413882 .color-AA5{color:#F7F8FE;} + .d2-2535413882 .color-AB4{color:#EDF0FD;} + .d2-2535413882 .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}]]>-------------------------------------------------------------------------------------------------------------------------------12345 diff --git a/e2etests/testdata/stable/pre/dagre/sketch.exp.svg b/e2etests/testdata/stable/pre/dagre/sketch.exp.svg index 09cabbf6a..c6c8c6617 100644 --- a/e2etests/testdata/stable/pre/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/pre/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Here is an example of AppleScript:

    @@ -850,7 +850,7 @@ end tell

    A code block continues until it reaches a line that is not indented (or the end of the article).

    -
    ab +ab diff --git a/e2etests/testdata/stable/pre/elk/sketch.exp.svg b/e2etests/testdata/stable/pre/elk/sketch.exp.svg index 77449f70e..842018046 100644 --- a/e2etests/testdata/stable/pre/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/pre/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Here is an example of AppleScript:

    @@ -850,7 +850,7 @@ end tell

    A code block continues until it reaches a line that is not indented (or the end of the article).

    -
    ab +ab diff --git a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg index 20c369daa..36a0763a7 100644 --- a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz hello + .d2-1241499041 .fill-N1{fill:#0A0F25;} + .d2-1241499041 .fill-N2{fill:#676C7E;} + .d2-1241499041 .fill-N3{fill:#9499AB;} + .d2-1241499041 .fill-N4{fill:#CFD2DD;} + .d2-1241499041 .fill-N5{fill:#DEE1EB;} + .d2-1241499041 .fill-N6{fill:#EEF1F8;} + .d2-1241499041 .fill-N7{fill:#FFFFFF;} + .d2-1241499041 .fill-B1{fill:#0D32B2;} + .d2-1241499041 .fill-B2{fill:#0D32B2;} + .d2-1241499041 .fill-B3{fill:#E3E9FD;} + .d2-1241499041 .fill-B4{fill:#E3E9FD;} + .d2-1241499041 .fill-B5{fill:#EDF0FD;} + .d2-1241499041 .fill-B6{fill:#F7F8FE;} + .d2-1241499041 .fill-AA2{fill:#4A6FF3;} + .d2-1241499041 .fill-AA4{fill:#EDF0FD;} + .d2-1241499041 .fill-AA5{fill:#F7F8FE;} + .d2-1241499041 .fill-AB4{fill:#EDF0FD;} + .d2-1241499041 .fill-AB5{fill:#F7F8FE;} + .d2-1241499041 .stroke-N1{stroke:#0A0F25;} + .d2-1241499041 .stroke-N2{stroke:#676C7E;} + .d2-1241499041 .stroke-N3{stroke:#9499AB;} + .d2-1241499041 .stroke-N4{stroke:#CFD2DD;} + .d2-1241499041 .stroke-N5{stroke:#DEE1EB;} + .d2-1241499041 .stroke-N6{stroke:#EEF1F8;} + .d2-1241499041 .stroke-N7{stroke:#FFFFFF;} + .d2-1241499041 .stroke-B1{stroke:#0D32B2;} + .d2-1241499041 .stroke-B2{stroke:#0D32B2;} + .d2-1241499041 .stroke-B3{stroke:#E3E9FD;} + .d2-1241499041 .stroke-B4{stroke:#E3E9FD;} + .d2-1241499041 .stroke-B5{stroke:#EDF0FD;} + .d2-1241499041 .stroke-B6{stroke:#F7F8FE;} + .d2-1241499041 .stroke-AA2{stroke:#4A6FF3;} + .d2-1241499041 .stroke-AA4{stroke:#EDF0FD;} + .d2-1241499041 .stroke-AA5{stroke:#F7F8FE;} + .d2-1241499041 .stroke-AB4{stroke:#EDF0FD;} + .d2-1241499041 .stroke-AB5{stroke:#F7F8FE;} + .d2-1241499041 .background-color-N1{background-color:#0A0F25;} + .d2-1241499041 .background-color-N2{background-color:#676C7E;} + .d2-1241499041 .background-color-N3{background-color:#9499AB;} + .d2-1241499041 .background-color-N4{background-color:#CFD2DD;} + .d2-1241499041 .background-color-N5{background-color:#DEE1EB;} + .d2-1241499041 .background-color-N6{background-color:#EEF1F8;} + .d2-1241499041 .background-color-N7{background-color:#FFFFFF;} + .d2-1241499041 .background-color-B1{background-color:#0D32B2;} + .d2-1241499041 .background-color-B2{background-color:#0D32B2;} + .d2-1241499041 .background-color-B3{background-color:#E3E9FD;} + .d2-1241499041 .background-color-B4{background-color:#E3E9FD;} + .d2-1241499041 .background-color-B5{background-color:#EDF0FD;} + .d2-1241499041 .background-color-B6{background-color:#F7F8FE;} + .d2-1241499041 .background-color-AA2{background-color:#4A6FF3;} + .d2-1241499041 .background-color-AA4{background-color:#EDF0FD;} + .d2-1241499041 .background-color-AA5{background-color:#F7F8FE;} + .d2-1241499041 .background-color-AB4{background-color:#EDF0FD;} + .d2-1241499041 .background-color-AB5{background-color:#F7F8FE;} + .d2-1241499041 .color-N1{color:#0A0F25;} + .d2-1241499041 .color-N2{color:#676C7E;} + .d2-1241499041 .color-N3{color:#9499AB;} + .d2-1241499041 .color-N4{color:#CFD2DD;} + .d2-1241499041 .color-N5{color:#DEE1EB;} + .d2-1241499041 .color-N6{color:#EEF1F8;} + .d2-1241499041 .color-N7{color:#FFFFFF;} + .d2-1241499041 .color-B1{color:#0D32B2;} + .d2-1241499041 .color-B2{color:#0D32B2;} + .d2-1241499041 .color-B3{color:#E3E9FD;} + .d2-1241499041 .color-B4{color:#E3E9FD;} + .d2-1241499041 .color-B5{color:#EDF0FD;} + .d2-1241499041 .color-B6{color:#F7F8FE;} + .d2-1241499041 .color-AA2{color:#4A6FF3;} + .d2-1241499041 .color-AA4{color:#EDF0FD;} + .d2-1241499041 .color-AA5{color:#F7F8FE;} + .d2-1241499041 .color-AB4{color:#EDF0FD;} + .d2-1241499041 .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}]]>xyz hello diff --git a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg index fbcb2c0c9..ada419fad 100644 --- a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz hello + .d2-2878633398 .fill-N1{fill:#0A0F25;} + .d2-2878633398 .fill-N2{fill:#676C7E;} + .d2-2878633398 .fill-N3{fill:#9499AB;} + .d2-2878633398 .fill-N4{fill:#CFD2DD;} + .d2-2878633398 .fill-N5{fill:#DEE1EB;} + .d2-2878633398 .fill-N6{fill:#EEF1F8;} + .d2-2878633398 .fill-N7{fill:#FFFFFF;} + .d2-2878633398 .fill-B1{fill:#0D32B2;} + .d2-2878633398 .fill-B2{fill:#0D32B2;} + .d2-2878633398 .fill-B3{fill:#E3E9FD;} + .d2-2878633398 .fill-B4{fill:#E3E9FD;} + .d2-2878633398 .fill-B5{fill:#EDF0FD;} + .d2-2878633398 .fill-B6{fill:#F7F8FE;} + .d2-2878633398 .fill-AA2{fill:#4A6FF3;} + .d2-2878633398 .fill-AA4{fill:#EDF0FD;} + .d2-2878633398 .fill-AA5{fill:#F7F8FE;} + .d2-2878633398 .fill-AB4{fill:#EDF0FD;} + .d2-2878633398 .fill-AB5{fill:#F7F8FE;} + .d2-2878633398 .stroke-N1{stroke:#0A0F25;} + .d2-2878633398 .stroke-N2{stroke:#676C7E;} + .d2-2878633398 .stroke-N3{stroke:#9499AB;} + .d2-2878633398 .stroke-N4{stroke:#CFD2DD;} + .d2-2878633398 .stroke-N5{stroke:#DEE1EB;} + .d2-2878633398 .stroke-N6{stroke:#EEF1F8;} + .d2-2878633398 .stroke-N7{stroke:#FFFFFF;} + .d2-2878633398 .stroke-B1{stroke:#0D32B2;} + .d2-2878633398 .stroke-B2{stroke:#0D32B2;} + .d2-2878633398 .stroke-B3{stroke:#E3E9FD;} + .d2-2878633398 .stroke-B4{stroke:#E3E9FD;} + .d2-2878633398 .stroke-B5{stroke:#EDF0FD;} + .d2-2878633398 .stroke-B6{stroke:#F7F8FE;} + .d2-2878633398 .stroke-AA2{stroke:#4A6FF3;} + .d2-2878633398 .stroke-AA4{stroke:#EDF0FD;} + .d2-2878633398 .stroke-AA5{stroke:#F7F8FE;} + .d2-2878633398 .stroke-AB4{stroke:#EDF0FD;} + .d2-2878633398 .stroke-AB5{stroke:#F7F8FE;} + .d2-2878633398 .background-color-N1{background-color:#0A0F25;} + .d2-2878633398 .background-color-N2{background-color:#676C7E;} + .d2-2878633398 .background-color-N3{background-color:#9499AB;} + .d2-2878633398 .background-color-N4{background-color:#CFD2DD;} + .d2-2878633398 .background-color-N5{background-color:#DEE1EB;} + .d2-2878633398 .background-color-N6{background-color:#EEF1F8;} + .d2-2878633398 .background-color-N7{background-color:#FFFFFF;} + .d2-2878633398 .background-color-B1{background-color:#0D32B2;} + .d2-2878633398 .background-color-B2{background-color:#0D32B2;} + .d2-2878633398 .background-color-B3{background-color:#E3E9FD;} + .d2-2878633398 .background-color-B4{background-color:#E3E9FD;} + .d2-2878633398 .background-color-B5{background-color:#EDF0FD;} + .d2-2878633398 .background-color-B6{background-color:#F7F8FE;} + .d2-2878633398 .background-color-AA2{background-color:#4A6FF3;} + .d2-2878633398 .background-color-AA4{background-color:#EDF0FD;} + .d2-2878633398 .background-color-AA5{background-color:#F7F8FE;} + .d2-2878633398 .background-color-AB4{background-color:#EDF0FD;} + .d2-2878633398 .background-color-AB5{background-color:#F7F8FE;} + .d2-2878633398 .color-N1{color:#0A0F25;} + .d2-2878633398 .color-N2{color:#676C7E;} + .d2-2878633398 .color-N3{color:#9499AB;} + .d2-2878633398 .color-N4{color:#CFD2DD;} + .d2-2878633398 .color-N5{color:#DEE1EB;} + .d2-2878633398 .color-N6{color:#EEF1F8;} + .d2-2878633398 .color-N7{color:#FFFFFF;} + .d2-2878633398 .color-B1{color:#0D32B2;} + .d2-2878633398 .color-B2{color:#0D32B2;} + .d2-2878633398 .color-B3{color:#E3E9FD;} + .d2-2878633398 .color-B4{color:#E3E9FD;} + .d2-2878633398 .color-B5{color:#EDF0FD;} + .d2-2878633398 .color-B6{color:#F7F8FE;} + .d2-2878633398 .color-AA2{color:#4A6FF3;} + .d2-2878633398 .color-AA4{color:#EDF0FD;} + .d2-2878633398 .color-AA5{color:#F7F8FE;} + .d2-2878633398 .color-AB4{color:#EDF0FD;} + .d2-2878633398 .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}]]>xyz hello 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 b03a93994..d06a3b0aa 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,16 +1,16 @@ -AB fooredirectbar + .d2-168883344 .fill-N1{fill:#0A0F25;} + .d2-168883344 .fill-N2{fill:#676C7E;} + .d2-168883344 .fill-N3{fill:#9499AB;} + .d2-168883344 .fill-N4{fill:#CFD2DD;} + .d2-168883344 .fill-N5{fill:#DEE1EB;} + .d2-168883344 .fill-N6{fill:#EEF1F8;} + .d2-168883344 .fill-N7{fill:#FFFFFF;} + .d2-168883344 .fill-B1{fill:#0D32B2;} + .d2-168883344 .fill-B2{fill:#0D32B2;} + .d2-168883344 .fill-B3{fill:#E3E9FD;} + .d2-168883344 .fill-B4{fill:#E3E9FD;} + .d2-168883344 .fill-B5{fill:#EDF0FD;} + .d2-168883344 .fill-B6{fill:#F7F8FE;} + .d2-168883344 .fill-AA2{fill:#4A6FF3;} + .d2-168883344 .fill-AA4{fill:#EDF0FD;} + .d2-168883344 .fill-AA5{fill:#F7F8FE;} + .d2-168883344 .fill-AB4{fill:#EDF0FD;} + .d2-168883344 .fill-AB5{fill:#F7F8FE;} + .d2-168883344 .stroke-N1{stroke:#0A0F25;} + .d2-168883344 .stroke-N2{stroke:#676C7E;} + .d2-168883344 .stroke-N3{stroke:#9499AB;} + .d2-168883344 .stroke-N4{stroke:#CFD2DD;} + .d2-168883344 .stroke-N5{stroke:#DEE1EB;} + .d2-168883344 .stroke-N6{stroke:#EEF1F8;} + .d2-168883344 .stroke-N7{stroke:#FFFFFF;} + .d2-168883344 .stroke-B1{stroke:#0D32B2;} + .d2-168883344 .stroke-B2{stroke:#0D32B2;} + .d2-168883344 .stroke-B3{stroke:#E3E9FD;} + .d2-168883344 .stroke-B4{stroke:#E3E9FD;} + .d2-168883344 .stroke-B5{stroke:#EDF0FD;} + .d2-168883344 .stroke-B6{stroke:#F7F8FE;} + .d2-168883344 .stroke-AA2{stroke:#4A6FF3;} + .d2-168883344 .stroke-AA4{stroke:#EDF0FD;} + .d2-168883344 .stroke-AA5{stroke:#F7F8FE;} + .d2-168883344 .stroke-AB4{stroke:#EDF0FD;} + .d2-168883344 .stroke-AB5{stroke:#F7F8FE;} + .d2-168883344 .background-color-N1{background-color:#0A0F25;} + .d2-168883344 .background-color-N2{background-color:#676C7E;} + .d2-168883344 .background-color-N3{background-color:#9499AB;} + .d2-168883344 .background-color-N4{background-color:#CFD2DD;} + .d2-168883344 .background-color-N5{background-color:#DEE1EB;} + .d2-168883344 .background-color-N6{background-color:#EEF1F8;} + .d2-168883344 .background-color-N7{background-color:#FFFFFF;} + .d2-168883344 .background-color-B1{background-color:#0D32B2;} + .d2-168883344 .background-color-B2{background-color:#0D32B2;} + .d2-168883344 .background-color-B3{background-color:#E3E9FD;} + .d2-168883344 .background-color-B4{background-color:#E3E9FD;} + .d2-168883344 .background-color-B5{background-color:#EDF0FD;} + .d2-168883344 .background-color-B6{background-color:#F7F8FE;} + .d2-168883344 .background-color-AA2{background-color:#4A6FF3;} + .d2-168883344 .background-color-AA4{background-color:#EDF0FD;} + .d2-168883344 .background-color-AA5{background-color:#F7F8FE;} + .d2-168883344 .background-color-AB4{background-color:#EDF0FD;} + .d2-168883344 .background-color-AB5{background-color:#F7F8FE;} + .d2-168883344 .color-N1{color:#0A0F25;} + .d2-168883344 .color-N2{color:#676C7E;} + .d2-168883344 .color-N3{color:#9499AB;} + .d2-168883344 .color-N4{color:#CFD2DD;} + .d2-168883344 .color-N5{color:#DEE1EB;} + .d2-168883344 .color-N6{color:#EEF1F8;} + .d2-168883344 .color-N7{color:#FFFFFF;} + .d2-168883344 .color-B1{color:#0D32B2;} + .d2-168883344 .color-B2{color:#0D32B2;} + .d2-168883344 .color-B3{color:#E3E9FD;} + .d2-168883344 .color-B4{color:#E3E9FD;} + .d2-168883344 .color-B5{color:#EDF0FD;} + .d2-168883344 .color-B6{color:#F7F8FE;} + .d2-168883344 .color-AA2{color:#4A6FF3;} + .d2-168883344 .color-AA4{color:#EDF0FD;} + .d2-168883344 .color-AA5{color:#F7F8FE;} + .d2-168883344 .color-AB4{color:#EDF0FD;} + .d2-168883344 .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}]]>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 b03a93994..d06a3b0aa 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,16 +1,16 @@ -AB fooredirectbar + .d2-168883344 .fill-N1{fill:#0A0F25;} + .d2-168883344 .fill-N2{fill:#676C7E;} + .d2-168883344 .fill-N3{fill:#9499AB;} + .d2-168883344 .fill-N4{fill:#CFD2DD;} + .d2-168883344 .fill-N5{fill:#DEE1EB;} + .d2-168883344 .fill-N6{fill:#EEF1F8;} + .d2-168883344 .fill-N7{fill:#FFFFFF;} + .d2-168883344 .fill-B1{fill:#0D32B2;} + .d2-168883344 .fill-B2{fill:#0D32B2;} + .d2-168883344 .fill-B3{fill:#E3E9FD;} + .d2-168883344 .fill-B4{fill:#E3E9FD;} + .d2-168883344 .fill-B5{fill:#EDF0FD;} + .d2-168883344 .fill-B6{fill:#F7F8FE;} + .d2-168883344 .fill-AA2{fill:#4A6FF3;} + .d2-168883344 .fill-AA4{fill:#EDF0FD;} + .d2-168883344 .fill-AA5{fill:#F7F8FE;} + .d2-168883344 .fill-AB4{fill:#EDF0FD;} + .d2-168883344 .fill-AB5{fill:#F7F8FE;} + .d2-168883344 .stroke-N1{stroke:#0A0F25;} + .d2-168883344 .stroke-N2{stroke:#676C7E;} + .d2-168883344 .stroke-N3{stroke:#9499AB;} + .d2-168883344 .stroke-N4{stroke:#CFD2DD;} + .d2-168883344 .stroke-N5{stroke:#DEE1EB;} + .d2-168883344 .stroke-N6{stroke:#EEF1F8;} + .d2-168883344 .stroke-N7{stroke:#FFFFFF;} + .d2-168883344 .stroke-B1{stroke:#0D32B2;} + .d2-168883344 .stroke-B2{stroke:#0D32B2;} + .d2-168883344 .stroke-B3{stroke:#E3E9FD;} + .d2-168883344 .stroke-B4{stroke:#E3E9FD;} + .d2-168883344 .stroke-B5{stroke:#EDF0FD;} + .d2-168883344 .stroke-B6{stroke:#F7F8FE;} + .d2-168883344 .stroke-AA2{stroke:#4A6FF3;} + .d2-168883344 .stroke-AA4{stroke:#EDF0FD;} + .d2-168883344 .stroke-AA5{stroke:#F7F8FE;} + .d2-168883344 .stroke-AB4{stroke:#EDF0FD;} + .d2-168883344 .stroke-AB5{stroke:#F7F8FE;} + .d2-168883344 .background-color-N1{background-color:#0A0F25;} + .d2-168883344 .background-color-N2{background-color:#676C7E;} + .d2-168883344 .background-color-N3{background-color:#9499AB;} + .d2-168883344 .background-color-N4{background-color:#CFD2DD;} + .d2-168883344 .background-color-N5{background-color:#DEE1EB;} + .d2-168883344 .background-color-N6{background-color:#EEF1F8;} + .d2-168883344 .background-color-N7{background-color:#FFFFFF;} + .d2-168883344 .background-color-B1{background-color:#0D32B2;} + .d2-168883344 .background-color-B2{background-color:#0D32B2;} + .d2-168883344 .background-color-B3{background-color:#E3E9FD;} + .d2-168883344 .background-color-B4{background-color:#E3E9FD;} + .d2-168883344 .background-color-B5{background-color:#EDF0FD;} + .d2-168883344 .background-color-B6{background-color:#F7F8FE;} + .d2-168883344 .background-color-AA2{background-color:#4A6FF3;} + .d2-168883344 .background-color-AA4{background-color:#EDF0FD;} + .d2-168883344 .background-color-AA5{background-color:#F7F8FE;} + .d2-168883344 .background-color-AB4{background-color:#EDF0FD;} + .d2-168883344 .background-color-AB5{background-color:#F7F8FE;} + .d2-168883344 .color-N1{color:#0A0F25;} + .d2-168883344 .color-N2{color:#676C7E;} + .d2-168883344 .color-N3{color:#9499AB;} + .d2-168883344 .color-N4{color:#CFD2DD;} + .d2-168883344 .color-N5{color:#DEE1EB;} + .d2-168883344 .color-N6{color:#EEF1F8;} + .d2-168883344 .color-N7{color:#FFFFFF;} + .d2-168883344 .color-B1{color:#0D32B2;} + .d2-168883344 .color-B2{color:#0D32B2;} + .d2-168883344 .color-B3{color:#E3E9FD;} + .d2-168883344 .color-B4{color:#E3E9FD;} + .d2-168883344 .color-B5{color:#EDF0FD;} + .d2-168883344 .color-B6{color:#F7F8FE;} + .d2-168883344 .color-AA2{color:#4A6FF3;} + .d2-168883344 .color-AA4{color:#EDF0FD;} + .d2-168883344 .color-AA5{color:#F7F8FE;} + .d2-168883344 .color-AB4{color:#EDF0FD;} + .d2-168883344 .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}]]>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 7691ae78b..8a85bf824 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,16 +1,16 @@ -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 + .d2-3454773836 .fill-N1{fill:#0A0F25;} + .d2-3454773836 .fill-N2{fill:#676C7E;} + .d2-3454773836 .fill-N3{fill:#9499AB;} + .d2-3454773836 .fill-N4{fill:#CFD2DD;} + .d2-3454773836 .fill-N5{fill:#DEE1EB;} + .d2-3454773836 .fill-N6{fill:#EEF1F8;} + .d2-3454773836 .fill-N7{fill:#FFFFFF;} + .d2-3454773836 .fill-B1{fill:#0D32B2;} + .d2-3454773836 .fill-B2{fill:#0D32B2;} + .d2-3454773836 .fill-B3{fill:#E3E9FD;} + .d2-3454773836 .fill-B4{fill:#E3E9FD;} + .d2-3454773836 .fill-B5{fill:#EDF0FD;} + .d2-3454773836 .fill-B6{fill:#F7F8FE;} + .d2-3454773836 .fill-AA2{fill:#4A6FF3;} + .d2-3454773836 .fill-AA4{fill:#EDF0FD;} + .d2-3454773836 .fill-AA5{fill:#F7F8FE;} + .d2-3454773836 .fill-AB4{fill:#EDF0FD;} + .d2-3454773836 .fill-AB5{fill:#F7F8FE;} + .d2-3454773836 .stroke-N1{stroke:#0A0F25;} + .d2-3454773836 .stroke-N2{stroke:#676C7E;} + .d2-3454773836 .stroke-N3{stroke:#9499AB;} + .d2-3454773836 .stroke-N4{stroke:#CFD2DD;} + .d2-3454773836 .stroke-N5{stroke:#DEE1EB;} + .d2-3454773836 .stroke-N6{stroke:#EEF1F8;} + .d2-3454773836 .stroke-N7{stroke:#FFFFFF;} + .d2-3454773836 .stroke-B1{stroke:#0D32B2;} + .d2-3454773836 .stroke-B2{stroke:#0D32B2;} + .d2-3454773836 .stroke-B3{stroke:#E3E9FD;} + .d2-3454773836 .stroke-B4{stroke:#E3E9FD;} + .d2-3454773836 .stroke-B5{stroke:#EDF0FD;} + .d2-3454773836 .stroke-B6{stroke:#F7F8FE;} + .d2-3454773836 .stroke-AA2{stroke:#4A6FF3;} + .d2-3454773836 .stroke-AA4{stroke:#EDF0FD;} + .d2-3454773836 .stroke-AA5{stroke:#F7F8FE;} + .d2-3454773836 .stroke-AB4{stroke:#EDF0FD;} + .d2-3454773836 .stroke-AB5{stroke:#F7F8FE;} + .d2-3454773836 .background-color-N1{background-color:#0A0F25;} + .d2-3454773836 .background-color-N2{background-color:#676C7E;} + .d2-3454773836 .background-color-N3{background-color:#9499AB;} + .d2-3454773836 .background-color-N4{background-color:#CFD2DD;} + .d2-3454773836 .background-color-N5{background-color:#DEE1EB;} + .d2-3454773836 .background-color-N6{background-color:#EEF1F8;} + .d2-3454773836 .background-color-N7{background-color:#FFFFFF;} + .d2-3454773836 .background-color-B1{background-color:#0D32B2;} + .d2-3454773836 .background-color-B2{background-color:#0D32B2;} + .d2-3454773836 .background-color-B3{background-color:#E3E9FD;} + .d2-3454773836 .background-color-B4{background-color:#E3E9FD;} + .d2-3454773836 .background-color-B5{background-color:#EDF0FD;} + .d2-3454773836 .background-color-B6{background-color:#F7F8FE;} + .d2-3454773836 .background-color-AA2{background-color:#4A6FF3;} + .d2-3454773836 .background-color-AA4{background-color:#EDF0FD;} + .d2-3454773836 .background-color-AA5{background-color:#F7F8FE;} + .d2-3454773836 .background-color-AB4{background-color:#EDF0FD;} + .d2-3454773836 .background-color-AB5{background-color:#F7F8FE;} + .d2-3454773836 .color-N1{color:#0A0F25;} + .d2-3454773836 .color-N2{color:#676C7E;} + .d2-3454773836 .color-N3{color:#9499AB;} + .d2-3454773836 .color-N4{color:#CFD2DD;} + .d2-3454773836 .color-N5{color:#DEE1EB;} + .d2-3454773836 .color-N6{color:#EEF1F8;} + .d2-3454773836 .color-N7{color:#FFFFFF;} + .d2-3454773836 .color-B1{color:#0D32B2;} + .d2-3454773836 .color-B2{color:#0D32B2;} + .d2-3454773836 .color-B3{color:#E3E9FD;} + .d2-3454773836 .color-B4{color:#E3E9FD;} + .d2-3454773836 .color-B5{color:#EDF0FD;} + .d2-3454773836 .color-B6{color:#F7F8FE;} + .d2-3454773836 .color-AA2{color:#4A6FF3;} + .d2-3454773836 .color-AA4{color:#EDF0FD;} + .d2-3454773836 .color-AA5{color:#F7F8FE;} + .d2-3454773836 .color-AB4{color:#EDF0FD;} + .d2-3454773836 .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}]]>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 7691ae78b..8a85bf824 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,16 +1,16 @@ -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 + .d2-3454773836 .fill-N1{fill:#0A0F25;} + .d2-3454773836 .fill-N2{fill:#676C7E;} + .d2-3454773836 .fill-N3{fill:#9499AB;} + .d2-3454773836 .fill-N4{fill:#CFD2DD;} + .d2-3454773836 .fill-N5{fill:#DEE1EB;} + .d2-3454773836 .fill-N6{fill:#EEF1F8;} + .d2-3454773836 .fill-N7{fill:#FFFFFF;} + .d2-3454773836 .fill-B1{fill:#0D32B2;} + .d2-3454773836 .fill-B2{fill:#0D32B2;} + .d2-3454773836 .fill-B3{fill:#E3E9FD;} + .d2-3454773836 .fill-B4{fill:#E3E9FD;} + .d2-3454773836 .fill-B5{fill:#EDF0FD;} + .d2-3454773836 .fill-B6{fill:#F7F8FE;} + .d2-3454773836 .fill-AA2{fill:#4A6FF3;} + .d2-3454773836 .fill-AA4{fill:#EDF0FD;} + .d2-3454773836 .fill-AA5{fill:#F7F8FE;} + .d2-3454773836 .fill-AB4{fill:#EDF0FD;} + .d2-3454773836 .fill-AB5{fill:#F7F8FE;} + .d2-3454773836 .stroke-N1{stroke:#0A0F25;} + .d2-3454773836 .stroke-N2{stroke:#676C7E;} + .d2-3454773836 .stroke-N3{stroke:#9499AB;} + .d2-3454773836 .stroke-N4{stroke:#CFD2DD;} + .d2-3454773836 .stroke-N5{stroke:#DEE1EB;} + .d2-3454773836 .stroke-N6{stroke:#EEF1F8;} + .d2-3454773836 .stroke-N7{stroke:#FFFFFF;} + .d2-3454773836 .stroke-B1{stroke:#0D32B2;} + .d2-3454773836 .stroke-B2{stroke:#0D32B2;} + .d2-3454773836 .stroke-B3{stroke:#E3E9FD;} + .d2-3454773836 .stroke-B4{stroke:#E3E9FD;} + .d2-3454773836 .stroke-B5{stroke:#EDF0FD;} + .d2-3454773836 .stroke-B6{stroke:#F7F8FE;} + .d2-3454773836 .stroke-AA2{stroke:#4A6FF3;} + .d2-3454773836 .stroke-AA4{stroke:#EDF0FD;} + .d2-3454773836 .stroke-AA5{stroke:#F7F8FE;} + .d2-3454773836 .stroke-AB4{stroke:#EDF0FD;} + .d2-3454773836 .stroke-AB5{stroke:#F7F8FE;} + .d2-3454773836 .background-color-N1{background-color:#0A0F25;} + .d2-3454773836 .background-color-N2{background-color:#676C7E;} + .d2-3454773836 .background-color-N3{background-color:#9499AB;} + .d2-3454773836 .background-color-N4{background-color:#CFD2DD;} + .d2-3454773836 .background-color-N5{background-color:#DEE1EB;} + .d2-3454773836 .background-color-N6{background-color:#EEF1F8;} + .d2-3454773836 .background-color-N7{background-color:#FFFFFF;} + .d2-3454773836 .background-color-B1{background-color:#0D32B2;} + .d2-3454773836 .background-color-B2{background-color:#0D32B2;} + .d2-3454773836 .background-color-B3{background-color:#E3E9FD;} + .d2-3454773836 .background-color-B4{background-color:#E3E9FD;} + .d2-3454773836 .background-color-B5{background-color:#EDF0FD;} + .d2-3454773836 .background-color-B6{background-color:#F7F8FE;} + .d2-3454773836 .background-color-AA2{background-color:#4A6FF3;} + .d2-3454773836 .background-color-AA4{background-color:#EDF0FD;} + .d2-3454773836 .background-color-AA5{background-color:#F7F8FE;} + .d2-3454773836 .background-color-AB4{background-color:#EDF0FD;} + .d2-3454773836 .background-color-AB5{background-color:#F7F8FE;} + .d2-3454773836 .color-N1{color:#0A0F25;} + .d2-3454773836 .color-N2{color:#676C7E;} + .d2-3454773836 .color-N3{color:#9499AB;} + .d2-3454773836 .color-N4{color:#CFD2DD;} + .d2-3454773836 .color-N5{color:#DEE1EB;} + .d2-3454773836 .color-N6{color:#EEF1F8;} + .d2-3454773836 .color-N7{color:#FFFFFF;} + .d2-3454773836 .color-B1{color:#0D32B2;} + .d2-3454773836 .color-B2{color:#0D32B2;} + .d2-3454773836 .color-B3{color:#E3E9FD;} + .d2-3454773836 .color-B4{color:#E3E9FD;} + .d2-3454773836 .color-B5{color:#EDF0FD;} + .d2-3454773836 .color-B6{color:#F7F8FE;} + .d2-3454773836 .color-AA2{color:#4A6FF3;} + .d2-3454773836 .color-AA4{color:#EDF0FD;} + .d2-3454773836 .color-AA5{color:#F7F8FE;} + .d2-3454773836 .color-AB4{color:#EDF0FD;} + .d2-3454773836 .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}]]>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/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index 338b9b683..dc0ad63e8 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-1508069385 .fill-N1{fill:#0A0F25;} + .d2-1508069385 .fill-N2{fill:#676C7E;} + .d2-1508069385 .fill-N3{fill:#9499AB;} + .d2-1508069385 .fill-N4{fill:#CFD2DD;} + .d2-1508069385 .fill-N5{fill:#DEE1EB;} + .d2-1508069385 .fill-N6{fill:#EEF1F8;} + .d2-1508069385 .fill-N7{fill:#FFFFFF;} + .d2-1508069385 .fill-B1{fill:#0D32B2;} + .d2-1508069385 .fill-B2{fill:#0D32B2;} + .d2-1508069385 .fill-B3{fill:#E3E9FD;} + .d2-1508069385 .fill-B4{fill:#E3E9FD;} + .d2-1508069385 .fill-B5{fill:#EDF0FD;} + .d2-1508069385 .fill-B6{fill:#F7F8FE;} + .d2-1508069385 .fill-AA2{fill:#4A6FF3;} + .d2-1508069385 .fill-AA4{fill:#EDF0FD;} + .d2-1508069385 .fill-AA5{fill:#F7F8FE;} + .d2-1508069385 .fill-AB4{fill:#EDF0FD;} + .d2-1508069385 .fill-AB5{fill:#F7F8FE;} + .d2-1508069385 .stroke-N1{stroke:#0A0F25;} + .d2-1508069385 .stroke-N2{stroke:#676C7E;} + .d2-1508069385 .stroke-N3{stroke:#9499AB;} + .d2-1508069385 .stroke-N4{stroke:#CFD2DD;} + .d2-1508069385 .stroke-N5{stroke:#DEE1EB;} + .d2-1508069385 .stroke-N6{stroke:#EEF1F8;} + .d2-1508069385 .stroke-N7{stroke:#FFFFFF;} + .d2-1508069385 .stroke-B1{stroke:#0D32B2;} + .d2-1508069385 .stroke-B2{stroke:#0D32B2;} + .d2-1508069385 .stroke-B3{stroke:#E3E9FD;} + .d2-1508069385 .stroke-B4{stroke:#E3E9FD;} + .d2-1508069385 .stroke-B5{stroke:#EDF0FD;} + .d2-1508069385 .stroke-B6{stroke:#F7F8FE;} + .d2-1508069385 .stroke-AA2{stroke:#4A6FF3;} + .d2-1508069385 .stroke-AA4{stroke:#EDF0FD;} + .d2-1508069385 .stroke-AA5{stroke:#F7F8FE;} + .d2-1508069385 .stroke-AB4{stroke:#EDF0FD;} + .d2-1508069385 .stroke-AB5{stroke:#F7F8FE;} + .d2-1508069385 .background-color-N1{background-color:#0A0F25;} + .d2-1508069385 .background-color-N2{background-color:#676C7E;} + .d2-1508069385 .background-color-N3{background-color:#9499AB;} + .d2-1508069385 .background-color-N4{background-color:#CFD2DD;} + .d2-1508069385 .background-color-N5{background-color:#DEE1EB;} + .d2-1508069385 .background-color-N6{background-color:#EEF1F8;} + .d2-1508069385 .background-color-N7{background-color:#FFFFFF;} + .d2-1508069385 .background-color-B1{background-color:#0D32B2;} + .d2-1508069385 .background-color-B2{background-color:#0D32B2;} + .d2-1508069385 .background-color-B3{background-color:#E3E9FD;} + .d2-1508069385 .background-color-B4{background-color:#E3E9FD;} + .d2-1508069385 .background-color-B5{background-color:#EDF0FD;} + .d2-1508069385 .background-color-B6{background-color:#F7F8FE;} + .d2-1508069385 .background-color-AA2{background-color:#4A6FF3;} + .d2-1508069385 .background-color-AA4{background-color:#EDF0FD;} + .d2-1508069385 .background-color-AA5{background-color:#F7F8FE;} + .d2-1508069385 .background-color-AB4{background-color:#EDF0FD;} + .d2-1508069385 .background-color-AB5{background-color:#F7F8FE;} + .d2-1508069385 .color-N1{color:#0A0F25;} + .d2-1508069385 .color-N2{color:#676C7E;} + .d2-1508069385 .color-N3{color:#9499AB;} + .d2-1508069385 .color-N4{color:#CFD2DD;} + .d2-1508069385 .color-N5{color:#DEE1EB;} + .d2-1508069385 .color-N6{color:#EEF1F8;} + .d2-1508069385 .color-N7{color:#FFFFFF;} + .d2-1508069385 .color-B1{color:#0D32B2;} + .d2-1508069385 .color-B2{color:#0D32B2;} + .d2-1508069385 .color-B3{color:#E3E9FD;} + .d2-1508069385 .color-B4{color:#E3E9FD;} + .d2-1508069385 .color-B5{color:#EDF0FD;} + .d2-1508069385 .color-B6{color:#F7F8FE;} + .d2-1508069385 .color-AA2{color:#4A6FF3;} + .d2-1508069385 .color-AA4{color:#EDF0FD;} + .d2-1508069385 .color-AA5{color:#F7F8FE;} + .d2-1508069385 .color-AB4{color:#EDF0FD;} + .d2-1508069385 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 338b9b683..dc0ad63e8 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-1508069385 .fill-N1{fill:#0A0F25;} + .d2-1508069385 .fill-N2{fill:#676C7E;} + .d2-1508069385 .fill-N3{fill:#9499AB;} + .d2-1508069385 .fill-N4{fill:#CFD2DD;} + .d2-1508069385 .fill-N5{fill:#DEE1EB;} + .d2-1508069385 .fill-N6{fill:#EEF1F8;} + .d2-1508069385 .fill-N7{fill:#FFFFFF;} + .d2-1508069385 .fill-B1{fill:#0D32B2;} + .d2-1508069385 .fill-B2{fill:#0D32B2;} + .d2-1508069385 .fill-B3{fill:#E3E9FD;} + .d2-1508069385 .fill-B4{fill:#E3E9FD;} + .d2-1508069385 .fill-B5{fill:#EDF0FD;} + .d2-1508069385 .fill-B6{fill:#F7F8FE;} + .d2-1508069385 .fill-AA2{fill:#4A6FF3;} + .d2-1508069385 .fill-AA4{fill:#EDF0FD;} + .d2-1508069385 .fill-AA5{fill:#F7F8FE;} + .d2-1508069385 .fill-AB4{fill:#EDF0FD;} + .d2-1508069385 .fill-AB5{fill:#F7F8FE;} + .d2-1508069385 .stroke-N1{stroke:#0A0F25;} + .d2-1508069385 .stroke-N2{stroke:#676C7E;} + .d2-1508069385 .stroke-N3{stroke:#9499AB;} + .d2-1508069385 .stroke-N4{stroke:#CFD2DD;} + .d2-1508069385 .stroke-N5{stroke:#DEE1EB;} + .d2-1508069385 .stroke-N6{stroke:#EEF1F8;} + .d2-1508069385 .stroke-N7{stroke:#FFFFFF;} + .d2-1508069385 .stroke-B1{stroke:#0D32B2;} + .d2-1508069385 .stroke-B2{stroke:#0D32B2;} + .d2-1508069385 .stroke-B3{stroke:#E3E9FD;} + .d2-1508069385 .stroke-B4{stroke:#E3E9FD;} + .d2-1508069385 .stroke-B5{stroke:#EDF0FD;} + .d2-1508069385 .stroke-B6{stroke:#F7F8FE;} + .d2-1508069385 .stroke-AA2{stroke:#4A6FF3;} + .d2-1508069385 .stroke-AA4{stroke:#EDF0FD;} + .d2-1508069385 .stroke-AA5{stroke:#F7F8FE;} + .d2-1508069385 .stroke-AB4{stroke:#EDF0FD;} + .d2-1508069385 .stroke-AB5{stroke:#F7F8FE;} + .d2-1508069385 .background-color-N1{background-color:#0A0F25;} + .d2-1508069385 .background-color-N2{background-color:#676C7E;} + .d2-1508069385 .background-color-N3{background-color:#9499AB;} + .d2-1508069385 .background-color-N4{background-color:#CFD2DD;} + .d2-1508069385 .background-color-N5{background-color:#DEE1EB;} + .d2-1508069385 .background-color-N6{background-color:#EEF1F8;} + .d2-1508069385 .background-color-N7{background-color:#FFFFFF;} + .d2-1508069385 .background-color-B1{background-color:#0D32B2;} + .d2-1508069385 .background-color-B2{background-color:#0D32B2;} + .d2-1508069385 .background-color-B3{background-color:#E3E9FD;} + .d2-1508069385 .background-color-B4{background-color:#E3E9FD;} + .d2-1508069385 .background-color-B5{background-color:#EDF0FD;} + .d2-1508069385 .background-color-B6{background-color:#F7F8FE;} + .d2-1508069385 .background-color-AA2{background-color:#4A6FF3;} + .d2-1508069385 .background-color-AA4{background-color:#EDF0FD;} + .d2-1508069385 .background-color-AA5{background-color:#F7F8FE;} + .d2-1508069385 .background-color-AB4{background-color:#EDF0FD;} + .d2-1508069385 .background-color-AB5{background-color:#F7F8FE;} + .d2-1508069385 .color-N1{color:#0A0F25;} + .d2-1508069385 .color-N2{color:#676C7E;} + .d2-1508069385 .color-N3{color:#9499AB;} + .d2-1508069385 .color-N4{color:#CFD2DD;} + .d2-1508069385 .color-N5{color:#DEE1EB;} + .d2-1508069385 .color-N6{color:#EEF1F8;} + .d2-1508069385 .color-N7{color:#FFFFFF;} + .d2-1508069385 .color-B1{color:#0D32B2;} + .d2-1508069385 .color-B2{color:#0D32B2;} + .d2-1508069385 .color-B3{color:#E3E9FD;} + .d2-1508069385 .color-B4{color:#E3E9FD;} + .d2-1508069385 .color-B5{color:#EDF0FD;} + .d2-1508069385 .color-B6{color:#F7F8FE;} + .d2-1508069385 .color-AA2{color:#4A6FF3;} + .d2-1508069385 .color-AA4{color:#EDF0FD;} + .d2-1508069385 .color-AA5{color:#F7F8FE;} + .d2-1508069385 .color-AB4{color:#EDF0FD;} + .d2-1508069385 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg index 03ed8cd36..36440c7d6 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + .d2-1518781560 .fill-N1{fill:#0A0F25;} + .d2-1518781560 .fill-N2{fill:#676C7E;} + .d2-1518781560 .fill-N3{fill:#9499AB;} + .d2-1518781560 .fill-N4{fill:#CFD2DD;} + .d2-1518781560 .fill-N5{fill:#DEE1EB;} + .d2-1518781560 .fill-N6{fill:#EEF1F8;} + .d2-1518781560 .fill-N7{fill:#FFFFFF;} + .d2-1518781560 .fill-B1{fill:#0D32B2;} + .d2-1518781560 .fill-B2{fill:#0D32B2;} + .d2-1518781560 .fill-B3{fill:#E3E9FD;} + .d2-1518781560 .fill-B4{fill:#E3E9FD;} + .d2-1518781560 .fill-B5{fill:#EDF0FD;} + .d2-1518781560 .fill-B6{fill:#F7F8FE;} + .d2-1518781560 .fill-AA2{fill:#4A6FF3;} + .d2-1518781560 .fill-AA4{fill:#EDF0FD;} + .d2-1518781560 .fill-AA5{fill:#F7F8FE;} + .d2-1518781560 .fill-AB4{fill:#EDF0FD;} + .d2-1518781560 .fill-AB5{fill:#F7F8FE;} + .d2-1518781560 .stroke-N1{stroke:#0A0F25;} + .d2-1518781560 .stroke-N2{stroke:#676C7E;} + .d2-1518781560 .stroke-N3{stroke:#9499AB;} + .d2-1518781560 .stroke-N4{stroke:#CFD2DD;} + .d2-1518781560 .stroke-N5{stroke:#DEE1EB;} + .d2-1518781560 .stroke-N6{stroke:#EEF1F8;} + .d2-1518781560 .stroke-N7{stroke:#FFFFFF;} + .d2-1518781560 .stroke-B1{stroke:#0D32B2;} + .d2-1518781560 .stroke-B2{stroke:#0D32B2;} + .d2-1518781560 .stroke-B3{stroke:#E3E9FD;} + .d2-1518781560 .stroke-B4{stroke:#E3E9FD;} + .d2-1518781560 .stroke-B5{stroke:#EDF0FD;} + .d2-1518781560 .stroke-B6{stroke:#F7F8FE;} + .d2-1518781560 .stroke-AA2{stroke:#4A6FF3;} + .d2-1518781560 .stroke-AA4{stroke:#EDF0FD;} + .d2-1518781560 .stroke-AA5{stroke:#F7F8FE;} + .d2-1518781560 .stroke-AB4{stroke:#EDF0FD;} + .d2-1518781560 .stroke-AB5{stroke:#F7F8FE;} + .d2-1518781560 .background-color-N1{background-color:#0A0F25;} + .d2-1518781560 .background-color-N2{background-color:#676C7E;} + .d2-1518781560 .background-color-N3{background-color:#9499AB;} + .d2-1518781560 .background-color-N4{background-color:#CFD2DD;} + .d2-1518781560 .background-color-N5{background-color:#DEE1EB;} + .d2-1518781560 .background-color-N6{background-color:#EEF1F8;} + .d2-1518781560 .background-color-N7{background-color:#FFFFFF;} + .d2-1518781560 .background-color-B1{background-color:#0D32B2;} + .d2-1518781560 .background-color-B2{background-color:#0D32B2;} + .d2-1518781560 .background-color-B3{background-color:#E3E9FD;} + .d2-1518781560 .background-color-B4{background-color:#E3E9FD;} + .d2-1518781560 .background-color-B5{background-color:#EDF0FD;} + .d2-1518781560 .background-color-B6{background-color:#F7F8FE;} + .d2-1518781560 .background-color-AA2{background-color:#4A6FF3;} + .d2-1518781560 .background-color-AA4{background-color:#EDF0FD;} + .d2-1518781560 .background-color-AA5{background-color:#F7F8FE;} + .d2-1518781560 .background-color-AB4{background-color:#EDF0FD;} + .d2-1518781560 .background-color-AB5{background-color:#F7F8FE;} + .d2-1518781560 .color-N1{color:#0A0F25;} + .d2-1518781560 .color-N2{color:#676C7E;} + .d2-1518781560 .color-N3{color:#9499AB;} + .d2-1518781560 .color-N4{color:#CFD2DD;} + .d2-1518781560 .color-N5{color:#DEE1EB;} + .d2-1518781560 .color-N6{color:#EEF1F8;} + .d2-1518781560 .color-N7{color:#FFFFFF;} + .d2-1518781560 .color-B1{color:#0D32B2;} + .d2-1518781560 .color-B2{color:#0D32B2;} + .d2-1518781560 .color-B3{color:#E3E9FD;} + .d2-1518781560 .color-B4{color:#E3E9FD;} + .d2-1518781560 .color-B5{color:#EDF0FD;} + .d2-1518781560 .color-B6{color:#F7F8FE;} + .d2-1518781560 .color-AA2{color:#4A6FF3;} + .d2-1518781560 .color-AA4{color:#EDF0FD;} + .d2-1518781560 .color-AA5{color:#F7F8FE;} + .d2-1518781560 .color-AB4{color:#EDF0FD;} + .d2-1518781560 .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}]]>alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games 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 03ed8cd36..36440c7d6 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + .d2-1518781560 .fill-N1{fill:#0A0F25;} + .d2-1518781560 .fill-N2{fill:#676C7E;} + .d2-1518781560 .fill-N3{fill:#9499AB;} + .d2-1518781560 .fill-N4{fill:#CFD2DD;} + .d2-1518781560 .fill-N5{fill:#DEE1EB;} + .d2-1518781560 .fill-N6{fill:#EEF1F8;} + .d2-1518781560 .fill-N7{fill:#FFFFFF;} + .d2-1518781560 .fill-B1{fill:#0D32B2;} + .d2-1518781560 .fill-B2{fill:#0D32B2;} + .d2-1518781560 .fill-B3{fill:#E3E9FD;} + .d2-1518781560 .fill-B4{fill:#E3E9FD;} + .d2-1518781560 .fill-B5{fill:#EDF0FD;} + .d2-1518781560 .fill-B6{fill:#F7F8FE;} + .d2-1518781560 .fill-AA2{fill:#4A6FF3;} + .d2-1518781560 .fill-AA4{fill:#EDF0FD;} + .d2-1518781560 .fill-AA5{fill:#F7F8FE;} + .d2-1518781560 .fill-AB4{fill:#EDF0FD;} + .d2-1518781560 .fill-AB5{fill:#F7F8FE;} + .d2-1518781560 .stroke-N1{stroke:#0A0F25;} + .d2-1518781560 .stroke-N2{stroke:#676C7E;} + .d2-1518781560 .stroke-N3{stroke:#9499AB;} + .d2-1518781560 .stroke-N4{stroke:#CFD2DD;} + .d2-1518781560 .stroke-N5{stroke:#DEE1EB;} + .d2-1518781560 .stroke-N6{stroke:#EEF1F8;} + .d2-1518781560 .stroke-N7{stroke:#FFFFFF;} + .d2-1518781560 .stroke-B1{stroke:#0D32B2;} + .d2-1518781560 .stroke-B2{stroke:#0D32B2;} + .d2-1518781560 .stroke-B3{stroke:#E3E9FD;} + .d2-1518781560 .stroke-B4{stroke:#E3E9FD;} + .d2-1518781560 .stroke-B5{stroke:#EDF0FD;} + .d2-1518781560 .stroke-B6{stroke:#F7F8FE;} + .d2-1518781560 .stroke-AA2{stroke:#4A6FF3;} + .d2-1518781560 .stroke-AA4{stroke:#EDF0FD;} + .d2-1518781560 .stroke-AA5{stroke:#F7F8FE;} + .d2-1518781560 .stroke-AB4{stroke:#EDF0FD;} + .d2-1518781560 .stroke-AB5{stroke:#F7F8FE;} + .d2-1518781560 .background-color-N1{background-color:#0A0F25;} + .d2-1518781560 .background-color-N2{background-color:#676C7E;} + .d2-1518781560 .background-color-N3{background-color:#9499AB;} + .d2-1518781560 .background-color-N4{background-color:#CFD2DD;} + .d2-1518781560 .background-color-N5{background-color:#DEE1EB;} + .d2-1518781560 .background-color-N6{background-color:#EEF1F8;} + .d2-1518781560 .background-color-N7{background-color:#FFFFFF;} + .d2-1518781560 .background-color-B1{background-color:#0D32B2;} + .d2-1518781560 .background-color-B2{background-color:#0D32B2;} + .d2-1518781560 .background-color-B3{background-color:#E3E9FD;} + .d2-1518781560 .background-color-B4{background-color:#E3E9FD;} + .d2-1518781560 .background-color-B5{background-color:#EDF0FD;} + .d2-1518781560 .background-color-B6{background-color:#F7F8FE;} + .d2-1518781560 .background-color-AA2{background-color:#4A6FF3;} + .d2-1518781560 .background-color-AA4{background-color:#EDF0FD;} + .d2-1518781560 .background-color-AA5{background-color:#F7F8FE;} + .d2-1518781560 .background-color-AB4{background-color:#EDF0FD;} + .d2-1518781560 .background-color-AB5{background-color:#F7F8FE;} + .d2-1518781560 .color-N1{color:#0A0F25;} + .d2-1518781560 .color-N2{color:#676C7E;} + .d2-1518781560 .color-N3{color:#9499AB;} + .d2-1518781560 .color-N4{color:#CFD2DD;} + .d2-1518781560 .color-N5{color:#DEE1EB;} + .d2-1518781560 .color-N6{color:#EEF1F8;} + .d2-1518781560 .color-N7{color:#FFFFFF;} + .d2-1518781560 .color-B1{color:#0D32B2;} + .d2-1518781560 .color-B2{color:#0D32B2;} + .d2-1518781560 .color-B3{color:#E3E9FD;} + .d2-1518781560 .color-B4{color:#E3E9FD;} + .d2-1518781560 .color-B5{color:#EDF0FD;} + .d2-1518781560 .color-B6{color:#F7F8FE;} + .d2-1518781560 .color-AA2{color:#4A6FF3;} + .d2-1518781560 .color-AA4{color:#EDF0FD;} + .d2-1518781560 .color-AA5{color:#F7F8FE;} + .d2-1518781560 .color-AB4{color:#EDF0FD;} + .d2-1518781560 .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}]]>alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games 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 593cb43d6..d19b57172 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + .d2-1702258218 .fill-N1{fill:#0A0F25;} + .d2-1702258218 .fill-N2{fill:#676C7E;} + .d2-1702258218 .fill-N3{fill:#9499AB;} + .d2-1702258218 .fill-N4{fill:#CFD2DD;} + .d2-1702258218 .fill-N5{fill:#DEE1EB;} + .d2-1702258218 .fill-N6{fill:#EEF1F8;} + .d2-1702258218 .fill-N7{fill:#FFFFFF;} + .d2-1702258218 .fill-B1{fill:#0D32B2;} + .d2-1702258218 .fill-B2{fill:#0D32B2;} + .d2-1702258218 .fill-B3{fill:#E3E9FD;} + .d2-1702258218 .fill-B4{fill:#E3E9FD;} + .d2-1702258218 .fill-B5{fill:#EDF0FD;} + .d2-1702258218 .fill-B6{fill:#F7F8FE;} + .d2-1702258218 .fill-AA2{fill:#4A6FF3;} + .d2-1702258218 .fill-AA4{fill:#EDF0FD;} + .d2-1702258218 .fill-AA5{fill:#F7F8FE;} + .d2-1702258218 .fill-AB4{fill:#EDF0FD;} + .d2-1702258218 .fill-AB5{fill:#F7F8FE;} + .d2-1702258218 .stroke-N1{stroke:#0A0F25;} + .d2-1702258218 .stroke-N2{stroke:#676C7E;} + .d2-1702258218 .stroke-N3{stroke:#9499AB;} + .d2-1702258218 .stroke-N4{stroke:#CFD2DD;} + .d2-1702258218 .stroke-N5{stroke:#DEE1EB;} + .d2-1702258218 .stroke-N6{stroke:#EEF1F8;} + .d2-1702258218 .stroke-N7{stroke:#FFFFFF;} + .d2-1702258218 .stroke-B1{stroke:#0D32B2;} + .d2-1702258218 .stroke-B2{stroke:#0D32B2;} + .d2-1702258218 .stroke-B3{stroke:#E3E9FD;} + .d2-1702258218 .stroke-B4{stroke:#E3E9FD;} + .d2-1702258218 .stroke-B5{stroke:#EDF0FD;} + .d2-1702258218 .stroke-B6{stroke:#F7F8FE;} + .d2-1702258218 .stroke-AA2{stroke:#4A6FF3;} + .d2-1702258218 .stroke-AA4{stroke:#EDF0FD;} + .d2-1702258218 .stroke-AA5{stroke:#F7F8FE;} + .d2-1702258218 .stroke-AB4{stroke:#EDF0FD;} + .d2-1702258218 .stroke-AB5{stroke:#F7F8FE;} + .d2-1702258218 .background-color-N1{background-color:#0A0F25;} + .d2-1702258218 .background-color-N2{background-color:#676C7E;} + .d2-1702258218 .background-color-N3{background-color:#9499AB;} + .d2-1702258218 .background-color-N4{background-color:#CFD2DD;} + .d2-1702258218 .background-color-N5{background-color:#DEE1EB;} + .d2-1702258218 .background-color-N6{background-color:#EEF1F8;} + .d2-1702258218 .background-color-N7{background-color:#FFFFFF;} + .d2-1702258218 .background-color-B1{background-color:#0D32B2;} + .d2-1702258218 .background-color-B2{background-color:#0D32B2;} + .d2-1702258218 .background-color-B3{background-color:#E3E9FD;} + .d2-1702258218 .background-color-B4{background-color:#E3E9FD;} + .d2-1702258218 .background-color-B5{background-color:#EDF0FD;} + .d2-1702258218 .background-color-B6{background-color:#F7F8FE;} + .d2-1702258218 .background-color-AA2{background-color:#4A6FF3;} + .d2-1702258218 .background-color-AA4{background-color:#EDF0FD;} + .d2-1702258218 .background-color-AA5{background-color:#F7F8FE;} + .d2-1702258218 .background-color-AB4{background-color:#EDF0FD;} + .d2-1702258218 .background-color-AB5{background-color:#F7F8FE;} + .d2-1702258218 .color-N1{color:#0A0F25;} + .d2-1702258218 .color-N2{color:#676C7E;} + .d2-1702258218 .color-N3{color:#9499AB;} + .d2-1702258218 .color-N4{color:#CFD2DD;} + .d2-1702258218 .color-N5{color:#DEE1EB;} + .d2-1702258218 .color-N6{color:#EEF1F8;} + .d2-1702258218 .color-N7{color:#FFFFFF;} + .d2-1702258218 .color-B1{color:#0D32B2;} + .d2-1702258218 .color-B2{color:#0D32B2;} + .d2-1702258218 .color-B3{color:#E3E9FD;} + .d2-1702258218 .color-B4{color:#E3E9FD;} + .d2-1702258218 .color-B5{color:#EDF0FD;} + .d2-1702258218 .color-B6{color:#F7F8FE;} + .d2-1702258218 .color-AA2{color:#4A6FF3;} + .d2-1702258218 .color-AA4{color:#EDF0FD;} + .d2-1702258218 .color-AA5{color:#F7F8FE;} + .d2-1702258218 .color-AB4{color:#EDF0FD;} + .d2-1702258218 .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}]]>abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note 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 593cb43d6..d19b57172 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + .d2-1702258218 .fill-N1{fill:#0A0F25;} + .d2-1702258218 .fill-N2{fill:#676C7E;} + .d2-1702258218 .fill-N3{fill:#9499AB;} + .d2-1702258218 .fill-N4{fill:#CFD2DD;} + .d2-1702258218 .fill-N5{fill:#DEE1EB;} + .d2-1702258218 .fill-N6{fill:#EEF1F8;} + .d2-1702258218 .fill-N7{fill:#FFFFFF;} + .d2-1702258218 .fill-B1{fill:#0D32B2;} + .d2-1702258218 .fill-B2{fill:#0D32B2;} + .d2-1702258218 .fill-B3{fill:#E3E9FD;} + .d2-1702258218 .fill-B4{fill:#E3E9FD;} + .d2-1702258218 .fill-B5{fill:#EDF0FD;} + .d2-1702258218 .fill-B6{fill:#F7F8FE;} + .d2-1702258218 .fill-AA2{fill:#4A6FF3;} + .d2-1702258218 .fill-AA4{fill:#EDF0FD;} + .d2-1702258218 .fill-AA5{fill:#F7F8FE;} + .d2-1702258218 .fill-AB4{fill:#EDF0FD;} + .d2-1702258218 .fill-AB5{fill:#F7F8FE;} + .d2-1702258218 .stroke-N1{stroke:#0A0F25;} + .d2-1702258218 .stroke-N2{stroke:#676C7E;} + .d2-1702258218 .stroke-N3{stroke:#9499AB;} + .d2-1702258218 .stroke-N4{stroke:#CFD2DD;} + .d2-1702258218 .stroke-N5{stroke:#DEE1EB;} + .d2-1702258218 .stroke-N6{stroke:#EEF1F8;} + .d2-1702258218 .stroke-N7{stroke:#FFFFFF;} + .d2-1702258218 .stroke-B1{stroke:#0D32B2;} + .d2-1702258218 .stroke-B2{stroke:#0D32B2;} + .d2-1702258218 .stroke-B3{stroke:#E3E9FD;} + .d2-1702258218 .stroke-B4{stroke:#E3E9FD;} + .d2-1702258218 .stroke-B5{stroke:#EDF0FD;} + .d2-1702258218 .stroke-B6{stroke:#F7F8FE;} + .d2-1702258218 .stroke-AA2{stroke:#4A6FF3;} + .d2-1702258218 .stroke-AA4{stroke:#EDF0FD;} + .d2-1702258218 .stroke-AA5{stroke:#F7F8FE;} + .d2-1702258218 .stroke-AB4{stroke:#EDF0FD;} + .d2-1702258218 .stroke-AB5{stroke:#F7F8FE;} + .d2-1702258218 .background-color-N1{background-color:#0A0F25;} + .d2-1702258218 .background-color-N2{background-color:#676C7E;} + .d2-1702258218 .background-color-N3{background-color:#9499AB;} + .d2-1702258218 .background-color-N4{background-color:#CFD2DD;} + .d2-1702258218 .background-color-N5{background-color:#DEE1EB;} + .d2-1702258218 .background-color-N6{background-color:#EEF1F8;} + .d2-1702258218 .background-color-N7{background-color:#FFFFFF;} + .d2-1702258218 .background-color-B1{background-color:#0D32B2;} + .d2-1702258218 .background-color-B2{background-color:#0D32B2;} + .d2-1702258218 .background-color-B3{background-color:#E3E9FD;} + .d2-1702258218 .background-color-B4{background-color:#E3E9FD;} + .d2-1702258218 .background-color-B5{background-color:#EDF0FD;} + .d2-1702258218 .background-color-B6{background-color:#F7F8FE;} + .d2-1702258218 .background-color-AA2{background-color:#4A6FF3;} + .d2-1702258218 .background-color-AA4{background-color:#EDF0FD;} + .d2-1702258218 .background-color-AA5{background-color:#F7F8FE;} + .d2-1702258218 .background-color-AB4{background-color:#EDF0FD;} + .d2-1702258218 .background-color-AB5{background-color:#F7F8FE;} + .d2-1702258218 .color-N1{color:#0A0F25;} + .d2-1702258218 .color-N2{color:#676C7E;} + .d2-1702258218 .color-N3{color:#9499AB;} + .d2-1702258218 .color-N4{color:#CFD2DD;} + .d2-1702258218 .color-N5{color:#DEE1EB;} + .d2-1702258218 .color-N6{color:#EEF1F8;} + .d2-1702258218 .color-N7{color:#FFFFFF;} + .d2-1702258218 .color-B1{color:#0D32B2;} + .d2-1702258218 .color-B2{color:#0D32B2;} + .d2-1702258218 .color-B3{color:#E3E9FD;} + .d2-1702258218 .color-B4{color:#E3E9FD;} + .d2-1702258218 .color-B5{color:#EDF0FD;} + .d2-1702258218 .color-B6{color:#F7F8FE;} + .d2-1702258218 .color-AA2{color:#4A6FF3;} + .d2-1702258218 .color-AA4{color:#EDF0FD;} + .d2-1702258218 .color-AA5{color:#F7F8FE;} + .d2-1702258218 .color-AB4{color:#EDF0FD;} + .d2-1702258218 .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}]]>abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note 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 2db94f3ba..18ec0ffea 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,9 +1,9 @@ -ab a note here to remember that padding must consider notes toojustalongnotehere + .d2-1523442205 .fill-N1{fill:#0A0F25;} + .d2-1523442205 .fill-N2{fill:#676C7E;} + .d2-1523442205 .fill-N3{fill:#9499AB;} + .d2-1523442205 .fill-N4{fill:#CFD2DD;} + .d2-1523442205 .fill-N5{fill:#DEE1EB;} + .d2-1523442205 .fill-N6{fill:#EEF1F8;} + .d2-1523442205 .fill-N7{fill:#FFFFFF;} + .d2-1523442205 .fill-B1{fill:#0D32B2;} + .d2-1523442205 .fill-B2{fill:#0D32B2;} + .d2-1523442205 .fill-B3{fill:#E3E9FD;} + .d2-1523442205 .fill-B4{fill:#E3E9FD;} + .d2-1523442205 .fill-B5{fill:#EDF0FD;} + .d2-1523442205 .fill-B6{fill:#F7F8FE;} + .d2-1523442205 .fill-AA2{fill:#4A6FF3;} + .d2-1523442205 .fill-AA4{fill:#EDF0FD;} + .d2-1523442205 .fill-AA5{fill:#F7F8FE;} + .d2-1523442205 .fill-AB4{fill:#EDF0FD;} + .d2-1523442205 .fill-AB5{fill:#F7F8FE;} + .d2-1523442205 .stroke-N1{stroke:#0A0F25;} + .d2-1523442205 .stroke-N2{stroke:#676C7E;} + .d2-1523442205 .stroke-N3{stroke:#9499AB;} + .d2-1523442205 .stroke-N4{stroke:#CFD2DD;} + .d2-1523442205 .stroke-N5{stroke:#DEE1EB;} + .d2-1523442205 .stroke-N6{stroke:#EEF1F8;} + .d2-1523442205 .stroke-N7{stroke:#FFFFFF;} + .d2-1523442205 .stroke-B1{stroke:#0D32B2;} + .d2-1523442205 .stroke-B2{stroke:#0D32B2;} + .d2-1523442205 .stroke-B3{stroke:#E3E9FD;} + .d2-1523442205 .stroke-B4{stroke:#E3E9FD;} + .d2-1523442205 .stroke-B5{stroke:#EDF0FD;} + .d2-1523442205 .stroke-B6{stroke:#F7F8FE;} + .d2-1523442205 .stroke-AA2{stroke:#4A6FF3;} + .d2-1523442205 .stroke-AA4{stroke:#EDF0FD;} + .d2-1523442205 .stroke-AA5{stroke:#F7F8FE;} + .d2-1523442205 .stroke-AB4{stroke:#EDF0FD;} + .d2-1523442205 .stroke-AB5{stroke:#F7F8FE;} + .d2-1523442205 .background-color-N1{background-color:#0A0F25;} + .d2-1523442205 .background-color-N2{background-color:#676C7E;} + .d2-1523442205 .background-color-N3{background-color:#9499AB;} + .d2-1523442205 .background-color-N4{background-color:#CFD2DD;} + .d2-1523442205 .background-color-N5{background-color:#DEE1EB;} + .d2-1523442205 .background-color-N6{background-color:#EEF1F8;} + .d2-1523442205 .background-color-N7{background-color:#FFFFFF;} + .d2-1523442205 .background-color-B1{background-color:#0D32B2;} + .d2-1523442205 .background-color-B2{background-color:#0D32B2;} + .d2-1523442205 .background-color-B3{background-color:#E3E9FD;} + .d2-1523442205 .background-color-B4{background-color:#E3E9FD;} + .d2-1523442205 .background-color-B5{background-color:#EDF0FD;} + .d2-1523442205 .background-color-B6{background-color:#F7F8FE;} + .d2-1523442205 .background-color-AA2{background-color:#4A6FF3;} + .d2-1523442205 .background-color-AA4{background-color:#EDF0FD;} + .d2-1523442205 .background-color-AA5{background-color:#F7F8FE;} + .d2-1523442205 .background-color-AB4{background-color:#EDF0FD;} + .d2-1523442205 .background-color-AB5{background-color:#F7F8FE;} + .d2-1523442205 .color-N1{color:#0A0F25;} + .d2-1523442205 .color-N2{color:#676C7E;} + .d2-1523442205 .color-N3{color:#9499AB;} + .d2-1523442205 .color-N4{color:#CFD2DD;} + .d2-1523442205 .color-N5{color:#DEE1EB;} + .d2-1523442205 .color-N6{color:#EEF1F8;} + .d2-1523442205 .color-N7{color:#FFFFFF;} + .d2-1523442205 .color-B1{color:#0D32B2;} + .d2-1523442205 .color-B2{color:#0D32B2;} + .d2-1523442205 .color-B3{color:#E3E9FD;} + .d2-1523442205 .color-B4{color:#E3E9FD;} + .d2-1523442205 .color-B5{color:#EDF0FD;} + .d2-1523442205 .color-B6{color:#F7F8FE;} + .d2-1523442205 .color-AA2{color:#4A6FF3;} + .d2-1523442205 .color-AA4{color:#EDF0FD;} + .d2-1523442205 .color-AA5{color:#F7F8FE;} + .d2-1523442205 .color-AB4{color:#EDF0FD;} + .d2-1523442205 .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}]]>ab a note here to remember that padding must consider notes toojustalongnotehere 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 2db94f3ba..18ec0ffea 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,9 +1,9 @@ -ab a note here to remember that padding must consider notes toojustalongnotehere + .d2-1523442205 .fill-N1{fill:#0A0F25;} + .d2-1523442205 .fill-N2{fill:#676C7E;} + .d2-1523442205 .fill-N3{fill:#9499AB;} + .d2-1523442205 .fill-N4{fill:#CFD2DD;} + .d2-1523442205 .fill-N5{fill:#DEE1EB;} + .d2-1523442205 .fill-N6{fill:#EEF1F8;} + .d2-1523442205 .fill-N7{fill:#FFFFFF;} + .d2-1523442205 .fill-B1{fill:#0D32B2;} + .d2-1523442205 .fill-B2{fill:#0D32B2;} + .d2-1523442205 .fill-B3{fill:#E3E9FD;} + .d2-1523442205 .fill-B4{fill:#E3E9FD;} + .d2-1523442205 .fill-B5{fill:#EDF0FD;} + .d2-1523442205 .fill-B6{fill:#F7F8FE;} + .d2-1523442205 .fill-AA2{fill:#4A6FF3;} + .d2-1523442205 .fill-AA4{fill:#EDF0FD;} + .d2-1523442205 .fill-AA5{fill:#F7F8FE;} + .d2-1523442205 .fill-AB4{fill:#EDF0FD;} + .d2-1523442205 .fill-AB5{fill:#F7F8FE;} + .d2-1523442205 .stroke-N1{stroke:#0A0F25;} + .d2-1523442205 .stroke-N2{stroke:#676C7E;} + .d2-1523442205 .stroke-N3{stroke:#9499AB;} + .d2-1523442205 .stroke-N4{stroke:#CFD2DD;} + .d2-1523442205 .stroke-N5{stroke:#DEE1EB;} + .d2-1523442205 .stroke-N6{stroke:#EEF1F8;} + .d2-1523442205 .stroke-N7{stroke:#FFFFFF;} + .d2-1523442205 .stroke-B1{stroke:#0D32B2;} + .d2-1523442205 .stroke-B2{stroke:#0D32B2;} + .d2-1523442205 .stroke-B3{stroke:#E3E9FD;} + .d2-1523442205 .stroke-B4{stroke:#E3E9FD;} + .d2-1523442205 .stroke-B5{stroke:#EDF0FD;} + .d2-1523442205 .stroke-B6{stroke:#F7F8FE;} + .d2-1523442205 .stroke-AA2{stroke:#4A6FF3;} + .d2-1523442205 .stroke-AA4{stroke:#EDF0FD;} + .d2-1523442205 .stroke-AA5{stroke:#F7F8FE;} + .d2-1523442205 .stroke-AB4{stroke:#EDF0FD;} + .d2-1523442205 .stroke-AB5{stroke:#F7F8FE;} + .d2-1523442205 .background-color-N1{background-color:#0A0F25;} + .d2-1523442205 .background-color-N2{background-color:#676C7E;} + .d2-1523442205 .background-color-N3{background-color:#9499AB;} + .d2-1523442205 .background-color-N4{background-color:#CFD2DD;} + .d2-1523442205 .background-color-N5{background-color:#DEE1EB;} + .d2-1523442205 .background-color-N6{background-color:#EEF1F8;} + .d2-1523442205 .background-color-N7{background-color:#FFFFFF;} + .d2-1523442205 .background-color-B1{background-color:#0D32B2;} + .d2-1523442205 .background-color-B2{background-color:#0D32B2;} + .d2-1523442205 .background-color-B3{background-color:#E3E9FD;} + .d2-1523442205 .background-color-B4{background-color:#E3E9FD;} + .d2-1523442205 .background-color-B5{background-color:#EDF0FD;} + .d2-1523442205 .background-color-B6{background-color:#F7F8FE;} + .d2-1523442205 .background-color-AA2{background-color:#4A6FF3;} + .d2-1523442205 .background-color-AA4{background-color:#EDF0FD;} + .d2-1523442205 .background-color-AA5{background-color:#F7F8FE;} + .d2-1523442205 .background-color-AB4{background-color:#EDF0FD;} + .d2-1523442205 .background-color-AB5{background-color:#F7F8FE;} + .d2-1523442205 .color-N1{color:#0A0F25;} + .d2-1523442205 .color-N2{color:#676C7E;} + .d2-1523442205 .color-N3{color:#9499AB;} + .d2-1523442205 .color-N4{color:#CFD2DD;} + .d2-1523442205 .color-N5{color:#DEE1EB;} + .d2-1523442205 .color-N6{color:#EEF1F8;} + .d2-1523442205 .color-N7{color:#FFFFFF;} + .d2-1523442205 .color-B1{color:#0D32B2;} + .d2-1523442205 .color-B2{color:#0D32B2;} + .d2-1523442205 .color-B3{color:#E3E9FD;} + .d2-1523442205 .color-B4{color:#E3E9FD;} + .d2-1523442205 .color-B5{color:#EDF0FD;} + .d2-1523442205 .color-B6{color:#F7F8FE;} + .d2-1523442205 .color-AA2{color:#4A6FF3;} + .d2-1523442205 .color-AA4{color:#EDF0FD;} + .d2-1523442205 .color-AA5{color:#F7F8FE;} + .d2-1523442205 .color-AB4{color:#EDF0FD;} + .d2-1523442205 .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}]]>ab a note here to remember that padding must consider notes toojustalongnotehere 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 a219e7674..c0ebb045c 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,9 +1,9 @@ -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 + .d2-1282632491 .fill-N1{fill:#0A0F25;} + .d2-1282632491 .fill-N2{fill:#676C7E;} + .d2-1282632491 .fill-N3{fill:#9499AB;} + .d2-1282632491 .fill-N4{fill:#CFD2DD;} + .d2-1282632491 .fill-N5{fill:#DEE1EB;} + .d2-1282632491 .fill-N6{fill:#EEF1F8;} + .d2-1282632491 .fill-N7{fill:#FFFFFF;} + .d2-1282632491 .fill-B1{fill:#0D32B2;} + .d2-1282632491 .fill-B2{fill:#0D32B2;} + .d2-1282632491 .fill-B3{fill:#E3E9FD;} + .d2-1282632491 .fill-B4{fill:#E3E9FD;} + .d2-1282632491 .fill-B5{fill:#EDF0FD;} + .d2-1282632491 .fill-B6{fill:#F7F8FE;} + .d2-1282632491 .fill-AA2{fill:#4A6FF3;} + .d2-1282632491 .fill-AA4{fill:#EDF0FD;} + .d2-1282632491 .fill-AA5{fill:#F7F8FE;} + .d2-1282632491 .fill-AB4{fill:#EDF0FD;} + .d2-1282632491 .fill-AB5{fill:#F7F8FE;} + .d2-1282632491 .stroke-N1{stroke:#0A0F25;} + .d2-1282632491 .stroke-N2{stroke:#676C7E;} + .d2-1282632491 .stroke-N3{stroke:#9499AB;} + .d2-1282632491 .stroke-N4{stroke:#CFD2DD;} + .d2-1282632491 .stroke-N5{stroke:#DEE1EB;} + .d2-1282632491 .stroke-N6{stroke:#EEF1F8;} + .d2-1282632491 .stroke-N7{stroke:#FFFFFF;} + .d2-1282632491 .stroke-B1{stroke:#0D32B2;} + .d2-1282632491 .stroke-B2{stroke:#0D32B2;} + .d2-1282632491 .stroke-B3{stroke:#E3E9FD;} + .d2-1282632491 .stroke-B4{stroke:#E3E9FD;} + .d2-1282632491 .stroke-B5{stroke:#EDF0FD;} + .d2-1282632491 .stroke-B6{stroke:#F7F8FE;} + .d2-1282632491 .stroke-AA2{stroke:#4A6FF3;} + .d2-1282632491 .stroke-AA4{stroke:#EDF0FD;} + .d2-1282632491 .stroke-AA5{stroke:#F7F8FE;} + .d2-1282632491 .stroke-AB4{stroke:#EDF0FD;} + .d2-1282632491 .stroke-AB5{stroke:#F7F8FE;} + .d2-1282632491 .background-color-N1{background-color:#0A0F25;} + .d2-1282632491 .background-color-N2{background-color:#676C7E;} + .d2-1282632491 .background-color-N3{background-color:#9499AB;} + .d2-1282632491 .background-color-N4{background-color:#CFD2DD;} + .d2-1282632491 .background-color-N5{background-color:#DEE1EB;} + .d2-1282632491 .background-color-N6{background-color:#EEF1F8;} + .d2-1282632491 .background-color-N7{background-color:#FFFFFF;} + .d2-1282632491 .background-color-B1{background-color:#0D32B2;} + .d2-1282632491 .background-color-B2{background-color:#0D32B2;} + .d2-1282632491 .background-color-B3{background-color:#E3E9FD;} + .d2-1282632491 .background-color-B4{background-color:#E3E9FD;} + .d2-1282632491 .background-color-B5{background-color:#EDF0FD;} + .d2-1282632491 .background-color-B6{background-color:#F7F8FE;} + .d2-1282632491 .background-color-AA2{background-color:#4A6FF3;} + .d2-1282632491 .background-color-AA4{background-color:#EDF0FD;} + .d2-1282632491 .background-color-AA5{background-color:#F7F8FE;} + .d2-1282632491 .background-color-AB4{background-color:#EDF0FD;} + .d2-1282632491 .background-color-AB5{background-color:#F7F8FE;} + .d2-1282632491 .color-N1{color:#0A0F25;} + .d2-1282632491 .color-N2{color:#676C7E;} + .d2-1282632491 .color-N3{color:#9499AB;} + .d2-1282632491 .color-N4{color:#CFD2DD;} + .d2-1282632491 .color-N5{color:#DEE1EB;} + .d2-1282632491 .color-N6{color:#EEF1F8;} + .d2-1282632491 .color-N7{color:#FFFFFF;} + .d2-1282632491 .color-B1{color:#0D32B2;} + .d2-1282632491 .color-B2{color:#0D32B2;} + .d2-1282632491 .color-B3{color:#E3E9FD;} + .d2-1282632491 .color-B4{color:#E3E9FD;} + .d2-1282632491 .color-B5{color:#EDF0FD;} + .d2-1282632491 .color-B6{color:#F7F8FE;} + .d2-1282632491 .color-AA2{color:#4A6FF3;} + .d2-1282632491 .color-AA4{color:#EDF0FD;} + .d2-1282632491 .color-AA5{color:#F7F8FE;} + .d2-1282632491 .color-AB4{color:#EDF0FD;} + .d2-1282632491 .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}]]>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 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 a219e7674..c0ebb045c 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,9 +1,9 @@ -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 + .d2-1282632491 .fill-N1{fill:#0A0F25;} + .d2-1282632491 .fill-N2{fill:#676C7E;} + .d2-1282632491 .fill-N3{fill:#9499AB;} + .d2-1282632491 .fill-N4{fill:#CFD2DD;} + .d2-1282632491 .fill-N5{fill:#DEE1EB;} + .d2-1282632491 .fill-N6{fill:#EEF1F8;} + .d2-1282632491 .fill-N7{fill:#FFFFFF;} + .d2-1282632491 .fill-B1{fill:#0D32B2;} + .d2-1282632491 .fill-B2{fill:#0D32B2;} + .d2-1282632491 .fill-B3{fill:#E3E9FD;} + .d2-1282632491 .fill-B4{fill:#E3E9FD;} + .d2-1282632491 .fill-B5{fill:#EDF0FD;} + .d2-1282632491 .fill-B6{fill:#F7F8FE;} + .d2-1282632491 .fill-AA2{fill:#4A6FF3;} + .d2-1282632491 .fill-AA4{fill:#EDF0FD;} + .d2-1282632491 .fill-AA5{fill:#F7F8FE;} + .d2-1282632491 .fill-AB4{fill:#EDF0FD;} + .d2-1282632491 .fill-AB5{fill:#F7F8FE;} + .d2-1282632491 .stroke-N1{stroke:#0A0F25;} + .d2-1282632491 .stroke-N2{stroke:#676C7E;} + .d2-1282632491 .stroke-N3{stroke:#9499AB;} + .d2-1282632491 .stroke-N4{stroke:#CFD2DD;} + .d2-1282632491 .stroke-N5{stroke:#DEE1EB;} + .d2-1282632491 .stroke-N6{stroke:#EEF1F8;} + .d2-1282632491 .stroke-N7{stroke:#FFFFFF;} + .d2-1282632491 .stroke-B1{stroke:#0D32B2;} + .d2-1282632491 .stroke-B2{stroke:#0D32B2;} + .d2-1282632491 .stroke-B3{stroke:#E3E9FD;} + .d2-1282632491 .stroke-B4{stroke:#E3E9FD;} + .d2-1282632491 .stroke-B5{stroke:#EDF0FD;} + .d2-1282632491 .stroke-B6{stroke:#F7F8FE;} + .d2-1282632491 .stroke-AA2{stroke:#4A6FF3;} + .d2-1282632491 .stroke-AA4{stroke:#EDF0FD;} + .d2-1282632491 .stroke-AA5{stroke:#F7F8FE;} + .d2-1282632491 .stroke-AB4{stroke:#EDF0FD;} + .d2-1282632491 .stroke-AB5{stroke:#F7F8FE;} + .d2-1282632491 .background-color-N1{background-color:#0A0F25;} + .d2-1282632491 .background-color-N2{background-color:#676C7E;} + .d2-1282632491 .background-color-N3{background-color:#9499AB;} + .d2-1282632491 .background-color-N4{background-color:#CFD2DD;} + .d2-1282632491 .background-color-N5{background-color:#DEE1EB;} + .d2-1282632491 .background-color-N6{background-color:#EEF1F8;} + .d2-1282632491 .background-color-N7{background-color:#FFFFFF;} + .d2-1282632491 .background-color-B1{background-color:#0D32B2;} + .d2-1282632491 .background-color-B2{background-color:#0D32B2;} + .d2-1282632491 .background-color-B3{background-color:#E3E9FD;} + .d2-1282632491 .background-color-B4{background-color:#E3E9FD;} + .d2-1282632491 .background-color-B5{background-color:#EDF0FD;} + .d2-1282632491 .background-color-B6{background-color:#F7F8FE;} + .d2-1282632491 .background-color-AA2{background-color:#4A6FF3;} + .d2-1282632491 .background-color-AA4{background-color:#EDF0FD;} + .d2-1282632491 .background-color-AA5{background-color:#F7F8FE;} + .d2-1282632491 .background-color-AB4{background-color:#EDF0FD;} + .d2-1282632491 .background-color-AB5{background-color:#F7F8FE;} + .d2-1282632491 .color-N1{color:#0A0F25;} + .d2-1282632491 .color-N2{color:#676C7E;} + .d2-1282632491 .color-N3{color:#9499AB;} + .d2-1282632491 .color-N4{color:#CFD2DD;} + .d2-1282632491 .color-N5{color:#DEE1EB;} + .d2-1282632491 .color-N6{color:#EEF1F8;} + .d2-1282632491 .color-N7{color:#FFFFFF;} + .d2-1282632491 .color-B1{color:#0D32B2;} + .d2-1282632491 .color-B2{color:#0D32B2;} + .d2-1282632491 .color-B3{color:#E3E9FD;} + .d2-1282632491 .color-B4{color:#E3E9FD;} + .d2-1282632491 .color-B5{color:#EDF0FD;} + .d2-1282632491 .color-B6{color:#F7F8FE;} + .d2-1282632491 .color-AA2{color:#4A6FF3;} + .d2-1282632491 .color-AA4{color:#EDF0FD;} + .d2-1282632491 .color-AA5{color:#F7F8FE;} + .d2-1282632491 .color-AB4{color:#EDF0FD;} + .d2-1282632491 .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}]]>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 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 6d4092d12..f8dd82a2f 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,9 +1,9 @@ -scoreritemResponseitemessayRubricconceptitemOutcome + .d2-1182885304 .fill-N1{fill:#0A0F25;} + .d2-1182885304 .fill-N2{fill:#676C7E;} + .d2-1182885304 .fill-N3{fill:#9499AB;} + .d2-1182885304 .fill-N4{fill:#CFD2DD;} + .d2-1182885304 .fill-N5{fill:#DEE1EB;} + .d2-1182885304 .fill-N6{fill:#EEF1F8;} + .d2-1182885304 .fill-N7{fill:#FFFFFF;} + .d2-1182885304 .fill-B1{fill:#0D32B2;} + .d2-1182885304 .fill-B2{fill:#0D32B2;} + .d2-1182885304 .fill-B3{fill:#E3E9FD;} + .d2-1182885304 .fill-B4{fill:#E3E9FD;} + .d2-1182885304 .fill-B5{fill:#EDF0FD;} + .d2-1182885304 .fill-B6{fill:#F7F8FE;} + .d2-1182885304 .fill-AA2{fill:#4A6FF3;} + .d2-1182885304 .fill-AA4{fill:#EDF0FD;} + .d2-1182885304 .fill-AA5{fill:#F7F8FE;} + .d2-1182885304 .fill-AB4{fill:#EDF0FD;} + .d2-1182885304 .fill-AB5{fill:#F7F8FE;} + .d2-1182885304 .stroke-N1{stroke:#0A0F25;} + .d2-1182885304 .stroke-N2{stroke:#676C7E;} + .d2-1182885304 .stroke-N3{stroke:#9499AB;} + .d2-1182885304 .stroke-N4{stroke:#CFD2DD;} + .d2-1182885304 .stroke-N5{stroke:#DEE1EB;} + .d2-1182885304 .stroke-N6{stroke:#EEF1F8;} + .d2-1182885304 .stroke-N7{stroke:#FFFFFF;} + .d2-1182885304 .stroke-B1{stroke:#0D32B2;} + .d2-1182885304 .stroke-B2{stroke:#0D32B2;} + .d2-1182885304 .stroke-B3{stroke:#E3E9FD;} + .d2-1182885304 .stroke-B4{stroke:#E3E9FD;} + .d2-1182885304 .stroke-B5{stroke:#EDF0FD;} + .d2-1182885304 .stroke-B6{stroke:#F7F8FE;} + .d2-1182885304 .stroke-AA2{stroke:#4A6FF3;} + .d2-1182885304 .stroke-AA4{stroke:#EDF0FD;} + .d2-1182885304 .stroke-AA5{stroke:#F7F8FE;} + .d2-1182885304 .stroke-AB4{stroke:#EDF0FD;} + .d2-1182885304 .stroke-AB5{stroke:#F7F8FE;} + .d2-1182885304 .background-color-N1{background-color:#0A0F25;} + .d2-1182885304 .background-color-N2{background-color:#676C7E;} + .d2-1182885304 .background-color-N3{background-color:#9499AB;} + .d2-1182885304 .background-color-N4{background-color:#CFD2DD;} + .d2-1182885304 .background-color-N5{background-color:#DEE1EB;} + .d2-1182885304 .background-color-N6{background-color:#EEF1F8;} + .d2-1182885304 .background-color-N7{background-color:#FFFFFF;} + .d2-1182885304 .background-color-B1{background-color:#0D32B2;} + .d2-1182885304 .background-color-B2{background-color:#0D32B2;} + .d2-1182885304 .background-color-B3{background-color:#E3E9FD;} + .d2-1182885304 .background-color-B4{background-color:#E3E9FD;} + .d2-1182885304 .background-color-B5{background-color:#EDF0FD;} + .d2-1182885304 .background-color-B6{background-color:#F7F8FE;} + .d2-1182885304 .background-color-AA2{background-color:#4A6FF3;} + .d2-1182885304 .background-color-AA4{background-color:#EDF0FD;} + .d2-1182885304 .background-color-AA5{background-color:#F7F8FE;} + .d2-1182885304 .background-color-AB4{background-color:#EDF0FD;} + .d2-1182885304 .background-color-AB5{background-color:#F7F8FE;} + .d2-1182885304 .color-N1{color:#0A0F25;} + .d2-1182885304 .color-N2{color:#676C7E;} + .d2-1182885304 .color-N3{color:#9499AB;} + .d2-1182885304 .color-N4{color:#CFD2DD;} + .d2-1182885304 .color-N5{color:#DEE1EB;} + .d2-1182885304 .color-N6{color:#EEF1F8;} + .d2-1182885304 .color-N7{color:#FFFFFF;} + .d2-1182885304 .color-B1{color:#0D32B2;} + .d2-1182885304 .color-B2{color:#0D32B2;} + .d2-1182885304 .color-B3{color:#E3E9FD;} + .d2-1182885304 .color-B4{color:#E3E9FD;} + .d2-1182885304 .color-B5{color:#EDF0FD;} + .d2-1182885304 .color-B6{color:#F7F8FE;} + .d2-1182885304 .color-AA2{color:#4A6FF3;} + .d2-1182885304 .color-AA4{color:#EDF0FD;} + .d2-1182885304 .color-AA5{color:#F7F8FE;} + .d2-1182885304 .color-AB4{color:#EDF0FD;} + .d2-1182885304 .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}]]>scoreritemResponseitemessayRubricconceptitemOutcome 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 6d4092d12..f8dd82a2f 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,9 +1,9 @@ -scoreritemResponseitemessayRubricconceptitemOutcome + .d2-1182885304 .fill-N1{fill:#0A0F25;} + .d2-1182885304 .fill-N2{fill:#676C7E;} + .d2-1182885304 .fill-N3{fill:#9499AB;} + .d2-1182885304 .fill-N4{fill:#CFD2DD;} + .d2-1182885304 .fill-N5{fill:#DEE1EB;} + .d2-1182885304 .fill-N6{fill:#EEF1F8;} + .d2-1182885304 .fill-N7{fill:#FFFFFF;} + .d2-1182885304 .fill-B1{fill:#0D32B2;} + .d2-1182885304 .fill-B2{fill:#0D32B2;} + .d2-1182885304 .fill-B3{fill:#E3E9FD;} + .d2-1182885304 .fill-B4{fill:#E3E9FD;} + .d2-1182885304 .fill-B5{fill:#EDF0FD;} + .d2-1182885304 .fill-B6{fill:#F7F8FE;} + .d2-1182885304 .fill-AA2{fill:#4A6FF3;} + .d2-1182885304 .fill-AA4{fill:#EDF0FD;} + .d2-1182885304 .fill-AA5{fill:#F7F8FE;} + .d2-1182885304 .fill-AB4{fill:#EDF0FD;} + .d2-1182885304 .fill-AB5{fill:#F7F8FE;} + .d2-1182885304 .stroke-N1{stroke:#0A0F25;} + .d2-1182885304 .stroke-N2{stroke:#676C7E;} + .d2-1182885304 .stroke-N3{stroke:#9499AB;} + .d2-1182885304 .stroke-N4{stroke:#CFD2DD;} + .d2-1182885304 .stroke-N5{stroke:#DEE1EB;} + .d2-1182885304 .stroke-N6{stroke:#EEF1F8;} + .d2-1182885304 .stroke-N7{stroke:#FFFFFF;} + .d2-1182885304 .stroke-B1{stroke:#0D32B2;} + .d2-1182885304 .stroke-B2{stroke:#0D32B2;} + .d2-1182885304 .stroke-B3{stroke:#E3E9FD;} + .d2-1182885304 .stroke-B4{stroke:#E3E9FD;} + .d2-1182885304 .stroke-B5{stroke:#EDF0FD;} + .d2-1182885304 .stroke-B6{stroke:#F7F8FE;} + .d2-1182885304 .stroke-AA2{stroke:#4A6FF3;} + .d2-1182885304 .stroke-AA4{stroke:#EDF0FD;} + .d2-1182885304 .stroke-AA5{stroke:#F7F8FE;} + .d2-1182885304 .stroke-AB4{stroke:#EDF0FD;} + .d2-1182885304 .stroke-AB5{stroke:#F7F8FE;} + .d2-1182885304 .background-color-N1{background-color:#0A0F25;} + .d2-1182885304 .background-color-N2{background-color:#676C7E;} + .d2-1182885304 .background-color-N3{background-color:#9499AB;} + .d2-1182885304 .background-color-N4{background-color:#CFD2DD;} + .d2-1182885304 .background-color-N5{background-color:#DEE1EB;} + .d2-1182885304 .background-color-N6{background-color:#EEF1F8;} + .d2-1182885304 .background-color-N7{background-color:#FFFFFF;} + .d2-1182885304 .background-color-B1{background-color:#0D32B2;} + .d2-1182885304 .background-color-B2{background-color:#0D32B2;} + .d2-1182885304 .background-color-B3{background-color:#E3E9FD;} + .d2-1182885304 .background-color-B4{background-color:#E3E9FD;} + .d2-1182885304 .background-color-B5{background-color:#EDF0FD;} + .d2-1182885304 .background-color-B6{background-color:#F7F8FE;} + .d2-1182885304 .background-color-AA2{background-color:#4A6FF3;} + .d2-1182885304 .background-color-AA4{background-color:#EDF0FD;} + .d2-1182885304 .background-color-AA5{background-color:#F7F8FE;} + .d2-1182885304 .background-color-AB4{background-color:#EDF0FD;} + .d2-1182885304 .background-color-AB5{background-color:#F7F8FE;} + .d2-1182885304 .color-N1{color:#0A0F25;} + .d2-1182885304 .color-N2{color:#676C7E;} + .d2-1182885304 .color-N3{color:#9499AB;} + .d2-1182885304 .color-N4{color:#CFD2DD;} + .d2-1182885304 .color-N5{color:#DEE1EB;} + .d2-1182885304 .color-N6{color:#EEF1F8;} + .d2-1182885304 .color-N7{color:#FFFFFF;} + .d2-1182885304 .color-B1{color:#0D32B2;} + .d2-1182885304 .color-B2{color:#0D32B2;} + .d2-1182885304 .color-B3{color:#E3E9FD;} + .d2-1182885304 .color-B4{color:#E3E9FD;} + .d2-1182885304 .color-B5{color:#EDF0FD;} + .d2-1182885304 .color-B6{color:#F7F8FE;} + .d2-1182885304 .color-AA2{color:#4A6FF3;} + .d2-1182885304 .color-AA4{color:#EDF0FD;} + .d2-1182885304 .color-AA5{color:#F7F8FE;} + .d2-1182885304 .color-AB4{color:#EDF0FD;} + .d2-1182885304 .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}]]>scoreritemResponseitemessayRubricconceptitemOutcome 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 f370ea907..9f622a404 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -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 + .d2-2067493331 .fill-N1{fill:#0A0F25;} + .d2-2067493331 .fill-N2{fill:#676C7E;} + .d2-2067493331 .fill-N3{fill:#9499AB;} + .d2-2067493331 .fill-N4{fill:#CFD2DD;} + .d2-2067493331 .fill-N5{fill:#DEE1EB;} + .d2-2067493331 .fill-N6{fill:#EEF1F8;} + .d2-2067493331 .fill-N7{fill:#FFFFFF;} + .d2-2067493331 .fill-B1{fill:#0D32B2;} + .d2-2067493331 .fill-B2{fill:#0D32B2;} + .d2-2067493331 .fill-B3{fill:#E3E9FD;} + .d2-2067493331 .fill-B4{fill:#E3E9FD;} + .d2-2067493331 .fill-B5{fill:#EDF0FD;} + .d2-2067493331 .fill-B6{fill:#F7F8FE;} + .d2-2067493331 .fill-AA2{fill:#4A6FF3;} + .d2-2067493331 .fill-AA4{fill:#EDF0FD;} + .d2-2067493331 .fill-AA5{fill:#F7F8FE;} + .d2-2067493331 .fill-AB4{fill:#EDF0FD;} + .d2-2067493331 .fill-AB5{fill:#F7F8FE;} + .d2-2067493331 .stroke-N1{stroke:#0A0F25;} + .d2-2067493331 .stroke-N2{stroke:#676C7E;} + .d2-2067493331 .stroke-N3{stroke:#9499AB;} + .d2-2067493331 .stroke-N4{stroke:#CFD2DD;} + .d2-2067493331 .stroke-N5{stroke:#DEE1EB;} + .d2-2067493331 .stroke-N6{stroke:#EEF1F8;} + .d2-2067493331 .stroke-N7{stroke:#FFFFFF;} + .d2-2067493331 .stroke-B1{stroke:#0D32B2;} + .d2-2067493331 .stroke-B2{stroke:#0D32B2;} + .d2-2067493331 .stroke-B3{stroke:#E3E9FD;} + .d2-2067493331 .stroke-B4{stroke:#E3E9FD;} + .d2-2067493331 .stroke-B5{stroke:#EDF0FD;} + .d2-2067493331 .stroke-B6{stroke:#F7F8FE;} + .d2-2067493331 .stroke-AA2{stroke:#4A6FF3;} + .d2-2067493331 .stroke-AA4{stroke:#EDF0FD;} + .d2-2067493331 .stroke-AA5{stroke:#F7F8FE;} + .d2-2067493331 .stroke-AB4{stroke:#EDF0FD;} + .d2-2067493331 .stroke-AB5{stroke:#F7F8FE;} + .d2-2067493331 .background-color-N1{background-color:#0A0F25;} + .d2-2067493331 .background-color-N2{background-color:#676C7E;} + .d2-2067493331 .background-color-N3{background-color:#9499AB;} + .d2-2067493331 .background-color-N4{background-color:#CFD2DD;} + .d2-2067493331 .background-color-N5{background-color:#DEE1EB;} + .d2-2067493331 .background-color-N6{background-color:#EEF1F8;} + .d2-2067493331 .background-color-N7{background-color:#FFFFFF;} + .d2-2067493331 .background-color-B1{background-color:#0D32B2;} + .d2-2067493331 .background-color-B2{background-color:#0D32B2;} + .d2-2067493331 .background-color-B3{background-color:#E3E9FD;} + .d2-2067493331 .background-color-B4{background-color:#E3E9FD;} + .d2-2067493331 .background-color-B5{background-color:#EDF0FD;} + .d2-2067493331 .background-color-B6{background-color:#F7F8FE;} + .d2-2067493331 .background-color-AA2{background-color:#4A6FF3;} + .d2-2067493331 .background-color-AA4{background-color:#EDF0FD;} + .d2-2067493331 .background-color-AA5{background-color:#F7F8FE;} + .d2-2067493331 .background-color-AB4{background-color:#EDF0FD;} + .d2-2067493331 .background-color-AB5{background-color:#F7F8FE;} + .d2-2067493331 .color-N1{color:#0A0F25;} + .d2-2067493331 .color-N2{color:#676C7E;} + .d2-2067493331 .color-N3{color:#9499AB;} + .d2-2067493331 .color-N4{color:#CFD2DD;} + .d2-2067493331 .color-N5{color:#DEE1EB;} + .d2-2067493331 .color-N6{color:#EEF1F8;} + .d2-2067493331 .color-N7{color:#FFFFFF;} + .d2-2067493331 .color-B1{color:#0D32B2;} + .d2-2067493331 .color-B2{color:#0D32B2;} + .d2-2067493331 .color-B3{color:#E3E9FD;} + .d2-2067493331 .color-B4{color:#E3E9FD;} + .d2-2067493331 .color-B5{color:#EDF0FD;} + .d2-2067493331 .color-B6{color:#F7F8FE;} + .d2-2067493331 .color-AA2{color:#4A6FF3;} + .d2-2067493331 .color-AA4{color:#EDF0FD;} + .d2-2067493331 .color-AA5{color:#F7F8FE;} + .d2-2067493331 .color-AB4{color:#EDF0FD;} + .d2-2067493331 .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}]]>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 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 f370ea907..9f622a404 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -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 + .d2-2067493331 .fill-N1{fill:#0A0F25;} + .d2-2067493331 .fill-N2{fill:#676C7E;} + .d2-2067493331 .fill-N3{fill:#9499AB;} + .d2-2067493331 .fill-N4{fill:#CFD2DD;} + .d2-2067493331 .fill-N5{fill:#DEE1EB;} + .d2-2067493331 .fill-N6{fill:#EEF1F8;} + .d2-2067493331 .fill-N7{fill:#FFFFFF;} + .d2-2067493331 .fill-B1{fill:#0D32B2;} + .d2-2067493331 .fill-B2{fill:#0D32B2;} + .d2-2067493331 .fill-B3{fill:#E3E9FD;} + .d2-2067493331 .fill-B4{fill:#E3E9FD;} + .d2-2067493331 .fill-B5{fill:#EDF0FD;} + .d2-2067493331 .fill-B6{fill:#F7F8FE;} + .d2-2067493331 .fill-AA2{fill:#4A6FF3;} + .d2-2067493331 .fill-AA4{fill:#EDF0FD;} + .d2-2067493331 .fill-AA5{fill:#F7F8FE;} + .d2-2067493331 .fill-AB4{fill:#EDF0FD;} + .d2-2067493331 .fill-AB5{fill:#F7F8FE;} + .d2-2067493331 .stroke-N1{stroke:#0A0F25;} + .d2-2067493331 .stroke-N2{stroke:#676C7E;} + .d2-2067493331 .stroke-N3{stroke:#9499AB;} + .d2-2067493331 .stroke-N4{stroke:#CFD2DD;} + .d2-2067493331 .stroke-N5{stroke:#DEE1EB;} + .d2-2067493331 .stroke-N6{stroke:#EEF1F8;} + .d2-2067493331 .stroke-N7{stroke:#FFFFFF;} + .d2-2067493331 .stroke-B1{stroke:#0D32B2;} + .d2-2067493331 .stroke-B2{stroke:#0D32B2;} + .d2-2067493331 .stroke-B3{stroke:#E3E9FD;} + .d2-2067493331 .stroke-B4{stroke:#E3E9FD;} + .d2-2067493331 .stroke-B5{stroke:#EDF0FD;} + .d2-2067493331 .stroke-B6{stroke:#F7F8FE;} + .d2-2067493331 .stroke-AA2{stroke:#4A6FF3;} + .d2-2067493331 .stroke-AA4{stroke:#EDF0FD;} + .d2-2067493331 .stroke-AA5{stroke:#F7F8FE;} + .d2-2067493331 .stroke-AB4{stroke:#EDF0FD;} + .d2-2067493331 .stroke-AB5{stroke:#F7F8FE;} + .d2-2067493331 .background-color-N1{background-color:#0A0F25;} + .d2-2067493331 .background-color-N2{background-color:#676C7E;} + .d2-2067493331 .background-color-N3{background-color:#9499AB;} + .d2-2067493331 .background-color-N4{background-color:#CFD2DD;} + .d2-2067493331 .background-color-N5{background-color:#DEE1EB;} + .d2-2067493331 .background-color-N6{background-color:#EEF1F8;} + .d2-2067493331 .background-color-N7{background-color:#FFFFFF;} + .d2-2067493331 .background-color-B1{background-color:#0D32B2;} + .d2-2067493331 .background-color-B2{background-color:#0D32B2;} + .d2-2067493331 .background-color-B3{background-color:#E3E9FD;} + .d2-2067493331 .background-color-B4{background-color:#E3E9FD;} + .d2-2067493331 .background-color-B5{background-color:#EDF0FD;} + .d2-2067493331 .background-color-B6{background-color:#F7F8FE;} + .d2-2067493331 .background-color-AA2{background-color:#4A6FF3;} + .d2-2067493331 .background-color-AA4{background-color:#EDF0FD;} + .d2-2067493331 .background-color-AA5{background-color:#F7F8FE;} + .d2-2067493331 .background-color-AB4{background-color:#EDF0FD;} + .d2-2067493331 .background-color-AB5{background-color:#F7F8FE;} + .d2-2067493331 .color-N1{color:#0A0F25;} + .d2-2067493331 .color-N2{color:#676C7E;} + .d2-2067493331 .color-N3{color:#9499AB;} + .d2-2067493331 .color-N4{color:#CFD2DD;} + .d2-2067493331 .color-N5{color:#DEE1EB;} + .d2-2067493331 .color-N6{color:#EEF1F8;} + .d2-2067493331 .color-N7{color:#FFFFFF;} + .d2-2067493331 .color-B1{color:#0D32B2;} + .d2-2067493331 .color-B2{color:#0D32B2;} + .d2-2067493331 .color-B3{color:#E3E9FD;} + .d2-2067493331 .color-B4{color:#E3E9FD;} + .d2-2067493331 .color-B5{color:#EDF0FD;} + .d2-2067493331 .color-B6{color:#F7F8FE;} + .d2-2067493331 .color-AA2{color:#4A6FF3;} + .d2-2067493331 .color-AA4{color:#EDF0FD;} + .d2-2067493331 .color-AA5{color:#F7F8FE;} + .d2-2067493331 .color-AB4{color:#EDF0FD;} + .d2-2067493331 .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}]]>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 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 66e7314ce..259383a72 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -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 + .d2-4062681535 .fill-N1{fill:#0A0F25;} + .d2-4062681535 .fill-N2{fill:#676C7E;} + .d2-4062681535 .fill-N3{fill:#9499AB;} + .d2-4062681535 .fill-N4{fill:#CFD2DD;} + .d2-4062681535 .fill-N5{fill:#DEE1EB;} + .d2-4062681535 .fill-N6{fill:#EEF1F8;} + .d2-4062681535 .fill-N7{fill:#FFFFFF;} + .d2-4062681535 .fill-B1{fill:#0D32B2;} + .d2-4062681535 .fill-B2{fill:#0D32B2;} + .d2-4062681535 .fill-B3{fill:#E3E9FD;} + .d2-4062681535 .fill-B4{fill:#E3E9FD;} + .d2-4062681535 .fill-B5{fill:#EDF0FD;} + .d2-4062681535 .fill-B6{fill:#F7F8FE;} + .d2-4062681535 .fill-AA2{fill:#4A6FF3;} + .d2-4062681535 .fill-AA4{fill:#EDF0FD;} + .d2-4062681535 .fill-AA5{fill:#F7F8FE;} + .d2-4062681535 .fill-AB4{fill:#EDF0FD;} + .d2-4062681535 .fill-AB5{fill:#F7F8FE;} + .d2-4062681535 .stroke-N1{stroke:#0A0F25;} + .d2-4062681535 .stroke-N2{stroke:#676C7E;} + .d2-4062681535 .stroke-N3{stroke:#9499AB;} + .d2-4062681535 .stroke-N4{stroke:#CFD2DD;} + .d2-4062681535 .stroke-N5{stroke:#DEE1EB;} + .d2-4062681535 .stroke-N6{stroke:#EEF1F8;} + .d2-4062681535 .stroke-N7{stroke:#FFFFFF;} + .d2-4062681535 .stroke-B1{stroke:#0D32B2;} + .d2-4062681535 .stroke-B2{stroke:#0D32B2;} + .d2-4062681535 .stroke-B3{stroke:#E3E9FD;} + .d2-4062681535 .stroke-B4{stroke:#E3E9FD;} + .d2-4062681535 .stroke-B5{stroke:#EDF0FD;} + .d2-4062681535 .stroke-B6{stroke:#F7F8FE;} + .d2-4062681535 .stroke-AA2{stroke:#4A6FF3;} + .d2-4062681535 .stroke-AA4{stroke:#EDF0FD;} + .d2-4062681535 .stroke-AA5{stroke:#F7F8FE;} + .d2-4062681535 .stroke-AB4{stroke:#EDF0FD;} + .d2-4062681535 .stroke-AB5{stroke:#F7F8FE;} + .d2-4062681535 .background-color-N1{background-color:#0A0F25;} + .d2-4062681535 .background-color-N2{background-color:#676C7E;} + .d2-4062681535 .background-color-N3{background-color:#9499AB;} + .d2-4062681535 .background-color-N4{background-color:#CFD2DD;} + .d2-4062681535 .background-color-N5{background-color:#DEE1EB;} + .d2-4062681535 .background-color-N6{background-color:#EEF1F8;} + .d2-4062681535 .background-color-N7{background-color:#FFFFFF;} + .d2-4062681535 .background-color-B1{background-color:#0D32B2;} + .d2-4062681535 .background-color-B2{background-color:#0D32B2;} + .d2-4062681535 .background-color-B3{background-color:#E3E9FD;} + .d2-4062681535 .background-color-B4{background-color:#E3E9FD;} + .d2-4062681535 .background-color-B5{background-color:#EDF0FD;} + .d2-4062681535 .background-color-B6{background-color:#F7F8FE;} + .d2-4062681535 .background-color-AA2{background-color:#4A6FF3;} + .d2-4062681535 .background-color-AA4{background-color:#EDF0FD;} + .d2-4062681535 .background-color-AA5{background-color:#F7F8FE;} + .d2-4062681535 .background-color-AB4{background-color:#EDF0FD;} + .d2-4062681535 .background-color-AB5{background-color:#F7F8FE;} + .d2-4062681535 .color-N1{color:#0A0F25;} + .d2-4062681535 .color-N2{color:#676C7E;} + .d2-4062681535 .color-N3{color:#9499AB;} + .d2-4062681535 .color-N4{color:#CFD2DD;} + .d2-4062681535 .color-N5{color:#DEE1EB;} + .d2-4062681535 .color-N6{color:#EEF1F8;} + .d2-4062681535 .color-N7{color:#FFFFFF;} + .d2-4062681535 .color-B1{color:#0D32B2;} + .d2-4062681535 .color-B2{color:#0D32B2;} + .d2-4062681535 .color-B3{color:#E3E9FD;} + .d2-4062681535 .color-B4{color:#E3E9FD;} + .d2-4062681535 .color-B5{color:#EDF0FD;} + .d2-4062681535 .color-B6{color:#F7F8FE;} + .d2-4062681535 .color-AA2{color:#4A6FF3;} + .d2-4062681535 .color-AA4{color:#EDF0FD;} + .d2-4062681535 .color-AA5{color:#F7F8FE;} + .d2-4062681535 .color-AB4{color:#EDF0FD;} + .d2-4062681535 .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}]]>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 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 465c8f704..8aa080cb4 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -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 + .d2-2885730879 .fill-N1{fill:#0A0F25;} + .d2-2885730879 .fill-N2{fill:#676C7E;} + .d2-2885730879 .fill-N3{fill:#9499AB;} + .d2-2885730879 .fill-N4{fill:#CFD2DD;} + .d2-2885730879 .fill-N5{fill:#DEE1EB;} + .d2-2885730879 .fill-N6{fill:#EEF1F8;} + .d2-2885730879 .fill-N7{fill:#FFFFFF;} + .d2-2885730879 .fill-B1{fill:#0D32B2;} + .d2-2885730879 .fill-B2{fill:#0D32B2;} + .d2-2885730879 .fill-B3{fill:#E3E9FD;} + .d2-2885730879 .fill-B4{fill:#E3E9FD;} + .d2-2885730879 .fill-B5{fill:#EDF0FD;} + .d2-2885730879 .fill-B6{fill:#F7F8FE;} + .d2-2885730879 .fill-AA2{fill:#4A6FF3;} + .d2-2885730879 .fill-AA4{fill:#EDF0FD;} + .d2-2885730879 .fill-AA5{fill:#F7F8FE;} + .d2-2885730879 .fill-AB4{fill:#EDF0FD;} + .d2-2885730879 .fill-AB5{fill:#F7F8FE;} + .d2-2885730879 .stroke-N1{stroke:#0A0F25;} + .d2-2885730879 .stroke-N2{stroke:#676C7E;} + .d2-2885730879 .stroke-N3{stroke:#9499AB;} + .d2-2885730879 .stroke-N4{stroke:#CFD2DD;} + .d2-2885730879 .stroke-N5{stroke:#DEE1EB;} + .d2-2885730879 .stroke-N6{stroke:#EEF1F8;} + .d2-2885730879 .stroke-N7{stroke:#FFFFFF;} + .d2-2885730879 .stroke-B1{stroke:#0D32B2;} + .d2-2885730879 .stroke-B2{stroke:#0D32B2;} + .d2-2885730879 .stroke-B3{stroke:#E3E9FD;} + .d2-2885730879 .stroke-B4{stroke:#E3E9FD;} + .d2-2885730879 .stroke-B5{stroke:#EDF0FD;} + .d2-2885730879 .stroke-B6{stroke:#F7F8FE;} + .d2-2885730879 .stroke-AA2{stroke:#4A6FF3;} + .d2-2885730879 .stroke-AA4{stroke:#EDF0FD;} + .d2-2885730879 .stroke-AA5{stroke:#F7F8FE;} + .d2-2885730879 .stroke-AB4{stroke:#EDF0FD;} + .d2-2885730879 .stroke-AB5{stroke:#F7F8FE;} + .d2-2885730879 .background-color-N1{background-color:#0A0F25;} + .d2-2885730879 .background-color-N2{background-color:#676C7E;} + .d2-2885730879 .background-color-N3{background-color:#9499AB;} + .d2-2885730879 .background-color-N4{background-color:#CFD2DD;} + .d2-2885730879 .background-color-N5{background-color:#DEE1EB;} + .d2-2885730879 .background-color-N6{background-color:#EEF1F8;} + .d2-2885730879 .background-color-N7{background-color:#FFFFFF;} + .d2-2885730879 .background-color-B1{background-color:#0D32B2;} + .d2-2885730879 .background-color-B2{background-color:#0D32B2;} + .d2-2885730879 .background-color-B3{background-color:#E3E9FD;} + .d2-2885730879 .background-color-B4{background-color:#E3E9FD;} + .d2-2885730879 .background-color-B5{background-color:#EDF0FD;} + .d2-2885730879 .background-color-B6{background-color:#F7F8FE;} + .d2-2885730879 .background-color-AA2{background-color:#4A6FF3;} + .d2-2885730879 .background-color-AA4{background-color:#EDF0FD;} + .d2-2885730879 .background-color-AA5{background-color:#F7F8FE;} + .d2-2885730879 .background-color-AB4{background-color:#EDF0FD;} + .d2-2885730879 .background-color-AB5{background-color:#F7F8FE;} + .d2-2885730879 .color-N1{color:#0A0F25;} + .d2-2885730879 .color-N2{color:#676C7E;} + .d2-2885730879 .color-N3{color:#9499AB;} + .d2-2885730879 .color-N4{color:#CFD2DD;} + .d2-2885730879 .color-N5{color:#DEE1EB;} + .d2-2885730879 .color-N6{color:#EEF1F8;} + .d2-2885730879 .color-N7{color:#FFFFFF;} + .d2-2885730879 .color-B1{color:#0D32B2;} + .d2-2885730879 .color-B2{color:#0D32B2;} + .d2-2885730879 .color-B3{color:#E3E9FD;} + .d2-2885730879 .color-B4{color:#E3E9FD;} + .d2-2885730879 .color-B5{color:#EDF0FD;} + .d2-2885730879 .color-B6{color:#F7F8FE;} + .d2-2885730879 .color-AA2{color:#4A6FF3;} + .d2-2885730879 .color-AA4{color:#EDF0FD;} + .d2-2885730879 .color-AA5{color:#F7F8FE;} + .d2-2885730879 .color-AB4{color:#EDF0FD;} + .d2-2885730879 .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}]]>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 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 58583ff46..3152be0ef 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,16 +1,16 @@ -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + .d2-1407769275 .fill-N1{fill:#0A0F25;} + .d2-1407769275 .fill-N2{fill:#676C7E;} + .d2-1407769275 .fill-N3{fill:#9499AB;} + .d2-1407769275 .fill-N4{fill:#CFD2DD;} + .d2-1407769275 .fill-N5{fill:#DEE1EB;} + .d2-1407769275 .fill-N6{fill:#EEF1F8;} + .d2-1407769275 .fill-N7{fill:#FFFFFF;} + .d2-1407769275 .fill-B1{fill:#0D32B2;} + .d2-1407769275 .fill-B2{fill:#0D32B2;} + .d2-1407769275 .fill-B3{fill:#E3E9FD;} + .d2-1407769275 .fill-B4{fill:#E3E9FD;} + .d2-1407769275 .fill-B5{fill:#EDF0FD;} + .d2-1407769275 .fill-B6{fill:#F7F8FE;} + .d2-1407769275 .fill-AA2{fill:#4A6FF3;} + .d2-1407769275 .fill-AA4{fill:#EDF0FD;} + .d2-1407769275 .fill-AA5{fill:#F7F8FE;} + .d2-1407769275 .fill-AB4{fill:#EDF0FD;} + .d2-1407769275 .fill-AB5{fill:#F7F8FE;} + .d2-1407769275 .stroke-N1{stroke:#0A0F25;} + .d2-1407769275 .stroke-N2{stroke:#676C7E;} + .d2-1407769275 .stroke-N3{stroke:#9499AB;} + .d2-1407769275 .stroke-N4{stroke:#CFD2DD;} + .d2-1407769275 .stroke-N5{stroke:#DEE1EB;} + .d2-1407769275 .stroke-N6{stroke:#EEF1F8;} + .d2-1407769275 .stroke-N7{stroke:#FFFFFF;} + .d2-1407769275 .stroke-B1{stroke:#0D32B2;} + .d2-1407769275 .stroke-B2{stroke:#0D32B2;} + .d2-1407769275 .stroke-B3{stroke:#E3E9FD;} + .d2-1407769275 .stroke-B4{stroke:#E3E9FD;} + .d2-1407769275 .stroke-B5{stroke:#EDF0FD;} + .d2-1407769275 .stroke-B6{stroke:#F7F8FE;} + .d2-1407769275 .stroke-AA2{stroke:#4A6FF3;} + .d2-1407769275 .stroke-AA4{stroke:#EDF0FD;} + .d2-1407769275 .stroke-AA5{stroke:#F7F8FE;} + .d2-1407769275 .stroke-AB4{stroke:#EDF0FD;} + .d2-1407769275 .stroke-AB5{stroke:#F7F8FE;} + .d2-1407769275 .background-color-N1{background-color:#0A0F25;} + .d2-1407769275 .background-color-N2{background-color:#676C7E;} + .d2-1407769275 .background-color-N3{background-color:#9499AB;} + .d2-1407769275 .background-color-N4{background-color:#CFD2DD;} + .d2-1407769275 .background-color-N5{background-color:#DEE1EB;} + .d2-1407769275 .background-color-N6{background-color:#EEF1F8;} + .d2-1407769275 .background-color-N7{background-color:#FFFFFF;} + .d2-1407769275 .background-color-B1{background-color:#0D32B2;} + .d2-1407769275 .background-color-B2{background-color:#0D32B2;} + .d2-1407769275 .background-color-B3{background-color:#E3E9FD;} + .d2-1407769275 .background-color-B4{background-color:#E3E9FD;} + .d2-1407769275 .background-color-B5{background-color:#EDF0FD;} + .d2-1407769275 .background-color-B6{background-color:#F7F8FE;} + .d2-1407769275 .background-color-AA2{background-color:#4A6FF3;} + .d2-1407769275 .background-color-AA4{background-color:#EDF0FD;} + .d2-1407769275 .background-color-AA5{background-color:#F7F8FE;} + .d2-1407769275 .background-color-AB4{background-color:#EDF0FD;} + .d2-1407769275 .background-color-AB5{background-color:#F7F8FE;} + .d2-1407769275 .color-N1{color:#0A0F25;} + .d2-1407769275 .color-N2{color:#676C7E;} + .d2-1407769275 .color-N3{color:#9499AB;} + .d2-1407769275 .color-N4{color:#CFD2DD;} + .d2-1407769275 .color-N5{color:#DEE1EB;} + .d2-1407769275 .color-N6{color:#EEF1F8;} + .d2-1407769275 .color-N7{color:#FFFFFF;} + .d2-1407769275 .color-B1{color:#0D32B2;} + .d2-1407769275 .color-B2{color:#0D32B2;} + .d2-1407769275 .color-B3{color:#E3E9FD;} + .d2-1407769275 .color-B4{color:#E3E9FD;} + .d2-1407769275 .color-B5{color:#EDF0FD;} + .d2-1407769275 .color-B6{color:#F7F8FE;} + .d2-1407769275 .color-AA2{color:#4A6FF3;} + .d2-1407769275 .color-AA4{color:#EDF0FD;} + .d2-1407769275 .color-AA5{color:#F7F8FE;} + .d2-1407769275 .color-AB4{color:#EDF0FD;} + .d2-1407769275 .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}]]>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 58583ff46..3152be0ef 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,16 +1,16 @@ -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + .d2-1407769275 .fill-N1{fill:#0A0F25;} + .d2-1407769275 .fill-N2{fill:#676C7E;} + .d2-1407769275 .fill-N3{fill:#9499AB;} + .d2-1407769275 .fill-N4{fill:#CFD2DD;} + .d2-1407769275 .fill-N5{fill:#DEE1EB;} + .d2-1407769275 .fill-N6{fill:#EEF1F8;} + .d2-1407769275 .fill-N7{fill:#FFFFFF;} + .d2-1407769275 .fill-B1{fill:#0D32B2;} + .d2-1407769275 .fill-B2{fill:#0D32B2;} + .d2-1407769275 .fill-B3{fill:#E3E9FD;} + .d2-1407769275 .fill-B4{fill:#E3E9FD;} + .d2-1407769275 .fill-B5{fill:#EDF0FD;} + .d2-1407769275 .fill-B6{fill:#F7F8FE;} + .d2-1407769275 .fill-AA2{fill:#4A6FF3;} + .d2-1407769275 .fill-AA4{fill:#EDF0FD;} + .d2-1407769275 .fill-AA5{fill:#F7F8FE;} + .d2-1407769275 .fill-AB4{fill:#EDF0FD;} + .d2-1407769275 .fill-AB5{fill:#F7F8FE;} + .d2-1407769275 .stroke-N1{stroke:#0A0F25;} + .d2-1407769275 .stroke-N2{stroke:#676C7E;} + .d2-1407769275 .stroke-N3{stroke:#9499AB;} + .d2-1407769275 .stroke-N4{stroke:#CFD2DD;} + .d2-1407769275 .stroke-N5{stroke:#DEE1EB;} + .d2-1407769275 .stroke-N6{stroke:#EEF1F8;} + .d2-1407769275 .stroke-N7{stroke:#FFFFFF;} + .d2-1407769275 .stroke-B1{stroke:#0D32B2;} + .d2-1407769275 .stroke-B2{stroke:#0D32B2;} + .d2-1407769275 .stroke-B3{stroke:#E3E9FD;} + .d2-1407769275 .stroke-B4{stroke:#E3E9FD;} + .d2-1407769275 .stroke-B5{stroke:#EDF0FD;} + .d2-1407769275 .stroke-B6{stroke:#F7F8FE;} + .d2-1407769275 .stroke-AA2{stroke:#4A6FF3;} + .d2-1407769275 .stroke-AA4{stroke:#EDF0FD;} + .d2-1407769275 .stroke-AA5{stroke:#F7F8FE;} + .d2-1407769275 .stroke-AB4{stroke:#EDF0FD;} + .d2-1407769275 .stroke-AB5{stroke:#F7F8FE;} + .d2-1407769275 .background-color-N1{background-color:#0A0F25;} + .d2-1407769275 .background-color-N2{background-color:#676C7E;} + .d2-1407769275 .background-color-N3{background-color:#9499AB;} + .d2-1407769275 .background-color-N4{background-color:#CFD2DD;} + .d2-1407769275 .background-color-N5{background-color:#DEE1EB;} + .d2-1407769275 .background-color-N6{background-color:#EEF1F8;} + .d2-1407769275 .background-color-N7{background-color:#FFFFFF;} + .d2-1407769275 .background-color-B1{background-color:#0D32B2;} + .d2-1407769275 .background-color-B2{background-color:#0D32B2;} + .d2-1407769275 .background-color-B3{background-color:#E3E9FD;} + .d2-1407769275 .background-color-B4{background-color:#E3E9FD;} + .d2-1407769275 .background-color-B5{background-color:#EDF0FD;} + .d2-1407769275 .background-color-B6{background-color:#F7F8FE;} + .d2-1407769275 .background-color-AA2{background-color:#4A6FF3;} + .d2-1407769275 .background-color-AA4{background-color:#EDF0FD;} + .d2-1407769275 .background-color-AA5{background-color:#F7F8FE;} + .d2-1407769275 .background-color-AB4{background-color:#EDF0FD;} + .d2-1407769275 .background-color-AB5{background-color:#F7F8FE;} + .d2-1407769275 .color-N1{color:#0A0F25;} + .d2-1407769275 .color-N2{color:#676C7E;} + .d2-1407769275 .color-N3{color:#9499AB;} + .d2-1407769275 .color-N4{color:#CFD2DD;} + .d2-1407769275 .color-N5{color:#DEE1EB;} + .d2-1407769275 .color-N6{color:#EEF1F8;} + .d2-1407769275 .color-N7{color:#FFFFFF;} + .d2-1407769275 .color-B1{color:#0D32B2;} + .d2-1407769275 .color-B2{color:#0D32B2;} + .d2-1407769275 .color-B3{color:#E3E9FD;} + .d2-1407769275 .color-B4{color:#E3E9FD;} + .d2-1407769275 .color-B5{color:#EDF0FD;} + .d2-1407769275 .color-B6{color:#F7F8FE;} + .d2-1407769275 .color-AA2{color:#4A6FF3;} + .d2-1407769275 .color-AA4{color:#EDF0FD;} + .d2-1407769275 .color-AA5{color:#F7F8FE;} + .d2-1407769275 .color-AB4{color:#EDF0FD;} + .d2-1407769275 .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}]]>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 d43c547ba..11d6008da 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -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 + .d2-4273132218 .fill-N1{fill:#0A0F25;} + .d2-4273132218 .fill-N2{fill:#676C7E;} + .d2-4273132218 .fill-N3{fill:#9499AB;} + .d2-4273132218 .fill-N4{fill:#CFD2DD;} + .d2-4273132218 .fill-N5{fill:#DEE1EB;} + .d2-4273132218 .fill-N6{fill:#EEF1F8;} + .d2-4273132218 .fill-N7{fill:#FFFFFF;} + .d2-4273132218 .fill-B1{fill:#0D32B2;} + .d2-4273132218 .fill-B2{fill:#0D32B2;} + .d2-4273132218 .fill-B3{fill:#E3E9FD;} + .d2-4273132218 .fill-B4{fill:#E3E9FD;} + .d2-4273132218 .fill-B5{fill:#EDF0FD;} + .d2-4273132218 .fill-B6{fill:#F7F8FE;} + .d2-4273132218 .fill-AA2{fill:#4A6FF3;} + .d2-4273132218 .fill-AA4{fill:#EDF0FD;} + .d2-4273132218 .fill-AA5{fill:#F7F8FE;} + .d2-4273132218 .fill-AB4{fill:#EDF0FD;} + .d2-4273132218 .fill-AB5{fill:#F7F8FE;} + .d2-4273132218 .stroke-N1{stroke:#0A0F25;} + .d2-4273132218 .stroke-N2{stroke:#676C7E;} + .d2-4273132218 .stroke-N3{stroke:#9499AB;} + .d2-4273132218 .stroke-N4{stroke:#CFD2DD;} + .d2-4273132218 .stroke-N5{stroke:#DEE1EB;} + .d2-4273132218 .stroke-N6{stroke:#EEF1F8;} + .d2-4273132218 .stroke-N7{stroke:#FFFFFF;} + .d2-4273132218 .stroke-B1{stroke:#0D32B2;} + .d2-4273132218 .stroke-B2{stroke:#0D32B2;} + .d2-4273132218 .stroke-B3{stroke:#E3E9FD;} + .d2-4273132218 .stroke-B4{stroke:#E3E9FD;} + .d2-4273132218 .stroke-B5{stroke:#EDF0FD;} + .d2-4273132218 .stroke-B6{stroke:#F7F8FE;} + .d2-4273132218 .stroke-AA2{stroke:#4A6FF3;} + .d2-4273132218 .stroke-AA4{stroke:#EDF0FD;} + .d2-4273132218 .stroke-AA5{stroke:#F7F8FE;} + .d2-4273132218 .stroke-AB4{stroke:#EDF0FD;} + .d2-4273132218 .stroke-AB5{stroke:#F7F8FE;} + .d2-4273132218 .background-color-N1{background-color:#0A0F25;} + .d2-4273132218 .background-color-N2{background-color:#676C7E;} + .d2-4273132218 .background-color-N3{background-color:#9499AB;} + .d2-4273132218 .background-color-N4{background-color:#CFD2DD;} + .d2-4273132218 .background-color-N5{background-color:#DEE1EB;} + .d2-4273132218 .background-color-N6{background-color:#EEF1F8;} + .d2-4273132218 .background-color-N7{background-color:#FFFFFF;} + .d2-4273132218 .background-color-B1{background-color:#0D32B2;} + .d2-4273132218 .background-color-B2{background-color:#0D32B2;} + .d2-4273132218 .background-color-B3{background-color:#E3E9FD;} + .d2-4273132218 .background-color-B4{background-color:#E3E9FD;} + .d2-4273132218 .background-color-B5{background-color:#EDF0FD;} + .d2-4273132218 .background-color-B6{background-color:#F7F8FE;} + .d2-4273132218 .background-color-AA2{background-color:#4A6FF3;} + .d2-4273132218 .background-color-AA4{background-color:#EDF0FD;} + .d2-4273132218 .background-color-AA5{background-color:#F7F8FE;} + .d2-4273132218 .background-color-AB4{background-color:#EDF0FD;} + .d2-4273132218 .background-color-AB5{background-color:#F7F8FE;} + .d2-4273132218 .color-N1{color:#0A0F25;} + .d2-4273132218 .color-N2{color:#676C7E;} + .d2-4273132218 .color-N3{color:#9499AB;} + .d2-4273132218 .color-N4{color:#CFD2DD;} + .d2-4273132218 .color-N5{color:#DEE1EB;} + .d2-4273132218 .color-N6{color:#EEF1F8;} + .d2-4273132218 .color-N7{color:#FFFFFF;} + .d2-4273132218 .color-B1{color:#0D32B2;} + .d2-4273132218 .color-B2{color:#0D32B2;} + .d2-4273132218 .color-B3{color:#E3E9FD;} + .d2-4273132218 .color-B4{color:#E3E9FD;} + .d2-4273132218 .color-B5{color:#EDF0FD;} + .d2-4273132218 .color-B6{color:#F7F8FE;} + .d2-4273132218 .color-AA2{color:#4A6FF3;} + .d2-4273132218 .color-AA4{color:#EDF0FD;} + .d2-4273132218 .color-AA5{color:#F7F8FE;} + .d2-4273132218 .color-AB4{color:#EDF0FD;} + .d2-4273132218 .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}]]>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 d43c547ba..11d6008da 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -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 + .d2-4273132218 .fill-N1{fill:#0A0F25;} + .d2-4273132218 .fill-N2{fill:#676C7E;} + .d2-4273132218 .fill-N3{fill:#9499AB;} + .d2-4273132218 .fill-N4{fill:#CFD2DD;} + .d2-4273132218 .fill-N5{fill:#DEE1EB;} + .d2-4273132218 .fill-N6{fill:#EEF1F8;} + .d2-4273132218 .fill-N7{fill:#FFFFFF;} + .d2-4273132218 .fill-B1{fill:#0D32B2;} + .d2-4273132218 .fill-B2{fill:#0D32B2;} + .d2-4273132218 .fill-B3{fill:#E3E9FD;} + .d2-4273132218 .fill-B4{fill:#E3E9FD;} + .d2-4273132218 .fill-B5{fill:#EDF0FD;} + .d2-4273132218 .fill-B6{fill:#F7F8FE;} + .d2-4273132218 .fill-AA2{fill:#4A6FF3;} + .d2-4273132218 .fill-AA4{fill:#EDF0FD;} + .d2-4273132218 .fill-AA5{fill:#F7F8FE;} + .d2-4273132218 .fill-AB4{fill:#EDF0FD;} + .d2-4273132218 .fill-AB5{fill:#F7F8FE;} + .d2-4273132218 .stroke-N1{stroke:#0A0F25;} + .d2-4273132218 .stroke-N2{stroke:#676C7E;} + .d2-4273132218 .stroke-N3{stroke:#9499AB;} + .d2-4273132218 .stroke-N4{stroke:#CFD2DD;} + .d2-4273132218 .stroke-N5{stroke:#DEE1EB;} + .d2-4273132218 .stroke-N6{stroke:#EEF1F8;} + .d2-4273132218 .stroke-N7{stroke:#FFFFFF;} + .d2-4273132218 .stroke-B1{stroke:#0D32B2;} + .d2-4273132218 .stroke-B2{stroke:#0D32B2;} + .d2-4273132218 .stroke-B3{stroke:#E3E9FD;} + .d2-4273132218 .stroke-B4{stroke:#E3E9FD;} + .d2-4273132218 .stroke-B5{stroke:#EDF0FD;} + .d2-4273132218 .stroke-B6{stroke:#F7F8FE;} + .d2-4273132218 .stroke-AA2{stroke:#4A6FF3;} + .d2-4273132218 .stroke-AA4{stroke:#EDF0FD;} + .d2-4273132218 .stroke-AA5{stroke:#F7F8FE;} + .d2-4273132218 .stroke-AB4{stroke:#EDF0FD;} + .d2-4273132218 .stroke-AB5{stroke:#F7F8FE;} + .d2-4273132218 .background-color-N1{background-color:#0A0F25;} + .d2-4273132218 .background-color-N2{background-color:#676C7E;} + .d2-4273132218 .background-color-N3{background-color:#9499AB;} + .d2-4273132218 .background-color-N4{background-color:#CFD2DD;} + .d2-4273132218 .background-color-N5{background-color:#DEE1EB;} + .d2-4273132218 .background-color-N6{background-color:#EEF1F8;} + .d2-4273132218 .background-color-N7{background-color:#FFFFFF;} + .d2-4273132218 .background-color-B1{background-color:#0D32B2;} + .d2-4273132218 .background-color-B2{background-color:#0D32B2;} + .d2-4273132218 .background-color-B3{background-color:#E3E9FD;} + .d2-4273132218 .background-color-B4{background-color:#E3E9FD;} + .d2-4273132218 .background-color-B5{background-color:#EDF0FD;} + .d2-4273132218 .background-color-B6{background-color:#F7F8FE;} + .d2-4273132218 .background-color-AA2{background-color:#4A6FF3;} + .d2-4273132218 .background-color-AA4{background-color:#EDF0FD;} + .d2-4273132218 .background-color-AA5{background-color:#F7F8FE;} + .d2-4273132218 .background-color-AB4{background-color:#EDF0FD;} + .d2-4273132218 .background-color-AB5{background-color:#F7F8FE;} + .d2-4273132218 .color-N1{color:#0A0F25;} + .d2-4273132218 .color-N2{color:#676C7E;} + .d2-4273132218 .color-N3{color:#9499AB;} + .d2-4273132218 .color-N4{color:#CFD2DD;} + .d2-4273132218 .color-N5{color:#DEE1EB;} + .d2-4273132218 .color-N6{color:#EEF1F8;} + .d2-4273132218 .color-N7{color:#FFFFFF;} + .d2-4273132218 .color-B1{color:#0D32B2;} + .d2-4273132218 .color-B2{color:#0D32B2;} + .d2-4273132218 .color-B3{color:#E3E9FD;} + .d2-4273132218 .color-B4{color:#E3E9FD;} + .d2-4273132218 .color-B5{color:#EDF0FD;} + .d2-4273132218 .color-B6{color:#F7F8FE;} + .d2-4273132218 .color-AA2{color:#4A6FF3;} + .d2-4273132218 .color-AA4{color:#EDF0FD;} + .d2-4273132218 .color-AA5{color:#F7F8FE;} + .d2-4273132218 .color-AB4{color:#EDF0FD;} + .d2-4273132218 .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}]]>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 4c5a8427c..dcc7306ef 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + .d2-1774904488 .fill-N1{fill:#0A0F25;} + .d2-1774904488 .fill-N2{fill:#676C7E;} + .d2-1774904488 .fill-N3{fill:#9499AB;} + .d2-1774904488 .fill-N4{fill:#CFD2DD;} + .d2-1774904488 .fill-N5{fill:#DEE1EB;} + .d2-1774904488 .fill-N6{fill:#EEF1F8;} + .d2-1774904488 .fill-N7{fill:#FFFFFF;} + .d2-1774904488 .fill-B1{fill:#0D32B2;} + .d2-1774904488 .fill-B2{fill:#0D32B2;} + .d2-1774904488 .fill-B3{fill:#E3E9FD;} + .d2-1774904488 .fill-B4{fill:#E3E9FD;} + .d2-1774904488 .fill-B5{fill:#EDF0FD;} + .d2-1774904488 .fill-B6{fill:#F7F8FE;} + .d2-1774904488 .fill-AA2{fill:#4A6FF3;} + .d2-1774904488 .fill-AA4{fill:#EDF0FD;} + .d2-1774904488 .fill-AA5{fill:#F7F8FE;} + .d2-1774904488 .fill-AB4{fill:#EDF0FD;} + .d2-1774904488 .fill-AB5{fill:#F7F8FE;} + .d2-1774904488 .stroke-N1{stroke:#0A0F25;} + .d2-1774904488 .stroke-N2{stroke:#676C7E;} + .d2-1774904488 .stroke-N3{stroke:#9499AB;} + .d2-1774904488 .stroke-N4{stroke:#CFD2DD;} + .d2-1774904488 .stroke-N5{stroke:#DEE1EB;} + .d2-1774904488 .stroke-N6{stroke:#EEF1F8;} + .d2-1774904488 .stroke-N7{stroke:#FFFFFF;} + .d2-1774904488 .stroke-B1{stroke:#0D32B2;} + .d2-1774904488 .stroke-B2{stroke:#0D32B2;} + .d2-1774904488 .stroke-B3{stroke:#E3E9FD;} + .d2-1774904488 .stroke-B4{stroke:#E3E9FD;} + .d2-1774904488 .stroke-B5{stroke:#EDF0FD;} + .d2-1774904488 .stroke-B6{stroke:#F7F8FE;} + .d2-1774904488 .stroke-AA2{stroke:#4A6FF3;} + .d2-1774904488 .stroke-AA4{stroke:#EDF0FD;} + .d2-1774904488 .stroke-AA5{stroke:#F7F8FE;} + .d2-1774904488 .stroke-AB4{stroke:#EDF0FD;} + .d2-1774904488 .stroke-AB5{stroke:#F7F8FE;} + .d2-1774904488 .background-color-N1{background-color:#0A0F25;} + .d2-1774904488 .background-color-N2{background-color:#676C7E;} + .d2-1774904488 .background-color-N3{background-color:#9499AB;} + .d2-1774904488 .background-color-N4{background-color:#CFD2DD;} + .d2-1774904488 .background-color-N5{background-color:#DEE1EB;} + .d2-1774904488 .background-color-N6{background-color:#EEF1F8;} + .d2-1774904488 .background-color-N7{background-color:#FFFFFF;} + .d2-1774904488 .background-color-B1{background-color:#0D32B2;} + .d2-1774904488 .background-color-B2{background-color:#0D32B2;} + .d2-1774904488 .background-color-B3{background-color:#E3E9FD;} + .d2-1774904488 .background-color-B4{background-color:#E3E9FD;} + .d2-1774904488 .background-color-B5{background-color:#EDF0FD;} + .d2-1774904488 .background-color-B6{background-color:#F7F8FE;} + .d2-1774904488 .background-color-AA2{background-color:#4A6FF3;} + .d2-1774904488 .background-color-AA4{background-color:#EDF0FD;} + .d2-1774904488 .background-color-AA5{background-color:#F7F8FE;} + .d2-1774904488 .background-color-AB4{background-color:#EDF0FD;} + .d2-1774904488 .background-color-AB5{background-color:#F7F8FE;} + .d2-1774904488 .color-N1{color:#0A0F25;} + .d2-1774904488 .color-N2{color:#676C7E;} + .d2-1774904488 .color-N3{color:#9499AB;} + .d2-1774904488 .color-N4{color:#CFD2DD;} + .d2-1774904488 .color-N5{color:#DEE1EB;} + .d2-1774904488 .color-N6{color:#EEF1F8;} + .d2-1774904488 .color-N7{color:#FFFFFF;} + .d2-1774904488 .color-B1{color:#0D32B2;} + .d2-1774904488 .color-B2{color:#0D32B2;} + .d2-1774904488 .color-B3{color:#E3E9FD;} + .d2-1774904488 .color-B4{color:#E3E9FD;} + .d2-1774904488 .color-B5{color:#EDF0FD;} + .d2-1774904488 .color-B6{color:#F7F8FE;} + .d2-1774904488 .color-AA2{color:#4A6FF3;} + .d2-1774904488 .color-AA4{color:#EDF0FD;} + .d2-1774904488 .color-AA5{color:#F7F8FE;} + .d2-1774904488 .color-AB4{color:#EDF0FD;} + .d2-1774904488 .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}]]>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 4c5a8427c..dcc7306ef 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + .d2-1774904488 .fill-N1{fill:#0A0F25;} + .d2-1774904488 .fill-N2{fill:#676C7E;} + .d2-1774904488 .fill-N3{fill:#9499AB;} + .d2-1774904488 .fill-N4{fill:#CFD2DD;} + .d2-1774904488 .fill-N5{fill:#DEE1EB;} + .d2-1774904488 .fill-N6{fill:#EEF1F8;} + .d2-1774904488 .fill-N7{fill:#FFFFFF;} + .d2-1774904488 .fill-B1{fill:#0D32B2;} + .d2-1774904488 .fill-B2{fill:#0D32B2;} + .d2-1774904488 .fill-B3{fill:#E3E9FD;} + .d2-1774904488 .fill-B4{fill:#E3E9FD;} + .d2-1774904488 .fill-B5{fill:#EDF0FD;} + .d2-1774904488 .fill-B6{fill:#F7F8FE;} + .d2-1774904488 .fill-AA2{fill:#4A6FF3;} + .d2-1774904488 .fill-AA4{fill:#EDF0FD;} + .d2-1774904488 .fill-AA5{fill:#F7F8FE;} + .d2-1774904488 .fill-AB4{fill:#EDF0FD;} + .d2-1774904488 .fill-AB5{fill:#F7F8FE;} + .d2-1774904488 .stroke-N1{stroke:#0A0F25;} + .d2-1774904488 .stroke-N2{stroke:#676C7E;} + .d2-1774904488 .stroke-N3{stroke:#9499AB;} + .d2-1774904488 .stroke-N4{stroke:#CFD2DD;} + .d2-1774904488 .stroke-N5{stroke:#DEE1EB;} + .d2-1774904488 .stroke-N6{stroke:#EEF1F8;} + .d2-1774904488 .stroke-N7{stroke:#FFFFFF;} + .d2-1774904488 .stroke-B1{stroke:#0D32B2;} + .d2-1774904488 .stroke-B2{stroke:#0D32B2;} + .d2-1774904488 .stroke-B3{stroke:#E3E9FD;} + .d2-1774904488 .stroke-B4{stroke:#E3E9FD;} + .d2-1774904488 .stroke-B5{stroke:#EDF0FD;} + .d2-1774904488 .stroke-B6{stroke:#F7F8FE;} + .d2-1774904488 .stroke-AA2{stroke:#4A6FF3;} + .d2-1774904488 .stroke-AA4{stroke:#EDF0FD;} + .d2-1774904488 .stroke-AA5{stroke:#F7F8FE;} + .d2-1774904488 .stroke-AB4{stroke:#EDF0FD;} + .d2-1774904488 .stroke-AB5{stroke:#F7F8FE;} + .d2-1774904488 .background-color-N1{background-color:#0A0F25;} + .d2-1774904488 .background-color-N2{background-color:#676C7E;} + .d2-1774904488 .background-color-N3{background-color:#9499AB;} + .d2-1774904488 .background-color-N4{background-color:#CFD2DD;} + .d2-1774904488 .background-color-N5{background-color:#DEE1EB;} + .d2-1774904488 .background-color-N6{background-color:#EEF1F8;} + .d2-1774904488 .background-color-N7{background-color:#FFFFFF;} + .d2-1774904488 .background-color-B1{background-color:#0D32B2;} + .d2-1774904488 .background-color-B2{background-color:#0D32B2;} + .d2-1774904488 .background-color-B3{background-color:#E3E9FD;} + .d2-1774904488 .background-color-B4{background-color:#E3E9FD;} + .d2-1774904488 .background-color-B5{background-color:#EDF0FD;} + .d2-1774904488 .background-color-B6{background-color:#F7F8FE;} + .d2-1774904488 .background-color-AA2{background-color:#4A6FF3;} + .d2-1774904488 .background-color-AA4{background-color:#EDF0FD;} + .d2-1774904488 .background-color-AA5{background-color:#F7F8FE;} + .d2-1774904488 .background-color-AB4{background-color:#EDF0FD;} + .d2-1774904488 .background-color-AB5{background-color:#F7F8FE;} + .d2-1774904488 .color-N1{color:#0A0F25;} + .d2-1774904488 .color-N2{color:#676C7E;} + .d2-1774904488 .color-N3{color:#9499AB;} + .d2-1774904488 .color-N4{color:#CFD2DD;} + .d2-1774904488 .color-N5{color:#DEE1EB;} + .d2-1774904488 .color-N6{color:#EEF1F8;} + .d2-1774904488 .color-N7{color:#FFFFFF;} + .d2-1774904488 .color-B1{color:#0D32B2;} + .d2-1774904488 .color-B2{color:#0D32B2;} + .d2-1774904488 .color-B3{color:#E3E9FD;} + .d2-1774904488 .color-B4{color:#E3E9FD;} + .d2-1774904488 .color-B5{color:#EDF0FD;} + .d2-1774904488 .color-B6{color:#F7F8FE;} + .d2-1774904488 .color-AA2{color:#4A6FF3;} + .d2-1774904488 .color-AA4{color:#EDF0FD;} + .d2-1774904488 .color-AA5{color:#F7F8FE;} + .d2-1774904488 .color-AB4{color:#EDF0FD;} + .d2-1774904488 .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}]]>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 c94ab2dbd..8e3ca9acb 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -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) + .d2-1184307366 .fill-N1{fill:#0A0F25;} + .d2-1184307366 .fill-N2{fill:#676C7E;} + .d2-1184307366 .fill-N3{fill:#9499AB;} + .d2-1184307366 .fill-N4{fill:#CFD2DD;} + .d2-1184307366 .fill-N5{fill:#DEE1EB;} + .d2-1184307366 .fill-N6{fill:#EEF1F8;} + .d2-1184307366 .fill-N7{fill:#FFFFFF;} + .d2-1184307366 .fill-B1{fill:#0D32B2;} + .d2-1184307366 .fill-B2{fill:#0D32B2;} + .d2-1184307366 .fill-B3{fill:#E3E9FD;} + .d2-1184307366 .fill-B4{fill:#E3E9FD;} + .d2-1184307366 .fill-B5{fill:#EDF0FD;} + .d2-1184307366 .fill-B6{fill:#F7F8FE;} + .d2-1184307366 .fill-AA2{fill:#4A6FF3;} + .d2-1184307366 .fill-AA4{fill:#EDF0FD;} + .d2-1184307366 .fill-AA5{fill:#F7F8FE;} + .d2-1184307366 .fill-AB4{fill:#EDF0FD;} + .d2-1184307366 .fill-AB5{fill:#F7F8FE;} + .d2-1184307366 .stroke-N1{stroke:#0A0F25;} + .d2-1184307366 .stroke-N2{stroke:#676C7E;} + .d2-1184307366 .stroke-N3{stroke:#9499AB;} + .d2-1184307366 .stroke-N4{stroke:#CFD2DD;} + .d2-1184307366 .stroke-N5{stroke:#DEE1EB;} + .d2-1184307366 .stroke-N6{stroke:#EEF1F8;} + .d2-1184307366 .stroke-N7{stroke:#FFFFFF;} + .d2-1184307366 .stroke-B1{stroke:#0D32B2;} + .d2-1184307366 .stroke-B2{stroke:#0D32B2;} + .d2-1184307366 .stroke-B3{stroke:#E3E9FD;} + .d2-1184307366 .stroke-B4{stroke:#E3E9FD;} + .d2-1184307366 .stroke-B5{stroke:#EDF0FD;} + .d2-1184307366 .stroke-B6{stroke:#F7F8FE;} + .d2-1184307366 .stroke-AA2{stroke:#4A6FF3;} + .d2-1184307366 .stroke-AA4{stroke:#EDF0FD;} + .d2-1184307366 .stroke-AA5{stroke:#F7F8FE;} + .d2-1184307366 .stroke-AB4{stroke:#EDF0FD;} + .d2-1184307366 .stroke-AB5{stroke:#F7F8FE;} + .d2-1184307366 .background-color-N1{background-color:#0A0F25;} + .d2-1184307366 .background-color-N2{background-color:#676C7E;} + .d2-1184307366 .background-color-N3{background-color:#9499AB;} + .d2-1184307366 .background-color-N4{background-color:#CFD2DD;} + .d2-1184307366 .background-color-N5{background-color:#DEE1EB;} + .d2-1184307366 .background-color-N6{background-color:#EEF1F8;} + .d2-1184307366 .background-color-N7{background-color:#FFFFFF;} + .d2-1184307366 .background-color-B1{background-color:#0D32B2;} + .d2-1184307366 .background-color-B2{background-color:#0D32B2;} + .d2-1184307366 .background-color-B3{background-color:#E3E9FD;} + .d2-1184307366 .background-color-B4{background-color:#E3E9FD;} + .d2-1184307366 .background-color-B5{background-color:#EDF0FD;} + .d2-1184307366 .background-color-B6{background-color:#F7F8FE;} + .d2-1184307366 .background-color-AA2{background-color:#4A6FF3;} + .d2-1184307366 .background-color-AA4{background-color:#EDF0FD;} + .d2-1184307366 .background-color-AA5{background-color:#F7F8FE;} + .d2-1184307366 .background-color-AB4{background-color:#EDF0FD;} + .d2-1184307366 .background-color-AB5{background-color:#F7F8FE;} + .d2-1184307366 .color-N1{color:#0A0F25;} + .d2-1184307366 .color-N2{color:#676C7E;} + .d2-1184307366 .color-N3{color:#9499AB;} + .d2-1184307366 .color-N4{color:#CFD2DD;} + .d2-1184307366 .color-N5{color:#DEE1EB;} + .d2-1184307366 .color-N6{color:#EEF1F8;} + .d2-1184307366 .color-N7{color:#FFFFFF;} + .d2-1184307366 .color-B1{color:#0D32B2;} + .d2-1184307366 .color-B2{color:#0D32B2;} + .d2-1184307366 .color-B3{color:#E3E9FD;} + .d2-1184307366 .color-B4{color:#E3E9FD;} + .d2-1184307366 .color-B5{color:#EDF0FD;} + .d2-1184307366 .color-B6{color:#F7F8FE;} + .d2-1184307366 .color-AA2{color:#4A6FF3;} + .d2-1184307366 .color-AA4{color:#EDF0FD;} + .d2-1184307366 .color-AA5{color:#F7F8FE;} + .d2-1184307366 .color-AB4{color:#EDF0FD;} + .d2-1184307366 .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_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 25df379fc..1e55e6cb1 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -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) + .d2-1337594695 .fill-N1{fill:#0A0F25;} + .d2-1337594695 .fill-N2{fill:#676C7E;} + .d2-1337594695 .fill-N3{fill:#9499AB;} + .d2-1337594695 .fill-N4{fill:#CFD2DD;} + .d2-1337594695 .fill-N5{fill:#DEE1EB;} + .d2-1337594695 .fill-N6{fill:#EEF1F8;} + .d2-1337594695 .fill-N7{fill:#FFFFFF;} + .d2-1337594695 .fill-B1{fill:#0D32B2;} + .d2-1337594695 .fill-B2{fill:#0D32B2;} + .d2-1337594695 .fill-B3{fill:#E3E9FD;} + .d2-1337594695 .fill-B4{fill:#E3E9FD;} + .d2-1337594695 .fill-B5{fill:#EDF0FD;} + .d2-1337594695 .fill-B6{fill:#F7F8FE;} + .d2-1337594695 .fill-AA2{fill:#4A6FF3;} + .d2-1337594695 .fill-AA4{fill:#EDF0FD;} + .d2-1337594695 .fill-AA5{fill:#F7F8FE;} + .d2-1337594695 .fill-AB4{fill:#EDF0FD;} + .d2-1337594695 .fill-AB5{fill:#F7F8FE;} + .d2-1337594695 .stroke-N1{stroke:#0A0F25;} + .d2-1337594695 .stroke-N2{stroke:#676C7E;} + .d2-1337594695 .stroke-N3{stroke:#9499AB;} + .d2-1337594695 .stroke-N4{stroke:#CFD2DD;} + .d2-1337594695 .stroke-N5{stroke:#DEE1EB;} + .d2-1337594695 .stroke-N6{stroke:#EEF1F8;} + .d2-1337594695 .stroke-N7{stroke:#FFFFFF;} + .d2-1337594695 .stroke-B1{stroke:#0D32B2;} + .d2-1337594695 .stroke-B2{stroke:#0D32B2;} + .d2-1337594695 .stroke-B3{stroke:#E3E9FD;} + .d2-1337594695 .stroke-B4{stroke:#E3E9FD;} + .d2-1337594695 .stroke-B5{stroke:#EDF0FD;} + .d2-1337594695 .stroke-B6{stroke:#F7F8FE;} + .d2-1337594695 .stroke-AA2{stroke:#4A6FF3;} + .d2-1337594695 .stroke-AA4{stroke:#EDF0FD;} + .d2-1337594695 .stroke-AA5{stroke:#F7F8FE;} + .d2-1337594695 .stroke-AB4{stroke:#EDF0FD;} + .d2-1337594695 .stroke-AB5{stroke:#F7F8FE;} + .d2-1337594695 .background-color-N1{background-color:#0A0F25;} + .d2-1337594695 .background-color-N2{background-color:#676C7E;} + .d2-1337594695 .background-color-N3{background-color:#9499AB;} + .d2-1337594695 .background-color-N4{background-color:#CFD2DD;} + .d2-1337594695 .background-color-N5{background-color:#DEE1EB;} + .d2-1337594695 .background-color-N6{background-color:#EEF1F8;} + .d2-1337594695 .background-color-N7{background-color:#FFFFFF;} + .d2-1337594695 .background-color-B1{background-color:#0D32B2;} + .d2-1337594695 .background-color-B2{background-color:#0D32B2;} + .d2-1337594695 .background-color-B3{background-color:#E3E9FD;} + .d2-1337594695 .background-color-B4{background-color:#E3E9FD;} + .d2-1337594695 .background-color-B5{background-color:#EDF0FD;} + .d2-1337594695 .background-color-B6{background-color:#F7F8FE;} + .d2-1337594695 .background-color-AA2{background-color:#4A6FF3;} + .d2-1337594695 .background-color-AA4{background-color:#EDF0FD;} + .d2-1337594695 .background-color-AA5{background-color:#F7F8FE;} + .d2-1337594695 .background-color-AB4{background-color:#EDF0FD;} + .d2-1337594695 .background-color-AB5{background-color:#F7F8FE;} + .d2-1337594695 .color-N1{color:#0A0F25;} + .d2-1337594695 .color-N2{color:#676C7E;} + .d2-1337594695 .color-N3{color:#9499AB;} + .d2-1337594695 .color-N4{color:#CFD2DD;} + .d2-1337594695 .color-N5{color:#DEE1EB;} + .d2-1337594695 .color-N6{color:#EEF1F8;} + .d2-1337594695 .color-N7{color:#FFFFFF;} + .d2-1337594695 .color-B1{color:#0D32B2;} + .d2-1337594695 .color-B2{color:#0D32B2;} + .d2-1337594695 .color-B3{color:#E3E9FD;} + .d2-1337594695 .color-B4{color:#E3E9FD;} + .d2-1337594695 .color-B5{color:#EDF0FD;} + .d2-1337594695 .color-B6{color:#F7F8FE;} + .d2-1337594695 .color-AA2{color:#4A6FF3;} + .d2-1337594695 .color-AA4{color:#EDF0FD;} + .d2-1337594695 .color-AA5{color:#F7F8FE;} + .d2-1337594695 .color-AB4{color:#EDF0FD;} + .d2-1337594695 .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_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/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg index f6f298fb6..0470cc3d3 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-832122773 .fill-N1{fill:#0A0F25;} + .d2-832122773 .fill-N2{fill:#676C7E;} + .d2-832122773 .fill-N3{fill:#9499AB;} + .d2-832122773 .fill-N4{fill:#CFD2DD;} + .d2-832122773 .fill-N5{fill:#DEE1EB;} + .d2-832122773 .fill-N6{fill:#EEF1F8;} + .d2-832122773 .fill-N7{fill:#FFFFFF;} + .d2-832122773 .fill-B1{fill:#0D32B2;} + .d2-832122773 .fill-B2{fill:#0D32B2;} + .d2-832122773 .fill-B3{fill:#E3E9FD;} + .d2-832122773 .fill-B4{fill:#E3E9FD;} + .d2-832122773 .fill-B5{fill:#EDF0FD;} + .d2-832122773 .fill-B6{fill:#F7F8FE;} + .d2-832122773 .fill-AA2{fill:#4A6FF3;} + .d2-832122773 .fill-AA4{fill:#EDF0FD;} + .d2-832122773 .fill-AA5{fill:#F7F8FE;} + .d2-832122773 .fill-AB4{fill:#EDF0FD;} + .d2-832122773 .fill-AB5{fill:#F7F8FE;} + .d2-832122773 .stroke-N1{stroke:#0A0F25;} + .d2-832122773 .stroke-N2{stroke:#676C7E;} + .d2-832122773 .stroke-N3{stroke:#9499AB;} + .d2-832122773 .stroke-N4{stroke:#CFD2DD;} + .d2-832122773 .stroke-N5{stroke:#DEE1EB;} + .d2-832122773 .stroke-N6{stroke:#EEF1F8;} + .d2-832122773 .stroke-N7{stroke:#FFFFFF;} + .d2-832122773 .stroke-B1{stroke:#0D32B2;} + .d2-832122773 .stroke-B2{stroke:#0D32B2;} + .d2-832122773 .stroke-B3{stroke:#E3E9FD;} + .d2-832122773 .stroke-B4{stroke:#E3E9FD;} + .d2-832122773 .stroke-B5{stroke:#EDF0FD;} + .d2-832122773 .stroke-B6{stroke:#F7F8FE;} + .d2-832122773 .stroke-AA2{stroke:#4A6FF3;} + .d2-832122773 .stroke-AA4{stroke:#EDF0FD;} + .d2-832122773 .stroke-AA5{stroke:#F7F8FE;} + .d2-832122773 .stroke-AB4{stroke:#EDF0FD;} + .d2-832122773 .stroke-AB5{stroke:#F7F8FE;} + .d2-832122773 .background-color-N1{background-color:#0A0F25;} + .d2-832122773 .background-color-N2{background-color:#676C7E;} + .d2-832122773 .background-color-N3{background-color:#9499AB;} + .d2-832122773 .background-color-N4{background-color:#CFD2DD;} + .d2-832122773 .background-color-N5{background-color:#DEE1EB;} + .d2-832122773 .background-color-N6{background-color:#EEF1F8;} + .d2-832122773 .background-color-N7{background-color:#FFFFFF;} + .d2-832122773 .background-color-B1{background-color:#0D32B2;} + .d2-832122773 .background-color-B2{background-color:#0D32B2;} + .d2-832122773 .background-color-B3{background-color:#E3E9FD;} + .d2-832122773 .background-color-B4{background-color:#E3E9FD;} + .d2-832122773 .background-color-B5{background-color:#EDF0FD;} + .d2-832122773 .background-color-B6{background-color:#F7F8FE;} + .d2-832122773 .background-color-AA2{background-color:#4A6FF3;} + .d2-832122773 .background-color-AA4{background-color:#EDF0FD;} + .d2-832122773 .background-color-AA5{background-color:#F7F8FE;} + .d2-832122773 .background-color-AB4{background-color:#EDF0FD;} + .d2-832122773 .background-color-AB5{background-color:#F7F8FE;} + .d2-832122773 .color-N1{color:#0A0F25;} + .d2-832122773 .color-N2{color:#676C7E;} + .d2-832122773 .color-N3{color:#9499AB;} + .d2-832122773 .color-N4{color:#CFD2DD;} + .d2-832122773 .color-N5{color:#DEE1EB;} + .d2-832122773 .color-N6{color:#EEF1F8;} + .d2-832122773 .color-N7{color:#FFFFFF;} + .d2-832122773 .color-B1{color:#0D32B2;} + .d2-832122773 .color-B2{color:#0D32B2;} + .d2-832122773 .color-B3{color:#E3E9FD;} + .d2-832122773 .color-B4{color:#E3E9FD;} + .d2-832122773 .color-B5{color:#EDF0FD;} + .d2-832122773 .color-B6{color:#F7F8FE;} + .d2-832122773 .color-AA2{color:#4A6FF3;} + .d2-832122773 .color-AA4{color:#EDF0FD;} + .d2-832122773 .color-AA5{color:#F7F8FE;} + .d2-832122773 .color-AB4{color:#EDF0FD;} + .d2-832122773 .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/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg index b5c4aa493..102155a32 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-1454861019 .fill-N1{fill:#0A0F25;} + .d2-1454861019 .fill-N2{fill:#676C7E;} + .d2-1454861019 .fill-N3{fill:#9499AB;} + .d2-1454861019 .fill-N4{fill:#CFD2DD;} + .d2-1454861019 .fill-N5{fill:#DEE1EB;} + .d2-1454861019 .fill-N6{fill:#EEF1F8;} + .d2-1454861019 .fill-N7{fill:#FFFFFF;} + .d2-1454861019 .fill-B1{fill:#0D32B2;} + .d2-1454861019 .fill-B2{fill:#0D32B2;} + .d2-1454861019 .fill-B3{fill:#E3E9FD;} + .d2-1454861019 .fill-B4{fill:#E3E9FD;} + .d2-1454861019 .fill-B5{fill:#EDF0FD;} + .d2-1454861019 .fill-B6{fill:#F7F8FE;} + .d2-1454861019 .fill-AA2{fill:#4A6FF3;} + .d2-1454861019 .fill-AA4{fill:#EDF0FD;} + .d2-1454861019 .fill-AA5{fill:#F7F8FE;} + .d2-1454861019 .fill-AB4{fill:#EDF0FD;} + .d2-1454861019 .fill-AB5{fill:#F7F8FE;} + .d2-1454861019 .stroke-N1{stroke:#0A0F25;} + .d2-1454861019 .stroke-N2{stroke:#676C7E;} + .d2-1454861019 .stroke-N3{stroke:#9499AB;} + .d2-1454861019 .stroke-N4{stroke:#CFD2DD;} + .d2-1454861019 .stroke-N5{stroke:#DEE1EB;} + .d2-1454861019 .stroke-N6{stroke:#EEF1F8;} + .d2-1454861019 .stroke-N7{stroke:#FFFFFF;} + .d2-1454861019 .stroke-B1{stroke:#0D32B2;} + .d2-1454861019 .stroke-B2{stroke:#0D32B2;} + .d2-1454861019 .stroke-B3{stroke:#E3E9FD;} + .d2-1454861019 .stroke-B4{stroke:#E3E9FD;} + .d2-1454861019 .stroke-B5{stroke:#EDF0FD;} + .d2-1454861019 .stroke-B6{stroke:#F7F8FE;} + .d2-1454861019 .stroke-AA2{stroke:#4A6FF3;} + .d2-1454861019 .stroke-AA4{stroke:#EDF0FD;} + .d2-1454861019 .stroke-AA5{stroke:#F7F8FE;} + .d2-1454861019 .stroke-AB4{stroke:#EDF0FD;} + .d2-1454861019 .stroke-AB5{stroke:#F7F8FE;} + .d2-1454861019 .background-color-N1{background-color:#0A0F25;} + .d2-1454861019 .background-color-N2{background-color:#676C7E;} + .d2-1454861019 .background-color-N3{background-color:#9499AB;} + .d2-1454861019 .background-color-N4{background-color:#CFD2DD;} + .d2-1454861019 .background-color-N5{background-color:#DEE1EB;} + .d2-1454861019 .background-color-N6{background-color:#EEF1F8;} + .d2-1454861019 .background-color-N7{background-color:#FFFFFF;} + .d2-1454861019 .background-color-B1{background-color:#0D32B2;} + .d2-1454861019 .background-color-B2{background-color:#0D32B2;} + .d2-1454861019 .background-color-B3{background-color:#E3E9FD;} + .d2-1454861019 .background-color-B4{background-color:#E3E9FD;} + .d2-1454861019 .background-color-B5{background-color:#EDF0FD;} + .d2-1454861019 .background-color-B6{background-color:#F7F8FE;} + .d2-1454861019 .background-color-AA2{background-color:#4A6FF3;} + .d2-1454861019 .background-color-AA4{background-color:#EDF0FD;} + .d2-1454861019 .background-color-AA5{background-color:#F7F8FE;} + .d2-1454861019 .background-color-AB4{background-color:#EDF0FD;} + .d2-1454861019 .background-color-AB5{background-color:#F7F8FE;} + .d2-1454861019 .color-N1{color:#0A0F25;} + .d2-1454861019 .color-N2{color:#676C7E;} + .d2-1454861019 .color-N3{color:#9499AB;} + .d2-1454861019 .color-N4{color:#CFD2DD;} + .d2-1454861019 .color-N5{color:#DEE1EB;} + .d2-1454861019 .color-N6{color:#EEF1F8;} + .d2-1454861019 .color-N7{color:#FFFFFF;} + .d2-1454861019 .color-B1{color:#0D32B2;} + .d2-1454861019 .color-B2{color:#0D32B2;} + .d2-1454861019 .color-B3{color:#E3E9FD;} + .d2-1454861019 .color-B4{color:#E3E9FD;} + .d2-1454861019 .color-B5{color:#EDF0FD;} + .d2-1454861019 .color-B6{color:#F7F8FE;} + .d2-1454861019 .color-AA2{color:#4A6FF3;} + .d2-1454861019 .color-AA4{color:#EDF0FD;} + .d2-1454861019 .color-AA5{color:#F7F8FE;} + .d2-1454861019 .color-AB4{color:#EDF0FD;} + .d2-1454861019 .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/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg index 7a1ed3dc2..dc16009bd 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + .d2-2736169546 .fill-N1{fill:#0A0F25;} + .d2-2736169546 .fill-N2{fill:#676C7E;} + .d2-2736169546 .fill-N3{fill:#9499AB;} + .d2-2736169546 .fill-N4{fill:#CFD2DD;} + .d2-2736169546 .fill-N5{fill:#DEE1EB;} + .d2-2736169546 .fill-N6{fill:#EEF1F8;} + .d2-2736169546 .fill-N7{fill:#FFFFFF;} + .d2-2736169546 .fill-B1{fill:#0D32B2;} + .d2-2736169546 .fill-B2{fill:#0D32B2;} + .d2-2736169546 .fill-B3{fill:#E3E9FD;} + .d2-2736169546 .fill-B4{fill:#E3E9FD;} + .d2-2736169546 .fill-B5{fill:#EDF0FD;} + .d2-2736169546 .fill-B6{fill:#F7F8FE;} + .d2-2736169546 .fill-AA2{fill:#4A6FF3;} + .d2-2736169546 .fill-AA4{fill:#EDF0FD;} + .d2-2736169546 .fill-AA5{fill:#F7F8FE;} + .d2-2736169546 .fill-AB4{fill:#EDF0FD;} + .d2-2736169546 .fill-AB5{fill:#F7F8FE;} + .d2-2736169546 .stroke-N1{stroke:#0A0F25;} + .d2-2736169546 .stroke-N2{stroke:#676C7E;} + .d2-2736169546 .stroke-N3{stroke:#9499AB;} + .d2-2736169546 .stroke-N4{stroke:#CFD2DD;} + .d2-2736169546 .stroke-N5{stroke:#DEE1EB;} + .d2-2736169546 .stroke-N6{stroke:#EEF1F8;} + .d2-2736169546 .stroke-N7{stroke:#FFFFFF;} + .d2-2736169546 .stroke-B1{stroke:#0D32B2;} + .d2-2736169546 .stroke-B2{stroke:#0D32B2;} + .d2-2736169546 .stroke-B3{stroke:#E3E9FD;} + .d2-2736169546 .stroke-B4{stroke:#E3E9FD;} + .d2-2736169546 .stroke-B5{stroke:#EDF0FD;} + .d2-2736169546 .stroke-B6{stroke:#F7F8FE;} + .d2-2736169546 .stroke-AA2{stroke:#4A6FF3;} + .d2-2736169546 .stroke-AA4{stroke:#EDF0FD;} + .d2-2736169546 .stroke-AA5{stroke:#F7F8FE;} + .d2-2736169546 .stroke-AB4{stroke:#EDF0FD;} + .d2-2736169546 .stroke-AB5{stroke:#F7F8FE;} + .d2-2736169546 .background-color-N1{background-color:#0A0F25;} + .d2-2736169546 .background-color-N2{background-color:#676C7E;} + .d2-2736169546 .background-color-N3{background-color:#9499AB;} + .d2-2736169546 .background-color-N4{background-color:#CFD2DD;} + .d2-2736169546 .background-color-N5{background-color:#DEE1EB;} + .d2-2736169546 .background-color-N6{background-color:#EEF1F8;} + .d2-2736169546 .background-color-N7{background-color:#FFFFFF;} + .d2-2736169546 .background-color-B1{background-color:#0D32B2;} + .d2-2736169546 .background-color-B2{background-color:#0D32B2;} + .d2-2736169546 .background-color-B3{background-color:#E3E9FD;} + .d2-2736169546 .background-color-B4{background-color:#E3E9FD;} + .d2-2736169546 .background-color-B5{background-color:#EDF0FD;} + .d2-2736169546 .background-color-B6{background-color:#F7F8FE;} + .d2-2736169546 .background-color-AA2{background-color:#4A6FF3;} + .d2-2736169546 .background-color-AA4{background-color:#EDF0FD;} + .d2-2736169546 .background-color-AA5{background-color:#F7F8FE;} + .d2-2736169546 .background-color-AB4{background-color:#EDF0FD;} + .d2-2736169546 .background-color-AB5{background-color:#F7F8FE;} + .d2-2736169546 .color-N1{color:#0A0F25;} + .d2-2736169546 .color-N2{color:#676C7E;} + .d2-2736169546 .color-N3{color:#9499AB;} + .d2-2736169546 .color-N4{color:#CFD2DD;} + .d2-2736169546 .color-N5{color:#DEE1EB;} + .d2-2736169546 .color-N6{color:#EEF1F8;} + .d2-2736169546 .color-N7{color:#FFFFFF;} + .d2-2736169546 .color-B1{color:#0D32B2;} + .d2-2736169546 .color-B2{color:#0D32B2;} + .d2-2736169546 .color-B3{color:#E3E9FD;} + .d2-2736169546 .color-B4{color:#E3E9FD;} + .d2-2736169546 .color-B5{color:#EDF0FD;} + .d2-2736169546 .color-B6{color:#F7F8FE;} + .d2-2736169546 .color-AA2{color:#4A6FF3;} + .d2-2736169546 .color-AA4{color:#EDF0FD;} + .d2-2736169546 .color-AA5{color:#F7F8FE;} + .d2-2736169546 .color-AB4{color:#EDF0FD;} + .d2-2736169546 .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}]]>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/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg index 307bf93f6..ba839738a 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + .d2-2874260775 .fill-N1{fill:#0A0F25;} + .d2-2874260775 .fill-N2{fill:#676C7E;} + .d2-2874260775 .fill-N3{fill:#9499AB;} + .d2-2874260775 .fill-N4{fill:#CFD2DD;} + .d2-2874260775 .fill-N5{fill:#DEE1EB;} + .d2-2874260775 .fill-N6{fill:#EEF1F8;} + .d2-2874260775 .fill-N7{fill:#FFFFFF;} + .d2-2874260775 .fill-B1{fill:#0D32B2;} + .d2-2874260775 .fill-B2{fill:#0D32B2;} + .d2-2874260775 .fill-B3{fill:#E3E9FD;} + .d2-2874260775 .fill-B4{fill:#E3E9FD;} + .d2-2874260775 .fill-B5{fill:#EDF0FD;} + .d2-2874260775 .fill-B6{fill:#F7F8FE;} + .d2-2874260775 .fill-AA2{fill:#4A6FF3;} + .d2-2874260775 .fill-AA4{fill:#EDF0FD;} + .d2-2874260775 .fill-AA5{fill:#F7F8FE;} + .d2-2874260775 .fill-AB4{fill:#EDF0FD;} + .d2-2874260775 .fill-AB5{fill:#F7F8FE;} + .d2-2874260775 .stroke-N1{stroke:#0A0F25;} + .d2-2874260775 .stroke-N2{stroke:#676C7E;} + .d2-2874260775 .stroke-N3{stroke:#9499AB;} + .d2-2874260775 .stroke-N4{stroke:#CFD2DD;} + .d2-2874260775 .stroke-N5{stroke:#DEE1EB;} + .d2-2874260775 .stroke-N6{stroke:#EEF1F8;} + .d2-2874260775 .stroke-N7{stroke:#FFFFFF;} + .d2-2874260775 .stroke-B1{stroke:#0D32B2;} + .d2-2874260775 .stroke-B2{stroke:#0D32B2;} + .d2-2874260775 .stroke-B3{stroke:#E3E9FD;} + .d2-2874260775 .stroke-B4{stroke:#E3E9FD;} + .d2-2874260775 .stroke-B5{stroke:#EDF0FD;} + .d2-2874260775 .stroke-B6{stroke:#F7F8FE;} + .d2-2874260775 .stroke-AA2{stroke:#4A6FF3;} + .d2-2874260775 .stroke-AA4{stroke:#EDF0FD;} + .d2-2874260775 .stroke-AA5{stroke:#F7F8FE;} + .d2-2874260775 .stroke-AB4{stroke:#EDF0FD;} + .d2-2874260775 .stroke-AB5{stroke:#F7F8FE;} + .d2-2874260775 .background-color-N1{background-color:#0A0F25;} + .d2-2874260775 .background-color-N2{background-color:#676C7E;} + .d2-2874260775 .background-color-N3{background-color:#9499AB;} + .d2-2874260775 .background-color-N4{background-color:#CFD2DD;} + .d2-2874260775 .background-color-N5{background-color:#DEE1EB;} + .d2-2874260775 .background-color-N6{background-color:#EEF1F8;} + .d2-2874260775 .background-color-N7{background-color:#FFFFFF;} + .d2-2874260775 .background-color-B1{background-color:#0D32B2;} + .d2-2874260775 .background-color-B2{background-color:#0D32B2;} + .d2-2874260775 .background-color-B3{background-color:#E3E9FD;} + .d2-2874260775 .background-color-B4{background-color:#E3E9FD;} + .d2-2874260775 .background-color-B5{background-color:#EDF0FD;} + .d2-2874260775 .background-color-B6{background-color:#F7F8FE;} + .d2-2874260775 .background-color-AA2{background-color:#4A6FF3;} + .d2-2874260775 .background-color-AA4{background-color:#EDF0FD;} + .d2-2874260775 .background-color-AA5{background-color:#F7F8FE;} + .d2-2874260775 .background-color-AB4{background-color:#EDF0FD;} + .d2-2874260775 .background-color-AB5{background-color:#F7F8FE;} + .d2-2874260775 .color-N1{color:#0A0F25;} + .d2-2874260775 .color-N2{color:#676C7E;} + .d2-2874260775 .color-N3{color:#9499AB;} + .d2-2874260775 .color-N4{color:#CFD2DD;} + .d2-2874260775 .color-N5{color:#DEE1EB;} + .d2-2874260775 .color-N6{color:#EEF1F8;} + .d2-2874260775 .color-N7{color:#FFFFFF;} + .d2-2874260775 .color-B1{color:#0D32B2;} + .d2-2874260775 .color-B2{color:#0D32B2;} + .d2-2874260775 .color-B3{color:#E3E9FD;} + .d2-2874260775 .color-B4{color:#E3E9FD;} + .d2-2874260775 .color-B5{color:#EDF0FD;} + .d2-2874260775 .color-B6{color:#F7F8FE;} + .d2-2874260775 .color-AA2{color:#4A6FF3;} + .d2-2874260775 .color-AA4{color:#EDF0FD;} + .d2-2874260775 .color-AA5{color:#F7F8FE;} + .d2-2874260775 .color-AB4{color:#EDF0FD;} + .d2-2874260775 .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}]]>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/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg index 2a1f3abeb..9e9859a6b 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 @@ -xyab I like turtles + .d2-1756795631 .fill-N1{fill:#0A0F25;} + .d2-1756795631 .fill-N2{fill:#676C7E;} + .d2-1756795631 .fill-N3{fill:#9499AB;} + .d2-1756795631 .fill-N4{fill:#CFD2DD;} + .d2-1756795631 .fill-N5{fill:#DEE1EB;} + .d2-1756795631 .fill-N6{fill:#EEF1F8;} + .d2-1756795631 .fill-N7{fill:#FFFFFF;} + .d2-1756795631 .fill-B1{fill:#0D32B2;} + .d2-1756795631 .fill-B2{fill:#0D32B2;} + .d2-1756795631 .fill-B3{fill:#E3E9FD;} + .d2-1756795631 .fill-B4{fill:#E3E9FD;} + .d2-1756795631 .fill-B5{fill:#EDF0FD;} + .d2-1756795631 .fill-B6{fill:#F7F8FE;} + .d2-1756795631 .fill-AA2{fill:#4A6FF3;} + .d2-1756795631 .fill-AA4{fill:#EDF0FD;} + .d2-1756795631 .fill-AA5{fill:#F7F8FE;} + .d2-1756795631 .fill-AB4{fill:#EDF0FD;} + .d2-1756795631 .fill-AB5{fill:#F7F8FE;} + .d2-1756795631 .stroke-N1{stroke:#0A0F25;} + .d2-1756795631 .stroke-N2{stroke:#676C7E;} + .d2-1756795631 .stroke-N3{stroke:#9499AB;} + .d2-1756795631 .stroke-N4{stroke:#CFD2DD;} + .d2-1756795631 .stroke-N5{stroke:#DEE1EB;} + .d2-1756795631 .stroke-N6{stroke:#EEF1F8;} + .d2-1756795631 .stroke-N7{stroke:#FFFFFF;} + .d2-1756795631 .stroke-B1{stroke:#0D32B2;} + .d2-1756795631 .stroke-B2{stroke:#0D32B2;} + .d2-1756795631 .stroke-B3{stroke:#E3E9FD;} + .d2-1756795631 .stroke-B4{stroke:#E3E9FD;} + .d2-1756795631 .stroke-B5{stroke:#EDF0FD;} + .d2-1756795631 .stroke-B6{stroke:#F7F8FE;} + .d2-1756795631 .stroke-AA2{stroke:#4A6FF3;} + .d2-1756795631 .stroke-AA4{stroke:#EDF0FD;} + .d2-1756795631 .stroke-AA5{stroke:#F7F8FE;} + .d2-1756795631 .stroke-AB4{stroke:#EDF0FD;} + .d2-1756795631 .stroke-AB5{stroke:#F7F8FE;} + .d2-1756795631 .background-color-N1{background-color:#0A0F25;} + .d2-1756795631 .background-color-N2{background-color:#676C7E;} + .d2-1756795631 .background-color-N3{background-color:#9499AB;} + .d2-1756795631 .background-color-N4{background-color:#CFD2DD;} + .d2-1756795631 .background-color-N5{background-color:#DEE1EB;} + .d2-1756795631 .background-color-N6{background-color:#EEF1F8;} + .d2-1756795631 .background-color-N7{background-color:#FFFFFF;} + .d2-1756795631 .background-color-B1{background-color:#0D32B2;} + .d2-1756795631 .background-color-B2{background-color:#0D32B2;} + .d2-1756795631 .background-color-B3{background-color:#E3E9FD;} + .d2-1756795631 .background-color-B4{background-color:#E3E9FD;} + .d2-1756795631 .background-color-B5{background-color:#EDF0FD;} + .d2-1756795631 .background-color-B6{background-color:#F7F8FE;} + .d2-1756795631 .background-color-AA2{background-color:#4A6FF3;} + .d2-1756795631 .background-color-AA4{background-color:#EDF0FD;} + .d2-1756795631 .background-color-AA5{background-color:#F7F8FE;} + .d2-1756795631 .background-color-AB4{background-color:#EDF0FD;} + .d2-1756795631 .background-color-AB5{background-color:#F7F8FE;} + .d2-1756795631 .color-N1{color:#0A0F25;} + .d2-1756795631 .color-N2{color:#676C7E;} + .d2-1756795631 .color-N3{color:#9499AB;} + .d2-1756795631 .color-N4{color:#CFD2DD;} + .d2-1756795631 .color-N5{color:#DEE1EB;} + .d2-1756795631 .color-N6{color:#EEF1F8;} + .d2-1756795631 .color-N7{color:#FFFFFF;} + .d2-1756795631 .color-B1{color:#0D32B2;} + .d2-1756795631 .color-B2{color:#0D32B2;} + .d2-1756795631 .color-B3{color:#E3E9FD;} + .d2-1756795631 .color-B4{color:#E3E9FD;} + .d2-1756795631 .color-B5{color:#EDF0FD;} + .d2-1756795631 .color-B6{color:#F7F8FE;} + .d2-1756795631 .color-AA2{color:#4A6FF3;} + .d2-1756795631 .color-AA4{color:#EDF0FD;} + .d2-1756795631 .color-AA5{color:#F7F8FE;} + .d2-1756795631 .color-AB4{color:#EDF0FD;} + .d2-1756795631 .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}]]>xyab I like turtles @@ -111,7 +111,7 @@ - + \ No newline at end of file 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 acd2bf2c9..edf830e63 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 @@ -xyab I like turtles + .d2-1870435628 .fill-N1{fill:#0A0F25;} + .d2-1870435628 .fill-N2{fill:#676C7E;} + .d2-1870435628 .fill-N3{fill:#9499AB;} + .d2-1870435628 .fill-N4{fill:#CFD2DD;} + .d2-1870435628 .fill-N5{fill:#DEE1EB;} + .d2-1870435628 .fill-N6{fill:#EEF1F8;} + .d2-1870435628 .fill-N7{fill:#FFFFFF;} + .d2-1870435628 .fill-B1{fill:#0D32B2;} + .d2-1870435628 .fill-B2{fill:#0D32B2;} + .d2-1870435628 .fill-B3{fill:#E3E9FD;} + .d2-1870435628 .fill-B4{fill:#E3E9FD;} + .d2-1870435628 .fill-B5{fill:#EDF0FD;} + .d2-1870435628 .fill-B6{fill:#F7F8FE;} + .d2-1870435628 .fill-AA2{fill:#4A6FF3;} + .d2-1870435628 .fill-AA4{fill:#EDF0FD;} + .d2-1870435628 .fill-AA5{fill:#F7F8FE;} + .d2-1870435628 .fill-AB4{fill:#EDF0FD;} + .d2-1870435628 .fill-AB5{fill:#F7F8FE;} + .d2-1870435628 .stroke-N1{stroke:#0A0F25;} + .d2-1870435628 .stroke-N2{stroke:#676C7E;} + .d2-1870435628 .stroke-N3{stroke:#9499AB;} + .d2-1870435628 .stroke-N4{stroke:#CFD2DD;} + .d2-1870435628 .stroke-N5{stroke:#DEE1EB;} + .d2-1870435628 .stroke-N6{stroke:#EEF1F8;} + .d2-1870435628 .stroke-N7{stroke:#FFFFFF;} + .d2-1870435628 .stroke-B1{stroke:#0D32B2;} + .d2-1870435628 .stroke-B2{stroke:#0D32B2;} + .d2-1870435628 .stroke-B3{stroke:#E3E9FD;} + .d2-1870435628 .stroke-B4{stroke:#E3E9FD;} + .d2-1870435628 .stroke-B5{stroke:#EDF0FD;} + .d2-1870435628 .stroke-B6{stroke:#F7F8FE;} + .d2-1870435628 .stroke-AA2{stroke:#4A6FF3;} + .d2-1870435628 .stroke-AA4{stroke:#EDF0FD;} + .d2-1870435628 .stroke-AA5{stroke:#F7F8FE;} + .d2-1870435628 .stroke-AB4{stroke:#EDF0FD;} + .d2-1870435628 .stroke-AB5{stroke:#F7F8FE;} + .d2-1870435628 .background-color-N1{background-color:#0A0F25;} + .d2-1870435628 .background-color-N2{background-color:#676C7E;} + .d2-1870435628 .background-color-N3{background-color:#9499AB;} + .d2-1870435628 .background-color-N4{background-color:#CFD2DD;} + .d2-1870435628 .background-color-N5{background-color:#DEE1EB;} + .d2-1870435628 .background-color-N6{background-color:#EEF1F8;} + .d2-1870435628 .background-color-N7{background-color:#FFFFFF;} + .d2-1870435628 .background-color-B1{background-color:#0D32B2;} + .d2-1870435628 .background-color-B2{background-color:#0D32B2;} + .d2-1870435628 .background-color-B3{background-color:#E3E9FD;} + .d2-1870435628 .background-color-B4{background-color:#E3E9FD;} + .d2-1870435628 .background-color-B5{background-color:#EDF0FD;} + .d2-1870435628 .background-color-B6{background-color:#F7F8FE;} + .d2-1870435628 .background-color-AA2{background-color:#4A6FF3;} + .d2-1870435628 .background-color-AA4{background-color:#EDF0FD;} + .d2-1870435628 .background-color-AA5{background-color:#F7F8FE;} + .d2-1870435628 .background-color-AB4{background-color:#EDF0FD;} + .d2-1870435628 .background-color-AB5{background-color:#F7F8FE;} + .d2-1870435628 .color-N1{color:#0A0F25;} + .d2-1870435628 .color-N2{color:#676C7E;} + .d2-1870435628 .color-N3{color:#9499AB;} + .d2-1870435628 .color-N4{color:#CFD2DD;} + .d2-1870435628 .color-N5{color:#DEE1EB;} + .d2-1870435628 .color-N6{color:#EEF1F8;} + .d2-1870435628 .color-N7{color:#FFFFFF;} + .d2-1870435628 .color-B1{color:#0D32B2;} + .d2-1870435628 .color-B2{color:#0D32B2;} + .d2-1870435628 .color-B3{color:#E3E9FD;} + .d2-1870435628 .color-B4{color:#E3E9FD;} + .d2-1870435628 .color-B5{color:#EDF0FD;} + .d2-1870435628 .color-B6{color:#F7F8FE;} + .d2-1870435628 .color-AA2{color:#4A6FF3;} + .d2-1870435628 .color-AA4{color:#EDF0FD;} + .d2-1870435628 .color-AA5{color:#F7F8FE;} + .d2-1870435628 .color-AB4{color:#EDF0FD;} + .d2-1870435628 .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}]]>xyab I like turtles @@ -111,7 +111,7 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index fd040560c..dd0014e49 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-690706478 .fill-N1{fill:#0A0F25;} + .d2-690706478 .fill-N2{fill:#676C7E;} + .d2-690706478 .fill-N3{fill:#9499AB;} + .d2-690706478 .fill-N4{fill:#CFD2DD;} + .d2-690706478 .fill-N5{fill:#DEE1EB;} + .d2-690706478 .fill-N6{fill:#EEF1F8;} + .d2-690706478 .fill-N7{fill:#FFFFFF;} + .d2-690706478 .fill-B1{fill:#0D32B2;} + .d2-690706478 .fill-B2{fill:#0D32B2;} + .d2-690706478 .fill-B3{fill:#E3E9FD;} + .d2-690706478 .fill-B4{fill:#E3E9FD;} + .d2-690706478 .fill-B5{fill:#EDF0FD;} + .d2-690706478 .fill-B6{fill:#F7F8FE;} + .d2-690706478 .fill-AA2{fill:#4A6FF3;} + .d2-690706478 .fill-AA4{fill:#EDF0FD;} + .d2-690706478 .fill-AA5{fill:#F7F8FE;} + .d2-690706478 .fill-AB4{fill:#EDF0FD;} + .d2-690706478 .fill-AB5{fill:#F7F8FE;} + .d2-690706478 .stroke-N1{stroke:#0A0F25;} + .d2-690706478 .stroke-N2{stroke:#676C7E;} + .d2-690706478 .stroke-N3{stroke:#9499AB;} + .d2-690706478 .stroke-N4{stroke:#CFD2DD;} + .d2-690706478 .stroke-N5{stroke:#DEE1EB;} + .d2-690706478 .stroke-N6{stroke:#EEF1F8;} + .d2-690706478 .stroke-N7{stroke:#FFFFFF;} + .d2-690706478 .stroke-B1{stroke:#0D32B2;} + .d2-690706478 .stroke-B2{stroke:#0D32B2;} + .d2-690706478 .stroke-B3{stroke:#E3E9FD;} + .d2-690706478 .stroke-B4{stroke:#E3E9FD;} + .d2-690706478 .stroke-B5{stroke:#EDF0FD;} + .d2-690706478 .stroke-B6{stroke:#F7F8FE;} + .d2-690706478 .stroke-AA2{stroke:#4A6FF3;} + .d2-690706478 .stroke-AA4{stroke:#EDF0FD;} + .d2-690706478 .stroke-AA5{stroke:#F7F8FE;} + .d2-690706478 .stroke-AB4{stroke:#EDF0FD;} + .d2-690706478 .stroke-AB5{stroke:#F7F8FE;} + .d2-690706478 .background-color-N1{background-color:#0A0F25;} + .d2-690706478 .background-color-N2{background-color:#676C7E;} + .d2-690706478 .background-color-N3{background-color:#9499AB;} + .d2-690706478 .background-color-N4{background-color:#CFD2DD;} + .d2-690706478 .background-color-N5{background-color:#DEE1EB;} + .d2-690706478 .background-color-N6{background-color:#EEF1F8;} + .d2-690706478 .background-color-N7{background-color:#FFFFFF;} + .d2-690706478 .background-color-B1{background-color:#0D32B2;} + .d2-690706478 .background-color-B2{background-color:#0D32B2;} + .d2-690706478 .background-color-B3{background-color:#E3E9FD;} + .d2-690706478 .background-color-B4{background-color:#E3E9FD;} + .d2-690706478 .background-color-B5{background-color:#EDF0FD;} + .d2-690706478 .background-color-B6{background-color:#F7F8FE;} + .d2-690706478 .background-color-AA2{background-color:#4A6FF3;} + .d2-690706478 .background-color-AA4{background-color:#EDF0FD;} + .d2-690706478 .background-color-AA5{background-color:#F7F8FE;} + .d2-690706478 .background-color-AB4{background-color:#EDF0FD;} + .d2-690706478 .background-color-AB5{background-color:#F7F8FE;} + .d2-690706478 .color-N1{color:#0A0F25;} + .d2-690706478 .color-N2{color:#676C7E;} + .d2-690706478 .color-N3{color:#9499AB;} + .d2-690706478 .color-N4{color:#CFD2DD;} + .d2-690706478 .color-N5{color:#DEE1EB;} + .d2-690706478 .color-N6{color:#EEF1F8;} + .d2-690706478 .color-N7{color:#FFFFFF;} + .d2-690706478 .color-B1{color:#0D32B2;} + .d2-690706478 .color-B2{color:#0D32B2;} + .d2-690706478 .color-B3{color:#E3E9FD;} + .d2-690706478 .color-B4{color:#E3E9FD;} + .d2-690706478 .color-B5{color:#EDF0FD;} + .d2-690706478 .color-B6{color:#F7F8FE;} + .d2-690706478 .color-AA2{color:#4A6FF3;} + .d2-690706478 .color-AA4{color:#EDF0FD;} + .d2-690706478 .color-AA5{color:#F7F8FE;} + .d2-690706478 .color-AB4{color:#EDF0FD;} + .d2-690706478 .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/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index 7bb655b52..5925b5488 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-344759968 .fill-N1{fill:#0A0F25;} + .d2-344759968 .fill-N2{fill:#676C7E;} + .d2-344759968 .fill-N3{fill:#9499AB;} + .d2-344759968 .fill-N4{fill:#CFD2DD;} + .d2-344759968 .fill-N5{fill:#DEE1EB;} + .d2-344759968 .fill-N6{fill:#EEF1F8;} + .d2-344759968 .fill-N7{fill:#FFFFFF;} + .d2-344759968 .fill-B1{fill:#0D32B2;} + .d2-344759968 .fill-B2{fill:#0D32B2;} + .d2-344759968 .fill-B3{fill:#E3E9FD;} + .d2-344759968 .fill-B4{fill:#E3E9FD;} + .d2-344759968 .fill-B5{fill:#EDF0FD;} + .d2-344759968 .fill-B6{fill:#F7F8FE;} + .d2-344759968 .fill-AA2{fill:#4A6FF3;} + .d2-344759968 .fill-AA4{fill:#EDF0FD;} + .d2-344759968 .fill-AA5{fill:#F7F8FE;} + .d2-344759968 .fill-AB4{fill:#EDF0FD;} + .d2-344759968 .fill-AB5{fill:#F7F8FE;} + .d2-344759968 .stroke-N1{stroke:#0A0F25;} + .d2-344759968 .stroke-N2{stroke:#676C7E;} + .d2-344759968 .stroke-N3{stroke:#9499AB;} + .d2-344759968 .stroke-N4{stroke:#CFD2DD;} + .d2-344759968 .stroke-N5{stroke:#DEE1EB;} + .d2-344759968 .stroke-N6{stroke:#EEF1F8;} + .d2-344759968 .stroke-N7{stroke:#FFFFFF;} + .d2-344759968 .stroke-B1{stroke:#0D32B2;} + .d2-344759968 .stroke-B2{stroke:#0D32B2;} + .d2-344759968 .stroke-B3{stroke:#E3E9FD;} + .d2-344759968 .stroke-B4{stroke:#E3E9FD;} + .d2-344759968 .stroke-B5{stroke:#EDF0FD;} + .d2-344759968 .stroke-B6{stroke:#F7F8FE;} + .d2-344759968 .stroke-AA2{stroke:#4A6FF3;} + .d2-344759968 .stroke-AA4{stroke:#EDF0FD;} + .d2-344759968 .stroke-AA5{stroke:#F7F8FE;} + .d2-344759968 .stroke-AB4{stroke:#EDF0FD;} + .d2-344759968 .stroke-AB5{stroke:#F7F8FE;} + .d2-344759968 .background-color-N1{background-color:#0A0F25;} + .d2-344759968 .background-color-N2{background-color:#676C7E;} + .d2-344759968 .background-color-N3{background-color:#9499AB;} + .d2-344759968 .background-color-N4{background-color:#CFD2DD;} + .d2-344759968 .background-color-N5{background-color:#DEE1EB;} + .d2-344759968 .background-color-N6{background-color:#EEF1F8;} + .d2-344759968 .background-color-N7{background-color:#FFFFFF;} + .d2-344759968 .background-color-B1{background-color:#0D32B2;} + .d2-344759968 .background-color-B2{background-color:#0D32B2;} + .d2-344759968 .background-color-B3{background-color:#E3E9FD;} + .d2-344759968 .background-color-B4{background-color:#E3E9FD;} + .d2-344759968 .background-color-B5{background-color:#EDF0FD;} + .d2-344759968 .background-color-B6{background-color:#F7F8FE;} + .d2-344759968 .background-color-AA2{background-color:#4A6FF3;} + .d2-344759968 .background-color-AA4{background-color:#EDF0FD;} + .d2-344759968 .background-color-AA5{background-color:#F7F8FE;} + .d2-344759968 .background-color-AB4{background-color:#EDF0FD;} + .d2-344759968 .background-color-AB5{background-color:#F7F8FE;} + .d2-344759968 .color-N1{color:#0A0F25;} + .d2-344759968 .color-N2{color:#676C7E;} + .d2-344759968 .color-N3{color:#9499AB;} + .d2-344759968 .color-N4{color:#CFD2DD;} + .d2-344759968 .color-N5{color:#DEE1EB;} + .d2-344759968 .color-N6{color:#EEF1F8;} + .d2-344759968 .color-N7{color:#FFFFFF;} + .d2-344759968 .color-B1{color:#0D32B2;} + .d2-344759968 .color-B2{color:#0D32B2;} + .d2-344759968 .color-B3{color:#E3E9FD;} + .d2-344759968 .color-B4{color:#E3E9FD;} + .d2-344759968 .color-B5{color:#EDF0FD;} + .d2-344759968 .color-B6{color:#F7F8FE;} + .d2-344759968 .color-AA2{color:#4A6FF3;} + .d2-344759968 .color-AA4{color:#EDF0FD;} + .d2-344759968 .color-AA5{color:#F7F8FE;} + .d2-344759968 .color-AB4{color:#EDF0FD;} + .d2-344759968 .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 dba25808b..a7b7c0418 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1793282847 .fill-N1{fill:#0A0F25;} + .d2-1793282847 .fill-N2{fill:#676C7E;} + .d2-1793282847 .fill-N3{fill:#9499AB;} + .d2-1793282847 .fill-N4{fill:#CFD2DD;} + .d2-1793282847 .fill-N5{fill:#DEE1EB;} + .d2-1793282847 .fill-N6{fill:#EEF1F8;} + .d2-1793282847 .fill-N7{fill:#FFFFFF;} + .d2-1793282847 .fill-B1{fill:#0D32B2;} + .d2-1793282847 .fill-B2{fill:#0D32B2;} + .d2-1793282847 .fill-B3{fill:#E3E9FD;} + .d2-1793282847 .fill-B4{fill:#E3E9FD;} + .d2-1793282847 .fill-B5{fill:#EDF0FD;} + .d2-1793282847 .fill-B6{fill:#F7F8FE;} + .d2-1793282847 .fill-AA2{fill:#4A6FF3;} + .d2-1793282847 .fill-AA4{fill:#EDF0FD;} + .d2-1793282847 .fill-AA5{fill:#F7F8FE;} + .d2-1793282847 .fill-AB4{fill:#EDF0FD;} + .d2-1793282847 .fill-AB5{fill:#F7F8FE;} + .d2-1793282847 .stroke-N1{stroke:#0A0F25;} + .d2-1793282847 .stroke-N2{stroke:#676C7E;} + .d2-1793282847 .stroke-N3{stroke:#9499AB;} + .d2-1793282847 .stroke-N4{stroke:#CFD2DD;} + .d2-1793282847 .stroke-N5{stroke:#DEE1EB;} + .d2-1793282847 .stroke-N6{stroke:#EEF1F8;} + .d2-1793282847 .stroke-N7{stroke:#FFFFFF;} + .d2-1793282847 .stroke-B1{stroke:#0D32B2;} + .d2-1793282847 .stroke-B2{stroke:#0D32B2;} + .d2-1793282847 .stroke-B3{stroke:#E3E9FD;} + .d2-1793282847 .stroke-B4{stroke:#E3E9FD;} + .d2-1793282847 .stroke-B5{stroke:#EDF0FD;} + .d2-1793282847 .stroke-B6{stroke:#F7F8FE;} + .d2-1793282847 .stroke-AA2{stroke:#4A6FF3;} + .d2-1793282847 .stroke-AA4{stroke:#EDF0FD;} + .d2-1793282847 .stroke-AA5{stroke:#F7F8FE;} + .d2-1793282847 .stroke-AB4{stroke:#EDF0FD;} + .d2-1793282847 .stroke-AB5{stroke:#F7F8FE;} + .d2-1793282847 .background-color-N1{background-color:#0A0F25;} + .d2-1793282847 .background-color-N2{background-color:#676C7E;} + .d2-1793282847 .background-color-N3{background-color:#9499AB;} + .d2-1793282847 .background-color-N4{background-color:#CFD2DD;} + .d2-1793282847 .background-color-N5{background-color:#DEE1EB;} + .d2-1793282847 .background-color-N6{background-color:#EEF1F8;} + .d2-1793282847 .background-color-N7{background-color:#FFFFFF;} + .d2-1793282847 .background-color-B1{background-color:#0D32B2;} + .d2-1793282847 .background-color-B2{background-color:#0D32B2;} + .d2-1793282847 .background-color-B3{background-color:#E3E9FD;} + .d2-1793282847 .background-color-B4{background-color:#E3E9FD;} + .d2-1793282847 .background-color-B5{background-color:#EDF0FD;} + .d2-1793282847 .background-color-B6{background-color:#F7F8FE;} + .d2-1793282847 .background-color-AA2{background-color:#4A6FF3;} + .d2-1793282847 .background-color-AA4{background-color:#EDF0FD;} + .d2-1793282847 .background-color-AA5{background-color:#F7F8FE;} + .d2-1793282847 .background-color-AB4{background-color:#EDF0FD;} + .d2-1793282847 .background-color-AB5{background-color:#F7F8FE;} + .d2-1793282847 .color-N1{color:#0A0F25;} + .d2-1793282847 .color-N2{color:#676C7E;} + .d2-1793282847 .color-N3{color:#9499AB;} + .d2-1793282847 .color-N4{color:#CFD2DD;} + .d2-1793282847 .color-N5{color:#DEE1EB;} + .d2-1793282847 .color-N6{color:#EEF1F8;} + .d2-1793282847 .color-N7{color:#FFFFFF;} + .d2-1793282847 .color-B1{color:#0D32B2;} + .d2-1793282847 .color-B2{color:#0D32B2;} + .d2-1793282847 .color-B3{color:#E3E9FD;} + .d2-1793282847 .color-B4{color:#E3E9FD;} + .d2-1793282847 .color-B5{color:#EDF0FD;} + .d2-1793282847 .color-B6{color:#F7F8FE;} + .d2-1793282847 .color-AA2{color:#4A6FF3;} + .d2-1793282847 .color-AA4{color:#EDF0FD;} + .d2-1793282847 .color-AA5{color:#F7F8FE;} + .d2-1793282847 .color-AB4{color:#EDF0FD;} + .d2-1793282847 .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}]]> rectangle -square +square diff --git a/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg b/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg index 4114dbbdb..ed48dc76a 100644 --- a/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1830000542 .fill-N1{fill:#0A0F25;} + .d2-1830000542 .fill-N2{fill:#676C7E;} + .d2-1830000542 .fill-N3{fill:#9499AB;} + .d2-1830000542 .fill-N4{fill:#CFD2DD;} + .d2-1830000542 .fill-N5{fill:#DEE1EB;} + .d2-1830000542 .fill-N6{fill:#EEF1F8;} + .d2-1830000542 .fill-N7{fill:#FFFFFF;} + .d2-1830000542 .fill-B1{fill:#0D32B2;} + .d2-1830000542 .fill-B2{fill:#0D32B2;} + .d2-1830000542 .fill-B3{fill:#E3E9FD;} + .d2-1830000542 .fill-B4{fill:#E3E9FD;} + .d2-1830000542 .fill-B5{fill:#EDF0FD;} + .d2-1830000542 .fill-B6{fill:#F7F8FE;} + .d2-1830000542 .fill-AA2{fill:#4A6FF3;} + .d2-1830000542 .fill-AA4{fill:#EDF0FD;} + .d2-1830000542 .fill-AA5{fill:#F7F8FE;} + .d2-1830000542 .fill-AB4{fill:#EDF0FD;} + .d2-1830000542 .fill-AB5{fill:#F7F8FE;} + .d2-1830000542 .stroke-N1{stroke:#0A0F25;} + .d2-1830000542 .stroke-N2{stroke:#676C7E;} + .d2-1830000542 .stroke-N3{stroke:#9499AB;} + .d2-1830000542 .stroke-N4{stroke:#CFD2DD;} + .d2-1830000542 .stroke-N5{stroke:#DEE1EB;} + .d2-1830000542 .stroke-N6{stroke:#EEF1F8;} + .d2-1830000542 .stroke-N7{stroke:#FFFFFF;} + .d2-1830000542 .stroke-B1{stroke:#0D32B2;} + .d2-1830000542 .stroke-B2{stroke:#0D32B2;} + .d2-1830000542 .stroke-B3{stroke:#E3E9FD;} + .d2-1830000542 .stroke-B4{stroke:#E3E9FD;} + .d2-1830000542 .stroke-B5{stroke:#EDF0FD;} + .d2-1830000542 .stroke-B6{stroke:#F7F8FE;} + .d2-1830000542 .stroke-AA2{stroke:#4A6FF3;} + .d2-1830000542 .stroke-AA4{stroke:#EDF0FD;} + .d2-1830000542 .stroke-AA5{stroke:#F7F8FE;} + .d2-1830000542 .stroke-AB4{stroke:#EDF0FD;} + .d2-1830000542 .stroke-AB5{stroke:#F7F8FE;} + .d2-1830000542 .background-color-N1{background-color:#0A0F25;} + .d2-1830000542 .background-color-N2{background-color:#676C7E;} + .d2-1830000542 .background-color-N3{background-color:#9499AB;} + .d2-1830000542 .background-color-N4{background-color:#CFD2DD;} + .d2-1830000542 .background-color-N5{background-color:#DEE1EB;} + .d2-1830000542 .background-color-N6{background-color:#EEF1F8;} + .d2-1830000542 .background-color-N7{background-color:#FFFFFF;} + .d2-1830000542 .background-color-B1{background-color:#0D32B2;} + .d2-1830000542 .background-color-B2{background-color:#0D32B2;} + .d2-1830000542 .background-color-B3{background-color:#E3E9FD;} + .d2-1830000542 .background-color-B4{background-color:#E3E9FD;} + .d2-1830000542 .background-color-B5{background-color:#EDF0FD;} + .d2-1830000542 .background-color-B6{background-color:#F7F8FE;} + .d2-1830000542 .background-color-AA2{background-color:#4A6FF3;} + .d2-1830000542 .background-color-AA4{background-color:#EDF0FD;} + .d2-1830000542 .background-color-AA5{background-color:#F7F8FE;} + .d2-1830000542 .background-color-AB4{background-color:#EDF0FD;} + .d2-1830000542 .background-color-AB5{background-color:#F7F8FE;} + .d2-1830000542 .color-N1{color:#0A0F25;} + .d2-1830000542 .color-N2{color:#676C7E;} + .d2-1830000542 .color-N3{color:#9499AB;} + .d2-1830000542 .color-N4{color:#CFD2DD;} + .d2-1830000542 .color-N5{color:#DEE1EB;} + .d2-1830000542 .color-N6{color:#EEF1F8;} + .d2-1830000542 .color-N7{color:#FFFFFF;} + .d2-1830000542 .color-B1{color:#0D32B2;} + .d2-1830000542 .color-B2{color:#0D32B2;} + .d2-1830000542 .color-B3{color:#E3E9FD;} + .d2-1830000542 .color-B4{color:#E3E9FD;} + .d2-1830000542 .color-B5{color:#EDF0FD;} + .d2-1830000542 .color-B6{color:#F7F8FE;} + .d2-1830000542 .color-AA2{color:#4A6FF3;} + .d2-1830000542 .color-AA4{color:#EDF0FD;} + .d2-1830000542 .color-AA5{color:#F7F8FE;} + .d2-1830000542 .color-AB4{color:#EDF0FD;} + .d2-1830000542 .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}]]> rectangle -square +square diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg index 2911a3634..5986936b0 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-1367388716 .fill-N1{fill:#0A0F25;} + .d2-1367388716 .fill-N2{fill:#676C7E;} + .d2-1367388716 .fill-N3{fill:#9499AB;} + .d2-1367388716 .fill-N4{fill:#CFD2DD;} + .d2-1367388716 .fill-N5{fill:#DEE1EB;} + .d2-1367388716 .fill-N6{fill:#EEF1F8;} + .d2-1367388716 .fill-N7{fill:#FFFFFF;} + .d2-1367388716 .fill-B1{fill:#0D32B2;} + .d2-1367388716 .fill-B2{fill:#0D32B2;} + .d2-1367388716 .fill-B3{fill:#E3E9FD;} + .d2-1367388716 .fill-B4{fill:#E3E9FD;} + .d2-1367388716 .fill-B5{fill:#EDF0FD;} + .d2-1367388716 .fill-B6{fill:#F7F8FE;} + .d2-1367388716 .fill-AA2{fill:#4A6FF3;} + .d2-1367388716 .fill-AA4{fill:#EDF0FD;} + .d2-1367388716 .fill-AA5{fill:#F7F8FE;} + .d2-1367388716 .fill-AB4{fill:#EDF0FD;} + .d2-1367388716 .fill-AB5{fill:#F7F8FE;} + .d2-1367388716 .stroke-N1{stroke:#0A0F25;} + .d2-1367388716 .stroke-N2{stroke:#676C7E;} + .d2-1367388716 .stroke-N3{stroke:#9499AB;} + .d2-1367388716 .stroke-N4{stroke:#CFD2DD;} + .d2-1367388716 .stroke-N5{stroke:#DEE1EB;} + .d2-1367388716 .stroke-N6{stroke:#EEF1F8;} + .d2-1367388716 .stroke-N7{stroke:#FFFFFF;} + .d2-1367388716 .stroke-B1{stroke:#0D32B2;} + .d2-1367388716 .stroke-B2{stroke:#0D32B2;} + .d2-1367388716 .stroke-B3{stroke:#E3E9FD;} + .d2-1367388716 .stroke-B4{stroke:#E3E9FD;} + .d2-1367388716 .stroke-B5{stroke:#EDF0FD;} + .d2-1367388716 .stroke-B6{stroke:#F7F8FE;} + .d2-1367388716 .stroke-AA2{stroke:#4A6FF3;} + .d2-1367388716 .stroke-AA4{stroke:#EDF0FD;} + .d2-1367388716 .stroke-AA5{stroke:#F7F8FE;} + .d2-1367388716 .stroke-AB4{stroke:#EDF0FD;} + .d2-1367388716 .stroke-AB5{stroke:#F7F8FE;} + .d2-1367388716 .background-color-N1{background-color:#0A0F25;} + .d2-1367388716 .background-color-N2{background-color:#676C7E;} + .d2-1367388716 .background-color-N3{background-color:#9499AB;} + .d2-1367388716 .background-color-N4{background-color:#CFD2DD;} + .d2-1367388716 .background-color-N5{background-color:#DEE1EB;} + .d2-1367388716 .background-color-N6{background-color:#EEF1F8;} + .d2-1367388716 .background-color-N7{background-color:#FFFFFF;} + .d2-1367388716 .background-color-B1{background-color:#0D32B2;} + .d2-1367388716 .background-color-B2{background-color:#0D32B2;} + .d2-1367388716 .background-color-B3{background-color:#E3E9FD;} + .d2-1367388716 .background-color-B4{background-color:#E3E9FD;} + .d2-1367388716 .background-color-B5{background-color:#EDF0FD;} + .d2-1367388716 .background-color-B6{background-color:#F7F8FE;} + .d2-1367388716 .background-color-AA2{background-color:#4A6FF3;} + .d2-1367388716 .background-color-AA4{background-color:#EDF0FD;} + .d2-1367388716 .background-color-AA5{background-color:#F7F8FE;} + .d2-1367388716 .background-color-AB4{background-color:#EDF0FD;} + .d2-1367388716 .background-color-AB5{background-color:#F7F8FE;} + .d2-1367388716 .color-N1{color:#0A0F25;} + .d2-1367388716 .color-N2{color:#676C7E;} + .d2-1367388716 .color-N3{color:#9499AB;} + .d2-1367388716 .color-N4{color:#CFD2DD;} + .d2-1367388716 .color-N5{color:#DEE1EB;} + .d2-1367388716 .color-N6{color:#EEF1F8;} + .d2-1367388716 .color-N7{color:#FFFFFF;} + .d2-1367388716 .color-B1{color:#0D32B2;} + .d2-1367388716 .color-B2{color:#0D32B2;} + .d2-1367388716 .color-B3{color:#E3E9FD;} + .d2-1367388716 .color-B4{color:#E3E9FD;} + .d2-1367388716 .color-B5{color:#EDF0FD;} + .d2-1367388716 .color-B6{color:#F7F8FE;} + .d2-1367388716 .color-AA2{color:#4A6FF3;} + .d2-1367388716 .color-AA4{color:#EDF0FD;} + .d2-1367388716 .color-AA5{color:#F7F8FE;} + .d2-1367388716 .color-AB4{color:#EDF0FD;} + .d2-1367388716 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc 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 49183ae4c..595452aaf 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-2088457274 .fill-N1{fill:#0A0F25;} + .d2-2088457274 .fill-N2{fill:#676C7E;} + .d2-2088457274 .fill-N3{fill:#9499AB;} + .d2-2088457274 .fill-N4{fill:#CFD2DD;} + .d2-2088457274 .fill-N5{fill:#DEE1EB;} + .d2-2088457274 .fill-N6{fill:#EEF1F8;} + .d2-2088457274 .fill-N7{fill:#FFFFFF;} + .d2-2088457274 .fill-B1{fill:#0D32B2;} + .d2-2088457274 .fill-B2{fill:#0D32B2;} + .d2-2088457274 .fill-B3{fill:#E3E9FD;} + .d2-2088457274 .fill-B4{fill:#E3E9FD;} + .d2-2088457274 .fill-B5{fill:#EDF0FD;} + .d2-2088457274 .fill-B6{fill:#F7F8FE;} + .d2-2088457274 .fill-AA2{fill:#4A6FF3;} + .d2-2088457274 .fill-AA4{fill:#EDF0FD;} + .d2-2088457274 .fill-AA5{fill:#F7F8FE;} + .d2-2088457274 .fill-AB4{fill:#EDF0FD;} + .d2-2088457274 .fill-AB5{fill:#F7F8FE;} + .d2-2088457274 .stroke-N1{stroke:#0A0F25;} + .d2-2088457274 .stroke-N2{stroke:#676C7E;} + .d2-2088457274 .stroke-N3{stroke:#9499AB;} + .d2-2088457274 .stroke-N4{stroke:#CFD2DD;} + .d2-2088457274 .stroke-N5{stroke:#DEE1EB;} + .d2-2088457274 .stroke-N6{stroke:#EEF1F8;} + .d2-2088457274 .stroke-N7{stroke:#FFFFFF;} + .d2-2088457274 .stroke-B1{stroke:#0D32B2;} + .d2-2088457274 .stroke-B2{stroke:#0D32B2;} + .d2-2088457274 .stroke-B3{stroke:#E3E9FD;} + .d2-2088457274 .stroke-B4{stroke:#E3E9FD;} + .d2-2088457274 .stroke-B5{stroke:#EDF0FD;} + .d2-2088457274 .stroke-B6{stroke:#F7F8FE;} + .d2-2088457274 .stroke-AA2{stroke:#4A6FF3;} + .d2-2088457274 .stroke-AA4{stroke:#EDF0FD;} + .d2-2088457274 .stroke-AA5{stroke:#F7F8FE;} + .d2-2088457274 .stroke-AB4{stroke:#EDF0FD;} + .d2-2088457274 .stroke-AB5{stroke:#F7F8FE;} + .d2-2088457274 .background-color-N1{background-color:#0A0F25;} + .d2-2088457274 .background-color-N2{background-color:#676C7E;} + .d2-2088457274 .background-color-N3{background-color:#9499AB;} + .d2-2088457274 .background-color-N4{background-color:#CFD2DD;} + .d2-2088457274 .background-color-N5{background-color:#DEE1EB;} + .d2-2088457274 .background-color-N6{background-color:#EEF1F8;} + .d2-2088457274 .background-color-N7{background-color:#FFFFFF;} + .d2-2088457274 .background-color-B1{background-color:#0D32B2;} + .d2-2088457274 .background-color-B2{background-color:#0D32B2;} + .d2-2088457274 .background-color-B3{background-color:#E3E9FD;} + .d2-2088457274 .background-color-B4{background-color:#E3E9FD;} + .d2-2088457274 .background-color-B5{background-color:#EDF0FD;} + .d2-2088457274 .background-color-B6{background-color:#F7F8FE;} + .d2-2088457274 .background-color-AA2{background-color:#4A6FF3;} + .d2-2088457274 .background-color-AA4{background-color:#EDF0FD;} + .d2-2088457274 .background-color-AA5{background-color:#F7F8FE;} + .d2-2088457274 .background-color-AB4{background-color:#EDF0FD;} + .d2-2088457274 .background-color-AB5{background-color:#F7F8FE;} + .d2-2088457274 .color-N1{color:#0A0F25;} + .d2-2088457274 .color-N2{color:#676C7E;} + .d2-2088457274 .color-N3{color:#9499AB;} + .d2-2088457274 .color-N4{color:#CFD2DD;} + .d2-2088457274 .color-N5{color:#DEE1EB;} + .d2-2088457274 .color-N6{color:#EEF1F8;} + .d2-2088457274 .color-N7{color:#FFFFFF;} + .d2-2088457274 .color-B1{color:#0D32B2;} + .d2-2088457274 .color-B2{color:#0D32B2;} + .d2-2088457274 .color-B3{color:#E3E9FD;} + .d2-2088457274 .color-B4{color:#E3E9FD;} + .d2-2088457274 .color-B5{color:#EDF0FD;} + .d2-2088457274 .color-B6{color:#F7F8FE;} + .d2-2088457274 .color-AA2{color:#4A6FF3;} + .d2-2088457274 .color-AA4{color:#EDF0FD;} + .d2-2088457274 .color-AA5{color:#F7F8FE;} + .d2-2088457274 .color-AB4{color:#EDF0FD;} + .d2-2088457274 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc diff --git a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg index e2ffa411a..0acdedbe1 100644 --- a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2923702954 .fill-N1{fill:#0A0F25;} + .d2-2923702954 .fill-N2{fill:#676C7E;} + .d2-2923702954 .fill-N3{fill:#9499AB;} + .d2-2923702954 .fill-N4{fill:#CFD2DD;} + .d2-2923702954 .fill-N5{fill:#DEE1EB;} + .d2-2923702954 .fill-N6{fill:#EEF1F8;} + .d2-2923702954 .fill-N7{fill:#FFFFFF;} + .d2-2923702954 .fill-B1{fill:#0D32B2;} + .d2-2923702954 .fill-B2{fill:#0D32B2;} + .d2-2923702954 .fill-B3{fill:#E3E9FD;} + .d2-2923702954 .fill-B4{fill:#E3E9FD;} + .d2-2923702954 .fill-B5{fill:#EDF0FD;} + .d2-2923702954 .fill-B6{fill:#F7F8FE;} + .d2-2923702954 .fill-AA2{fill:#4A6FF3;} + .d2-2923702954 .fill-AA4{fill:#EDF0FD;} + .d2-2923702954 .fill-AA5{fill:#F7F8FE;} + .d2-2923702954 .fill-AB4{fill:#EDF0FD;} + .d2-2923702954 .fill-AB5{fill:#F7F8FE;} + .d2-2923702954 .stroke-N1{stroke:#0A0F25;} + .d2-2923702954 .stroke-N2{stroke:#676C7E;} + .d2-2923702954 .stroke-N3{stroke:#9499AB;} + .d2-2923702954 .stroke-N4{stroke:#CFD2DD;} + .d2-2923702954 .stroke-N5{stroke:#DEE1EB;} + .d2-2923702954 .stroke-N6{stroke:#EEF1F8;} + .d2-2923702954 .stroke-N7{stroke:#FFFFFF;} + .d2-2923702954 .stroke-B1{stroke:#0D32B2;} + .d2-2923702954 .stroke-B2{stroke:#0D32B2;} + .d2-2923702954 .stroke-B3{stroke:#E3E9FD;} + .d2-2923702954 .stroke-B4{stroke:#E3E9FD;} + .d2-2923702954 .stroke-B5{stroke:#EDF0FD;} + .d2-2923702954 .stroke-B6{stroke:#F7F8FE;} + .d2-2923702954 .stroke-AA2{stroke:#4A6FF3;} + .d2-2923702954 .stroke-AA4{stroke:#EDF0FD;} + .d2-2923702954 .stroke-AA5{stroke:#F7F8FE;} + .d2-2923702954 .stroke-AB4{stroke:#EDF0FD;} + .d2-2923702954 .stroke-AB5{stroke:#F7F8FE;} + .d2-2923702954 .background-color-N1{background-color:#0A0F25;} + .d2-2923702954 .background-color-N2{background-color:#676C7E;} + .d2-2923702954 .background-color-N3{background-color:#9499AB;} + .d2-2923702954 .background-color-N4{background-color:#CFD2DD;} + .d2-2923702954 .background-color-N5{background-color:#DEE1EB;} + .d2-2923702954 .background-color-N6{background-color:#EEF1F8;} + .d2-2923702954 .background-color-N7{background-color:#FFFFFF;} + .d2-2923702954 .background-color-B1{background-color:#0D32B2;} + .d2-2923702954 .background-color-B2{background-color:#0D32B2;} + .d2-2923702954 .background-color-B3{background-color:#E3E9FD;} + .d2-2923702954 .background-color-B4{background-color:#E3E9FD;} + .d2-2923702954 .background-color-B5{background-color:#EDF0FD;} + .d2-2923702954 .background-color-B6{background-color:#F7F8FE;} + .d2-2923702954 .background-color-AA2{background-color:#4A6FF3;} + .d2-2923702954 .background-color-AA4{background-color:#EDF0FD;} + .d2-2923702954 .background-color-AA5{background-color:#F7F8FE;} + .d2-2923702954 .background-color-AB4{background-color:#EDF0FD;} + .d2-2923702954 .background-color-AB5{background-color:#F7F8FE;} + .d2-2923702954 .color-N1{color:#0A0F25;} + .d2-2923702954 .color-N2{color:#676C7E;} + .d2-2923702954 .color-N3{color:#9499AB;} + .d2-2923702954 .color-N4{color:#CFD2DD;} + .d2-2923702954 .color-N5{color:#DEE1EB;} + .d2-2923702954 .color-N6{color:#EEF1F8;} + .d2-2923702954 .color-N7{color:#FFFFFF;} + .d2-2923702954 .color-B1{color:#0D32B2;} + .d2-2923702954 .color-B2{color:#0D32B2;} + .d2-2923702954 .color-B3{color:#E3E9FD;} + .d2-2923702954 .color-B4{color:#E3E9FD;} + .d2-2923702954 .color-B5{color:#EDF0FD;} + .d2-2923702954 .color-B6{color:#F7F8FE;} + .d2-2923702954 .color-AA2{color:#4A6FF3;} + .d2-2923702954 .color-AA4{color:#EDF0FD;} + .d2-2923702954 .color-AA5{color:#F7F8FE;} + .d2-2923702954 .color-AB4{color:#EDF0FD;} + .d2-2923702954 .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}]]> @@ -106,7 +106,7 @@ x -y in style +y in style diff --git a/e2etests/testdata/stable/stylish/elk/sketch.exp.svg b/e2etests/testdata/stable/stylish/elk/sketch.exp.svg index 9c3f2367f..6d96f3e82 100644 --- a/e2etests/testdata/stable/stylish/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/elk/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2497092455 .fill-N1{fill:#0A0F25;} + .d2-2497092455 .fill-N2{fill:#676C7E;} + .d2-2497092455 .fill-N3{fill:#9499AB;} + .d2-2497092455 .fill-N4{fill:#CFD2DD;} + .d2-2497092455 .fill-N5{fill:#DEE1EB;} + .d2-2497092455 .fill-N6{fill:#EEF1F8;} + .d2-2497092455 .fill-N7{fill:#FFFFFF;} + .d2-2497092455 .fill-B1{fill:#0D32B2;} + .d2-2497092455 .fill-B2{fill:#0D32B2;} + .d2-2497092455 .fill-B3{fill:#E3E9FD;} + .d2-2497092455 .fill-B4{fill:#E3E9FD;} + .d2-2497092455 .fill-B5{fill:#EDF0FD;} + .d2-2497092455 .fill-B6{fill:#F7F8FE;} + .d2-2497092455 .fill-AA2{fill:#4A6FF3;} + .d2-2497092455 .fill-AA4{fill:#EDF0FD;} + .d2-2497092455 .fill-AA5{fill:#F7F8FE;} + .d2-2497092455 .fill-AB4{fill:#EDF0FD;} + .d2-2497092455 .fill-AB5{fill:#F7F8FE;} + .d2-2497092455 .stroke-N1{stroke:#0A0F25;} + .d2-2497092455 .stroke-N2{stroke:#676C7E;} + .d2-2497092455 .stroke-N3{stroke:#9499AB;} + .d2-2497092455 .stroke-N4{stroke:#CFD2DD;} + .d2-2497092455 .stroke-N5{stroke:#DEE1EB;} + .d2-2497092455 .stroke-N6{stroke:#EEF1F8;} + .d2-2497092455 .stroke-N7{stroke:#FFFFFF;} + .d2-2497092455 .stroke-B1{stroke:#0D32B2;} + .d2-2497092455 .stroke-B2{stroke:#0D32B2;} + .d2-2497092455 .stroke-B3{stroke:#E3E9FD;} + .d2-2497092455 .stroke-B4{stroke:#E3E9FD;} + .d2-2497092455 .stroke-B5{stroke:#EDF0FD;} + .d2-2497092455 .stroke-B6{stroke:#F7F8FE;} + .d2-2497092455 .stroke-AA2{stroke:#4A6FF3;} + .d2-2497092455 .stroke-AA4{stroke:#EDF0FD;} + .d2-2497092455 .stroke-AA5{stroke:#F7F8FE;} + .d2-2497092455 .stroke-AB4{stroke:#EDF0FD;} + .d2-2497092455 .stroke-AB5{stroke:#F7F8FE;} + .d2-2497092455 .background-color-N1{background-color:#0A0F25;} + .d2-2497092455 .background-color-N2{background-color:#676C7E;} + .d2-2497092455 .background-color-N3{background-color:#9499AB;} + .d2-2497092455 .background-color-N4{background-color:#CFD2DD;} + .d2-2497092455 .background-color-N5{background-color:#DEE1EB;} + .d2-2497092455 .background-color-N6{background-color:#EEF1F8;} + .d2-2497092455 .background-color-N7{background-color:#FFFFFF;} + .d2-2497092455 .background-color-B1{background-color:#0D32B2;} + .d2-2497092455 .background-color-B2{background-color:#0D32B2;} + .d2-2497092455 .background-color-B3{background-color:#E3E9FD;} + .d2-2497092455 .background-color-B4{background-color:#E3E9FD;} + .d2-2497092455 .background-color-B5{background-color:#EDF0FD;} + .d2-2497092455 .background-color-B6{background-color:#F7F8FE;} + .d2-2497092455 .background-color-AA2{background-color:#4A6FF3;} + .d2-2497092455 .background-color-AA4{background-color:#EDF0FD;} + .d2-2497092455 .background-color-AA5{background-color:#F7F8FE;} + .d2-2497092455 .background-color-AB4{background-color:#EDF0FD;} + .d2-2497092455 .background-color-AB5{background-color:#F7F8FE;} + .d2-2497092455 .color-N1{color:#0A0F25;} + .d2-2497092455 .color-N2{color:#676C7E;} + .d2-2497092455 .color-N3{color:#9499AB;} + .d2-2497092455 .color-N4{color:#CFD2DD;} + .d2-2497092455 .color-N5{color:#DEE1EB;} + .d2-2497092455 .color-N6{color:#EEF1F8;} + .d2-2497092455 .color-N7{color:#FFFFFF;} + .d2-2497092455 .color-B1{color:#0D32B2;} + .d2-2497092455 .color-B2{color:#0D32B2;} + .d2-2497092455 .color-B3{color:#E3E9FD;} + .d2-2497092455 .color-B4{color:#E3E9FD;} + .d2-2497092455 .color-B5{color:#EDF0FD;} + .d2-2497092455 .color-B6{color:#F7F8FE;} + .d2-2497092455 .color-AA2{color:#4A6FF3;} + .d2-2497092455 .color-AA4{color:#EDF0FD;} + .d2-2497092455 .color-AA5{color:#F7F8FE;} + .d2-2497092455 .color-AB4{color:#EDF0FD;} + .d2-2497092455 .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}]]> @@ -106,7 +106,7 @@ x -y in style +y in style diff --git a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg index b2b3afd55..467f9def2 100644 --- a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

    Identity Native Proxy

    -
    Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged +Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged diff --git a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg index 95b961a25..13e69c647 100644 --- a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

    Identity Native Proxy

    -
    Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged +Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged diff --git a/e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg b/e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg index 8a02a49a4..ee2121974 100644 --- a/e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg @@ -1,26 +1,26 @@ -bearmama bearpapa bear +bearmama bearpapa bear diff --git a/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg index a78afa458..163e6761d 100644 --- a/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg @@ -1,26 +1,26 @@ -bearmama bearpapa bear +bearmama bearpapa bear diff --git a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg index e700a0dad..2bbd663cd 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1269925474 .fill-N1{fill:#0A0F25;} + .d2-1269925474 .fill-N2{fill:#676C7E;} + .d2-1269925474 .fill-N3{fill:#9499AB;} + .d2-1269925474 .fill-N4{fill:#CFD2DD;} + .d2-1269925474 .fill-N5{fill:#DEE1EB;} + .d2-1269925474 .fill-N6{fill:#EEF1F8;} + .d2-1269925474 .fill-N7{fill:#FFFFFF;} + .d2-1269925474 .fill-B1{fill:#0D32B2;} + .d2-1269925474 .fill-B2{fill:#0D32B2;} + .d2-1269925474 .fill-B3{fill:#E3E9FD;} + .d2-1269925474 .fill-B4{fill:#E3E9FD;} + .d2-1269925474 .fill-B5{fill:#EDF0FD;} + .d2-1269925474 .fill-B6{fill:#F7F8FE;} + .d2-1269925474 .fill-AA2{fill:#4A6FF3;} + .d2-1269925474 .fill-AA4{fill:#EDF0FD;} + .d2-1269925474 .fill-AA5{fill:#F7F8FE;} + .d2-1269925474 .fill-AB4{fill:#EDF0FD;} + .d2-1269925474 .fill-AB5{fill:#F7F8FE;} + .d2-1269925474 .stroke-N1{stroke:#0A0F25;} + .d2-1269925474 .stroke-N2{stroke:#676C7E;} + .d2-1269925474 .stroke-N3{stroke:#9499AB;} + .d2-1269925474 .stroke-N4{stroke:#CFD2DD;} + .d2-1269925474 .stroke-N5{stroke:#DEE1EB;} + .d2-1269925474 .stroke-N6{stroke:#EEF1F8;} + .d2-1269925474 .stroke-N7{stroke:#FFFFFF;} + .d2-1269925474 .stroke-B1{stroke:#0D32B2;} + .d2-1269925474 .stroke-B2{stroke:#0D32B2;} + .d2-1269925474 .stroke-B3{stroke:#E3E9FD;} + .d2-1269925474 .stroke-B4{stroke:#E3E9FD;} + .d2-1269925474 .stroke-B5{stroke:#EDF0FD;} + .d2-1269925474 .stroke-B6{stroke:#F7F8FE;} + .d2-1269925474 .stroke-AA2{stroke:#4A6FF3;} + .d2-1269925474 .stroke-AA4{stroke:#EDF0FD;} + .d2-1269925474 .stroke-AA5{stroke:#F7F8FE;} + .d2-1269925474 .stroke-AB4{stroke:#EDF0FD;} + .d2-1269925474 .stroke-AB5{stroke:#F7F8FE;} + .d2-1269925474 .background-color-N1{background-color:#0A0F25;} + .d2-1269925474 .background-color-N2{background-color:#676C7E;} + .d2-1269925474 .background-color-N3{background-color:#9499AB;} + .d2-1269925474 .background-color-N4{background-color:#CFD2DD;} + .d2-1269925474 .background-color-N5{background-color:#DEE1EB;} + .d2-1269925474 .background-color-N6{background-color:#EEF1F8;} + .d2-1269925474 .background-color-N7{background-color:#FFFFFF;} + .d2-1269925474 .background-color-B1{background-color:#0D32B2;} + .d2-1269925474 .background-color-B2{background-color:#0D32B2;} + .d2-1269925474 .background-color-B3{background-color:#E3E9FD;} + .d2-1269925474 .background-color-B4{background-color:#E3E9FD;} + .d2-1269925474 .background-color-B5{background-color:#EDF0FD;} + .d2-1269925474 .background-color-B6{background-color:#F7F8FE;} + .d2-1269925474 .background-color-AA2{background-color:#4A6FF3;} + .d2-1269925474 .background-color-AA4{background-color:#EDF0FD;} + .d2-1269925474 .background-color-AA5{background-color:#F7F8FE;} + .d2-1269925474 .background-color-AB4{background-color:#EDF0FD;} + .d2-1269925474 .background-color-AB5{background-color:#F7F8FE;} + .d2-1269925474 .color-N1{color:#0A0F25;} + .d2-1269925474 .color-N2{color:#676C7E;} + .d2-1269925474 .color-N3{color:#9499AB;} + .d2-1269925474 .color-N4{color:#CFD2DD;} + .d2-1269925474 .color-N5{color:#DEE1EB;} + .d2-1269925474 .color-N6{color:#EEF1F8;} + .d2-1269925474 .color-N7{color:#FFFFFF;} + .d2-1269925474 .color-B1{color:#0D32B2;} + .d2-1269925474 .color-B2{color:#0D32B2;} + .d2-1269925474 .color-B3{color:#E3E9FD;} + .d2-1269925474 .color-B4{color:#E3E9FD;} + .d2-1269925474 .color-B5{color:#EDF0FD;} + .d2-1269925474 .color-B6{color:#F7F8FE;} + .d2-1269925474 .color-AA2{color:#4A6FF3;} + .d2-1269925474 .color-AA4{color:#EDF0FD;} + .d2-1269925474 .color-AA5{color:#F7F8FE;} + .d2-1269925474 .color-AB4{color:#EDF0FD;} + .d2-1269925474 .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}]]> -cube +cube \ No newline at end of file diff --git a/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg b/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg index 7307df74d..599dd810f 100644 --- a/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3162970690 .fill-N1{fill:#0A0F25;} + .d2-3162970690 .fill-N2{fill:#676C7E;} + .d2-3162970690 .fill-N3{fill:#9499AB;} + .d2-3162970690 .fill-N4{fill:#CFD2DD;} + .d2-3162970690 .fill-N5{fill:#DEE1EB;} + .d2-3162970690 .fill-N6{fill:#EEF1F8;} + .d2-3162970690 .fill-N7{fill:#FFFFFF;} + .d2-3162970690 .fill-B1{fill:#0D32B2;} + .d2-3162970690 .fill-B2{fill:#0D32B2;} + .d2-3162970690 .fill-B3{fill:#E3E9FD;} + .d2-3162970690 .fill-B4{fill:#E3E9FD;} + .d2-3162970690 .fill-B5{fill:#EDF0FD;} + .d2-3162970690 .fill-B6{fill:#F7F8FE;} + .d2-3162970690 .fill-AA2{fill:#4A6FF3;} + .d2-3162970690 .fill-AA4{fill:#EDF0FD;} + .d2-3162970690 .fill-AA5{fill:#F7F8FE;} + .d2-3162970690 .fill-AB4{fill:#EDF0FD;} + .d2-3162970690 .fill-AB5{fill:#F7F8FE;} + .d2-3162970690 .stroke-N1{stroke:#0A0F25;} + .d2-3162970690 .stroke-N2{stroke:#676C7E;} + .d2-3162970690 .stroke-N3{stroke:#9499AB;} + .d2-3162970690 .stroke-N4{stroke:#CFD2DD;} + .d2-3162970690 .stroke-N5{stroke:#DEE1EB;} + .d2-3162970690 .stroke-N6{stroke:#EEF1F8;} + .d2-3162970690 .stroke-N7{stroke:#FFFFFF;} + .d2-3162970690 .stroke-B1{stroke:#0D32B2;} + .d2-3162970690 .stroke-B2{stroke:#0D32B2;} + .d2-3162970690 .stroke-B3{stroke:#E3E9FD;} + .d2-3162970690 .stroke-B4{stroke:#E3E9FD;} + .d2-3162970690 .stroke-B5{stroke:#EDF0FD;} + .d2-3162970690 .stroke-B6{stroke:#F7F8FE;} + .d2-3162970690 .stroke-AA2{stroke:#4A6FF3;} + .d2-3162970690 .stroke-AA4{stroke:#EDF0FD;} + .d2-3162970690 .stroke-AA5{stroke:#F7F8FE;} + .d2-3162970690 .stroke-AB4{stroke:#EDF0FD;} + .d2-3162970690 .stroke-AB5{stroke:#F7F8FE;} + .d2-3162970690 .background-color-N1{background-color:#0A0F25;} + .d2-3162970690 .background-color-N2{background-color:#676C7E;} + .d2-3162970690 .background-color-N3{background-color:#9499AB;} + .d2-3162970690 .background-color-N4{background-color:#CFD2DD;} + .d2-3162970690 .background-color-N5{background-color:#DEE1EB;} + .d2-3162970690 .background-color-N6{background-color:#EEF1F8;} + .d2-3162970690 .background-color-N7{background-color:#FFFFFF;} + .d2-3162970690 .background-color-B1{background-color:#0D32B2;} + .d2-3162970690 .background-color-B2{background-color:#0D32B2;} + .d2-3162970690 .background-color-B3{background-color:#E3E9FD;} + .d2-3162970690 .background-color-B4{background-color:#E3E9FD;} + .d2-3162970690 .background-color-B5{background-color:#EDF0FD;} + .d2-3162970690 .background-color-B6{background-color:#F7F8FE;} + .d2-3162970690 .background-color-AA2{background-color:#4A6FF3;} + .d2-3162970690 .background-color-AA4{background-color:#EDF0FD;} + .d2-3162970690 .background-color-AA5{background-color:#F7F8FE;} + .d2-3162970690 .background-color-AB4{background-color:#EDF0FD;} + .d2-3162970690 .background-color-AB5{background-color:#F7F8FE;} + .d2-3162970690 .color-N1{color:#0A0F25;} + .d2-3162970690 .color-N2{color:#676C7E;} + .d2-3162970690 .color-N3{color:#9499AB;} + .d2-3162970690 .color-N4{color:#CFD2DD;} + .d2-3162970690 .color-N5{color:#DEE1EB;} + .d2-3162970690 .color-N6{color:#EEF1F8;} + .d2-3162970690 .color-N7{color:#FFFFFF;} + .d2-3162970690 .color-B1{color:#0D32B2;} + .d2-3162970690 .color-B2{color:#0D32B2;} + .d2-3162970690 .color-B3{color:#E3E9FD;} + .d2-3162970690 .color-B4{color:#E3E9FD;} + .d2-3162970690 .color-B5{color:#EDF0FD;} + .d2-3162970690 .color-B6{color:#F7F8FE;} + .d2-3162970690 .color-AA2{color:#4A6FF3;} + .d2-3162970690 .color-AA4{color:#EDF0FD;} + .d2-3162970690 .color-AA5{color:#F7F8FE;} + .d2-3162970690 .color-AB4{color:#EDF0FD;} + .d2-3162970690 .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}]]> -cube +cube \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg index 1e9587dee..5eb8be596 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-4206423234 .fill-N1{fill:#0A0F25;} + .d2-4206423234 .fill-N2{fill:#676C7E;} + .d2-4206423234 .fill-N3{fill:#9499AB;} + .d2-4206423234 .fill-N4{fill:#CFD2DD;} + .d2-4206423234 .fill-N5{fill:#DEE1EB;} + .d2-4206423234 .fill-N6{fill:#EEF1F8;} + .d2-4206423234 .fill-N7{fill:#FFFFFF;} + .d2-4206423234 .fill-B1{fill:#0D32B2;} + .d2-4206423234 .fill-B2{fill:#0D32B2;} + .d2-4206423234 .fill-B3{fill:#E3E9FD;} + .d2-4206423234 .fill-B4{fill:#E3E9FD;} + .d2-4206423234 .fill-B5{fill:#EDF0FD;} + .d2-4206423234 .fill-B6{fill:#F7F8FE;} + .d2-4206423234 .fill-AA2{fill:#4A6FF3;} + .d2-4206423234 .fill-AA4{fill:#EDF0FD;} + .d2-4206423234 .fill-AA5{fill:#F7F8FE;} + .d2-4206423234 .fill-AB4{fill:#EDF0FD;} + .d2-4206423234 .fill-AB5{fill:#F7F8FE;} + .d2-4206423234 .stroke-N1{stroke:#0A0F25;} + .d2-4206423234 .stroke-N2{stroke:#676C7E;} + .d2-4206423234 .stroke-N3{stroke:#9499AB;} + .d2-4206423234 .stroke-N4{stroke:#CFD2DD;} + .d2-4206423234 .stroke-N5{stroke:#DEE1EB;} + .d2-4206423234 .stroke-N6{stroke:#EEF1F8;} + .d2-4206423234 .stroke-N7{stroke:#FFFFFF;} + .d2-4206423234 .stroke-B1{stroke:#0D32B2;} + .d2-4206423234 .stroke-B2{stroke:#0D32B2;} + .d2-4206423234 .stroke-B3{stroke:#E3E9FD;} + .d2-4206423234 .stroke-B4{stroke:#E3E9FD;} + .d2-4206423234 .stroke-B5{stroke:#EDF0FD;} + .d2-4206423234 .stroke-B6{stroke:#F7F8FE;} + .d2-4206423234 .stroke-AA2{stroke:#4A6FF3;} + .d2-4206423234 .stroke-AA4{stroke:#EDF0FD;} + .d2-4206423234 .stroke-AA5{stroke:#F7F8FE;} + .d2-4206423234 .stroke-AB4{stroke:#EDF0FD;} + .d2-4206423234 .stroke-AB5{stroke:#F7F8FE;} + .d2-4206423234 .background-color-N1{background-color:#0A0F25;} + .d2-4206423234 .background-color-N2{background-color:#676C7E;} + .d2-4206423234 .background-color-N3{background-color:#9499AB;} + .d2-4206423234 .background-color-N4{background-color:#CFD2DD;} + .d2-4206423234 .background-color-N5{background-color:#DEE1EB;} + .d2-4206423234 .background-color-N6{background-color:#EEF1F8;} + .d2-4206423234 .background-color-N7{background-color:#FFFFFF;} + .d2-4206423234 .background-color-B1{background-color:#0D32B2;} + .d2-4206423234 .background-color-B2{background-color:#0D32B2;} + .d2-4206423234 .background-color-B3{background-color:#E3E9FD;} + .d2-4206423234 .background-color-B4{background-color:#E3E9FD;} + .d2-4206423234 .background-color-B5{background-color:#EDF0FD;} + .d2-4206423234 .background-color-B6{background-color:#F7F8FE;} + .d2-4206423234 .background-color-AA2{background-color:#4A6FF3;} + .d2-4206423234 .background-color-AA4{background-color:#EDF0FD;} + .d2-4206423234 .background-color-AA5{background-color:#F7F8FE;} + .d2-4206423234 .background-color-AB4{background-color:#EDF0FD;} + .d2-4206423234 .background-color-AB5{background-color:#F7F8FE;} + .d2-4206423234 .color-N1{color:#0A0F25;} + .d2-4206423234 .color-N2{color:#676C7E;} + .d2-4206423234 .color-N3{color:#9499AB;} + .d2-4206423234 .color-N4{color:#CFD2DD;} + .d2-4206423234 .color-N5{color:#DEE1EB;} + .d2-4206423234 .color-N6{color:#EEF1F8;} + .d2-4206423234 .color-N7{color:#FFFFFF;} + .d2-4206423234 .color-B1{color:#0D32B2;} + .d2-4206423234 .color-B2{color:#0D32B2;} + .d2-4206423234 .color-B3{color:#E3E9FD;} + .d2-4206423234 .color-B4{color:#E3E9FD;} + .d2-4206423234 .color-B5{color:#EDF0FD;} + .d2-4206423234 .color-B6{color:#F7F8FE;} + .d2-4206423234 .color-AA2{color:#4A6FF3;} + .d2-4206423234 .color-AA4{color:#EDF0FD;} + .d2-4206423234 .color-AA5{color:#F7F8FE;} + .d2-4206423234 .color-AB4{color:#EDF0FD;} + .d2-4206423234 .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/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg index 4bdc933c9..907eaebce 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-197062209 .fill-N1{fill:#0A0F25;} + .d2-197062209 .fill-N2{fill:#676C7E;} + .d2-197062209 .fill-N3{fill:#9499AB;} + .d2-197062209 .fill-N4{fill:#CFD2DD;} + .d2-197062209 .fill-N5{fill:#DEE1EB;} + .d2-197062209 .fill-N6{fill:#EEF1F8;} + .d2-197062209 .fill-N7{fill:#FFFFFF;} + .d2-197062209 .fill-B1{fill:#0D32B2;} + .d2-197062209 .fill-B2{fill:#0D32B2;} + .d2-197062209 .fill-B3{fill:#E3E9FD;} + .d2-197062209 .fill-B4{fill:#E3E9FD;} + .d2-197062209 .fill-B5{fill:#EDF0FD;} + .d2-197062209 .fill-B6{fill:#F7F8FE;} + .d2-197062209 .fill-AA2{fill:#4A6FF3;} + .d2-197062209 .fill-AA4{fill:#EDF0FD;} + .d2-197062209 .fill-AA5{fill:#F7F8FE;} + .d2-197062209 .fill-AB4{fill:#EDF0FD;} + .d2-197062209 .fill-AB5{fill:#F7F8FE;} + .d2-197062209 .stroke-N1{stroke:#0A0F25;} + .d2-197062209 .stroke-N2{stroke:#676C7E;} + .d2-197062209 .stroke-N3{stroke:#9499AB;} + .d2-197062209 .stroke-N4{stroke:#CFD2DD;} + .d2-197062209 .stroke-N5{stroke:#DEE1EB;} + .d2-197062209 .stroke-N6{stroke:#EEF1F8;} + .d2-197062209 .stroke-N7{stroke:#FFFFFF;} + .d2-197062209 .stroke-B1{stroke:#0D32B2;} + .d2-197062209 .stroke-B2{stroke:#0D32B2;} + .d2-197062209 .stroke-B3{stroke:#E3E9FD;} + .d2-197062209 .stroke-B4{stroke:#E3E9FD;} + .d2-197062209 .stroke-B5{stroke:#EDF0FD;} + .d2-197062209 .stroke-B6{stroke:#F7F8FE;} + .d2-197062209 .stroke-AA2{stroke:#4A6FF3;} + .d2-197062209 .stroke-AA4{stroke:#EDF0FD;} + .d2-197062209 .stroke-AA5{stroke:#F7F8FE;} + .d2-197062209 .stroke-AB4{stroke:#EDF0FD;} + .d2-197062209 .stroke-AB5{stroke:#F7F8FE;} + .d2-197062209 .background-color-N1{background-color:#0A0F25;} + .d2-197062209 .background-color-N2{background-color:#676C7E;} + .d2-197062209 .background-color-N3{background-color:#9499AB;} + .d2-197062209 .background-color-N4{background-color:#CFD2DD;} + .d2-197062209 .background-color-N5{background-color:#DEE1EB;} + .d2-197062209 .background-color-N6{background-color:#EEF1F8;} + .d2-197062209 .background-color-N7{background-color:#FFFFFF;} + .d2-197062209 .background-color-B1{background-color:#0D32B2;} + .d2-197062209 .background-color-B2{background-color:#0D32B2;} + .d2-197062209 .background-color-B3{background-color:#E3E9FD;} + .d2-197062209 .background-color-B4{background-color:#E3E9FD;} + .d2-197062209 .background-color-B5{background-color:#EDF0FD;} + .d2-197062209 .background-color-B6{background-color:#F7F8FE;} + .d2-197062209 .background-color-AA2{background-color:#4A6FF3;} + .d2-197062209 .background-color-AA4{background-color:#EDF0FD;} + .d2-197062209 .background-color-AA5{background-color:#F7F8FE;} + .d2-197062209 .background-color-AB4{background-color:#EDF0FD;} + .d2-197062209 .background-color-AB5{background-color:#F7F8FE;} + .d2-197062209 .color-N1{color:#0A0F25;} + .d2-197062209 .color-N2{color:#676C7E;} + .d2-197062209 .color-N3{color:#9499AB;} + .d2-197062209 .color-N4{color:#CFD2DD;} + .d2-197062209 .color-N5{color:#DEE1EB;} + .d2-197062209 .color-N6{color:#EEF1F8;} + .d2-197062209 .color-N7{color:#FFFFFF;} + .d2-197062209 .color-B1{color:#0D32B2;} + .d2-197062209 .color-B2{color:#0D32B2;} + .d2-197062209 .color-B3{color:#E3E9FD;} + .d2-197062209 .color-B4{color:#E3E9FD;} + .d2-197062209 .color-B5{color:#EDF0FD;} + .d2-197062209 .color-B6{color:#F7F8FE;} + .d2-197062209 .color-AA2{color:#4A6FF3;} + .d2-197062209 .color-AA4{color:#EDF0FD;} + .d2-197062209 .color-AA5{color:#F7F8FE;} + .d2-197062209 .color-AB4{color:#EDF0FD;} + .d2-197062209 .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/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg index b925388bc..92c38ae22 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-2056966260 .fill-N1{fill:#0A0F25;} + .d2-2056966260 .fill-N2{fill:#676C7E;} + .d2-2056966260 .fill-N3{fill:#9499AB;} + .d2-2056966260 .fill-N4{fill:#CFD2DD;} + .d2-2056966260 .fill-N5{fill:#DEE1EB;} + .d2-2056966260 .fill-N6{fill:#EEF1F8;} + .d2-2056966260 .fill-N7{fill:#FFFFFF;} + .d2-2056966260 .fill-B1{fill:#0D32B2;} + .d2-2056966260 .fill-B2{fill:#0D32B2;} + .d2-2056966260 .fill-B3{fill:#E3E9FD;} + .d2-2056966260 .fill-B4{fill:#E3E9FD;} + .d2-2056966260 .fill-B5{fill:#EDF0FD;} + .d2-2056966260 .fill-B6{fill:#F7F8FE;} + .d2-2056966260 .fill-AA2{fill:#4A6FF3;} + .d2-2056966260 .fill-AA4{fill:#EDF0FD;} + .d2-2056966260 .fill-AA5{fill:#F7F8FE;} + .d2-2056966260 .fill-AB4{fill:#EDF0FD;} + .d2-2056966260 .fill-AB5{fill:#F7F8FE;} + .d2-2056966260 .stroke-N1{stroke:#0A0F25;} + .d2-2056966260 .stroke-N2{stroke:#676C7E;} + .d2-2056966260 .stroke-N3{stroke:#9499AB;} + .d2-2056966260 .stroke-N4{stroke:#CFD2DD;} + .d2-2056966260 .stroke-N5{stroke:#DEE1EB;} + .d2-2056966260 .stroke-N6{stroke:#EEF1F8;} + .d2-2056966260 .stroke-N7{stroke:#FFFFFF;} + .d2-2056966260 .stroke-B1{stroke:#0D32B2;} + .d2-2056966260 .stroke-B2{stroke:#0D32B2;} + .d2-2056966260 .stroke-B3{stroke:#E3E9FD;} + .d2-2056966260 .stroke-B4{stroke:#E3E9FD;} + .d2-2056966260 .stroke-B5{stroke:#EDF0FD;} + .d2-2056966260 .stroke-B6{stroke:#F7F8FE;} + .d2-2056966260 .stroke-AA2{stroke:#4A6FF3;} + .d2-2056966260 .stroke-AA4{stroke:#EDF0FD;} + .d2-2056966260 .stroke-AA5{stroke:#F7F8FE;} + .d2-2056966260 .stroke-AB4{stroke:#EDF0FD;} + .d2-2056966260 .stroke-AB5{stroke:#F7F8FE;} + .d2-2056966260 .background-color-N1{background-color:#0A0F25;} + .d2-2056966260 .background-color-N2{background-color:#676C7E;} + .d2-2056966260 .background-color-N3{background-color:#9499AB;} + .d2-2056966260 .background-color-N4{background-color:#CFD2DD;} + .d2-2056966260 .background-color-N5{background-color:#DEE1EB;} + .d2-2056966260 .background-color-N6{background-color:#EEF1F8;} + .d2-2056966260 .background-color-N7{background-color:#FFFFFF;} + .d2-2056966260 .background-color-B1{background-color:#0D32B2;} + .d2-2056966260 .background-color-B2{background-color:#0D32B2;} + .d2-2056966260 .background-color-B3{background-color:#E3E9FD;} + .d2-2056966260 .background-color-B4{background-color:#E3E9FD;} + .d2-2056966260 .background-color-B5{background-color:#EDF0FD;} + .d2-2056966260 .background-color-B6{background-color:#F7F8FE;} + .d2-2056966260 .background-color-AA2{background-color:#4A6FF3;} + .d2-2056966260 .background-color-AA4{background-color:#EDF0FD;} + .d2-2056966260 .background-color-AA5{background-color:#F7F8FE;} + .d2-2056966260 .background-color-AB4{background-color:#EDF0FD;} + .d2-2056966260 .background-color-AB5{background-color:#F7F8FE;} + .d2-2056966260 .color-N1{color:#0A0F25;} + .d2-2056966260 .color-N2{color:#676C7E;} + .d2-2056966260 .color-N3{color:#9499AB;} + .d2-2056966260 .color-N4{color:#CFD2DD;} + .d2-2056966260 .color-N5{color:#DEE1EB;} + .d2-2056966260 .color-N6{color:#EEF1F8;} + .d2-2056966260 .color-N7{color:#FFFFFF;} + .d2-2056966260 .color-B1{color:#0D32B2;} + .d2-2056966260 .color-B2{color:#0D32B2;} + .d2-2056966260 .color-B3{color:#E3E9FD;} + .d2-2056966260 .color-B4{color:#E3E9FD;} + .d2-2056966260 .color-B5{color:#EDF0FD;} + .d2-2056966260 .color-B6{color:#F7F8FE;} + .d2-2056966260 .color-AA2{color:#4A6FF3;} + .d2-2056966260 .color-AA4{color:#EDF0FD;} + .d2-2056966260 .color-AA5{color:#F7F8FE;} + .d2-2056966260 .color-AB4{color:#EDF0FD;} + .d2-2056966260 .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/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg index f8abb3b54..73b35255d 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-933844085 .fill-N1{fill:#0A0F25;} + .d2-933844085 .fill-N2{fill:#676C7E;} + .d2-933844085 .fill-N3{fill:#9499AB;} + .d2-933844085 .fill-N4{fill:#CFD2DD;} + .d2-933844085 .fill-N5{fill:#DEE1EB;} + .d2-933844085 .fill-N6{fill:#EEF1F8;} + .d2-933844085 .fill-N7{fill:#FFFFFF;} + .d2-933844085 .fill-B1{fill:#0D32B2;} + .d2-933844085 .fill-B2{fill:#0D32B2;} + .d2-933844085 .fill-B3{fill:#E3E9FD;} + .d2-933844085 .fill-B4{fill:#E3E9FD;} + .d2-933844085 .fill-B5{fill:#EDF0FD;} + .d2-933844085 .fill-B6{fill:#F7F8FE;} + .d2-933844085 .fill-AA2{fill:#4A6FF3;} + .d2-933844085 .fill-AA4{fill:#EDF0FD;} + .d2-933844085 .fill-AA5{fill:#F7F8FE;} + .d2-933844085 .fill-AB4{fill:#EDF0FD;} + .d2-933844085 .fill-AB5{fill:#F7F8FE;} + .d2-933844085 .stroke-N1{stroke:#0A0F25;} + .d2-933844085 .stroke-N2{stroke:#676C7E;} + .d2-933844085 .stroke-N3{stroke:#9499AB;} + .d2-933844085 .stroke-N4{stroke:#CFD2DD;} + .d2-933844085 .stroke-N5{stroke:#DEE1EB;} + .d2-933844085 .stroke-N6{stroke:#EEF1F8;} + .d2-933844085 .stroke-N7{stroke:#FFFFFF;} + .d2-933844085 .stroke-B1{stroke:#0D32B2;} + .d2-933844085 .stroke-B2{stroke:#0D32B2;} + .d2-933844085 .stroke-B3{stroke:#E3E9FD;} + .d2-933844085 .stroke-B4{stroke:#E3E9FD;} + .d2-933844085 .stroke-B5{stroke:#EDF0FD;} + .d2-933844085 .stroke-B6{stroke:#F7F8FE;} + .d2-933844085 .stroke-AA2{stroke:#4A6FF3;} + .d2-933844085 .stroke-AA4{stroke:#EDF0FD;} + .d2-933844085 .stroke-AA5{stroke:#F7F8FE;} + .d2-933844085 .stroke-AB4{stroke:#EDF0FD;} + .d2-933844085 .stroke-AB5{stroke:#F7F8FE;} + .d2-933844085 .background-color-N1{background-color:#0A0F25;} + .d2-933844085 .background-color-N2{background-color:#676C7E;} + .d2-933844085 .background-color-N3{background-color:#9499AB;} + .d2-933844085 .background-color-N4{background-color:#CFD2DD;} + .d2-933844085 .background-color-N5{background-color:#DEE1EB;} + .d2-933844085 .background-color-N6{background-color:#EEF1F8;} + .d2-933844085 .background-color-N7{background-color:#FFFFFF;} + .d2-933844085 .background-color-B1{background-color:#0D32B2;} + .d2-933844085 .background-color-B2{background-color:#0D32B2;} + .d2-933844085 .background-color-B3{background-color:#E3E9FD;} + .d2-933844085 .background-color-B4{background-color:#E3E9FD;} + .d2-933844085 .background-color-B5{background-color:#EDF0FD;} + .d2-933844085 .background-color-B6{background-color:#F7F8FE;} + .d2-933844085 .background-color-AA2{background-color:#4A6FF3;} + .d2-933844085 .background-color-AA4{background-color:#EDF0FD;} + .d2-933844085 .background-color-AA5{background-color:#F7F8FE;} + .d2-933844085 .background-color-AB4{background-color:#EDF0FD;} + .d2-933844085 .background-color-AB5{background-color:#F7F8FE;} + .d2-933844085 .color-N1{color:#0A0F25;} + .d2-933844085 .color-N2{color:#676C7E;} + .d2-933844085 .color-N3{color:#9499AB;} + .d2-933844085 .color-N4{color:#CFD2DD;} + .d2-933844085 .color-N5{color:#DEE1EB;} + .d2-933844085 .color-N6{color:#EEF1F8;} + .d2-933844085 .color-N7{color:#FFFFFF;} + .d2-933844085 .color-B1{color:#0D32B2;} + .d2-933844085 .color-B2{color:#0D32B2;} + .d2-933844085 .color-B3{color:#E3E9FD;} + .d2-933844085 .color-B4{color:#E3E9FD;} + .d2-933844085 .color-B5{color:#EDF0FD;} + .d2-933844085 .color-B6{color:#F7F8FE;} + .d2-933844085 .color-AA2{color:#4A6FF3;} + .d2-933844085 .color-AA4{color:#EDF0FD;} + .d2-933844085 .color-AA5{color:#F7F8FE;} + .d2-933844085 .color-AB4{color:#EDF0FD;} + .d2-933844085 .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 284673e41..ad49bb674 100644 --- a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + .d2-1802566061 .fill-N1{fill:#0A0F25;} + .d2-1802566061 .fill-N2{fill:#676C7E;} + .d2-1802566061 .fill-N3{fill:#9499AB;} + .d2-1802566061 .fill-N4{fill:#CFD2DD;} + .d2-1802566061 .fill-N5{fill:#DEE1EB;} + .d2-1802566061 .fill-N6{fill:#EEF1F8;} + .d2-1802566061 .fill-N7{fill:#FFFFFF;} + .d2-1802566061 .fill-B1{fill:#0D32B2;} + .d2-1802566061 .fill-B2{fill:#0D32B2;} + .d2-1802566061 .fill-B3{fill:#E3E9FD;} + .d2-1802566061 .fill-B4{fill:#E3E9FD;} + .d2-1802566061 .fill-B5{fill:#EDF0FD;} + .d2-1802566061 .fill-B6{fill:#F7F8FE;} + .d2-1802566061 .fill-AA2{fill:#4A6FF3;} + .d2-1802566061 .fill-AA4{fill:#EDF0FD;} + .d2-1802566061 .fill-AA5{fill:#F7F8FE;} + .d2-1802566061 .fill-AB4{fill:#EDF0FD;} + .d2-1802566061 .fill-AB5{fill:#F7F8FE;} + .d2-1802566061 .stroke-N1{stroke:#0A0F25;} + .d2-1802566061 .stroke-N2{stroke:#676C7E;} + .d2-1802566061 .stroke-N3{stroke:#9499AB;} + .d2-1802566061 .stroke-N4{stroke:#CFD2DD;} + .d2-1802566061 .stroke-N5{stroke:#DEE1EB;} + .d2-1802566061 .stroke-N6{stroke:#EEF1F8;} + .d2-1802566061 .stroke-N7{stroke:#FFFFFF;} + .d2-1802566061 .stroke-B1{stroke:#0D32B2;} + .d2-1802566061 .stroke-B2{stroke:#0D32B2;} + .d2-1802566061 .stroke-B3{stroke:#E3E9FD;} + .d2-1802566061 .stroke-B4{stroke:#E3E9FD;} + .d2-1802566061 .stroke-B5{stroke:#EDF0FD;} + .d2-1802566061 .stroke-B6{stroke:#F7F8FE;} + .d2-1802566061 .stroke-AA2{stroke:#4A6FF3;} + .d2-1802566061 .stroke-AA4{stroke:#EDF0FD;} + .d2-1802566061 .stroke-AA5{stroke:#F7F8FE;} + .d2-1802566061 .stroke-AB4{stroke:#EDF0FD;} + .d2-1802566061 .stroke-AB5{stroke:#F7F8FE;} + .d2-1802566061 .background-color-N1{background-color:#0A0F25;} + .d2-1802566061 .background-color-N2{background-color:#676C7E;} + .d2-1802566061 .background-color-N3{background-color:#9499AB;} + .d2-1802566061 .background-color-N4{background-color:#CFD2DD;} + .d2-1802566061 .background-color-N5{background-color:#DEE1EB;} + .d2-1802566061 .background-color-N6{background-color:#EEF1F8;} + .d2-1802566061 .background-color-N7{background-color:#FFFFFF;} + .d2-1802566061 .background-color-B1{background-color:#0D32B2;} + .d2-1802566061 .background-color-B2{background-color:#0D32B2;} + .d2-1802566061 .background-color-B3{background-color:#E3E9FD;} + .d2-1802566061 .background-color-B4{background-color:#E3E9FD;} + .d2-1802566061 .background-color-B5{background-color:#EDF0FD;} + .d2-1802566061 .background-color-B6{background-color:#F7F8FE;} + .d2-1802566061 .background-color-AA2{background-color:#4A6FF3;} + .d2-1802566061 .background-color-AA4{background-color:#EDF0FD;} + .d2-1802566061 .background-color-AA5{background-color:#F7F8FE;} + .d2-1802566061 .background-color-AB4{background-color:#EDF0FD;} + .d2-1802566061 .background-color-AB5{background-color:#F7F8FE;} + .d2-1802566061 .color-N1{color:#0A0F25;} + .d2-1802566061 .color-N2{color:#676C7E;} + .d2-1802566061 .color-N3{color:#9499AB;} + .d2-1802566061 .color-N4{color:#CFD2DD;} + .d2-1802566061 .color-N5{color:#DEE1EB;} + .d2-1802566061 .color-N6{color:#EEF1F8;} + .d2-1802566061 .color-N7{color:#FFFFFF;} + .d2-1802566061 .color-B1{color:#0D32B2;} + .d2-1802566061 .color-B2{color:#0D32B2;} + .d2-1802566061 .color-B3{color:#E3E9FD;} + .d2-1802566061 .color-B4{color:#E3E9FD;} + .d2-1802566061 .color-B5{color:#EDF0FD;} + .d2-1802566061 .color-B6{color:#F7F8FE;} + .d2-1802566061 .color-AA2{color:#4A6FF3;} + .d2-1802566061 .color-AA4{color:#EDF0FD;} + .d2-1802566061 .color-AA5{color:#F7F8FE;} + .d2-1802566061 .color-AB4{color:#EDF0FD;} + .d2-1802566061 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND diff --git a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg index 7ec3a4dd2..84fd14bb0 100644 --- a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + .d2-1796634463 .fill-N1{fill:#0A0F25;} + .d2-1796634463 .fill-N2{fill:#676C7E;} + .d2-1796634463 .fill-N3{fill:#9499AB;} + .d2-1796634463 .fill-N4{fill:#CFD2DD;} + .d2-1796634463 .fill-N5{fill:#DEE1EB;} + .d2-1796634463 .fill-N6{fill:#EEF1F8;} + .d2-1796634463 .fill-N7{fill:#FFFFFF;} + .d2-1796634463 .fill-B1{fill:#0D32B2;} + .d2-1796634463 .fill-B2{fill:#0D32B2;} + .d2-1796634463 .fill-B3{fill:#E3E9FD;} + .d2-1796634463 .fill-B4{fill:#E3E9FD;} + .d2-1796634463 .fill-B5{fill:#EDF0FD;} + .d2-1796634463 .fill-B6{fill:#F7F8FE;} + .d2-1796634463 .fill-AA2{fill:#4A6FF3;} + .d2-1796634463 .fill-AA4{fill:#EDF0FD;} + .d2-1796634463 .fill-AA5{fill:#F7F8FE;} + .d2-1796634463 .fill-AB4{fill:#EDF0FD;} + .d2-1796634463 .fill-AB5{fill:#F7F8FE;} + .d2-1796634463 .stroke-N1{stroke:#0A0F25;} + .d2-1796634463 .stroke-N2{stroke:#676C7E;} + .d2-1796634463 .stroke-N3{stroke:#9499AB;} + .d2-1796634463 .stroke-N4{stroke:#CFD2DD;} + .d2-1796634463 .stroke-N5{stroke:#DEE1EB;} + .d2-1796634463 .stroke-N6{stroke:#EEF1F8;} + .d2-1796634463 .stroke-N7{stroke:#FFFFFF;} + .d2-1796634463 .stroke-B1{stroke:#0D32B2;} + .d2-1796634463 .stroke-B2{stroke:#0D32B2;} + .d2-1796634463 .stroke-B3{stroke:#E3E9FD;} + .d2-1796634463 .stroke-B4{stroke:#E3E9FD;} + .d2-1796634463 .stroke-B5{stroke:#EDF0FD;} + .d2-1796634463 .stroke-B6{stroke:#F7F8FE;} + .d2-1796634463 .stroke-AA2{stroke:#4A6FF3;} + .d2-1796634463 .stroke-AA4{stroke:#EDF0FD;} + .d2-1796634463 .stroke-AA5{stroke:#F7F8FE;} + .d2-1796634463 .stroke-AB4{stroke:#EDF0FD;} + .d2-1796634463 .stroke-AB5{stroke:#F7F8FE;} + .d2-1796634463 .background-color-N1{background-color:#0A0F25;} + .d2-1796634463 .background-color-N2{background-color:#676C7E;} + .d2-1796634463 .background-color-N3{background-color:#9499AB;} + .d2-1796634463 .background-color-N4{background-color:#CFD2DD;} + .d2-1796634463 .background-color-N5{background-color:#DEE1EB;} + .d2-1796634463 .background-color-N6{background-color:#EEF1F8;} + .d2-1796634463 .background-color-N7{background-color:#FFFFFF;} + .d2-1796634463 .background-color-B1{background-color:#0D32B2;} + .d2-1796634463 .background-color-B2{background-color:#0D32B2;} + .d2-1796634463 .background-color-B3{background-color:#E3E9FD;} + .d2-1796634463 .background-color-B4{background-color:#E3E9FD;} + .d2-1796634463 .background-color-B5{background-color:#EDF0FD;} + .d2-1796634463 .background-color-B6{background-color:#F7F8FE;} + .d2-1796634463 .background-color-AA2{background-color:#4A6FF3;} + .d2-1796634463 .background-color-AA4{background-color:#EDF0FD;} + .d2-1796634463 .background-color-AA5{background-color:#F7F8FE;} + .d2-1796634463 .background-color-AB4{background-color:#EDF0FD;} + .d2-1796634463 .background-color-AB5{background-color:#F7F8FE;} + .d2-1796634463 .color-N1{color:#0A0F25;} + .d2-1796634463 .color-N2{color:#676C7E;} + .d2-1796634463 .color-N3{color:#9499AB;} + .d2-1796634463 .color-N4{color:#CFD2DD;} + .d2-1796634463 .color-N5{color:#DEE1EB;} + .d2-1796634463 .color-N6{color:#EEF1F8;} + .d2-1796634463 .color-N7{color:#FFFFFF;} + .d2-1796634463 .color-B1{color:#0D32B2;} + .d2-1796634463 .color-B2{color:#0D32B2;} + .d2-1796634463 .color-B3{color:#E3E9FD;} + .d2-1796634463 .color-B4{color:#E3E9FD;} + .d2-1796634463 .color-B5{color:#EDF0FD;} + .d2-1796634463 .color-B6{color:#F7F8FE;} + .d2-1796634463 .color-AA2{color:#4A6FF3;} + .d2-1796634463 .color-AA4{color:#EDF0FD;} + .d2-1796634463 .color-AA5{color:#F7F8FE;} + .d2-1796634463 .color-AB4{color:#EDF0FD;} + .d2-1796634463 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND 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 3a8a1bc2d..41b628462 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    @@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index ee0d5cab1..c2557a42f 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    @@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg index 27ba3ffea..d3bb4aeab 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 + .d2-1917458193 .fill-N1{fill:#0A0F25;} + .d2-1917458193 .fill-N2{fill:#676C7E;} + .d2-1917458193 .fill-N3{fill:#9499AB;} + .d2-1917458193 .fill-N4{fill:#CFD2DD;} + .d2-1917458193 .fill-N5{fill:#DEE1EB;} + .d2-1917458193 .fill-N6{fill:#EEF1F8;} + .d2-1917458193 .fill-N7{fill:#FFFFFF;} + .d2-1917458193 .fill-B1{fill:#0D32B2;} + .d2-1917458193 .fill-B2{fill:#0D32B2;} + .d2-1917458193 .fill-B3{fill:#E3E9FD;} + .d2-1917458193 .fill-B4{fill:#E3E9FD;} + .d2-1917458193 .fill-B5{fill:#EDF0FD;} + .d2-1917458193 .fill-B6{fill:#F7F8FE;} + .d2-1917458193 .fill-AA2{fill:#4A6FF3;} + .d2-1917458193 .fill-AA4{fill:#EDF0FD;} + .d2-1917458193 .fill-AA5{fill:#F7F8FE;} + .d2-1917458193 .fill-AB4{fill:#EDF0FD;} + .d2-1917458193 .fill-AB5{fill:#F7F8FE;} + .d2-1917458193 .stroke-N1{stroke:#0A0F25;} + .d2-1917458193 .stroke-N2{stroke:#676C7E;} + .d2-1917458193 .stroke-N3{stroke:#9499AB;} + .d2-1917458193 .stroke-N4{stroke:#CFD2DD;} + .d2-1917458193 .stroke-N5{stroke:#DEE1EB;} + .d2-1917458193 .stroke-N6{stroke:#EEF1F8;} + .d2-1917458193 .stroke-N7{stroke:#FFFFFF;} + .d2-1917458193 .stroke-B1{stroke:#0D32B2;} + .d2-1917458193 .stroke-B2{stroke:#0D32B2;} + .d2-1917458193 .stroke-B3{stroke:#E3E9FD;} + .d2-1917458193 .stroke-B4{stroke:#E3E9FD;} + .d2-1917458193 .stroke-B5{stroke:#EDF0FD;} + .d2-1917458193 .stroke-B6{stroke:#F7F8FE;} + .d2-1917458193 .stroke-AA2{stroke:#4A6FF3;} + .d2-1917458193 .stroke-AA4{stroke:#EDF0FD;} + .d2-1917458193 .stroke-AA5{stroke:#F7F8FE;} + .d2-1917458193 .stroke-AB4{stroke:#EDF0FD;} + .d2-1917458193 .stroke-AB5{stroke:#F7F8FE;} + .d2-1917458193 .background-color-N1{background-color:#0A0F25;} + .d2-1917458193 .background-color-N2{background-color:#676C7E;} + .d2-1917458193 .background-color-N3{background-color:#9499AB;} + .d2-1917458193 .background-color-N4{background-color:#CFD2DD;} + .d2-1917458193 .background-color-N5{background-color:#DEE1EB;} + .d2-1917458193 .background-color-N6{background-color:#EEF1F8;} + .d2-1917458193 .background-color-N7{background-color:#FFFFFF;} + .d2-1917458193 .background-color-B1{background-color:#0D32B2;} + .d2-1917458193 .background-color-B2{background-color:#0D32B2;} + .d2-1917458193 .background-color-B3{background-color:#E3E9FD;} + .d2-1917458193 .background-color-B4{background-color:#E3E9FD;} + .d2-1917458193 .background-color-B5{background-color:#EDF0FD;} + .d2-1917458193 .background-color-B6{background-color:#F7F8FE;} + .d2-1917458193 .background-color-AA2{background-color:#4A6FF3;} + .d2-1917458193 .background-color-AA4{background-color:#EDF0FD;} + .d2-1917458193 .background-color-AA5{background-color:#F7F8FE;} + .d2-1917458193 .background-color-AB4{background-color:#EDF0FD;} + .d2-1917458193 .background-color-AB5{background-color:#F7F8FE;} + .d2-1917458193 .color-N1{color:#0A0F25;} + .d2-1917458193 .color-N2{color:#676C7E;} + .d2-1917458193 .color-N3{color:#9499AB;} + .d2-1917458193 .color-N4{color:#CFD2DD;} + .d2-1917458193 .color-N5{color:#DEE1EB;} + .d2-1917458193 .color-N6{color:#EEF1F8;} + .d2-1917458193 .color-N7{color:#FFFFFF;} + .d2-1917458193 .color-B1{color:#0D32B2;} + .d2-1917458193 .color-B2{color:#0D32B2;} + .d2-1917458193 .color-B3{color:#E3E9FD;} + .d2-1917458193 .color-B4{color:#E3E9FD;} + .d2-1917458193 .color-B5{color:#EDF0FD;} + .d2-1917458193 .color-B6{color:#F7F8FE;} + .d2-1917458193 .color-AA2{color:#4A6FF3;} + .d2-1917458193 .color-AA4{color:#EDF0FD;} + .d2-1917458193 .color-AA5{color:#F7F8FE;} + .d2-1917458193 .color-AB4{color:#EDF0FD;} + .d2-1917458193 .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}]]>Big fontabca 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 9b8e91818..f1a6f1a47 100644 --- a/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Big fontabca + .d2-1959422453 .fill-N1{fill:#0A0F25;} + .d2-1959422453 .fill-N2{fill:#676C7E;} + .d2-1959422453 .fill-N3{fill:#9499AB;} + .d2-1959422453 .fill-N4{fill:#CFD2DD;} + .d2-1959422453 .fill-N5{fill:#DEE1EB;} + .d2-1959422453 .fill-N6{fill:#EEF1F8;} + .d2-1959422453 .fill-N7{fill:#FFFFFF;} + .d2-1959422453 .fill-B1{fill:#0D32B2;} + .d2-1959422453 .fill-B2{fill:#0D32B2;} + .d2-1959422453 .fill-B3{fill:#E3E9FD;} + .d2-1959422453 .fill-B4{fill:#E3E9FD;} + .d2-1959422453 .fill-B5{fill:#EDF0FD;} + .d2-1959422453 .fill-B6{fill:#F7F8FE;} + .d2-1959422453 .fill-AA2{fill:#4A6FF3;} + .d2-1959422453 .fill-AA4{fill:#EDF0FD;} + .d2-1959422453 .fill-AA5{fill:#F7F8FE;} + .d2-1959422453 .fill-AB4{fill:#EDF0FD;} + .d2-1959422453 .fill-AB5{fill:#F7F8FE;} + .d2-1959422453 .stroke-N1{stroke:#0A0F25;} + .d2-1959422453 .stroke-N2{stroke:#676C7E;} + .d2-1959422453 .stroke-N3{stroke:#9499AB;} + .d2-1959422453 .stroke-N4{stroke:#CFD2DD;} + .d2-1959422453 .stroke-N5{stroke:#DEE1EB;} + .d2-1959422453 .stroke-N6{stroke:#EEF1F8;} + .d2-1959422453 .stroke-N7{stroke:#FFFFFF;} + .d2-1959422453 .stroke-B1{stroke:#0D32B2;} + .d2-1959422453 .stroke-B2{stroke:#0D32B2;} + .d2-1959422453 .stroke-B3{stroke:#E3E9FD;} + .d2-1959422453 .stroke-B4{stroke:#E3E9FD;} + .d2-1959422453 .stroke-B5{stroke:#EDF0FD;} + .d2-1959422453 .stroke-B6{stroke:#F7F8FE;} + .d2-1959422453 .stroke-AA2{stroke:#4A6FF3;} + .d2-1959422453 .stroke-AA4{stroke:#EDF0FD;} + .d2-1959422453 .stroke-AA5{stroke:#F7F8FE;} + .d2-1959422453 .stroke-AB4{stroke:#EDF0FD;} + .d2-1959422453 .stroke-AB5{stroke:#F7F8FE;} + .d2-1959422453 .background-color-N1{background-color:#0A0F25;} + .d2-1959422453 .background-color-N2{background-color:#676C7E;} + .d2-1959422453 .background-color-N3{background-color:#9499AB;} + .d2-1959422453 .background-color-N4{background-color:#CFD2DD;} + .d2-1959422453 .background-color-N5{background-color:#DEE1EB;} + .d2-1959422453 .background-color-N6{background-color:#EEF1F8;} + .d2-1959422453 .background-color-N7{background-color:#FFFFFF;} + .d2-1959422453 .background-color-B1{background-color:#0D32B2;} + .d2-1959422453 .background-color-B2{background-color:#0D32B2;} + .d2-1959422453 .background-color-B3{background-color:#E3E9FD;} + .d2-1959422453 .background-color-B4{background-color:#E3E9FD;} + .d2-1959422453 .background-color-B5{background-color:#EDF0FD;} + .d2-1959422453 .background-color-B6{background-color:#F7F8FE;} + .d2-1959422453 .background-color-AA2{background-color:#4A6FF3;} + .d2-1959422453 .background-color-AA4{background-color:#EDF0FD;} + .d2-1959422453 .background-color-AA5{background-color:#F7F8FE;} + .d2-1959422453 .background-color-AB4{background-color:#EDF0FD;} + .d2-1959422453 .background-color-AB5{background-color:#F7F8FE;} + .d2-1959422453 .color-N1{color:#0A0F25;} + .d2-1959422453 .color-N2{color:#676C7E;} + .d2-1959422453 .color-N3{color:#9499AB;} + .d2-1959422453 .color-N4{color:#CFD2DD;} + .d2-1959422453 .color-N5{color:#DEE1EB;} + .d2-1959422453 .color-N6{color:#EEF1F8;} + .d2-1959422453 .color-N7{color:#FFFFFF;} + .d2-1959422453 .color-B1{color:#0D32B2;} + .d2-1959422453 .color-B2{color:#0D32B2;} + .d2-1959422453 .color-B3{color:#E3E9FD;} + .d2-1959422453 .color-B4{color:#E3E9FD;} + .d2-1959422453 .color-B5{color:#EDF0FD;} + .d2-1959422453 .color-B6{color:#F7F8FE;} + .d2-1959422453 .color-AA2{color:#4A6FF3;} + .d2-1959422453 .color-AA4{color:#EDF0FD;} + .d2-1959422453 .color-AA5{color:#F7F8FE;} + .d2-1959422453 .color-AB4{color:#EDF0FD;} + .d2-1959422453 .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}]]>Big fontabca 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 7e7c78a5e..182edbd3c 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,16 +1,16 @@ -aa container labeldefgc + .d2-2837967438 .fill-N1{fill:#0A0F25;} + .d2-2837967438 .fill-N2{fill:#676C7E;} + .d2-2837967438 .fill-N3{fill:#9499AB;} + .d2-2837967438 .fill-N4{fill:#CFD2DD;} + .d2-2837967438 .fill-N5{fill:#DEE1EB;} + .d2-2837967438 .fill-N6{fill:#EEF1F8;} + .d2-2837967438 .fill-N7{fill:#FFFFFF;} + .d2-2837967438 .fill-B1{fill:#0D32B2;} + .d2-2837967438 .fill-B2{fill:#0D32B2;} + .d2-2837967438 .fill-B3{fill:#E3E9FD;} + .d2-2837967438 .fill-B4{fill:#E3E9FD;} + .d2-2837967438 .fill-B5{fill:#EDF0FD;} + .d2-2837967438 .fill-B6{fill:#F7F8FE;} + .d2-2837967438 .fill-AA2{fill:#4A6FF3;} + .d2-2837967438 .fill-AA4{fill:#EDF0FD;} + .d2-2837967438 .fill-AA5{fill:#F7F8FE;} + .d2-2837967438 .fill-AB4{fill:#EDF0FD;} + .d2-2837967438 .fill-AB5{fill:#F7F8FE;} + .d2-2837967438 .stroke-N1{stroke:#0A0F25;} + .d2-2837967438 .stroke-N2{stroke:#676C7E;} + .d2-2837967438 .stroke-N3{stroke:#9499AB;} + .d2-2837967438 .stroke-N4{stroke:#CFD2DD;} + .d2-2837967438 .stroke-N5{stroke:#DEE1EB;} + .d2-2837967438 .stroke-N6{stroke:#EEF1F8;} + .d2-2837967438 .stroke-N7{stroke:#FFFFFF;} + .d2-2837967438 .stroke-B1{stroke:#0D32B2;} + .d2-2837967438 .stroke-B2{stroke:#0D32B2;} + .d2-2837967438 .stroke-B3{stroke:#E3E9FD;} + .d2-2837967438 .stroke-B4{stroke:#E3E9FD;} + .d2-2837967438 .stroke-B5{stroke:#EDF0FD;} + .d2-2837967438 .stroke-B6{stroke:#F7F8FE;} + .d2-2837967438 .stroke-AA2{stroke:#4A6FF3;} + .d2-2837967438 .stroke-AA4{stroke:#EDF0FD;} + .d2-2837967438 .stroke-AA5{stroke:#F7F8FE;} + .d2-2837967438 .stroke-AB4{stroke:#EDF0FD;} + .d2-2837967438 .stroke-AB5{stroke:#F7F8FE;} + .d2-2837967438 .background-color-N1{background-color:#0A0F25;} + .d2-2837967438 .background-color-N2{background-color:#676C7E;} + .d2-2837967438 .background-color-N3{background-color:#9499AB;} + .d2-2837967438 .background-color-N4{background-color:#CFD2DD;} + .d2-2837967438 .background-color-N5{background-color:#DEE1EB;} + .d2-2837967438 .background-color-N6{background-color:#EEF1F8;} + .d2-2837967438 .background-color-N7{background-color:#FFFFFF;} + .d2-2837967438 .background-color-B1{background-color:#0D32B2;} + .d2-2837967438 .background-color-B2{background-color:#0D32B2;} + .d2-2837967438 .background-color-B3{background-color:#E3E9FD;} + .d2-2837967438 .background-color-B4{background-color:#E3E9FD;} + .d2-2837967438 .background-color-B5{background-color:#EDF0FD;} + .d2-2837967438 .background-color-B6{background-color:#F7F8FE;} + .d2-2837967438 .background-color-AA2{background-color:#4A6FF3;} + .d2-2837967438 .background-color-AA4{background-color:#EDF0FD;} + .d2-2837967438 .background-color-AA5{background-color:#F7F8FE;} + .d2-2837967438 .background-color-AB4{background-color:#EDF0FD;} + .d2-2837967438 .background-color-AB5{background-color:#F7F8FE;} + .d2-2837967438 .color-N1{color:#0A0F25;} + .d2-2837967438 .color-N2{color:#676C7E;} + .d2-2837967438 .color-N3{color:#9499AB;} + .d2-2837967438 .color-N4{color:#CFD2DD;} + .d2-2837967438 .color-N5{color:#DEE1EB;} + .d2-2837967438 .color-N6{color:#EEF1F8;} + .d2-2837967438 .color-N7{color:#FFFFFF;} + .d2-2837967438 .color-B1{color:#0D32B2;} + .d2-2837967438 .color-B2{color:#0D32B2;} + .d2-2837967438 .color-B3{color:#E3E9FD;} + .d2-2837967438 .color-B4{color:#E3E9FD;} + .d2-2837967438 .color-B5{color:#EDF0FD;} + .d2-2837967438 .color-B6{color:#F7F8FE;} + .d2-2837967438 .color-AA2{color:#4A6FF3;} + .d2-2837967438 .color-AA4{color:#EDF0FD;} + .d2-2837967438 .color-AA5{color:#F7F8FE;} + .d2-2837967438 .color-AB4{color:#EDF0FD;} + .d2-2837967438 .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}]]>aa container labeldefgc 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 f6b566b3c..c58556eb8 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,16 +1,16 @@ -aa container labeldefgc + .d2-1280600924 .fill-N1{fill:#0A0F25;} + .d2-1280600924 .fill-N2{fill:#676C7E;} + .d2-1280600924 .fill-N3{fill:#9499AB;} + .d2-1280600924 .fill-N4{fill:#CFD2DD;} + .d2-1280600924 .fill-N5{fill:#DEE1EB;} + .d2-1280600924 .fill-N6{fill:#EEF1F8;} + .d2-1280600924 .fill-N7{fill:#FFFFFF;} + .d2-1280600924 .fill-B1{fill:#0D32B2;} + .d2-1280600924 .fill-B2{fill:#0D32B2;} + .d2-1280600924 .fill-B3{fill:#E3E9FD;} + .d2-1280600924 .fill-B4{fill:#E3E9FD;} + .d2-1280600924 .fill-B5{fill:#EDF0FD;} + .d2-1280600924 .fill-B6{fill:#F7F8FE;} + .d2-1280600924 .fill-AA2{fill:#4A6FF3;} + .d2-1280600924 .fill-AA4{fill:#EDF0FD;} + .d2-1280600924 .fill-AA5{fill:#F7F8FE;} + .d2-1280600924 .fill-AB4{fill:#EDF0FD;} + .d2-1280600924 .fill-AB5{fill:#F7F8FE;} + .d2-1280600924 .stroke-N1{stroke:#0A0F25;} + .d2-1280600924 .stroke-N2{stroke:#676C7E;} + .d2-1280600924 .stroke-N3{stroke:#9499AB;} + .d2-1280600924 .stroke-N4{stroke:#CFD2DD;} + .d2-1280600924 .stroke-N5{stroke:#DEE1EB;} + .d2-1280600924 .stroke-N6{stroke:#EEF1F8;} + .d2-1280600924 .stroke-N7{stroke:#FFFFFF;} + .d2-1280600924 .stroke-B1{stroke:#0D32B2;} + .d2-1280600924 .stroke-B2{stroke:#0D32B2;} + .d2-1280600924 .stroke-B3{stroke:#E3E9FD;} + .d2-1280600924 .stroke-B4{stroke:#E3E9FD;} + .d2-1280600924 .stroke-B5{stroke:#EDF0FD;} + .d2-1280600924 .stroke-B6{stroke:#F7F8FE;} + .d2-1280600924 .stroke-AA2{stroke:#4A6FF3;} + .d2-1280600924 .stroke-AA4{stroke:#EDF0FD;} + .d2-1280600924 .stroke-AA5{stroke:#F7F8FE;} + .d2-1280600924 .stroke-AB4{stroke:#EDF0FD;} + .d2-1280600924 .stroke-AB5{stroke:#F7F8FE;} + .d2-1280600924 .background-color-N1{background-color:#0A0F25;} + .d2-1280600924 .background-color-N2{background-color:#676C7E;} + .d2-1280600924 .background-color-N3{background-color:#9499AB;} + .d2-1280600924 .background-color-N4{background-color:#CFD2DD;} + .d2-1280600924 .background-color-N5{background-color:#DEE1EB;} + .d2-1280600924 .background-color-N6{background-color:#EEF1F8;} + .d2-1280600924 .background-color-N7{background-color:#FFFFFF;} + .d2-1280600924 .background-color-B1{background-color:#0D32B2;} + .d2-1280600924 .background-color-B2{background-color:#0D32B2;} + .d2-1280600924 .background-color-B3{background-color:#E3E9FD;} + .d2-1280600924 .background-color-B4{background-color:#E3E9FD;} + .d2-1280600924 .background-color-B5{background-color:#EDF0FD;} + .d2-1280600924 .background-color-B6{background-color:#F7F8FE;} + .d2-1280600924 .background-color-AA2{background-color:#4A6FF3;} + .d2-1280600924 .background-color-AA4{background-color:#EDF0FD;} + .d2-1280600924 .background-color-AA5{background-color:#F7F8FE;} + .d2-1280600924 .background-color-AB4{background-color:#EDF0FD;} + .d2-1280600924 .background-color-AB5{background-color:#F7F8FE;} + .d2-1280600924 .color-N1{color:#0A0F25;} + .d2-1280600924 .color-N2{color:#676C7E;} + .d2-1280600924 .color-N3{color:#9499AB;} + .d2-1280600924 .color-N4{color:#CFD2DD;} + .d2-1280600924 .color-N5{color:#DEE1EB;} + .d2-1280600924 .color-N6{color:#EEF1F8;} + .d2-1280600924 .color-N7{color:#FFFFFF;} + .d2-1280600924 .color-B1{color:#0D32B2;} + .d2-1280600924 .color-B2{color:#0D32B2;} + .d2-1280600924 .color-B3{color:#E3E9FD;} + .d2-1280600924 .color-B4{color:#E3E9FD;} + .d2-1280600924 .color-B5{color:#EDF0FD;} + .d2-1280600924 .color-B6{color:#F7F8FE;} + .d2-1280600924 .color-AA2{color:#4A6FF3;} + .d2-1280600924 .color-AA4{color:#EDF0FD;} + .d2-1280600924 .color-AA5{color:#F7F8FE;} + .d2-1280600924 .color-AB4{color:#EDF0FD;} + .d2-1280600924 .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}]]>aa container labeldefgc 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 0907cbced..d73f69271 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,23 +1,23 @@ -xbarz foo + .d2-3520681588 .fill-N1{fill:#0A0F25;} + .d2-3520681588 .fill-N2{fill:#676C7E;} + .d2-3520681588 .fill-N3{fill:#9499AB;} + .d2-3520681588 .fill-N4{fill:#CFD2DD;} + .d2-3520681588 .fill-N5{fill:#DEE1EB;} + .d2-3520681588 .fill-N6{fill:#EEF1F8;} + .d2-3520681588 .fill-N7{fill:#FFFFFF;} + .d2-3520681588 .fill-B1{fill:#0D32B2;} + .d2-3520681588 .fill-B2{fill:#0D32B2;} + .d2-3520681588 .fill-B3{fill:#E3E9FD;} + .d2-3520681588 .fill-B4{fill:#E3E9FD;} + .d2-3520681588 .fill-B5{fill:#EDF0FD;} + .d2-3520681588 .fill-B6{fill:#F7F8FE;} + .d2-3520681588 .fill-AA2{fill:#4A6FF3;} + .d2-3520681588 .fill-AA4{fill:#EDF0FD;} + .d2-3520681588 .fill-AA5{fill:#F7F8FE;} + .d2-3520681588 .fill-AB4{fill:#EDF0FD;} + .d2-3520681588 .fill-AB5{fill:#F7F8FE;} + .d2-3520681588 .stroke-N1{stroke:#0A0F25;} + .d2-3520681588 .stroke-N2{stroke:#676C7E;} + .d2-3520681588 .stroke-N3{stroke:#9499AB;} + .d2-3520681588 .stroke-N4{stroke:#CFD2DD;} + .d2-3520681588 .stroke-N5{stroke:#DEE1EB;} + .d2-3520681588 .stroke-N6{stroke:#EEF1F8;} + .d2-3520681588 .stroke-N7{stroke:#FFFFFF;} + .d2-3520681588 .stroke-B1{stroke:#0D32B2;} + .d2-3520681588 .stroke-B2{stroke:#0D32B2;} + .d2-3520681588 .stroke-B3{stroke:#E3E9FD;} + .d2-3520681588 .stroke-B4{stroke:#E3E9FD;} + .d2-3520681588 .stroke-B5{stroke:#EDF0FD;} + .d2-3520681588 .stroke-B6{stroke:#F7F8FE;} + .d2-3520681588 .stroke-AA2{stroke:#4A6FF3;} + .d2-3520681588 .stroke-AA4{stroke:#EDF0FD;} + .d2-3520681588 .stroke-AA5{stroke:#F7F8FE;} + .d2-3520681588 .stroke-AB4{stroke:#EDF0FD;} + .d2-3520681588 .stroke-AB5{stroke:#F7F8FE;} + .d2-3520681588 .background-color-N1{background-color:#0A0F25;} + .d2-3520681588 .background-color-N2{background-color:#676C7E;} + .d2-3520681588 .background-color-N3{background-color:#9499AB;} + .d2-3520681588 .background-color-N4{background-color:#CFD2DD;} + .d2-3520681588 .background-color-N5{background-color:#DEE1EB;} + .d2-3520681588 .background-color-N6{background-color:#EEF1F8;} + .d2-3520681588 .background-color-N7{background-color:#FFFFFF;} + .d2-3520681588 .background-color-B1{background-color:#0D32B2;} + .d2-3520681588 .background-color-B2{background-color:#0D32B2;} + .d2-3520681588 .background-color-B3{background-color:#E3E9FD;} + .d2-3520681588 .background-color-B4{background-color:#E3E9FD;} + .d2-3520681588 .background-color-B5{background-color:#EDF0FD;} + .d2-3520681588 .background-color-B6{background-color:#F7F8FE;} + .d2-3520681588 .background-color-AA2{background-color:#4A6FF3;} + .d2-3520681588 .background-color-AA4{background-color:#EDF0FD;} + .d2-3520681588 .background-color-AA5{background-color:#F7F8FE;} + .d2-3520681588 .background-color-AB4{background-color:#EDF0FD;} + .d2-3520681588 .background-color-AB5{background-color:#F7F8FE;} + .d2-3520681588 .color-N1{color:#0A0F25;} + .d2-3520681588 .color-N2{color:#676C7E;} + .d2-3520681588 .color-N3{color:#9499AB;} + .d2-3520681588 .color-N4{color:#CFD2DD;} + .d2-3520681588 .color-N5{color:#DEE1EB;} + .d2-3520681588 .color-N6{color:#EEF1F8;} + .d2-3520681588 .color-N7{color:#FFFFFF;} + .d2-3520681588 .color-B1{color:#0D32B2;} + .d2-3520681588 .color-B2{color:#0D32B2;} + .d2-3520681588 .color-B3{color:#E3E9FD;} + .d2-3520681588 .color-B4{color:#E3E9FD;} + .d2-3520681588 .color-B5{color:#EDF0FD;} + .d2-3520681588 .color-B6{color:#F7F8FE;} + .d2-3520681588 .color-AA2{color:#4A6FF3;} + .d2-3520681588 .color-AA4{color:#EDF0FD;} + .d2-3520681588 .color-AA5{color:#F7F8FE;} + .d2-3520681588 .color-AB4{color:#EDF0FD;} + .d2-3520681588 .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}]]>xbarz foo 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 a653c8a1e..addb78754 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,23 +1,23 @@ -xbarz foo + .d2-2150775247 .fill-N1{fill:#0A0F25;} + .d2-2150775247 .fill-N2{fill:#676C7E;} + .d2-2150775247 .fill-N3{fill:#9499AB;} + .d2-2150775247 .fill-N4{fill:#CFD2DD;} + .d2-2150775247 .fill-N5{fill:#DEE1EB;} + .d2-2150775247 .fill-N6{fill:#EEF1F8;} + .d2-2150775247 .fill-N7{fill:#FFFFFF;} + .d2-2150775247 .fill-B1{fill:#0D32B2;} + .d2-2150775247 .fill-B2{fill:#0D32B2;} + .d2-2150775247 .fill-B3{fill:#E3E9FD;} + .d2-2150775247 .fill-B4{fill:#E3E9FD;} + .d2-2150775247 .fill-B5{fill:#EDF0FD;} + .d2-2150775247 .fill-B6{fill:#F7F8FE;} + .d2-2150775247 .fill-AA2{fill:#4A6FF3;} + .d2-2150775247 .fill-AA4{fill:#EDF0FD;} + .d2-2150775247 .fill-AA5{fill:#F7F8FE;} + .d2-2150775247 .fill-AB4{fill:#EDF0FD;} + .d2-2150775247 .fill-AB5{fill:#F7F8FE;} + .d2-2150775247 .stroke-N1{stroke:#0A0F25;} + .d2-2150775247 .stroke-N2{stroke:#676C7E;} + .d2-2150775247 .stroke-N3{stroke:#9499AB;} + .d2-2150775247 .stroke-N4{stroke:#CFD2DD;} + .d2-2150775247 .stroke-N5{stroke:#DEE1EB;} + .d2-2150775247 .stroke-N6{stroke:#EEF1F8;} + .d2-2150775247 .stroke-N7{stroke:#FFFFFF;} + .d2-2150775247 .stroke-B1{stroke:#0D32B2;} + .d2-2150775247 .stroke-B2{stroke:#0D32B2;} + .d2-2150775247 .stroke-B3{stroke:#E3E9FD;} + .d2-2150775247 .stroke-B4{stroke:#E3E9FD;} + .d2-2150775247 .stroke-B5{stroke:#EDF0FD;} + .d2-2150775247 .stroke-B6{stroke:#F7F8FE;} + .d2-2150775247 .stroke-AA2{stroke:#4A6FF3;} + .d2-2150775247 .stroke-AA4{stroke:#EDF0FD;} + .d2-2150775247 .stroke-AA5{stroke:#F7F8FE;} + .d2-2150775247 .stroke-AB4{stroke:#EDF0FD;} + .d2-2150775247 .stroke-AB5{stroke:#F7F8FE;} + .d2-2150775247 .background-color-N1{background-color:#0A0F25;} + .d2-2150775247 .background-color-N2{background-color:#676C7E;} + .d2-2150775247 .background-color-N3{background-color:#9499AB;} + .d2-2150775247 .background-color-N4{background-color:#CFD2DD;} + .d2-2150775247 .background-color-N5{background-color:#DEE1EB;} + .d2-2150775247 .background-color-N6{background-color:#EEF1F8;} + .d2-2150775247 .background-color-N7{background-color:#FFFFFF;} + .d2-2150775247 .background-color-B1{background-color:#0D32B2;} + .d2-2150775247 .background-color-B2{background-color:#0D32B2;} + .d2-2150775247 .background-color-B3{background-color:#E3E9FD;} + .d2-2150775247 .background-color-B4{background-color:#E3E9FD;} + .d2-2150775247 .background-color-B5{background-color:#EDF0FD;} + .d2-2150775247 .background-color-B6{background-color:#F7F8FE;} + .d2-2150775247 .background-color-AA2{background-color:#4A6FF3;} + .d2-2150775247 .background-color-AA4{background-color:#EDF0FD;} + .d2-2150775247 .background-color-AA5{background-color:#F7F8FE;} + .d2-2150775247 .background-color-AB4{background-color:#EDF0FD;} + .d2-2150775247 .background-color-AB5{background-color:#F7F8FE;} + .d2-2150775247 .color-N1{color:#0A0F25;} + .d2-2150775247 .color-N2{color:#676C7E;} + .d2-2150775247 .color-N3{color:#9499AB;} + .d2-2150775247 .color-N4{color:#CFD2DD;} + .d2-2150775247 .color-N5{color:#DEE1EB;} + .d2-2150775247 .color-N6{color:#EEF1F8;} + .d2-2150775247 .color-N7{color:#FFFFFF;} + .d2-2150775247 .color-B1{color:#0D32B2;} + .d2-2150775247 .color-B2{color:#0D32B2;} + .d2-2150775247 .color-B3{color:#E3E9FD;} + .d2-2150775247 .color-B4{color:#E3E9FD;} + .d2-2150775247 .color-B5{color:#EDF0FD;} + .d2-2150775247 .color-B6{color:#F7F8FE;} + .d2-2150775247 .color-AA2{color:#4A6FF3;} + .d2-2150775247 .color-AA4{color:#EDF0FD;} + .d2-2150775247 .color-AA5{color:#F7F8FE;} + .d2-2150775247 .color-AB4{color:#EDF0FD;} + .d2-2150775247 .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}]]>xbarz foo 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 7f0604958..8d38b11f1 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,20 +1,20 @@ -OEM Factory

    company Warehouse

    @@ -843,7 +843,7 @@
  • Staging
  • Dispatch to Site
    • -
    MasterRegional-1Regional-2Regional-N +
    MasterRegional-1Regional-2Regional-N diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/elk/sketch.exp.svg b/e2etests/testdata/todo/dagre_container_md_label_panic/elk/sketch.exp.svg index 001759c7b..a078d6067 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM Factory

    company Warehouse

    @@ -843,7 +843,7 @@
  • Staging
  • Dispatch to Site
    • -
    MasterRegional-1Regional-2Regional-N +
    MasterRegional-1Regional-2Regional-N diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg index 9e26ad556..a021f345e 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + .d2-124661428 .fill-N1{fill:#0A0F25;} + .d2-124661428 .fill-N2{fill:#676C7E;} + .d2-124661428 .fill-N3{fill:#9499AB;} + .d2-124661428 .fill-N4{fill:#CFD2DD;} + .d2-124661428 .fill-N5{fill:#DEE1EB;} + .d2-124661428 .fill-N6{fill:#EEF1F8;} + .d2-124661428 .fill-N7{fill:#FFFFFF;} + .d2-124661428 .fill-B1{fill:#0D32B2;} + .d2-124661428 .fill-B2{fill:#0D32B2;} + .d2-124661428 .fill-B3{fill:#E3E9FD;} + .d2-124661428 .fill-B4{fill:#E3E9FD;} + .d2-124661428 .fill-B5{fill:#EDF0FD;} + .d2-124661428 .fill-B6{fill:#F7F8FE;} + .d2-124661428 .fill-AA2{fill:#4A6FF3;} + .d2-124661428 .fill-AA4{fill:#EDF0FD;} + .d2-124661428 .fill-AA5{fill:#F7F8FE;} + .d2-124661428 .fill-AB4{fill:#EDF0FD;} + .d2-124661428 .fill-AB5{fill:#F7F8FE;} + .d2-124661428 .stroke-N1{stroke:#0A0F25;} + .d2-124661428 .stroke-N2{stroke:#676C7E;} + .d2-124661428 .stroke-N3{stroke:#9499AB;} + .d2-124661428 .stroke-N4{stroke:#CFD2DD;} + .d2-124661428 .stroke-N5{stroke:#DEE1EB;} + .d2-124661428 .stroke-N6{stroke:#EEF1F8;} + .d2-124661428 .stroke-N7{stroke:#FFFFFF;} + .d2-124661428 .stroke-B1{stroke:#0D32B2;} + .d2-124661428 .stroke-B2{stroke:#0D32B2;} + .d2-124661428 .stroke-B3{stroke:#E3E9FD;} + .d2-124661428 .stroke-B4{stroke:#E3E9FD;} + .d2-124661428 .stroke-B5{stroke:#EDF0FD;} + .d2-124661428 .stroke-B6{stroke:#F7F8FE;} + .d2-124661428 .stroke-AA2{stroke:#4A6FF3;} + .d2-124661428 .stroke-AA4{stroke:#EDF0FD;} + .d2-124661428 .stroke-AA5{stroke:#F7F8FE;} + .d2-124661428 .stroke-AB4{stroke:#EDF0FD;} + .d2-124661428 .stroke-AB5{stroke:#F7F8FE;} + .d2-124661428 .background-color-N1{background-color:#0A0F25;} + .d2-124661428 .background-color-N2{background-color:#676C7E;} + .d2-124661428 .background-color-N3{background-color:#9499AB;} + .d2-124661428 .background-color-N4{background-color:#CFD2DD;} + .d2-124661428 .background-color-N5{background-color:#DEE1EB;} + .d2-124661428 .background-color-N6{background-color:#EEF1F8;} + .d2-124661428 .background-color-N7{background-color:#FFFFFF;} + .d2-124661428 .background-color-B1{background-color:#0D32B2;} + .d2-124661428 .background-color-B2{background-color:#0D32B2;} + .d2-124661428 .background-color-B3{background-color:#E3E9FD;} + .d2-124661428 .background-color-B4{background-color:#E3E9FD;} + .d2-124661428 .background-color-B5{background-color:#EDF0FD;} + .d2-124661428 .background-color-B6{background-color:#F7F8FE;} + .d2-124661428 .background-color-AA2{background-color:#4A6FF3;} + .d2-124661428 .background-color-AA4{background-color:#EDF0FD;} + .d2-124661428 .background-color-AA5{background-color:#F7F8FE;} + .d2-124661428 .background-color-AB4{background-color:#EDF0FD;} + .d2-124661428 .background-color-AB5{background-color:#F7F8FE;} + .d2-124661428 .color-N1{color:#0A0F25;} + .d2-124661428 .color-N2{color:#676C7E;} + .d2-124661428 .color-N3{color:#9499AB;} + .d2-124661428 .color-N4{color:#CFD2DD;} + .d2-124661428 .color-N5{color:#DEE1EB;} + .d2-124661428 .color-N6{color:#EEF1F8;} + .d2-124661428 .color-N7{color:#FFFFFF;} + .d2-124661428 .color-B1{color:#0D32B2;} + .d2-124661428 .color-B2{color:#0D32B2;} + .d2-124661428 .color-B3{color:#E3E9FD;} + .d2-124661428 .color-B4{color:#E3E9FD;} + .d2-124661428 .color-B5{color:#EDF0FD;} + .d2-124661428 .color-B6{color:#F7F8FE;} + .d2-124661428 .color-AA2{color:#4A6FF3;} + .d2-124661428 .color-AA4{color:#EDF0FD;} + .d2-124661428 .color-AA5{color:#F7F8FE;} + .d2-124661428 .color-AB4{color:#EDF0FD;} + .d2-124661428 .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}]]>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 9e26ad556..a021f345e 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,9 +1,9 @@ -bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + .d2-124661428 .fill-N1{fill:#0A0F25;} + .d2-124661428 .fill-N2{fill:#676C7E;} + .d2-124661428 .fill-N3{fill:#9499AB;} + .d2-124661428 .fill-N4{fill:#CFD2DD;} + .d2-124661428 .fill-N5{fill:#DEE1EB;} + .d2-124661428 .fill-N6{fill:#EEF1F8;} + .d2-124661428 .fill-N7{fill:#FFFFFF;} + .d2-124661428 .fill-B1{fill:#0D32B2;} + .d2-124661428 .fill-B2{fill:#0D32B2;} + .d2-124661428 .fill-B3{fill:#E3E9FD;} + .d2-124661428 .fill-B4{fill:#E3E9FD;} + .d2-124661428 .fill-B5{fill:#EDF0FD;} + .d2-124661428 .fill-B6{fill:#F7F8FE;} + .d2-124661428 .fill-AA2{fill:#4A6FF3;} + .d2-124661428 .fill-AA4{fill:#EDF0FD;} + .d2-124661428 .fill-AA5{fill:#F7F8FE;} + .d2-124661428 .fill-AB4{fill:#EDF0FD;} + .d2-124661428 .fill-AB5{fill:#F7F8FE;} + .d2-124661428 .stroke-N1{stroke:#0A0F25;} + .d2-124661428 .stroke-N2{stroke:#676C7E;} + .d2-124661428 .stroke-N3{stroke:#9499AB;} + .d2-124661428 .stroke-N4{stroke:#CFD2DD;} + .d2-124661428 .stroke-N5{stroke:#DEE1EB;} + .d2-124661428 .stroke-N6{stroke:#EEF1F8;} + .d2-124661428 .stroke-N7{stroke:#FFFFFF;} + .d2-124661428 .stroke-B1{stroke:#0D32B2;} + .d2-124661428 .stroke-B2{stroke:#0D32B2;} + .d2-124661428 .stroke-B3{stroke:#E3E9FD;} + .d2-124661428 .stroke-B4{stroke:#E3E9FD;} + .d2-124661428 .stroke-B5{stroke:#EDF0FD;} + .d2-124661428 .stroke-B6{stroke:#F7F8FE;} + .d2-124661428 .stroke-AA2{stroke:#4A6FF3;} + .d2-124661428 .stroke-AA4{stroke:#EDF0FD;} + .d2-124661428 .stroke-AA5{stroke:#F7F8FE;} + .d2-124661428 .stroke-AB4{stroke:#EDF0FD;} + .d2-124661428 .stroke-AB5{stroke:#F7F8FE;} + .d2-124661428 .background-color-N1{background-color:#0A0F25;} + .d2-124661428 .background-color-N2{background-color:#676C7E;} + .d2-124661428 .background-color-N3{background-color:#9499AB;} + .d2-124661428 .background-color-N4{background-color:#CFD2DD;} + .d2-124661428 .background-color-N5{background-color:#DEE1EB;} + .d2-124661428 .background-color-N6{background-color:#EEF1F8;} + .d2-124661428 .background-color-N7{background-color:#FFFFFF;} + .d2-124661428 .background-color-B1{background-color:#0D32B2;} + .d2-124661428 .background-color-B2{background-color:#0D32B2;} + .d2-124661428 .background-color-B3{background-color:#E3E9FD;} + .d2-124661428 .background-color-B4{background-color:#E3E9FD;} + .d2-124661428 .background-color-B5{background-color:#EDF0FD;} + .d2-124661428 .background-color-B6{background-color:#F7F8FE;} + .d2-124661428 .background-color-AA2{background-color:#4A6FF3;} + .d2-124661428 .background-color-AA4{background-color:#EDF0FD;} + .d2-124661428 .background-color-AA5{background-color:#F7F8FE;} + .d2-124661428 .background-color-AB4{background-color:#EDF0FD;} + .d2-124661428 .background-color-AB5{background-color:#F7F8FE;} + .d2-124661428 .color-N1{color:#0A0F25;} + .d2-124661428 .color-N2{color:#676C7E;} + .d2-124661428 .color-N3{color:#9499AB;} + .d2-124661428 .color-N4{color:#CFD2DD;} + .d2-124661428 .color-N5{color:#DEE1EB;} + .d2-124661428 .color-N6{color:#EEF1F8;} + .d2-124661428 .color-N7{color:#FFFFFF;} + .d2-124661428 .color-B1{color:#0D32B2;} + .d2-124661428 .color-B2{color:#0D32B2;} + .d2-124661428 .color-B3{color:#E3E9FD;} + .d2-124661428 .color-B4{color:#E3E9FD;} + .d2-124661428 .color-B5{color:#EDF0FD;} + .d2-124661428 .color-B6{color:#F7F8FE;} + .d2-124661428 .color-AA2{color:#4A6FF3;} + .d2-124661428 .color-AA4{color:#EDF0FD;} + .d2-124661428 .color-AA5{color:#F7F8FE;} + .d2-124661428 .color-AB4{color:#EDF0FD;} + .d2-124661428 .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}]]>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 72d15bad6..d7a566b44 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,16 +1,16 @@ -Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + .d2-562107218 .fill-N1{fill:#0A0F25;} + .d2-562107218 .fill-N2{fill:#676C7E;} + .d2-562107218 .fill-N3{fill:#9499AB;} + .d2-562107218 .fill-N4{fill:#CFD2DD;} + .d2-562107218 .fill-N5{fill:#DEE1EB;} + .d2-562107218 .fill-N6{fill:#EEF1F8;} + .d2-562107218 .fill-N7{fill:#FFFFFF;} + .d2-562107218 .fill-B1{fill:#0D32B2;} + .d2-562107218 .fill-B2{fill:#0D32B2;} + .d2-562107218 .fill-B3{fill:#E3E9FD;} + .d2-562107218 .fill-B4{fill:#E3E9FD;} + .d2-562107218 .fill-B5{fill:#EDF0FD;} + .d2-562107218 .fill-B6{fill:#F7F8FE;} + .d2-562107218 .fill-AA2{fill:#4A6FF3;} + .d2-562107218 .fill-AA4{fill:#EDF0FD;} + .d2-562107218 .fill-AA5{fill:#F7F8FE;} + .d2-562107218 .fill-AB4{fill:#EDF0FD;} + .d2-562107218 .fill-AB5{fill:#F7F8FE;} + .d2-562107218 .stroke-N1{stroke:#0A0F25;} + .d2-562107218 .stroke-N2{stroke:#676C7E;} + .d2-562107218 .stroke-N3{stroke:#9499AB;} + .d2-562107218 .stroke-N4{stroke:#CFD2DD;} + .d2-562107218 .stroke-N5{stroke:#DEE1EB;} + .d2-562107218 .stroke-N6{stroke:#EEF1F8;} + .d2-562107218 .stroke-N7{stroke:#FFFFFF;} + .d2-562107218 .stroke-B1{stroke:#0D32B2;} + .d2-562107218 .stroke-B2{stroke:#0D32B2;} + .d2-562107218 .stroke-B3{stroke:#E3E9FD;} + .d2-562107218 .stroke-B4{stroke:#E3E9FD;} + .d2-562107218 .stroke-B5{stroke:#EDF0FD;} + .d2-562107218 .stroke-B6{stroke:#F7F8FE;} + .d2-562107218 .stroke-AA2{stroke:#4A6FF3;} + .d2-562107218 .stroke-AA4{stroke:#EDF0FD;} + .d2-562107218 .stroke-AA5{stroke:#F7F8FE;} + .d2-562107218 .stroke-AB4{stroke:#EDF0FD;} + .d2-562107218 .stroke-AB5{stroke:#F7F8FE;} + .d2-562107218 .background-color-N1{background-color:#0A0F25;} + .d2-562107218 .background-color-N2{background-color:#676C7E;} + .d2-562107218 .background-color-N3{background-color:#9499AB;} + .d2-562107218 .background-color-N4{background-color:#CFD2DD;} + .d2-562107218 .background-color-N5{background-color:#DEE1EB;} + .d2-562107218 .background-color-N6{background-color:#EEF1F8;} + .d2-562107218 .background-color-N7{background-color:#FFFFFF;} + .d2-562107218 .background-color-B1{background-color:#0D32B2;} + .d2-562107218 .background-color-B2{background-color:#0D32B2;} + .d2-562107218 .background-color-B3{background-color:#E3E9FD;} + .d2-562107218 .background-color-B4{background-color:#E3E9FD;} + .d2-562107218 .background-color-B5{background-color:#EDF0FD;} + .d2-562107218 .background-color-B6{background-color:#F7F8FE;} + .d2-562107218 .background-color-AA2{background-color:#4A6FF3;} + .d2-562107218 .background-color-AA4{background-color:#EDF0FD;} + .d2-562107218 .background-color-AA5{background-color:#F7F8FE;} + .d2-562107218 .background-color-AB4{background-color:#EDF0FD;} + .d2-562107218 .background-color-AB5{background-color:#F7F8FE;} + .d2-562107218 .color-N1{color:#0A0F25;} + .d2-562107218 .color-N2{color:#676C7E;} + .d2-562107218 .color-N3{color:#9499AB;} + .d2-562107218 .color-N4{color:#CFD2DD;} + .d2-562107218 .color-N5{color:#DEE1EB;} + .d2-562107218 .color-N6{color:#EEF1F8;} + .d2-562107218 .color-N7{color:#FFFFFF;} + .d2-562107218 .color-B1{color:#0D32B2;} + .d2-562107218 .color-B2{color:#0D32B2;} + .d2-562107218 .color-B3{color:#E3E9FD;} + .d2-562107218 .color-B4{color:#E3E9FD;} + .d2-562107218 .color-B5{color:#EDF0FD;} + .d2-562107218 .color-B6{color:#F7F8FE;} + .d2-562107218 .color-AA2{color:#4A6FF3;} + .d2-562107218 .color-AA4{color:#EDF0FD;} + .d2-562107218 .color-AA5{color:#F7F8FE;} + .d2-562107218 .color-AB4{color:#EDF0FD;} + .d2-562107218 .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}]]>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 3b1747923..3c37dca11 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,16 +1,16 @@ -Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + .d2-269856569 .fill-N1{fill:#0A0F25;} + .d2-269856569 .fill-N2{fill:#676C7E;} + .d2-269856569 .fill-N3{fill:#9499AB;} + .d2-269856569 .fill-N4{fill:#CFD2DD;} + .d2-269856569 .fill-N5{fill:#DEE1EB;} + .d2-269856569 .fill-N6{fill:#EEF1F8;} + .d2-269856569 .fill-N7{fill:#FFFFFF;} + .d2-269856569 .fill-B1{fill:#0D32B2;} + .d2-269856569 .fill-B2{fill:#0D32B2;} + .d2-269856569 .fill-B3{fill:#E3E9FD;} + .d2-269856569 .fill-B4{fill:#E3E9FD;} + .d2-269856569 .fill-B5{fill:#EDF0FD;} + .d2-269856569 .fill-B6{fill:#F7F8FE;} + .d2-269856569 .fill-AA2{fill:#4A6FF3;} + .d2-269856569 .fill-AA4{fill:#EDF0FD;} + .d2-269856569 .fill-AA5{fill:#F7F8FE;} + .d2-269856569 .fill-AB4{fill:#EDF0FD;} + .d2-269856569 .fill-AB5{fill:#F7F8FE;} + .d2-269856569 .stroke-N1{stroke:#0A0F25;} + .d2-269856569 .stroke-N2{stroke:#676C7E;} + .d2-269856569 .stroke-N3{stroke:#9499AB;} + .d2-269856569 .stroke-N4{stroke:#CFD2DD;} + .d2-269856569 .stroke-N5{stroke:#DEE1EB;} + .d2-269856569 .stroke-N6{stroke:#EEF1F8;} + .d2-269856569 .stroke-N7{stroke:#FFFFFF;} + .d2-269856569 .stroke-B1{stroke:#0D32B2;} + .d2-269856569 .stroke-B2{stroke:#0D32B2;} + .d2-269856569 .stroke-B3{stroke:#E3E9FD;} + .d2-269856569 .stroke-B4{stroke:#E3E9FD;} + .d2-269856569 .stroke-B5{stroke:#EDF0FD;} + .d2-269856569 .stroke-B6{stroke:#F7F8FE;} + .d2-269856569 .stroke-AA2{stroke:#4A6FF3;} + .d2-269856569 .stroke-AA4{stroke:#EDF0FD;} + .d2-269856569 .stroke-AA5{stroke:#F7F8FE;} + .d2-269856569 .stroke-AB4{stroke:#EDF0FD;} + .d2-269856569 .stroke-AB5{stroke:#F7F8FE;} + .d2-269856569 .background-color-N1{background-color:#0A0F25;} + .d2-269856569 .background-color-N2{background-color:#676C7E;} + .d2-269856569 .background-color-N3{background-color:#9499AB;} + .d2-269856569 .background-color-N4{background-color:#CFD2DD;} + .d2-269856569 .background-color-N5{background-color:#DEE1EB;} + .d2-269856569 .background-color-N6{background-color:#EEF1F8;} + .d2-269856569 .background-color-N7{background-color:#FFFFFF;} + .d2-269856569 .background-color-B1{background-color:#0D32B2;} + .d2-269856569 .background-color-B2{background-color:#0D32B2;} + .d2-269856569 .background-color-B3{background-color:#E3E9FD;} + .d2-269856569 .background-color-B4{background-color:#E3E9FD;} + .d2-269856569 .background-color-B5{background-color:#EDF0FD;} + .d2-269856569 .background-color-B6{background-color:#F7F8FE;} + .d2-269856569 .background-color-AA2{background-color:#4A6FF3;} + .d2-269856569 .background-color-AA4{background-color:#EDF0FD;} + .d2-269856569 .background-color-AA5{background-color:#F7F8FE;} + .d2-269856569 .background-color-AB4{background-color:#EDF0FD;} + .d2-269856569 .background-color-AB5{background-color:#F7F8FE;} + .d2-269856569 .color-N1{color:#0A0F25;} + .d2-269856569 .color-N2{color:#676C7E;} + .d2-269856569 .color-N3{color:#9499AB;} + .d2-269856569 .color-N4{color:#CFD2DD;} + .d2-269856569 .color-N5{color:#DEE1EB;} + .d2-269856569 .color-N6{color:#EEF1F8;} + .d2-269856569 .color-N7{color:#FFFFFF;} + .d2-269856569 .color-B1{color:#0D32B2;} + .d2-269856569 .color-B2{color:#0D32B2;} + .d2-269856569 .color-B3{color:#E3E9FD;} + .d2-269856569 .color-B4{color:#E3E9FD;} + .d2-269856569 .color-B5{color:#EDF0FD;} + .d2-269856569 .color-B6{color:#F7F8FE;} + .d2-269856569 .color-AA2{color:#4A6FF3;} + .d2-269856569 .color-AA4{color:#EDF0FD;} + .d2-269856569 .color-AA5{color:#F7F8FE;} + .d2-269856569 .color-AB4{color:#EDF0FD;} + .d2-269856569 .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}]]>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/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg index d646d7f81..fc0124dd1 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

    @@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval 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 c3fe55fe5..8213f5b49 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

    markdown text expanded to 800x400

    @@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval diff --git a/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg b/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg index 33f07256f..00dacba24 100644 --- a/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    床前明月光，

    疑是地上霜。

    举头望明月，

    低头思故乡。

    -
    所以，即使夏天很热 +
    所以，即使夏天很热 diff --git a/e2etests/testdata/unicode/chinese/elk/sketch.exp.svg b/e2etests/testdata/unicode/chinese/elk/sketch.exp.svg index 1a024dd01..2e4c6965c 100644 --- a/e2etests/testdata/unicode/chinese/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/chinese/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    床前明月光，

    疑是地上霜。

    举头望明月，

    低头思故乡。

    -
    所以，即使夏天很热 +
    所以，即使夏天很热 diff --git a/e2etests/testdata/unicode/emojis/dagre/sketch.exp.svg b/e2etests/testdata/unicode/emojis/dagre/sketch.exp.svg index 3f21f2eff..7ae1e9de2 100644 --- a/e2etests/testdata/unicode/emojis/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/emojis/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ + .d2-3342222526 .fill-N1{fill:#0A0F25;} + .d2-3342222526 .fill-N2{fill:#676C7E;} + .d2-3342222526 .fill-N3{fill:#9499AB;} + .d2-3342222526 .fill-N4{fill:#CFD2DD;} + .d2-3342222526 .fill-N5{fill:#DEE1EB;} + .d2-3342222526 .fill-N6{fill:#EEF1F8;} + .d2-3342222526 .fill-N7{fill:#FFFFFF;} + .d2-3342222526 .fill-B1{fill:#0D32B2;} + .d2-3342222526 .fill-B2{fill:#0D32B2;} + .d2-3342222526 .fill-B3{fill:#E3E9FD;} + .d2-3342222526 .fill-B4{fill:#E3E9FD;} + .d2-3342222526 .fill-B5{fill:#EDF0FD;} + .d2-3342222526 .fill-B6{fill:#F7F8FE;} + .d2-3342222526 .fill-AA2{fill:#4A6FF3;} + .d2-3342222526 .fill-AA4{fill:#EDF0FD;} + .d2-3342222526 .fill-AA5{fill:#F7F8FE;} + .d2-3342222526 .fill-AB4{fill:#EDF0FD;} + .d2-3342222526 .fill-AB5{fill:#F7F8FE;} + .d2-3342222526 .stroke-N1{stroke:#0A0F25;} + .d2-3342222526 .stroke-N2{stroke:#676C7E;} + .d2-3342222526 .stroke-N3{stroke:#9499AB;} + .d2-3342222526 .stroke-N4{stroke:#CFD2DD;} + .d2-3342222526 .stroke-N5{stroke:#DEE1EB;} + .d2-3342222526 .stroke-N6{stroke:#EEF1F8;} + .d2-3342222526 .stroke-N7{stroke:#FFFFFF;} + .d2-3342222526 .stroke-B1{stroke:#0D32B2;} + .d2-3342222526 .stroke-B2{stroke:#0D32B2;} + .d2-3342222526 .stroke-B3{stroke:#E3E9FD;} + .d2-3342222526 .stroke-B4{stroke:#E3E9FD;} + .d2-3342222526 .stroke-B5{stroke:#EDF0FD;} + .d2-3342222526 .stroke-B6{stroke:#F7F8FE;} + .d2-3342222526 .stroke-AA2{stroke:#4A6FF3;} + .d2-3342222526 .stroke-AA4{stroke:#EDF0FD;} + .d2-3342222526 .stroke-AA5{stroke:#F7F8FE;} + .d2-3342222526 .stroke-AB4{stroke:#EDF0FD;} + .d2-3342222526 .stroke-AB5{stroke:#F7F8FE;} + .d2-3342222526 .background-color-N1{background-color:#0A0F25;} + .d2-3342222526 .background-color-N2{background-color:#676C7E;} + .d2-3342222526 .background-color-N3{background-color:#9499AB;} + .d2-3342222526 .background-color-N4{background-color:#CFD2DD;} + .d2-3342222526 .background-color-N5{background-color:#DEE1EB;} + .d2-3342222526 .background-color-N6{background-color:#EEF1F8;} + .d2-3342222526 .background-color-N7{background-color:#FFFFFF;} + .d2-3342222526 .background-color-B1{background-color:#0D32B2;} + .d2-3342222526 .background-color-B2{background-color:#0D32B2;} + .d2-3342222526 .background-color-B3{background-color:#E3E9FD;} + .d2-3342222526 .background-color-B4{background-color:#E3E9FD;} + .d2-3342222526 .background-color-B5{background-color:#EDF0FD;} + .d2-3342222526 .background-color-B6{background-color:#F7F8FE;} + .d2-3342222526 .background-color-AA2{background-color:#4A6FF3;} + .d2-3342222526 .background-color-AA4{background-color:#EDF0FD;} + .d2-3342222526 .background-color-AA5{background-color:#F7F8FE;} + .d2-3342222526 .background-color-AB4{background-color:#EDF0FD;} + .d2-3342222526 .background-color-AB5{background-color:#F7F8FE;} + .d2-3342222526 .color-N1{color:#0A0F25;} + .d2-3342222526 .color-N2{color:#676C7E;} + .d2-3342222526 .color-N3{color:#9499AB;} + .d2-3342222526 .color-N4{color:#CFD2DD;} + .d2-3342222526 .color-N5{color:#DEE1EB;} + .d2-3342222526 .color-N6{color:#EEF1F8;} + .d2-3342222526 .color-N7{color:#FFFFFF;} + .d2-3342222526 .color-B1{color:#0D32B2;} + .d2-3342222526 .color-B2{color:#0D32B2;} + .d2-3342222526 .color-B3{color:#E3E9FD;} + .d2-3342222526 .color-B4{color:#E3E9FD;} + .d2-3342222526 .color-B5{color:#EDF0FD;} + .d2-3342222526 .color-B6{color:#F7F8FE;} + .d2-3342222526 .color-AA2{color:#4A6FF3;} + .d2-3342222526 .color-AA4{color:#EDF0FD;} + .d2-3342222526 .color-AA5{color:#F7F8FE;} + .d2-3342222526 .color-AB4{color:#EDF0FD;} + .d2-3342222526 .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}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ diff --git a/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg b/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg index 911ae61fc..7cebb321a 100644 --- a/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ + .d2-2559513672 .fill-N1{fill:#0A0F25;} + .d2-2559513672 .fill-N2{fill:#676C7E;} + .d2-2559513672 .fill-N3{fill:#9499AB;} + .d2-2559513672 .fill-N4{fill:#CFD2DD;} + .d2-2559513672 .fill-N5{fill:#DEE1EB;} + .d2-2559513672 .fill-N6{fill:#EEF1F8;} + .d2-2559513672 .fill-N7{fill:#FFFFFF;} + .d2-2559513672 .fill-B1{fill:#0D32B2;} + .d2-2559513672 .fill-B2{fill:#0D32B2;} + .d2-2559513672 .fill-B3{fill:#E3E9FD;} + .d2-2559513672 .fill-B4{fill:#E3E9FD;} + .d2-2559513672 .fill-B5{fill:#EDF0FD;} + .d2-2559513672 .fill-B6{fill:#F7F8FE;} + .d2-2559513672 .fill-AA2{fill:#4A6FF3;} + .d2-2559513672 .fill-AA4{fill:#EDF0FD;} + .d2-2559513672 .fill-AA5{fill:#F7F8FE;} + .d2-2559513672 .fill-AB4{fill:#EDF0FD;} + .d2-2559513672 .fill-AB5{fill:#F7F8FE;} + .d2-2559513672 .stroke-N1{stroke:#0A0F25;} + .d2-2559513672 .stroke-N2{stroke:#676C7E;} + .d2-2559513672 .stroke-N3{stroke:#9499AB;} + .d2-2559513672 .stroke-N4{stroke:#CFD2DD;} + .d2-2559513672 .stroke-N5{stroke:#DEE1EB;} + .d2-2559513672 .stroke-N6{stroke:#EEF1F8;} + .d2-2559513672 .stroke-N7{stroke:#FFFFFF;} + .d2-2559513672 .stroke-B1{stroke:#0D32B2;} + .d2-2559513672 .stroke-B2{stroke:#0D32B2;} + .d2-2559513672 .stroke-B3{stroke:#E3E9FD;} + .d2-2559513672 .stroke-B4{stroke:#E3E9FD;} + .d2-2559513672 .stroke-B5{stroke:#EDF0FD;} + .d2-2559513672 .stroke-B6{stroke:#F7F8FE;} + .d2-2559513672 .stroke-AA2{stroke:#4A6FF3;} + .d2-2559513672 .stroke-AA4{stroke:#EDF0FD;} + .d2-2559513672 .stroke-AA5{stroke:#F7F8FE;} + .d2-2559513672 .stroke-AB4{stroke:#EDF0FD;} + .d2-2559513672 .stroke-AB5{stroke:#F7F8FE;} + .d2-2559513672 .background-color-N1{background-color:#0A0F25;} + .d2-2559513672 .background-color-N2{background-color:#676C7E;} + .d2-2559513672 .background-color-N3{background-color:#9499AB;} + .d2-2559513672 .background-color-N4{background-color:#CFD2DD;} + .d2-2559513672 .background-color-N5{background-color:#DEE1EB;} + .d2-2559513672 .background-color-N6{background-color:#EEF1F8;} + .d2-2559513672 .background-color-N7{background-color:#FFFFFF;} + .d2-2559513672 .background-color-B1{background-color:#0D32B2;} + .d2-2559513672 .background-color-B2{background-color:#0D32B2;} + .d2-2559513672 .background-color-B3{background-color:#E3E9FD;} + .d2-2559513672 .background-color-B4{background-color:#E3E9FD;} + .d2-2559513672 .background-color-B5{background-color:#EDF0FD;} + .d2-2559513672 .background-color-B6{background-color:#F7F8FE;} + .d2-2559513672 .background-color-AA2{background-color:#4A6FF3;} + .d2-2559513672 .background-color-AA4{background-color:#EDF0FD;} + .d2-2559513672 .background-color-AA5{background-color:#F7F8FE;} + .d2-2559513672 .background-color-AB4{background-color:#EDF0FD;} + .d2-2559513672 .background-color-AB5{background-color:#F7F8FE;} + .d2-2559513672 .color-N1{color:#0A0F25;} + .d2-2559513672 .color-N2{color:#676C7E;} + .d2-2559513672 .color-N3{color:#9499AB;} + .d2-2559513672 .color-N4{color:#CFD2DD;} + .d2-2559513672 .color-N5{color:#DEE1EB;} + .d2-2559513672 .color-N6{color:#EEF1F8;} + .d2-2559513672 .color-N7{color:#FFFFFF;} + .d2-2559513672 .color-B1{color:#0D32B2;} + .d2-2559513672 .color-B2{color:#0D32B2;} + .d2-2559513672 .color-B3{color:#E3E9FD;} + .d2-2559513672 .color-B4{color:#E3E9FD;} + .d2-2559513672 .color-B5{color:#EDF0FD;} + .d2-2559513672 .color-B6{color:#F7F8FE;} + .d2-2559513672 .color-AA2{color:#4A6FF3;} + .d2-2559513672 .color-AA4{color:#EDF0FD;} + .d2-2559513672 .color-AA5{color:#F7F8FE;} + .d2-2559513672 .color-AB4{color:#EDF0FD;} + .d2-2559513672 .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}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ diff --git a/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg index efaec6515..d26ad66c2 100644 --- a/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ああああああああああ + .d2-1197325548 .fill-N1{fill:#0A0F25;} + .d2-1197325548 .fill-N2{fill:#676C7E;} + .d2-1197325548 .fill-N3{fill:#9499AB;} + .d2-1197325548 .fill-N4{fill:#CFD2DD;} + .d2-1197325548 .fill-N5{fill:#DEE1EB;} + .d2-1197325548 .fill-N6{fill:#EEF1F8;} + .d2-1197325548 .fill-N7{fill:#FFFFFF;} + .d2-1197325548 .fill-B1{fill:#0D32B2;} + .d2-1197325548 .fill-B2{fill:#0D32B2;} + .d2-1197325548 .fill-B3{fill:#E3E9FD;} + .d2-1197325548 .fill-B4{fill:#E3E9FD;} + .d2-1197325548 .fill-B5{fill:#EDF0FD;} + .d2-1197325548 .fill-B6{fill:#F7F8FE;} + .d2-1197325548 .fill-AA2{fill:#4A6FF3;} + .d2-1197325548 .fill-AA4{fill:#EDF0FD;} + .d2-1197325548 .fill-AA5{fill:#F7F8FE;} + .d2-1197325548 .fill-AB4{fill:#EDF0FD;} + .d2-1197325548 .fill-AB5{fill:#F7F8FE;} + .d2-1197325548 .stroke-N1{stroke:#0A0F25;} + .d2-1197325548 .stroke-N2{stroke:#676C7E;} + .d2-1197325548 .stroke-N3{stroke:#9499AB;} + .d2-1197325548 .stroke-N4{stroke:#CFD2DD;} + .d2-1197325548 .stroke-N5{stroke:#DEE1EB;} + .d2-1197325548 .stroke-N6{stroke:#EEF1F8;} + .d2-1197325548 .stroke-N7{stroke:#FFFFFF;} + .d2-1197325548 .stroke-B1{stroke:#0D32B2;} + .d2-1197325548 .stroke-B2{stroke:#0D32B2;} + .d2-1197325548 .stroke-B3{stroke:#E3E9FD;} + .d2-1197325548 .stroke-B4{stroke:#E3E9FD;} + .d2-1197325548 .stroke-B5{stroke:#EDF0FD;} + .d2-1197325548 .stroke-B6{stroke:#F7F8FE;} + .d2-1197325548 .stroke-AA2{stroke:#4A6FF3;} + .d2-1197325548 .stroke-AA4{stroke:#EDF0FD;} + .d2-1197325548 .stroke-AA5{stroke:#F7F8FE;} + .d2-1197325548 .stroke-AB4{stroke:#EDF0FD;} + .d2-1197325548 .stroke-AB5{stroke:#F7F8FE;} + .d2-1197325548 .background-color-N1{background-color:#0A0F25;} + .d2-1197325548 .background-color-N2{background-color:#676C7E;} + .d2-1197325548 .background-color-N3{background-color:#9499AB;} + .d2-1197325548 .background-color-N4{background-color:#CFD2DD;} + .d2-1197325548 .background-color-N5{background-color:#DEE1EB;} + .d2-1197325548 .background-color-N6{background-color:#EEF1F8;} + .d2-1197325548 .background-color-N7{background-color:#FFFFFF;} + .d2-1197325548 .background-color-B1{background-color:#0D32B2;} + .d2-1197325548 .background-color-B2{background-color:#0D32B2;} + .d2-1197325548 .background-color-B3{background-color:#E3E9FD;} + .d2-1197325548 .background-color-B4{background-color:#E3E9FD;} + .d2-1197325548 .background-color-B5{background-color:#EDF0FD;} + .d2-1197325548 .background-color-B6{background-color:#F7F8FE;} + .d2-1197325548 .background-color-AA2{background-color:#4A6FF3;} + .d2-1197325548 .background-color-AA4{background-color:#EDF0FD;} + .d2-1197325548 .background-color-AA5{background-color:#F7F8FE;} + .d2-1197325548 .background-color-AB4{background-color:#EDF0FD;} + .d2-1197325548 .background-color-AB5{background-color:#F7F8FE;} + .d2-1197325548 .color-N1{color:#0A0F25;} + .d2-1197325548 .color-N2{color:#676C7E;} + .d2-1197325548 .color-N3{color:#9499AB;} + .d2-1197325548 .color-N4{color:#CFD2DD;} + .d2-1197325548 .color-N5{color:#DEE1EB;} + .d2-1197325548 .color-N6{color:#EEF1F8;} + .d2-1197325548 .color-N7{color:#FFFFFF;} + .d2-1197325548 .color-B1{color:#0D32B2;} + .d2-1197325548 .color-B2{color:#0D32B2;} + .d2-1197325548 .color-B3{color:#E3E9FD;} + .d2-1197325548 .color-B4{color:#E3E9FD;} + .d2-1197325548 .color-B5{color:#EDF0FD;} + .d2-1197325548 .color-B6{color:#F7F8FE;} + .d2-1197325548 .color-AA2{color:#4A6FF3;} + .d2-1197325548 .color-AA4{color:#EDF0FD;} + .d2-1197325548 .color-AA5{color:#F7F8FE;} + .d2-1197325548 .color-AB4{color:#EDF0FD;} + .d2-1197325548 .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}]]>ああああああああああ \ 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 cd674416b..778818f61 100644 --- a/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ああああああああああ + .d2-1489435172 .fill-N1{fill:#0A0F25;} + .d2-1489435172 .fill-N2{fill:#676C7E;} + .d2-1489435172 .fill-N3{fill:#9499AB;} + .d2-1489435172 .fill-N4{fill:#CFD2DD;} + .d2-1489435172 .fill-N5{fill:#DEE1EB;} + .d2-1489435172 .fill-N6{fill:#EEF1F8;} + .d2-1489435172 .fill-N7{fill:#FFFFFF;} + .d2-1489435172 .fill-B1{fill:#0D32B2;} + .d2-1489435172 .fill-B2{fill:#0D32B2;} + .d2-1489435172 .fill-B3{fill:#E3E9FD;} + .d2-1489435172 .fill-B4{fill:#E3E9FD;} + .d2-1489435172 .fill-B5{fill:#EDF0FD;} + .d2-1489435172 .fill-B6{fill:#F7F8FE;} + .d2-1489435172 .fill-AA2{fill:#4A6FF3;} + .d2-1489435172 .fill-AA4{fill:#EDF0FD;} + .d2-1489435172 .fill-AA5{fill:#F7F8FE;} + .d2-1489435172 .fill-AB4{fill:#EDF0FD;} + .d2-1489435172 .fill-AB5{fill:#F7F8FE;} + .d2-1489435172 .stroke-N1{stroke:#0A0F25;} + .d2-1489435172 .stroke-N2{stroke:#676C7E;} + .d2-1489435172 .stroke-N3{stroke:#9499AB;} + .d2-1489435172 .stroke-N4{stroke:#CFD2DD;} + .d2-1489435172 .stroke-N5{stroke:#DEE1EB;} + .d2-1489435172 .stroke-N6{stroke:#EEF1F8;} + .d2-1489435172 .stroke-N7{stroke:#FFFFFF;} + .d2-1489435172 .stroke-B1{stroke:#0D32B2;} + .d2-1489435172 .stroke-B2{stroke:#0D32B2;} + .d2-1489435172 .stroke-B3{stroke:#E3E9FD;} + .d2-1489435172 .stroke-B4{stroke:#E3E9FD;} + .d2-1489435172 .stroke-B5{stroke:#EDF0FD;} + .d2-1489435172 .stroke-B6{stroke:#F7F8FE;} + .d2-1489435172 .stroke-AA2{stroke:#4A6FF3;} + .d2-1489435172 .stroke-AA4{stroke:#EDF0FD;} + .d2-1489435172 .stroke-AA5{stroke:#F7F8FE;} + .d2-1489435172 .stroke-AB4{stroke:#EDF0FD;} + .d2-1489435172 .stroke-AB5{stroke:#F7F8FE;} + .d2-1489435172 .background-color-N1{background-color:#0A0F25;} + .d2-1489435172 .background-color-N2{background-color:#676C7E;} + .d2-1489435172 .background-color-N3{background-color:#9499AB;} + .d2-1489435172 .background-color-N4{background-color:#CFD2DD;} + .d2-1489435172 .background-color-N5{background-color:#DEE1EB;} + .d2-1489435172 .background-color-N6{background-color:#EEF1F8;} + .d2-1489435172 .background-color-N7{background-color:#FFFFFF;} + .d2-1489435172 .background-color-B1{background-color:#0D32B2;} + .d2-1489435172 .background-color-B2{background-color:#0D32B2;} + .d2-1489435172 .background-color-B3{background-color:#E3E9FD;} + .d2-1489435172 .background-color-B4{background-color:#E3E9FD;} + .d2-1489435172 .background-color-B5{background-color:#EDF0FD;} + .d2-1489435172 .background-color-B6{background-color:#F7F8FE;} + .d2-1489435172 .background-color-AA2{background-color:#4A6FF3;} + .d2-1489435172 .background-color-AA4{background-color:#EDF0FD;} + .d2-1489435172 .background-color-AA5{background-color:#F7F8FE;} + .d2-1489435172 .background-color-AB4{background-color:#EDF0FD;} + .d2-1489435172 .background-color-AB5{background-color:#F7F8FE;} + .d2-1489435172 .color-N1{color:#0A0F25;} + .d2-1489435172 .color-N2{color:#676C7E;} + .d2-1489435172 .color-N3{color:#9499AB;} + .d2-1489435172 .color-N4{color:#CFD2DD;} + .d2-1489435172 .color-N5{color:#DEE1EB;} + .d2-1489435172 .color-N6{color:#EEF1F8;} + .d2-1489435172 .color-N7{color:#FFFFFF;} + .d2-1489435172 .color-B1{color:#0D32B2;} + .d2-1489435172 .color-B2{color:#0D32B2;} + .d2-1489435172 .color-B3{color:#E3E9FD;} + .d2-1489435172 .color-B4{color:#E3E9FD;} + .d2-1489435172 .color-B5{color:#EDF0FD;} + .d2-1489435172 .color-B6{color:#F7F8FE;} + .d2-1489435172 .color-AA2{color:#4A6FF3;} + .d2-1489435172 .color-AA4{color:#EDF0FD;} + .d2-1489435172 .color-AA5{color:#F7F8FE;} + .d2-1489435172 .color-AB4{color:#EDF0FD;} + .d2-1489435172 .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}]]>ああああああああああ \ 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 56f5d9f03..2121c3093 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 + .d2-953633631 .fill-N1{fill:#0A0F25;} + .d2-953633631 .fill-N2{fill:#676C7E;} + .d2-953633631 .fill-N3{fill:#9499AB;} + .d2-953633631 .fill-N4{fill:#CFD2DD;} + .d2-953633631 .fill-N5{fill:#DEE1EB;} + .d2-953633631 .fill-N6{fill:#EEF1F8;} + .d2-953633631 .fill-N7{fill:#FFFFFF;} + .d2-953633631 .fill-B1{fill:#0D32B2;} + .d2-953633631 .fill-B2{fill:#0D32B2;} + .d2-953633631 .fill-B3{fill:#E3E9FD;} + .d2-953633631 .fill-B4{fill:#E3E9FD;} + .d2-953633631 .fill-B5{fill:#EDF0FD;} + .d2-953633631 .fill-B6{fill:#F7F8FE;} + .d2-953633631 .fill-AA2{fill:#4A6FF3;} + .d2-953633631 .fill-AA4{fill:#EDF0FD;} + .d2-953633631 .fill-AA5{fill:#F7F8FE;} + .d2-953633631 .fill-AB4{fill:#EDF0FD;} + .d2-953633631 .fill-AB5{fill:#F7F8FE;} + .d2-953633631 .stroke-N1{stroke:#0A0F25;} + .d2-953633631 .stroke-N2{stroke:#676C7E;} + .d2-953633631 .stroke-N3{stroke:#9499AB;} + .d2-953633631 .stroke-N4{stroke:#CFD2DD;} + .d2-953633631 .stroke-N5{stroke:#DEE1EB;} + .d2-953633631 .stroke-N6{stroke:#EEF1F8;} + .d2-953633631 .stroke-N7{stroke:#FFFFFF;} + .d2-953633631 .stroke-B1{stroke:#0D32B2;} + .d2-953633631 .stroke-B2{stroke:#0D32B2;} + .d2-953633631 .stroke-B3{stroke:#E3E9FD;} + .d2-953633631 .stroke-B4{stroke:#E3E9FD;} + .d2-953633631 .stroke-B5{stroke:#EDF0FD;} + .d2-953633631 .stroke-B6{stroke:#F7F8FE;} + .d2-953633631 .stroke-AA2{stroke:#4A6FF3;} + .d2-953633631 .stroke-AA4{stroke:#EDF0FD;} + .d2-953633631 .stroke-AA5{stroke:#F7F8FE;} + .d2-953633631 .stroke-AB4{stroke:#EDF0FD;} + .d2-953633631 .stroke-AB5{stroke:#F7F8FE;} + .d2-953633631 .background-color-N1{background-color:#0A0F25;} + .d2-953633631 .background-color-N2{background-color:#676C7E;} + .d2-953633631 .background-color-N3{background-color:#9499AB;} + .d2-953633631 .background-color-N4{background-color:#CFD2DD;} + .d2-953633631 .background-color-N5{background-color:#DEE1EB;} + .d2-953633631 .background-color-N6{background-color:#EEF1F8;} + .d2-953633631 .background-color-N7{background-color:#FFFFFF;} + .d2-953633631 .background-color-B1{background-color:#0D32B2;} + .d2-953633631 .background-color-B2{background-color:#0D32B2;} + .d2-953633631 .background-color-B3{background-color:#E3E9FD;} + .d2-953633631 .background-color-B4{background-color:#E3E9FD;} + .d2-953633631 .background-color-B5{background-color:#EDF0FD;} + .d2-953633631 .background-color-B6{background-color:#F7F8FE;} + .d2-953633631 .background-color-AA2{background-color:#4A6FF3;} + .d2-953633631 .background-color-AA4{background-color:#EDF0FD;} + .d2-953633631 .background-color-AA5{background-color:#F7F8FE;} + .d2-953633631 .background-color-AB4{background-color:#EDF0FD;} + .d2-953633631 .background-color-AB5{background-color:#F7F8FE;} + .d2-953633631 .color-N1{color:#0A0F25;} + .d2-953633631 .color-N2{color:#676C7E;} + .d2-953633631 .color-N3{color:#9499AB;} + .d2-953633631 .color-N4{color:#CFD2DD;} + .d2-953633631 .color-N5{color:#DEE1EB;} + .d2-953633631 .color-N6{color:#EEF1F8;} + .d2-953633631 .color-N7{color:#FFFFFF;} + .d2-953633631 .color-B1{color:#0D32B2;} + .d2-953633631 .color-B2{color:#0D32B2;} + .d2-953633631 .color-B3{color:#E3E9FD;} + .d2-953633631 .color-B4{color:#E3E9FD;} + .d2-953633631 .color-B5{color:#EDF0FD;} + .d2-953633631 .color-B6{color:#F7F8FE;} + .d2-953633631 .color-AA2{color:#4A6FF3;} + .d2-953633631 .color-AA4{color:#EDF0FD;} + .d2-953633631 .color-AA5{color:#F7F8FE;} + .d2-953633631 .color-AB4{color:#EDF0FD;} + .d2-953633631 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 diff --git a/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg index b94a2a54b..cb23d2452 100644 --- a/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 + .d2-2895298439 .fill-N1{fill:#0A0F25;} + .d2-2895298439 .fill-N2{fill:#676C7E;} + .d2-2895298439 .fill-N3{fill:#9499AB;} + .d2-2895298439 .fill-N4{fill:#CFD2DD;} + .d2-2895298439 .fill-N5{fill:#DEE1EB;} + .d2-2895298439 .fill-N6{fill:#EEF1F8;} + .d2-2895298439 .fill-N7{fill:#FFFFFF;} + .d2-2895298439 .fill-B1{fill:#0D32B2;} + .d2-2895298439 .fill-B2{fill:#0D32B2;} + .d2-2895298439 .fill-B3{fill:#E3E9FD;} + .d2-2895298439 .fill-B4{fill:#E3E9FD;} + .d2-2895298439 .fill-B5{fill:#EDF0FD;} + .d2-2895298439 .fill-B6{fill:#F7F8FE;} + .d2-2895298439 .fill-AA2{fill:#4A6FF3;} + .d2-2895298439 .fill-AA4{fill:#EDF0FD;} + .d2-2895298439 .fill-AA5{fill:#F7F8FE;} + .d2-2895298439 .fill-AB4{fill:#EDF0FD;} + .d2-2895298439 .fill-AB5{fill:#F7F8FE;} + .d2-2895298439 .stroke-N1{stroke:#0A0F25;} + .d2-2895298439 .stroke-N2{stroke:#676C7E;} + .d2-2895298439 .stroke-N3{stroke:#9499AB;} + .d2-2895298439 .stroke-N4{stroke:#CFD2DD;} + .d2-2895298439 .stroke-N5{stroke:#DEE1EB;} + .d2-2895298439 .stroke-N6{stroke:#EEF1F8;} + .d2-2895298439 .stroke-N7{stroke:#FFFFFF;} + .d2-2895298439 .stroke-B1{stroke:#0D32B2;} + .d2-2895298439 .stroke-B2{stroke:#0D32B2;} + .d2-2895298439 .stroke-B3{stroke:#E3E9FD;} + .d2-2895298439 .stroke-B4{stroke:#E3E9FD;} + .d2-2895298439 .stroke-B5{stroke:#EDF0FD;} + .d2-2895298439 .stroke-B6{stroke:#F7F8FE;} + .d2-2895298439 .stroke-AA2{stroke:#4A6FF3;} + .d2-2895298439 .stroke-AA4{stroke:#EDF0FD;} + .d2-2895298439 .stroke-AA5{stroke:#F7F8FE;} + .d2-2895298439 .stroke-AB4{stroke:#EDF0FD;} + .d2-2895298439 .stroke-AB5{stroke:#F7F8FE;} + .d2-2895298439 .background-color-N1{background-color:#0A0F25;} + .d2-2895298439 .background-color-N2{background-color:#676C7E;} + .d2-2895298439 .background-color-N3{background-color:#9499AB;} + .d2-2895298439 .background-color-N4{background-color:#CFD2DD;} + .d2-2895298439 .background-color-N5{background-color:#DEE1EB;} + .d2-2895298439 .background-color-N6{background-color:#EEF1F8;} + .d2-2895298439 .background-color-N7{background-color:#FFFFFF;} + .d2-2895298439 .background-color-B1{background-color:#0D32B2;} + .d2-2895298439 .background-color-B2{background-color:#0D32B2;} + .d2-2895298439 .background-color-B3{background-color:#E3E9FD;} + .d2-2895298439 .background-color-B4{background-color:#E3E9FD;} + .d2-2895298439 .background-color-B5{background-color:#EDF0FD;} + .d2-2895298439 .background-color-B6{background-color:#F7F8FE;} + .d2-2895298439 .background-color-AA2{background-color:#4A6FF3;} + .d2-2895298439 .background-color-AA4{background-color:#EDF0FD;} + .d2-2895298439 .background-color-AA5{background-color:#F7F8FE;} + .d2-2895298439 .background-color-AB4{background-color:#EDF0FD;} + .d2-2895298439 .background-color-AB5{background-color:#F7F8FE;} + .d2-2895298439 .color-N1{color:#0A0F25;} + .d2-2895298439 .color-N2{color:#676C7E;} + .d2-2895298439 .color-N3{color:#9499AB;} + .d2-2895298439 .color-N4{color:#CFD2DD;} + .d2-2895298439 .color-N5{color:#DEE1EB;} + .d2-2895298439 .color-N6{color:#EEF1F8;} + .d2-2895298439 .color-N7{color:#FFFFFF;} + .d2-2895298439 .color-B1{color:#0D32B2;} + .d2-2895298439 .color-B2{color:#0D32B2;} + .d2-2895298439 .color-B3{color:#E3E9FD;} + .d2-2895298439 .color-B4{color:#E3E9FD;} + .d2-2895298439 .color-B5{color:#EDF0FD;} + .d2-2895298439 .color-B6{color:#F7F8FE;} + .d2-2895298439 .color-AA2{color:#4A6FF3;} + .d2-2895298439 .color-AA4{color:#EDF0FD;} + .d2-2895298439 .color-AA5{color:#F7F8FE;} + .d2-2895298439 .color-AB4{color:#EDF0FD;} + .d2-2895298439 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 diff --git a/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg index d14a89082..4ad93f981 100644 --- a/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 + .d2-799413400 .fill-N1{fill:#0A0F25;} + .d2-799413400 .fill-N2{fill:#676C7E;} + .d2-799413400 .fill-N3{fill:#9499AB;} + .d2-799413400 .fill-N4{fill:#CFD2DD;} + .d2-799413400 .fill-N5{fill:#DEE1EB;} + .d2-799413400 .fill-N6{fill:#EEF1F8;} + .d2-799413400 .fill-N7{fill:#FFFFFF;} + .d2-799413400 .fill-B1{fill:#0D32B2;} + .d2-799413400 .fill-B2{fill:#0D32B2;} + .d2-799413400 .fill-B3{fill:#E3E9FD;} + .d2-799413400 .fill-B4{fill:#E3E9FD;} + .d2-799413400 .fill-B5{fill:#EDF0FD;} + .d2-799413400 .fill-B6{fill:#F7F8FE;} + .d2-799413400 .fill-AA2{fill:#4A6FF3;} + .d2-799413400 .fill-AA4{fill:#EDF0FD;} + .d2-799413400 .fill-AA5{fill:#F7F8FE;} + .d2-799413400 .fill-AB4{fill:#EDF0FD;} + .d2-799413400 .fill-AB5{fill:#F7F8FE;} + .d2-799413400 .stroke-N1{stroke:#0A0F25;} + .d2-799413400 .stroke-N2{stroke:#676C7E;} + .d2-799413400 .stroke-N3{stroke:#9499AB;} + .d2-799413400 .stroke-N4{stroke:#CFD2DD;} + .d2-799413400 .stroke-N5{stroke:#DEE1EB;} + .d2-799413400 .stroke-N6{stroke:#EEF1F8;} + .d2-799413400 .stroke-N7{stroke:#FFFFFF;} + .d2-799413400 .stroke-B1{stroke:#0D32B2;} + .d2-799413400 .stroke-B2{stroke:#0D32B2;} + .d2-799413400 .stroke-B3{stroke:#E3E9FD;} + .d2-799413400 .stroke-B4{stroke:#E3E9FD;} + .d2-799413400 .stroke-B5{stroke:#EDF0FD;} + .d2-799413400 .stroke-B6{stroke:#F7F8FE;} + .d2-799413400 .stroke-AA2{stroke:#4A6FF3;} + .d2-799413400 .stroke-AA4{stroke:#EDF0FD;} + .d2-799413400 .stroke-AA5{stroke:#F7F8FE;} + .d2-799413400 .stroke-AB4{stroke:#EDF0FD;} + .d2-799413400 .stroke-AB5{stroke:#F7F8FE;} + .d2-799413400 .background-color-N1{background-color:#0A0F25;} + .d2-799413400 .background-color-N2{background-color:#676C7E;} + .d2-799413400 .background-color-N3{background-color:#9499AB;} + .d2-799413400 .background-color-N4{background-color:#CFD2DD;} + .d2-799413400 .background-color-N5{background-color:#DEE1EB;} + .d2-799413400 .background-color-N6{background-color:#EEF1F8;} + .d2-799413400 .background-color-N7{background-color:#FFFFFF;} + .d2-799413400 .background-color-B1{background-color:#0D32B2;} + .d2-799413400 .background-color-B2{background-color:#0D32B2;} + .d2-799413400 .background-color-B3{background-color:#E3E9FD;} + .d2-799413400 .background-color-B4{background-color:#E3E9FD;} + .d2-799413400 .background-color-B5{background-color:#EDF0FD;} + .d2-799413400 .background-color-B6{background-color:#F7F8FE;} + .d2-799413400 .background-color-AA2{background-color:#4A6FF3;} + .d2-799413400 .background-color-AA4{background-color:#EDF0FD;} + .d2-799413400 .background-color-AA5{background-color:#F7F8FE;} + .d2-799413400 .background-color-AB4{background-color:#EDF0FD;} + .d2-799413400 .background-color-AB5{background-color:#F7F8FE;} + .d2-799413400 .color-N1{color:#0A0F25;} + .d2-799413400 .color-N2{color:#676C7E;} + .d2-799413400 .color-N3{color:#9499AB;} + .d2-799413400 .color-N4{color:#CFD2DD;} + .d2-799413400 .color-N5{color:#DEE1EB;} + .d2-799413400 .color-N6{color:#EEF1F8;} + .d2-799413400 .color-N7{color:#FFFFFF;} + .d2-799413400 .color-B1{color:#0D32B2;} + .d2-799413400 .color-B2{color:#0D32B2;} + .d2-799413400 .color-B3{color:#E3E9FD;} + .d2-799413400 .color-B4{color:#E3E9FD;} + .d2-799413400 .color-B5{color:#EDF0FD;} + .d2-799413400 .color-B6{color:#F7F8FE;} + .d2-799413400 .color-AA2{color:#4A6FF3;} + .d2-799413400 .color-AA4{color:#EDF0FD;} + .d2-799413400 .color-AA5{color:#F7F8FE;} + .d2-799413400 .color-AB4{color:#EDF0FD;} + .d2-799413400 .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}]]>トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 diff --git a/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg index 10c872f7d..16deba82b 100644 --- a/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 + .d2-1875542808 .fill-N1{fill:#0A0F25;} + .d2-1875542808 .fill-N2{fill:#676C7E;} + .d2-1875542808 .fill-N3{fill:#9499AB;} + .d2-1875542808 .fill-N4{fill:#CFD2DD;} + .d2-1875542808 .fill-N5{fill:#DEE1EB;} + .d2-1875542808 .fill-N6{fill:#EEF1F8;} + .d2-1875542808 .fill-N7{fill:#FFFFFF;} + .d2-1875542808 .fill-B1{fill:#0D32B2;} + .d2-1875542808 .fill-B2{fill:#0D32B2;} + .d2-1875542808 .fill-B3{fill:#E3E9FD;} + .d2-1875542808 .fill-B4{fill:#E3E9FD;} + .d2-1875542808 .fill-B5{fill:#EDF0FD;} + .d2-1875542808 .fill-B6{fill:#F7F8FE;} + .d2-1875542808 .fill-AA2{fill:#4A6FF3;} + .d2-1875542808 .fill-AA4{fill:#EDF0FD;} + .d2-1875542808 .fill-AA5{fill:#F7F8FE;} + .d2-1875542808 .fill-AB4{fill:#EDF0FD;} + .d2-1875542808 .fill-AB5{fill:#F7F8FE;} + .d2-1875542808 .stroke-N1{stroke:#0A0F25;} + .d2-1875542808 .stroke-N2{stroke:#676C7E;} + .d2-1875542808 .stroke-N3{stroke:#9499AB;} + .d2-1875542808 .stroke-N4{stroke:#CFD2DD;} + .d2-1875542808 .stroke-N5{stroke:#DEE1EB;} + .d2-1875542808 .stroke-N6{stroke:#EEF1F8;} + .d2-1875542808 .stroke-N7{stroke:#FFFFFF;} + .d2-1875542808 .stroke-B1{stroke:#0D32B2;} + .d2-1875542808 .stroke-B2{stroke:#0D32B2;} + .d2-1875542808 .stroke-B3{stroke:#E3E9FD;} + .d2-1875542808 .stroke-B4{stroke:#E3E9FD;} + .d2-1875542808 .stroke-B5{stroke:#EDF0FD;} + .d2-1875542808 .stroke-B6{stroke:#F7F8FE;} + .d2-1875542808 .stroke-AA2{stroke:#4A6FF3;} + .d2-1875542808 .stroke-AA4{stroke:#EDF0FD;} + .d2-1875542808 .stroke-AA5{stroke:#F7F8FE;} + .d2-1875542808 .stroke-AB4{stroke:#EDF0FD;} + .d2-1875542808 .stroke-AB5{stroke:#F7F8FE;} + .d2-1875542808 .background-color-N1{background-color:#0A0F25;} + .d2-1875542808 .background-color-N2{background-color:#676C7E;} + .d2-1875542808 .background-color-N3{background-color:#9499AB;} + .d2-1875542808 .background-color-N4{background-color:#CFD2DD;} + .d2-1875542808 .background-color-N5{background-color:#DEE1EB;} + .d2-1875542808 .background-color-N6{background-color:#EEF1F8;} + .d2-1875542808 .background-color-N7{background-color:#FFFFFF;} + .d2-1875542808 .background-color-B1{background-color:#0D32B2;} + .d2-1875542808 .background-color-B2{background-color:#0D32B2;} + .d2-1875542808 .background-color-B3{background-color:#E3E9FD;} + .d2-1875542808 .background-color-B4{background-color:#E3E9FD;} + .d2-1875542808 .background-color-B5{background-color:#EDF0FD;} + .d2-1875542808 .background-color-B6{background-color:#F7F8FE;} + .d2-1875542808 .background-color-AA2{background-color:#4A6FF3;} + .d2-1875542808 .background-color-AA4{background-color:#EDF0FD;} + .d2-1875542808 .background-color-AA5{background-color:#F7F8FE;} + .d2-1875542808 .background-color-AB4{background-color:#EDF0FD;} + .d2-1875542808 .background-color-AB5{background-color:#F7F8FE;} + .d2-1875542808 .color-N1{color:#0A0F25;} + .d2-1875542808 .color-N2{color:#676C7E;} + .d2-1875542808 .color-N3{color:#9499AB;} + .d2-1875542808 .color-N4{color:#CFD2DD;} + .d2-1875542808 .color-N5{color:#DEE1EB;} + .d2-1875542808 .color-N6{color:#EEF1F8;} + .d2-1875542808 .color-N7{color:#FFFFFF;} + .d2-1875542808 .color-B1{color:#0D32B2;} + .d2-1875542808 .color-B2{color:#0D32B2;} + .d2-1875542808 .color-B3{color:#E3E9FD;} + .d2-1875542808 .color-B4{color:#E3E9FD;} + .d2-1875542808 .color-B5{color:#EDF0FD;} + .d2-1875542808 .color-B6{color:#F7F8FE;} + .d2-1875542808 .color-AA2{color:#4A6FF3;} + .d2-1875542808 .color-AA4{color:#EDF0FD;} + .d2-1875542808 .color-AA5{color:#F7F8FE;} + .d2-1875542808 .color-AB4{color:#EDF0FD;} + .d2-1875542808 .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}]]>トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 diff --git a/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg b/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg index 52d0828c0..1e11c165c 100644 --- a/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -고생끝에낙이온다 + .d2-157051261 .fill-N1{fill:#0A0F25;} + .d2-157051261 .fill-N2{fill:#676C7E;} + .d2-157051261 .fill-N3{fill:#9499AB;} + .d2-157051261 .fill-N4{fill:#CFD2DD;} + .d2-157051261 .fill-N5{fill:#DEE1EB;} + .d2-157051261 .fill-N6{fill:#EEF1F8;} + .d2-157051261 .fill-N7{fill:#FFFFFF;} + .d2-157051261 .fill-B1{fill:#0D32B2;} + .d2-157051261 .fill-B2{fill:#0D32B2;} + .d2-157051261 .fill-B3{fill:#E3E9FD;} + .d2-157051261 .fill-B4{fill:#E3E9FD;} + .d2-157051261 .fill-B5{fill:#EDF0FD;} + .d2-157051261 .fill-B6{fill:#F7F8FE;} + .d2-157051261 .fill-AA2{fill:#4A6FF3;} + .d2-157051261 .fill-AA4{fill:#EDF0FD;} + .d2-157051261 .fill-AA5{fill:#F7F8FE;} + .d2-157051261 .fill-AB4{fill:#EDF0FD;} + .d2-157051261 .fill-AB5{fill:#F7F8FE;} + .d2-157051261 .stroke-N1{stroke:#0A0F25;} + .d2-157051261 .stroke-N2{stroke:#676C7E;} + .d2-157051261 .stroke-N3{stroke:#9499AB;} + .d2-157051261 .stroke-N4{stroke:#CFD2DD;} + .d2-157051261 .stroke-N5{stroke:#DEE1EB;} + .d2-157051261 .stroke-N6{stroke:#EEF1F8;} + .d2-157051261 .stroke-N7{stroke:#FFFFFF;} + .d2-157051261 .stroke-B1{stroke:#0D32B2;} + .d2-157051261 .stroke-B2{stroke:#0D32B2;} + .d2-157051261 .stroke-B3{stroke:#E3E9FD;} + .d2-157051261 .stroke-B4{stroke:#E3E9FD;} + .d2-157051261 .stroke-B5{stroke:#EDF0FD;} + .d2-157051261 .stroke-B6{stroke:#F7F8FE;} + .d2-157051261 .stroke-AA2{stroke:#4A6FF3;} + .d2-157051261 .stroke-AA4{stroke:#EDF0FD;} + .d2-157051261 .stroke-AA5{stroke:#F7F8FE;} + .d2-157051261 .stroke-AB4{stroke:#EDF0FD;} + .d2-157051261 .stroke-AB5{stroke:#F7F8FE;} + .d2-157051261 .background-color-N1{background-color:#0A0F25;} + .d2-157051261 .background-color-N2{background-color:#676C7E;} + .d2-157051261 .background-color-N3{background-color:#9499AB;} + .d2-157051261 .background-color-N4{background-color:#CFD2DD;} + .d2-157051261 .background-color-N5{background-color:#DEE1EB;} + .d2-157051261 .background-color-N6{background-color:#EEF1F8;} + .d2-157051261 .background-color-N7{background-color:#FFFFFF;} + .d2-157051261 .background-color-B1{background-color:#0D32B2;} + .d2-157051261 .background-color-B2{background-color:#0D32B2;} + .d2-157051261 .background-color-B3{background-color:#E3E9FD;} + .d2-157051261 .background-color-B4{background-color:#E3E9FD;} + .d2-157051261 .background-color-B5{background-color:#EDF0FD;} + .d2-157051261 .background-color-B6{background-color:#F7F8FE;} + .d2-157051261 .background-color-AA2{background-color:#4A6FF3;} + .d2-157051261 .background-color-AA4{background-color:#EDF0FD;} + .d2-157051261 .background-color-AA5{background-color:#F7F8FE;} + .d2-157051261 .background-color-AB4{background-color:#EDF0FD;} + .d2-157051261 .background-color-AB5{background-color:#F7F8FE;} + .d2-157051261 .color-N1{color:#0A0F25;} + .d2-157051261 .color-N2{color:#676C7E;} + .d2-157051261 .color-N3{color:#9499AB;} + .d2-157051261 .color-N4{color:#CFD2DD;} + .d2-157051261 .color-N5{color:#DEE1EB;} + .d2-157051261 .color-N6{color:#EEF1F8;} + .d2-157051261 .color-N7{color:#FFFFFF;} + .d2-157051261 .color-B1{color:#0D32B2;} + .d2-157051261 .color-B2{color:#0D32B2;} + .d2-157051261 .color-B3{color:#E3E9FD;} + .d2-157051261 .color-B4{color:#E3E9FD;} + .d2-157051261 .color-B5{color:#EDF0FD;} + .d2-157051261 .color-B6{color:#F7F8FE;} + .d2-157051261 .color-AA2{color:#4A6FF3;} + .d2-157051261 .color-AA4{color:#EDF0FD;} + .d2-157051261 .color-AA5{color:#F7F8FE;} + .d2-157051261 .color-AB4{color:#EDF0FD;} + .d2-157051261 .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}]]>고생끝에낙이온다 \ 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 6960b3d61..06f087753 100644 --- a/e2etests/testdata/unicode/korean/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/korean/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -고생끝에낙이온다 + .d2-695752357 .fill-N1{fill:#0A0F25;} + .d2-695752357 .fill-N2{fill:#676C7E;} + .d2-695752357 .fill-N3{fill:#9499AB;} + .d2-695752357 .fill-N4{fill:#CFD2DD;} + .d2-695752357 .fill-N5{fill:#DEE1EB;} + .d2-695752357 .fill-N6{fill:#EEF1F8;} + .d2-695752357 .fill-N7{fill:#FFFFFF;} + .d2-695752357 .fill-B1{fill:#0D32B2;} + .d2-695752357 .fill-B2{fill:#0D32B2;} + .d2-695752357 .fill-B3{fill:#E3E9FD;} + .d2-695752357 .fill-B4{fill:#E3E9FD;} + .d2-695752357 .fill-B5{fill:#EDF0FD;} + .d2-695752357 .fill-B6{fill:#F7F8FE;} + .d2-695752357 .fill-AA2{fill:#4A6FF3;} + .d2-695752357 .fill-AA4{fill:#EDF0FD;} + .d2-695752357 .fill-AA5{fill:#F7F8FE;} + .d2-695752357 .fill-AB4{fill:#EDF0FD;} + .d2-695752357 .fill-AB5{fill:#F7F8FE;} + .d2-695752357 .stroke-N1{stroke:#0A0F25;} + .d2-695752357 .stroke-N2{stroke:#676C7E;} + .d2-695752357 .stroke-N3{stroke:#9499AB;} + .d2-695752357 .stroke-N4{stroke:#CFD2DD;} + .d2-695752357 .stroke-N5{stroke:#DEE1EB;} + .d2-695752357 .stroke-N6{stroke:#EEF1F8;} + .d2-695752357 .stroke-N7{stroke:#FFFFFF;} + .d2-695752357 .stroke-B1{stroke:#0D32B2;} + .d2-695752357 .stroke-B2{stroke:#0D32B2;} + .d2-695752357 .stroke-B3{stroke:#E3E9FD;} + .d2-695752357 .stroke-B4{stroke:#E3E9FD;} + .d2-695752357 .stroke-B5{stroke:#EDF0FD;} + .d2-695752357 .stroke-B6{stroke:#F7F8FE;} + .d2-695752357 .stroke-AA2{stroke:#4A6FF3;} + .d2-695752357 .stroke-AA4{stroke:#EDF0FD;} + .d2-695752357 .stroke-AA5{stroke:#F7F8FE;} + .d2-695752357 .stroke-AB4{stroke:#EDF0FD;} + .d2-695752357 .stroke-AB5{stroke:#F7F8FE;} + .d2-695752357 .background-color-N1{background-color:#0A0F25;} + .d2-695752357 .background-color-N2{background-color:#676C7E;} + .d2-695752357 .background-color-N3{background-color:#9499AB;} + .d2-695752357 .background-color-N4{background-color:#CFD2DD;} + .d2-695752357 .background-color-N5{background-color:#DEE1EB;} + .d2-695752357 .background-color-N6{background-color:#EEF1F8;} + .d2-695752357 .background-color-N7{background-color:#FFFFFF;} + .d2-695752357 .background-color-B1{background-color:#0D32B2;} + .d2-695752357 .background-color-B2{background-color:#0D32B2;} + .d2-695752357 .background-color-B3{background-color:#E3E9FD;} + .d2-695752357 .background-color-B4{background-color:#E3E9FD;} + .d2-695752357 .background-color-B5{background-color:#EDF0FD;} + .d2-695752357 .background-color-B6{background-color:#F7F8FE;} + .d2-695752357 .background-color-AA2{background-color:#4A6FF3;} + .d2-695752357 .background-color-AA4{background-color:#EDF0FD;} + .d2-695752357 .background-color-AA5{background-color:#F7F8FE;} + .d2-695752357 .background-color-AB4{background-color:#EDF0FD;} + .d2-695752357 .background-color-AB5{background-color:#F7F8FE;} + .d2-695752357 .color-N1{color:#0A0F25;} + .d2-695752357 .color-N2{color:#676C7E;} + .d2-695752357 .color-N3{color:#9499AB;} + .d2-695752357 .color-N4{color:#CFD2DD;} + .d2-695752357 .color-N5{color:#DEE1EB;} + .d2-695752357 .color-N6{color:#EEF1F8;} + .d2-695752357 .color-N7{color:#FFFFFF;} + .d2-695752357 .color-B1{color:#0D32B2;} + .d2-695752357 .color-B2{color:#0D32B2;} + .d2-695752357 .color-B3{color:#E3E9FD;} + .d2-695752357 .color-B4{color:#E3E9FD;} + .d2-695752357 .color-B5{color:#EDF0FD;} + .d2-695752357 .color-B6{color:#F7F8FE;} + .d2-695752357 .color-AA2{color:#4A6FF3;} + .d2-695752357 .color-AA4{color:#EDF0FD;} + .d2-695752357 .color-AA5{color:#F7F8FE;} + .d2-695752357 .color-AB4{color:#EDF0FD;} + .d2-695752357 .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}]]>고생끝에낙이온다 \ 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 c60ae05aa..3209df938 100644 --- a/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -我 (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مەن سىزنى ياخشى ئۈمىد ق + .d2-1231192003 .fill-N1{fill:#0A0F25;} + .d2-1231192003 .fill-N2{fill:#676C7E;} + .d2-1231192003 .fill-N3{fill:#9499AB;} + .d2-1231192003 .fill-N4{fill:#CFD2DD;} + .d2-1231192003 .fill-N5{fill:#DEE1EB;} + .d2-1231192003 .fill-N6{fill:#EEF1F8;} + .d2-1231192003 .fill-N7{fill:#FFFFFF;} + .d2-1231192003 .fill-B1{fill:#0D32B2;} + .d2-1231192003 .fill-B2{fill:#0D32B2;} + .d2-1231192003 .fill-B3{fill:#E3E9FD;} + .d2-1231192003 .fill-B4{fill:#E3E9FD;} + .d2-1231192003 .fill-B5{fill:#EDF0FD;} + .d2-1231192003 .fill-B6{fill:#F7F8FE;} + .d2-1231192003 .fill-AA2{fill:#4A6FF3;} + .d2-1231192003 .fill-AA4{fill:#EDF0FD;} + .d2-1231192003 .fill-AA5{fill:#F7F8FE;} + .d2-1231192003 .fill-AB4{fill:#EDF0FD;} + .d2-1231192003 .fill-AB5{fill:#F7F8FE;} + .d2-1231192003 .stroke-N1{stroke:#0A0F25;} + .d2-1231192003 .stroke-N2{stroke:#676C7E;} + .d2-1231192003 .stroke-N3{stroke:#9499AB;} + .d2-1231192003 .stroke-N4{stroke:#CFD2DD;} + .d2-1231192003 .stroke-N5{stroke:#DEE1EB;} + .d2-1231192003 .stroke-N6{stroke:#EEF1F8;} + .d2-1231192003 .stroke-N7{stroke:#FFFFFF;} + .d2-1231192003 .stroke-B1{stroke:#0D32B2;} + .d2-1231192003 .stroke-B2{stroke:#0D32B2;} + .d2-1231192003 .stroke-B3{stroke:#E3E9FD;} + .d2-1231192003 .stroke-B4{stroke:#E3E9FD;} + .d2-1231192003 .stroke-B5{stroke:#EDF0FD;} + .d2-1231192003 .stroke-B6{stroke:#F7F8FE;} + .d2-1231192003 .stroke-AA2{stroke:#4A6FF3;} + .d2-1231192003 .stroke-AA4{stroke:#EDF0FD;} + .d2-1231192003 .stroke-AA5{stroke:#F7F8FE;} + .d2-1231192003 .stroke-AB4{stroke:#EDF0FD;} + .d2-1231192003 .stroke-AB5{stroke:#F7F8FE;} + .d2-1231192003 .background-color-N1{background-color:#0A0F25;} + .d2-1231192003 .background-color-N2{background-color:#676C7E;} + .d2-1231192003 .background-color-N3{background-color:#9499AB;} + .d2-1231192003 .background-color-N4{background-color:#CFD2DD;} + .d2-1231192003 .background-color-N5{background-color:#DEE1EB;} + .d2-1231192003 .background-color-N6{background-color:#EEF1F8;} + .d2-1231192003 .background-color-N7{background-color:#FFFFFF;} + .d2-1231192003 .background-color-B1{background-color:#0D32B2;} + .d2-1231192003 .background-color-B2{background-color:#0D32B2;} + .d2-1231192003 .background-color-B3{background-color:#E3E9FD;} + .d2-1231192003 .background-color-B4{background-color:#E3E9FD;} + .d2-1231192003 .background-color-B5{background-color:#EDF0FD;} + .d2-1231192003 .background-color-B6{background-color:#F7F8FE;} + .d2-1231192003 .background-color-AA2{background-color:#4A6FF3;} + .d2-1231192003 .background-color-AA4{background-color:#EDF0FD;} + .d2-1231192003 .background-color-AA5{background-color:#F7F8FE;} + .d2-1231192003 .background-color-AB4{background-color:#EDF0FD;} + .d2-1231192003 .background-color-AB5{background-color:#F7F8FE;} + .d2-1231192003 .color-N1{color:#0A0F25;} + .d2-1231192003 .color-N2{color:#676C7E;} + .d2-1231192003 .color-N3{color:#9499AB;} + .d2-1231192003 .color-N4{color:#CFD2DD;} + .d2-1231192003 .color-N5{color:#DEE1EB;} + .d2-1231192003 .color-N6{color:#EEF1F8;} + .d2-1231192003 .color-N7{color:#FFFFFF;} + .d2-1231192003 .color-B1{color:#0D32B2;} + .d2-1231192003 .color-B2{color:#0D32B2;} + .d2-1231192003 .color-B3{color:#E3E9FD;} + .d2-1231192003 .color-B4{color:#E3E9FD;} + .d2-1231192003 .color-B5{color:#EDF0FD;} + .d2-1231192003 .color-B6{color:#F7F8FE;} + .d2-1231192003 .color-AA2{color:#4A6FF3;} + .d2-1231192003 .color-AA4{color:#EDF0FD;} + .d2-1231192003 .color-AA5{color:#F7F8FE;} + .d2-1231192003 .color-AB4{color:#EDF0FD;} + .d2-1231192003 .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}]]>我 (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مەن سىزنى ياخشى ئۈمىد ق 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 d84ba29e8..de2ed0c9f 100644 --- a/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -我 (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مەن سىزنى ياخشى ئۈمىد ق + .d2-3819243883 .fill-N1{fill:#0A0F25;} + .d2-3819243883 .fill-N2{fill:#676C7E;} + .d2-3819243883 .fill-N3{fill:#9499AB;} + .d2-3819243883 .fill-N4{fill:#CFD2DD;} + .d2-3819243883 .fill-N5{fill:#DEE1EB;} + .d2-3819243883 .fill-N6{fill:#EEF1F8;} + .d2-3819243883 .fill-N7{fill:#FFFFFF;} + .d2-3819243883 .fill-B1{fill:#0D32B2;} + .d2-3819243883 .fill-B2{fill:#0D32B2;} + .d2-3819243883 .fill-B3{fill:#E3E9FD;} + .d2-3819243883 .fill-B4{fill:#E3E9FD;} + .d2-3819243883 .fill-B5{fill:#EDF0FD;} + .d2-3819243883 .fill-B6{fill:#F7F8FE;} + .d2-3819243883 .fill-AA2{fill:#4A6FF3;} + .d2-3819243883 .fill-AA4{fill:#EDF0FD;} + .d2-3819243883 .fill-AA5{fill:#F7F8FE;} + .d2-3819243883 .fill-AB4{fill:#EDF0FD;} + .d2-3819243883 .fill-AB5{fill:#F7F8FE;} + .d2-3819243883 .stroke-N1{stroke:#0A0F25;} + .d2-3819243883 .stroke-N2{stroke:#676C7E;} + .d2-3819243883 .stroke-N3{stroke:#9499AB;} + .d2-3819243883 .stroke-N4{stroke:#CFD2DD;} + .d2-3819243883 .stroke-N5{stroke:#DEE1EB;} + .d2-3819243883 .stroke-N6{stroke:#EEF1F8;} + .d2-3819243883 .stroke-N7{stroke:#FFFFFF;} + .d2-3819243883 .stroke-B1{stroke:#0D32B2;} + .d2-3819243883 .stroke-B2{stroke:#0D32B2;} + .d2-3819243883 .stroke-B3{stroke:#E3E9FD;} + .d2-3819243883 .stroke-B4{stroke:#E3E9FD;} + .d2-3819243883 .stroke-B5{stroke:#EDF0FD;} + .d2-3819243883 .stroke-B6{stroke:#F7F8FE;} + .d2-3819243883 .stroke-AA2{stroke:#4A6FF3;} + .d2-3819243883 .stroke-AA4{stroke:#EDF0FD;} + .d2-3819243883 .stroke-AA5{stroke:#F7F8FE;} + .d2-3819243883 .stroke-AB4{stroke:#EDF0FD;} + .d2-3819243883 .stroke-AB5{stroke:#F7F8FE;} + .d2-3819243883 .background-color-N1{background-color:#0A0F25;} + .d2-3819243883 .background-color-N2{background-color:#676C7E;} + .d2-3819243883 .background-color-N3{background-color:#9499AB;} + .d2-3819243883 .background-color-N4{background-color:#CFD2DD;} + .d2-3819243883 .background-color-N5{background-color:#DEE1EB;} + .d2-3819243883 .background-color-N6{background-color:#EEF1F8;} + .d2-3819243883 .background-color-N7{background-color:#FFFFFF;} + .d2-3819243883 .background-color-B1{background-color:#0D32B2;} + .d2-3819243883 .background-color-B2{background-color:#0D32B2;} + .d2-3819243883 .background-color-B3{background-color:#E3E9FD;} + .d2-3819243883 .background-color-B4{background-color:#E3E9FD;} + .d2-3819243883 .background-color-B5{background-color:#EDF0FD;} + .d2-3819243883 .background-color-B6{background-color:#F7F8FE;} + .d2-3819243883 .background-color-AA2{background-color:#4A6FF3;} + .d2-3819243883 .background-color-AA4{background-color:#EDF0FD;} + .d2-3819243883 .background-color-AA5{background-color:#F7F8FE;} + .d2-3819243883 .background-color-AB4{background-color:#EDF0FD;} + .d2-3819243883 .background-color-AB5{background-color:#F7F8FE;} + .d2-3819243883 .color-N1{color:#0A0F25;} + .d2-3819243883 .color-N2{color:#676C7E;} + .d2-3819243883 .color-N3{color:#9499AB;} + .d2-3819243883 .color-N4{color:#CFD2DD;} + .d2-3819243883 .color-N5{color:#DEE1EB;} + .d2-3819243883 .color-N6{color:#EEF1F8;} + .d2-3819243883 .color-N7{color:#FFFFFF;} + .d2-3819243883 .color-B1{color:#0D32B2;} + .d2-3819243883 .color-B2{color:#0D32B2;} + .d2-3819243883 .color-B3{color:#E3E9FD;} + .d2-3819243883 .color-B4{color:#E3E9FD;} + .d2-3819243883 .color-B5{color:#EDF0FD;} + .d2-3819243883 .color-B6{color:#F7F8FE;} + .d2-3819243883 .color-AA2{color:#4A6FF3;} + .d2-3819243883 .color-AA4{color:#EDF0FD;} + .d2-3819243883 .color-AA5{color:#F7F8FE;} + .d2-3819243883 .color-AB4{color:#EDF0FD;} + .d2-3819243883 .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}]]>我 (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مەن سىزنى ياخشى ئۈمىد ق diff --git a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg index 7b91ef725..c0f3f4525 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

    夏になると、とても暑くて、人々は汗を流しています。

    여름에는 매우 더워서 사람들은 땀을 흘립니다.

    -
     + diff --git a/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg index 5e9acdb37..219304518 100644 --- a/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

    夏になると、とても暑くて、人々は汗を流しています。

    여름에는 매우 더워서 사람들은 땀을 흘립니다.

    -
     + diff --git a/e2etests/testdata/unicode/with-style/dagre/sketch.exp.svg b/e2etests/testdata/unicode/with-style/dagre/sketch.exp.svg index 34cf7ee0d..5a6ae095e 100644 --- a/e2etests/testdata/unicode/with-style/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/with-style/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -おやすみなさい + .d2-2323115990 .fill-N1{fill:#0A0F25;} + .d2-2323115990 .fill-N2{fill:#676C7E;} + .d2-2323115990 .fill-N3{fill:#9499AB;} + .d2-2323115990 .fill-N4{fill:#CFD2DD;} + .d2-2323115990 .fill-N5{fill:#DEE1EB;} + .d2-2323115990 .fill-N6{fill:#EEF1F8;} + .d2-2323115990 .fill-N7{fill:#FFFFFF;} + .d2-2323115990 .fill-B1{fill:#0D32B2;} + .d2-2323115990 .fill-B2{fill:#0D32B2;} + .d2-2323115990 .fill-B3{fill:#E3E9FD;} + .d2-2323115990 .fill-B4{fill:#E3E9FD;} + .d2-2323115990 .fill-B5{fill:#EDF0FD;} + .d2-2323115990 .fill-B6{fill:#F7F8FE;} + .d2-2323115990 .fill-AA2{fill:#4A6FF3;} + .d2-2323115990 .fill-AA4{fill:#EDF0FD;} + .d2-2323115990 .fill-AA5{fill:#F7F8FE;} + .d2-2323115990 .fill-AB4{fill:#EDF0FD;} + .d2-2323115990 .fill-AB5{fill:#F7F8FE;} + .d2-2323115990 .stroke-N1{stroke:#0A0F25;} + .d2-2323115990 .stroke-N2{stroke:#676C7E;} + .d2-2323115990 .stroke-N3{stroke:#9499AB;} + .d2-2323115990 .stroke-N4{stroke:#CFD2DD;} + .d2-2323115990 .stroke-N5{stroke:#DEE1EB;} + .d2-2323115990 .stroke-N6{stroke:#EEF1F8;} + .d2-2323115990 .stroke-N7{stroke:#FFFFFF;} + .d2-2323115990 .stroke-B1{stroke:#0D32B2;} + .d2-2323115990 .stroke-B2{stroke:#0D32B2;} + .d2-2323115990 .stroke-B3{stroke:#E3E9FD;} + .d2-2323115990 .stroke-B4{stroke:#E3E9FD;} + .d2-2323115990 .stroke-B5{stroke:#EDF0FD;} + .d2-2323115990 .stroke-B6{stroke:#F7F8FE;} + .d2-2323115990 .stroke-AA2{stroke:#4A6FF3;} + .d2-2323115990 .stroke-AA4{stroke:#EDF0FD;} + .d2-2323115990 .stroke-AA5{stroke:#F7F8FE;} + .d2-2323115990 .stroke-AB4{stroke:#EDF0FD;} + .d2-2323115990 .stroke-AB5{stroke:#F7F8FE;} + .d2-2323115990 .background-color-N1{background-color:#0A0F25;} + .d2-2323115990 .background-color-N2{background-color:#676C7E;} + .d2-2323115990 .background-color-N3{background-color:#9499AB;} + .d2-2323115990 .background-color-N4{background-color:#CFD2DD;} + .d2-2323115990 .background-color-N5{background-color:#DEE1EB;} + .d2-2323115990 .background-color-N6{background-color:#EEF1F8;} + .d2-2323115990 .background-color-N7{background-color:#FFFFFF;} + .d2-2323115990 .background-color-B1{background-color:#0D32B2;} + .d2-2323115990 .background-color-B2{background-color:#0D32B2;} + .d2-2323115990 .background-color-B3{background-color:#E3E9FD;} + .d2-2323115990 .background-color-B4{background-color:#E3E9FD;} + .d2-2323115990 .background-color-B5{background-color:#EDF0FD;} + .d2-2323115990 .background-color-B6{background-color:#F7F8FE;} + .d2-2323115990 .background-color-AA2{background-color:#4A6FF3;} + .d2-2323115990 .background-color-AA4{background-color:#EDF0FD;} + .d2-2323115990 .background-color-AA5{background-color:#F7F8FE;} + .d2-2323115990 .background-color-AB4{background-color:#EDF0FD;} + .d2-2323115990 .background-color-AB5{background-color:#F7F8FE;} + .d2-2323115990 .color-N1{color:#0A0F25;} + .d2-2323115990 .color-N2{color:#676C7E;} + .d2-2323115990 .color-N3{color:#9499AB;} + .d2-2323115990 .color-N4{color:#CFD2DD;} + .d2-2323115990 .color-N5{color:#DEE1EB;} + .d2-2323115990 .color-N6{color:#EEF1F8;} + .d2-2323115990 .color-N7{color:#FFFFFF;} + .d2-2323115990 .color-B1{color:#0D32B2;} + .d2-2323115990 .color-B2{color:#0D32B2;} + .d2-2323115990 .color-B3{color:#E3E9FD;} + .d2-2323115990 .color-B4{color:#E3E9FD;} + .d2-2323115990 .color-B5{color:#EDF0FD;} + .d2-2323115990 .color-B6{color:#F7F8FE;} + .d2-2323115990 .color-AA2{color:#4A6FF3;} + .d2-2323115990 .color-AA4{color:#EDF0FD;} + .d2-2323115990 .color-AA5{color:#F7F8FE;} + .d2-2323115990 .color-AB4{color:#EDF0FD;} + .d2-2323115990 .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}]]>おやすみなさい \ 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 94d0b8025..59102e369 100644 --- a/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -おやすみなさい + .d2-1654988174 .fill-N1{fill:#0A0F25;} + .d2-1654988174 .fill-N2{fill:#676C7E;} + .d2-1654988174 .fill-N3{fill:#9499AB;} + .d2-1654988174 .fill-N4{fill:#CFD2DD;} + .d2-1654988174 .fill-N5{fill:#DEE1EB;} + .d2-1654988174 .fill-N6{fill:#EEF1F8;} + .d2-1654988174 .fill-N7{fill:#FFFFFF;} + .d2-1654988174 .fill-B1{fill:#0D32B2;} + .d2-1654988174 .fill-B2{fill:#0D32B2;} + .d2-1654988174 .fill-B3{fill:#E3E9FD;} + .d2-1654988174 .fill-B4{fill:#E3E9FD;} + .d2-1654988174 .fill-B5{fill:#EDF0FD;} + .d2-1654988174 .fill-B6{fill:#F7F8FE;} + .d2-1654988174 .fill-AA2{fill:#4A6FF3;} + .d2-1654988174 .fill-AA4{fill:#EDF0FD;} + .d2-1654988174 .fill-AA5{fill:#F7F8FE;} + .d2-1654988174 .fill-AB4{fill:#EDF0FD;} + .d2-1654988174 .fill-AB5{fill:#F7F8FE;} + .d2-1654988174 .stroke-N1{stroke:#0A0F25;} + .d2-1654988174 .stroke-N2{stroke:#676C7E;} + .d2-1654988174 .stroke-N3{stroke:#9499AB;} + .d2-1654988174 .stroke-N4{stroke:#CFD2DD;} + .d2-1654988174 .stroke-N5{stroke:#DEE1EB;} + .d2-1654988174 .stroke-N6{stroke:#EEF1F8;} + .d2-1654988174 .stroke-N7{stroke:#FFFFFF;} + .d2-1654988174 .stroke-B1{stroke:#0D32B2;} + .d2-1654988174 .stroke-B2{stroke:#0D32B2;} + .d2-1654988174 .stroke-B3{stroke:#E3E9FD;} + .d2-1654988174 .stroke-B4{stroke:#E3E9FD;} + .d2-1654988174 .stroke-B5{stroke:#EDF0FD;} + .d2-1654988174 .stroke-B6{stroke:#F7F8FE;} + .d2-1654988174 .stroke-AA2{stroke:#4A6FF3;} + .d2-1654988174 .stroke-AA4{stroke:#EDF0FD;} + .d2-1654988174 .stroke-AA5{stroke:#F7F8FE;} + .d2-1654988174 .stroke-AB4{stroke:#EDF0FD;} + .d2-1654988174 .stroke-AB5{stroke:#F7F8FE;} + .d2-1654988174 .background-color-N1{background-color:#0A0F25;} + .d2-1654988174 .background-color-N2{background-color:#676C7E;} + .d2-1654988174 .background-color-N3{background-color:#9499AB;} + .d2-1654988174 .background-color-N4{background-color:#CFD2DD;} + .d2-1654988174 .background-color-N5{background-color:#DEE1EB;} + .d2-1654988174 .background-color-N6{background-color:#EEF1F8;} + .d2-1654988174 .background-color-N7{background-color:#FFFFFF;} + .d2-1654988174 .background-color-B1{background-color:#0D32B2;} + .d2-1654988174 .background-color-B2{background-color:#0D32B2;} + .d2-1654988174 .background-color-B3{background-color:#E3E9FD;} + .d2-1654988174 .background-color-B4{background-color:#E3E9FD;} + .d2-1654988174 .background-color-B5{background-color:#EDF0FD;} + .d2-1654988174 .background-color-B6{background-color:#F7F8FE;} + .d2-1654988174 .background-color-AA2{background-color:#4A6FF3;} + .d2-1654988174 .background-color-AA4{background-color:#EDF0FD;} + .d2-1654988174 .background-color-AA5{background-color:#F7F8FE;} + .d2-1654988174 .background-color-AB4{background-color:#EDF0FD;} + .d2-1654988174 .background-color-AB5{background-color:#F7F8FE;} + .d2-1654988174 .color-N1{color:#0A0F25;} + .d2-1654988174 .color-N2{color:#676C7E;} + .d2-1654988174 .color-N3{color:#9499AB;} + .d2-1654988174 .color-N4{color:#CFD2DD;} + .d2-1654988174 .color-N5{color:#DEE1EB;} + .d2-1654988174 .color-N6{color:#EEF1F8;} + .d2-1654988174 .color-N7{color:#FFFFFF;} + .d2-1654988174 .color-B1{color:#0D32B2;} + .d2-1654988174 .color-B2{color:#0D32B2;} + .d2-1654988174 .color-B3{color:#E3E9FD;} + .d2-1654988174 .color-B4{color:#E3E9FD;} + .d2-1654988174 .color-B5{color:#EDF0FD;} + .d2-1654988174 .color-B6{color:#F7F8FE;} + .d2-1654988174 .color-AA2{color:#4A6FF3;} + .d2-1654988174 .color-AA4{color:#EDF0FD;} + .d2-1654988174 .color-AA5{color:#F7F8FE;} + .d2-1654988174 .color-AB4{color:#EDF0FD;} + .d2-1654988174 .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}]]>おやすみなさい \ No newline at end of file From 2795e830b053ce2a4c386bd761144fe645c3c613 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 29 Jul 2023 13:55:48 -0700 Subject: [PATCH 105/138] Update next.md --- ci/release/changelogs/next.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 1c4a18e21..67303ce99 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,9 +1,13 @@ +D2 v0.6 introduces variable substitutions. The only major language feature left that were in the intial language design is globs, then we'll stamp it 1.0! + +Layout capability also takes a subtle but important step forward: you can now customize the position of labels and icons. + #### Features 🚀 - Variables and substitutions are implemented. See [docs](https://d2lang.com/tour/vars). [#1473](https://github.com/terrastruct/d2/pull/1473) - Configure timeout value with D2_TIMEOUT env var [#1392](https://github.com/terrastruct/d2/pull/1392) - Scale renders and disable fit to screen with `--scale` flag [#1413](https://github.com/terrastruct/d2/pull/1413) -- `null` keyword can be used to un-declare. See [docs](https://d2lang.com/tour/TODO) [#1446](https://github.com/terrastruct/d2/pull/1446) +- `null` keyword can be used to un-declare. See [docs](https://d2lang.com/tour/overrides#null) [#1446](https://github.com/terrastruct/d2/pull/1446) #### Improvements 🧹 @@ -13,7 +17,7 @@ - Improved rendering and text measurement for code shapes [#1425](https://github.com/terrastruct/d2/pull/1425) - The autoformatter moves board declarations to the bottom of its scope [#1424](https://github.com/terrastruct/d2/pull/1424) - All font styles in sketch mode use a consistent font-family [#1463](https://github.com/terrastruct/d2/pull/1463) -- Tooltip and link icons are now positioned on shape border [#1466](https://github.com/terrastruct/d2/pull/1466) +- Tooltip and link icons are positioned on shape border [#1466](https://github.com/terrastruct/d2/pull/1466) - Tooltip and link icons are always rendered over shapes [#1467](https://github.com/terrastruct/d2/pull/1467) - Boards with no objects are considered folders [#1504](https://github.com/terrastruct/d2/pull/1504) - `DEBUG` environment variable ignored if set incorrectly [#1505](https://github.com/terrastruct/d2/pull/1505) From 7bea22e5049d149beb21e7d886a716dccee87d1f Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 28 Jul 2023 23:22:28 -0700 Subject: [PATCH 106/138] draft --- d2cli/main.go | 11 +++++--- d2cli/static/watch.js | 6 ++--- d2cli/watch.go | 18 ++++++++++--- d2target/d2target.go | 61 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 10 deletions(-) diff --git a/d2cli/main.go b/d2cli/main.go index 635a5e440..546a5a977 100644 --- a/d2cli/main.go +++ b/d2cli/main.go @@ -331,7 +331,7 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { ctx, cancel := timelib.WithTimeout(ctx, time.Minute*2) defer cancel() - _, written, err := compile(ctx, ms, plugins, layoutFlag, renderOpts, fontFamily, *animateIntervalFlag, inputPath, outputPath, *bundleFlag, *forceAppendixFlag, pw.Page) + _, written, err := compile(ctx, ms, plugins, layoutFlag, renderOpts, fontFamily, *animateIntervalFlag, inputPath, outputPath, "", *bundleFlag, *forceAppendixFlag, pw.Page) if err != nil { if written { return fmt.Errorf("failed to fully compile (partial render written): %w", err) @@ -366,7 +366,7 @@ func LayoutResolver(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plu } } -func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, layout *string, renderOpts d2svg.RenderOpts, fontFamily *d2fonts.FontFamily, animateInterval int64, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page) (_ []byte, written bool, _ error) { +func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, layout *string, renderOpts d2svg.RenderOpts, fontFamily *d2fonts.FontFamily, animateInterval int64, inputPath, outputPath, boardPath string, bundle, forceAppendix bool, page playwright.Page) (_ []byte, written bool, _ error) { start := time.Now() input, err := ms.ReadPath(inputPath) if err != nil { @@ -500,7 +500,12 @@ func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, la } } - boards, err := render(ctx, ms, compileDur, plugin, renderOpts, inputPath, outputPath, bundle, forceAppendix, page, ruler, diagram) + board := diagram.GetBoard(boardPath) + if board == nil { + return nil, false, fmt.Errorf("Diagram with path %s not found", boardPath) + } + + boards, err := render(ctx, ms, compileDur, plugin, renderOpts, inputPath, outputPath, bundle, forceAppendix, page, ruler, board) if err != nil { return nil, false, err } diff --git a/d2cli/static/watch.js b/d2cli/static/watch.js index a95403971..9da3e630a 100644 --- a/d2cli/static/watch.js +++ b/d2cli/static/watch.js @@ -9,7 +9,7 @@ function init(reconnectDelay) { const devMode = document.body.dataset.d2DevMode === "true"; const ws = new WebSocket( - `ws://${window.location.host}${window.location.pathname}watch` + `ws://${window.location.host}/watch` ); let isInit = true; let ratio; @@ -28,7 +28,7 @@ function init(reconnectDelay) { // we can't just set `d2SVG.innerHTML = msg.svg` need to parse this as xml not html const parsedXML = new DOMParser().parseFromString(msg.svg, "text/xml"); d2SVG.replaceChildren(parsedXML.documentElement); - changeFavicon("./static/favicon.ico"); + changeFavicon("/static/favicon.ico"); const svgEl = d2SVG.querySelector("#d2-svg"); // just use inner SVG in watch mode svgEl.parentElement.replaceWith(svgEl); @@ -60,7 +60,7 @@ function init(reconnectDelay) { if (msg.err) { d2ErrDiv.innerText = msg.err; d2ErrDiv.style.display = "block"; - changeFavicon("./static/favicon-err.ico"); + changeFavicon("/static/favicon-err.ico"); d2ErrDiv.scrollIntoView(); } }; diff --git a/d2cli/watch.go b/d2cli/watch.go index 0fefabd61..b370a4d16 100644 --- a/d2cli/watch.go +++ b/d2cli/watch.go @@ -12,6 +12,7 @@ import ( "os" "path/filepath" "runtime" + "strings" "sync" "time" @@ -49,6 +50,7 @@ type watcherOpts struct { port string inputPath string outputPath string + boardPath string pwd string bundle bool forceAppendix bool @@ -362,7 +364,7 @@ func (w *watcher) compileLoop(ctx context.Context) error { w.pw = newPW } - svg, _, err := compile(ctx, w.ms, w.plugins, w.layout, w.renderOpts, w.fontFamily, w.animateInterval, w.inputPath, w.outputPath, w.bundle, w.forceAppendix, w.pw.Page) + svg, _, err := compile(ctx, w.ms, w.plugins, w.layout, w.renderOpts, w.fontFamily, w.animateInterval, w.inputPath, w.outputPath, w.boardPath, w.bundle, w.forceAppendix, w.pw.Page) errs := "" if err != nil { if len(svg) > 0 { @@ -430,15 +432,23 @@ func (w *watcher) handleRoot(hw http.ResponseWriter, r *http.Request) {     %s - - - + + +
    `, filepath.Base(w.outputPath), w.devMode) + + // if path is "/x.svg", we just want "x" + split := strings.Split(strings.TrimPrefix(r.URL.Path, "/"), ".") + boardPath := strings.Join(split[:len(split)-1], ".") + if boardPath != w.boardPath { + w.boardPath = boardPath + w.requestCompile() + } } func (w *watcher) handleWatch(hw http.ResponseWriter, r *http.Request) error { diff --git a/d2target/d2target.go b/d2target/d2target.go index 368e4c1a7..7bbfb63f8 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -6,6 +6,7 @@ import ( "hash/fnv" "math" "net/url" + "os" "strings" "oss.terrastruct.com/util-go/go2" @@ -72,6 +73,66 @@ type Diagram struct { Steps []*Diagram `json:"steps,omitempty"` } +// boardPath comes in the form of "x/layers/z/scenarios/a" +// or in the form of "layers/z/scenarios/a" +func (d *Diagram) GetBoard(boardPath string) *Diagram { + path := strings.Split(boardPath, string(os.PathSeparator)) + if len(path) == 0 || len(boardPath) == 0 { + return d + } + + head := path[0] + + if head == "index" { + return d + } + + switch head { + case "layers", "scenarios", "steps": + if len(path) < 2 { + return nil + } + } + + switch head { + case "layers": + for _, b := range d.Layers { + if b.Name == path[1] { + return b.GetBoard(strings.Join(path[2:], string(os.PathSeparator))) + } + } + case "scenarios": + for _, b := range d.Scenarios { + if b.Name == path[1] { + return b.GetBoard(strings.Join(path[2:], string(os.PathSeparator))) + } + } + case "steps": + for _, b := range d.Steps { + if b.Name == path[1] { + return b.GetBoard(strings.Join(path[2:], string(os.PathSeparator))) + } + } + } + + for _, b := range d.Layers { + if b.Name == head { + return b.GetBoard(strings.Join(path[1:], string(os.PathSeparator))) + } + } + for _, b := range d.Scenarios { + if b.Name == head { + return b.GetBoard(strings.Join(path[1:], string(os.PathSeparator))) + } + } + for _, b := range d.Steps { + if b.Name == head { + return b.GetBoard(strings.Join(path[1:], string(os.PathSeparator))) + } + } + return nil +} + func (diagram Diagram) Bytes() ([]byte, error) { b1, err := json.Marshal(diagram.Shapes) if err != nil { From 65f97fc7be23cdfa1bcad8dd6bdf31d1ff86c8ff Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 29 Jul 2023 09:16:45 -0700 Subject: [PATCH 107/138] pr comments --- d2cli/watch.go | 6 ++++-- d2target/d2target.go | 38 ++++++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/d2cli/watch.go b/d2cli/watch.go index b370a4d16..866a480b3 100644 --- a/d2cli/watch.go +++ b/d2cli/watch.go @@ -443,8 +443,10 @@ func (w *watcher) handleRoot(hw http.ResponseWriter, r *http.Request) { `, filepath.Base(w.outputPath), w.devMode) // if path is "/x.svg", we just want "x" - split := strings.Split(strings.TrimPrefix(r.URL.Path, "/"), ".") - boardPath := strings.Join(split[:len(split)-1], ".") + boardPath := strings.TrimPrefix(r.URL.Path, "/") + if idx := strings.LastIndexByte(boardPath, '.'); idx != -1 { + boardPath = boardPath[:idx] + } if boardPath != w.boardPath { w.boardPath = boardPath w.requestCompile() diff --git a/d2target/d2target.go b/d2target/d2target.go index 7bbfb63f8..ea8e67b0b 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -81,53 +81,59 @@ func (d *Diagram) GetBoard(boardPath string) *Diagram { return d } - head := path[0] + return d.getBoard(path) +} + +func (d *Diagram) getBoard(boardPath []string) *Diagram { + head := boardPath[0] if head == "index" { return d } switch head { - case "layers", "scenarios", "steps": - if len(path) < 2 { + case "layers": + if len(boardPath) < 2 { return nil } - } - - switch head { - case "layers": for _, b := range d.Layers { - if b.Name == path[1] { - return b.GetBoard(strings.Join(path[2:], string(os.PathSeparator))) + if b.Name == boardPath[1] { + return b.getBoard(boardPath[2:]) } } case "scenarios": + if len(boardPath) < 2 { + return nil + } for _, b := range d.Scenarios { - if b.Name == path[1] { - return b.GetBoard(strings.Join(path[2:], string(os.PathSeparator))) + if b.Name == boardPath[1] { + return b.getBoard(boardPath[2:]) } } case "steps": + if len(boardPath) < 2 { + return nil + } for _, b := range d.Steps { - if b.Name == path[1] { - return b.GetBoard(strings.Join(path[2:], string(os.PathSeparator))) + if b.Name == boardPath[1] { + return b.getBoard(boardPath[2:]) } } } for _, b := range d.Layers { if b.Name == head { - return b.GetBoard(strings.Join(path[1:], string(os.PathSeparator))) + return b.getBoard(boardPath[2:]) } } for _, b := range d.Scenarios { if b.Name == head { - return b.GetBoard(strings.Join(path[1:], string(os.PathSeparator))) + return b.getBoard(boardPath[2:]) } } for _, b := range d.Steps { if b.Name == head { - return b.GetBoard(strings.Join(path[1:], string(os.PathSeparator))) + return b.getBoard(boardPath[2:]) } } return nil From 2ca39f8ed322c1190641496bd7318a504212616b Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 29 Jul 2023 09:17:24 -0700 Subject: [PATCH 108/138] fmt --- d2cli/static/watch.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/d2cli/static/watch.js b/d2cli/static/watch.js index 9da3e630a..4d91259eb 100644 --- a/d2cli/static/watch.js +++ b/d2cli/static/watch.js @@ -8,9 +8,7 @@ function init(reconnectDelay) { const d2SVG = window.document.querySelector("#d2-svg-container"); const devMode = document.body.dataset.d2DevMode === "true"; - const ws = new WebSocket( - `ws://${window.location.host}/watch` - ); + const ws = new WebSocket(`ws://${window.location.host}/watch`); let isInit = true; let ratio; ws.onopen = () => { From 11a436343e55456cf8cde8389a7f280aede11aca Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 29 Jul 2023 09:20:03 -0700 Subject: [PATCH 109/138] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 67303ce99..b7032e194 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -8,6 +8,7 @@ Layout capability also takes a subtle but important step forward: you can now cu - Configure timeout value with D2_TIMEOUT env var [#1392](https://github.com/terrastruct/d2/pull/1392) - Scale renders and disable fit to screen with `--scale` flag [#1413](https://github.com/terrastruct/d2/pull/1413) - `null` keyword can be used to un-declare. See [docs](https://d2lang.com/tour/overrides#null) [#1446](https://github.com/terrastruct/d2/pull/1446) +- Develop multi-board diagrams in watch mode (links to layers/scenarios/steps work in `--watch`) [#1503](https://github.com/terrastruct/d2/pull/1503) #### Improvements 🧹 From 06e145ab12a3f0512902ae6462e09ac320a7098a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 29 Jul 2023 15:08:53 -0700 Subject: [PATCH 110/138] fix watch --- d2target/d2target.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/d2target/d2target.go b/d2target/d2target.go index ea8e67b0b..46e086985 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -85,6 +85,10 @@ func (d *Diagram) GetBoard(boardPath string) *Diagram { } func (d *Diagram) getBoard(boardPath []string) *Diagram { + if len(boardPath) == 0 { + return d + } + head := boardPath[0] if head == "index" { From 359976e5d4e8a3f6724e0a9db3faf2742a593f8d Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Fri, 23 Jun 2023 10:51:55 -0700 Subject: [PATCH 111/138] d2ir: Add single level field glob patterns --- d2ast/d2ast.go | 6 + d2ir/compile.go | 19 ++ d2ir/compile_test.go | 1 + d2ir/pattern.go | 31 +++ d2ir/pattern_test.go | 94 +++++++ d2parser/parse.go | 25 +- .../d2ir/TestCompile/globs/escaped.exp.json | 159 ++++++++++++ .../d2ir/TestCompile/globs/prefix.exp.json | 159 ++++++++++++ .../TestCompile/patterns/escaped.exp.json | 236 ++++++++++++++++++ .../patterns/prefix-suffix.exp.json | 159 ++++++++++++ .../patterns/prefix-suffix/2.exp.json | 159 ++++++++++++ .../patterns/prefix-suffix/3.exp.json | 159 ++++++++++++ .../d2ir/TestCompile/patterns/prefix.exp.json | 159 ++++++++++++ .../d2ir/TestCompile/patterns/suffix.exp.json | 159 ++++++++++++ 14 files changed, 1514 insertions(+), 11 deletions(-) create mode 100644 d2ir/pattern.go create mode 100644 d2ir/pattern_test.go create mode 100644 testdata/d2ir/TestCompile/globs/escaped.exp.json create mode 100644 testdata/d2ir/TestCompile/globs/prefix.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/escaped.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/prefix.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/suffix.exp.json diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 6313dbe0d..629612c22 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -500,6 +500,8 @@ type Number struct { type UnquotedString struct { Range Range `json:"range"` Value []InterpolationBox `json:"value"` + // Pattern holds the parsed glob pattern if in a key and the unquoted string represents a valid pattern. + Pattern []string `json:"pattern,omitempty"` } func (s *UnquotedString) Coalesce() { @@ -1056,6 +1058,10 @@ func (sb *StringBox) Unbox() String { } } +func (sb *StringBox) ScalarString() string { + return sb.Unbox().ScalarString() +} + // InterpolationBox is used to select between strings and substitutions in unquoted and // double quoted strings. There is no corresponding interface to avoid unnecessary // abstraction. diff --git a/d2ir/compile.go b/d2ir/compile.go index 66eb97818..f8e0ff67c 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -404,12 +404,31 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) return } } + + us, ok := kp.Path[0].Unbox().(*d2ast.UnquotedString) + if ok && us.Pattern != nil { + for _, f := range dst.Fields { + if matchPattern(f.Name, us.Pattern) { + if len(kp.Path) == 1 { + c._compileField(f, refctx) + } else { + // TODO: recurse + } + } + } + return + } + f, err := dst.EnsureField(kp, refctx) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) return } + c._compileField(f, refctx) +} + +func (c *compiler) _compileField(f *Field, refctx *RefContext) { if refctx.Key.Primary.Unbox() != nil { f.Primary_ = &Scalar{ parent: f, diff --git a/d2ir/compile_test.go b/d2ir/compile_test.go index ab7173c8e..f29b45c27 100644 --- a/d2ir/compile_test.go +++ b/d2ir/compile_test.go @@ -26,6 +26,7 @@ func TestCompile(t *testing.T) { t.Run("scenarios", testCompileScenarios) t.Run("steps", testCompileSteps) t.Run("imports", testCompileImports) + t.Run("patterns", testCompilePatterns) } type testCase struct { diff --git a/d2ir/pattern.go b/d2ir/pattern.go new file mode 100644 index 000000000..39fd5c397 --- /dev/null +++ b/d2ir/pattern.go @@ -0,0 +1,31 @@ +package d2ir + +import ( + "strings" +) + +func matchPattern(s string, pattern []string) bool { + if len(pattern) == 0 { + return true + } + + for i := 0; i < len(pattern); i++ { + if pattern[i] == "*" { + // * so match next. + if i != len(pattern)-1 { + j := strings.Index(s, pattern[i+1]) + if j == -1 { + return false + } + s = s[j+len(pattern[i+1]):] + i++ + } + } else { + if !strings.HasPrefix(s, pattern[i]) { + return false + } + s = s[len(pattern[i]):] + } + } + return true +} diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go new file mode 100644 index 000000000..b1709080d --- /dev/null +++ b/d2ir/pattern_test.go @@ -0,0 +1,94 @@ +package d2ir_test + +import ( + "testing" + + "oss.terrastruct.com/util-go/assert" +) + +func testCompilePatterns(t *testing.T) { + t.Parallel() + + tca := []testCase{ + { + name: "prefix", + run: func(t testing.TB) { + m, err := compile(t, `animal: meow +action: yes +a*: globbed`) + assert.Success(t, err) + assertQuery(t, m, 2, 0, nil, "") + assertQuery(t, m, 0, 0, "globbed", "animal") + assertQuery(t, m, 0, 0, "globbed", "action") + }, + }, + { + name: "suffix", + run: func(t testing.TB) { + m, err := compile(t, `animal: meow +jingle: loud +*l: globbed`) + assert.Success(t, err) + assertQuery(t, m, 2, 0, nil, "") + assertQuery(t, m, 0, 0, "globbed", "animal") + assertQuery(t, m, 0, 0, "globbed", "jingle") + }, + }, + { + name: "prefix-suffix", + run: func(t testing.TB) { + m, err := compile(t, `tinker: meow +thinker: yes +t*r: globbed`) + assert.Success(t, err) + assertQuery(t, m, 2, 0, nil, "") + assertQuery(t, m, 0, 0, "globbed", "tinker") + assertQuery(t, m, 0, 0, "globbed", "thinker") + }, + }, + { + name: "prefix-suffix/2", + run: func(t testing.TB) { + m, err := compile(t, `tinker: meow +thinker: yes +t*ink*r: globbed`) + assert.Success(t, err) + assertQuery(t, m, 2, 0, nil, "") + assertQuery(t, m, 0, 0, "globbed", "tinker") + assertQuery(t, m, 0, 0, "globbed", "thinker") + }, + }, + { + name: "prefix-suffix/3", + run: func(t testing.TB) { + m, err := compile(t, `tinkertinker: meow +thinkerthinker: yes +t*ink*r*t*inke*: globbed`) + assert.Success(t, err) + assertQuery(t, m, 2, 0, nil, "") + assertQuery(t, m, 0, 0, "globbed", "tinkertinker") + assertQuery(t, m, 0, 0, "globbed", "thinkerthinker") + }, + }, + { + name: "escaped", + run: func(t testing.TB) { + m, err := compile(t, `animal: meow +action: yes +a\*: globbed`) + assert.Success(t, err) + assertQuery(t, m, 3, 0, nil, "") + assertQuery(t, m, 0, 0, "meow", "animal") + assertQuery(t, m, 0, 0, "yes", "action") + assertQuery(t, m, 0, 0, "globbed", `a\*`) + }, + }, + } + + runa(t, tca) + + t.Run("errors", func(t *testing.T) { + tca := []testCase{} + runa(t, tca) + }) +} diff --git a/d2parser/parse.go b/d2parser/parse.go index bb460da82..d7a540897 100644 --- a/d2parser/parse.go +++ b/d2parser/parse.go @@ -1046,6 +1046,15 @@ func (p *parser) parseUnquotedString(inKey bool) (s *d2ast.UnquotedString) { s.Value = append(s.Value, d2ast.InterpolationBox{String: &sv, StringRaw: &rawv}) }() + lastPatternIndex := 0 + defer func() { + if s.Pattern != nil { + if lastPatternIndex < sb.Len() { + s.Pattern = append(s.Pattern, sb.String()[lastPatternIndex:]) + } + } + }() + _s, eof := p.peekn(4) p.rewind() if !eof { @@ -1118,18 +1127,12 @@ func (p *parser) parseUnquotedString(inKey bool) (s *d2ast.UnquotedString) { rawb.WriteRune(r) r = r2 case '*': - // TODO: need a peekNotSpace across escaped newlines - r2, eof := p.peek() - if eof { - return s + if sb.Len() == 0 { + s.Pattern = append(s.Pattern, "*") + } else { + s.Pattern = append(s.Pattern, sb.String()[lastPatternIndex:], "*") } - if r2 == '-' { - p.rewind() - return s - } - sb.WriteRune(r) - rawb.WriteRune(r) - r = r2 + lastPatternIndex = len(sb.String()) + 1 } } diff --git a/testdata/d2ir/TestCompile/globs/escaped.exp.json b/testdata/d2ir/TestCompile/globs/escaped.exp.json new file mode 100644 index 000000000..de7e12d68 --- /dev/null +++ b/testdata/d2ir/TestCompile/globs/escaped.exp.json @@ -0,0 +1,159 @@ +{ + "fields": [ + { + "name": "animal", + "primary": { + "value": { + "range": "TestCompile/globs/escaped.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/globs/escaped.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/globs/escaped.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/globs/escaped.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/globs/escaped.d2,0:0:0-0:12:12", + "key": { + "range": "TestCompile/globs/escaped.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/globs/escaped.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/globs/escaped.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "action", + "primary": { + "value": { + "range": "TestCompile/globs/escaped.d2,1:8:21-1:11:24", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/globs/escaped.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, + "key_path": { + "range": "TestCompile/globs/escaped.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/globs/escaped.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/globs/escaped.d2,1:0:13-1:11:24", + "key": { + "range": "TestCompile/globs/escaped.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/globs/escaped.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/globs/escaped.d2,1:8:21-1:11:24", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/globs/prefix.exp.json b/testdata/d2ir/TestCompile/globs/prefix.exp.json new file mode 100644 index 000000000..7c50c6809 --- /dev/null +++ b/testdata/d2ir/TestCompile/globs/prefix.exp.json @@ -0,0 +1,159 @@ +{ + "fields": [ + { + "name": "animal", + "primary": { + "value": { + "range": "TestCompile/globs/prefix.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/globs/prefix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/globs/prefix.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/globs/prefix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/globs/prefix.d2,0:0:0-0:12:12", + "key": { + "range": "TestCompile/globs/prefix.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/globs/prefix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/globs/prefix.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "action", + "primary": { + "value": { + "range": "TestCompile/globs/prefix.d2,1:8:21-1:11:24", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/globs/prefix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, + "key_path": { + "range": "TestCompile/globs/prefix.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/globs/prefix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/globs/prefix.d2,1:0:13-1:11:24", + "key": { + "range": "TestCompile/globs/prefix.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/globs/prefix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/globs/prefix.d2,1:8:21-1:11:24", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/escaped.exp.json b/testdata/d2ir/TestCompile/patterns/escaped.exp.json new file mode 100644 index 000000000..27262dd30 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/escaped.exp.json @@ -0,0 +1,236 @@ +{ + "fields": [ + { + "name": "animal", + "primary": { + "value": { + "range": "TestCompile/patterns/escaped.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/escaped.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/escaped.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/escaped.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/escaped.d2,0:0:0-0:12:12", + "key": { + "range": "TestCompile/patterns/escaped.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/escaped.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/escaped.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "action", + "primary": { + "value": { + "range": "TestCompile/patterns/escaped.d2,1:8:21-1:11:24", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/escaped.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/escaped.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/escaped.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/escaped.d2,1:0:13-1:11:24", + "key": { + "range": "TestCompile/patterns/escaped.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/escaped.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/escaped.d2,1:8:21-1:11:24", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + }, + { + "name": "a*", + "primary": { + "value": { + "range": "TestCompile/patterns/escaped.d2,2:5:30-2:12:37", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/escaped.d2,2:0:25-2:2:27", + "value": [ + { + "string": "a*", + "raw_string": "a\\*" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/escaped.d2,2:0:25-2:2:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/escaped.d2,2:0:25-2:2:27", + "value": [ + { + "string": "a*", + "raw_string": "a\\*" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/escaped.d2,2:0:25-2:12:37", + "key": { + "range": "TestCompile/patterns/escaped.d2,2:0:25-2:2:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/escaped.d2,2:0:25-2:2:27", + "value": [ + { + "string": "a*", + "raw_string": "a\\*" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/escaped.d2,2:5:30-2:12:37", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json new file mode 100644 index 000000000..a71fb970b --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json @@ -0,0 +1,159 @@ +{ + "fields": [ + { + "name": "tinker", + "primary": { + "value": { + "range": "TestCompile/patterns/prefix-suffix.d2,2:5:31-2:12:38", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prefix-suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prefix-suffix.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prefix-suffix.d2,0:0:0-0:12:12", + "key": { + "range": "TestCompile/patterns/prefix-suffix.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "thinker", + "primary": { + "value": { + "range": "TestCompile/patterns/prefix-suffix.d2,2:5:31-2:12:38", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prefix-suffix.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prefix-suffix.d2,1:0:13-1:7:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prefix-suffix.d2,1:0:13-1:12:25", + "key": { + "range": "TestCompile/patterns/prefix-suffix.d2,1:0:13-1:7:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix.d2,1:9:22-1:12:25", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json new file mode 100644 index 000000000..175299dad --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json @@ -0,0 +1,159 @@ +{ + "fields": [ + { + "name": "tinker", + "primary": { + "value": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,2:9:35-2:16:42", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,0:0:0-0:12:12", + "key": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "thinker", + "primary": { + "value": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,2:9:35-2:16:42", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,1:0:13-1:7:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,1:0:13-1:12:25", + "key": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,1:0:13-1:7:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,1:9:22-1:12:25", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json new file mode 100644 index 000000000..1504168b9 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json @@ -0,0 +1,159 @@ +{ + "fields": [ + { + "name": "tinkertinker", + "primary": { + "value": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,2:17:56-2:24:63", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,0:0:0-0:12:12", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,0:0:0-0:12:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,0:0:0-0:12:12", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,0:0:0-0:18:18", + "key": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,0:0:0-0:12:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,0:0:0-0:12:12", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,0:14:14-0:18:18", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "thinkerthinker", + "primary": { + "value": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,2:17:56-2:24:63", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,1:0:19-1:14:33", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,1:0:19-1:14:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,1:0:19-1:14:33", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,1:0:19-1:19:38", + "key": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,1:0:19-1:14:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,1:0:19-1:14:33", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,1:16:35-1:19:38", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/prefix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix.exp.json new file mode 100644 index 000000000..62dec6cc3 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/prefix.exp.json @@ -0,0 +1,159 @@ +{ + "fields": [ + { + "name": "animal", + "primary": { + "value": { + "range": "TestCompile/patterns/prefix.d2,2:4:29-2:11:36", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prefix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prefix.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prefix.d2,0:0:0-0:12:12", + "key": { + "range": "TestCompile/patterns/prefix.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prefix.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "action", + "primary": { + "value": { + "range": "TestCompile/patterns/prefix.d2,2:4:29-2:11:36", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prefix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prefix.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prefix.d2,1:0:13-1:11:24", + "key": { + "range": "TestCompile/patterns/prefix.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prefix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prefix.d2,1:8:21-1:11:24", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/suffix.exp.json b/testdata/d2ir/TestCompile/patterns/suffix.exp.json new file mode 100644 index 000000000..40da3b5a1 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/suffix.exp.json @@ -0,0 +1,159 @@ +{ + "fields": [ + { + "name": "animal", + "primary": { + "value": { + "range": "TestCompile/patterns/suffix.d2,2:4:30-2:11:37", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/suffix.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/suffix.d2,0:0:0-0:12:12", + "key": { + "range": "TestCompile/patterns/suffix.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/suffix.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "jingle", + "primary": { + "value": { + "range": "TestCompile/patterns/suffix.d2,2:4:30-2:11:37", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/suffix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "jingle", + "raw_string": "jingle" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/suffix.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/suffix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "jingle", + "raw_string": "jingle" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/suffix.d2,1:0:13-1:12:25", + "key": { + "range": "TestCompile/patterns/suffix.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/suffix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "jingle", + "raw_string": "jingle" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/suffix.d2,1:8:21-1:12:25", + "value": [ + { + "string": "loud", + "raw_string": "loud" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} From 210816a42b8a8ad2f347686fd15fb7216c1ea94d Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Fri, 14 Jul 2023 14:22:02 -0700 Subject: [PATCH 112/138] d2ir: Fix _ with null --- d2ir/compile.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/d2ir/compile.go b/d2ir/compile.go index f8e0ff67c..c68330542 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -396,15 +396,6 @@ func (c *compiler) compileKey(refctx *RefContext) { } func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) { - if refctx.Key != nil && len(refctx.Key.Edges) == 0 && refctx.Key.Value.Null != nil { - // For vars, if we delete the field, it may just resolve to an outer scope var of the same name - // Instead we keep it around, so that resolveSubstitutions can find it - if !IsVar(dst) { - dst.DeleteField(kp.IDA()...) - return - } - } - us, ok := kp.Path[0].Unbox().(*d2ast.UnquotedString) if ok && us.Pattern != nil { for _, f := range dst.Fields { @@ -429,6 +420,15 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } func (c *compiler) _compileField(f *Field, refctx *RefContext) { + if len(refctx.Key.Edges) == 0 && refctx.Key.Value.Null != nil { + // For vars, if we delete the field, it may just resolve to an outer scope var of the same name + // Instead we keep it around, so that resolveSubstitutions can find it + if !IsVar(ParentMap(f)) { + dst.DeleteField(f.Name) + return + } + } + if refctx.Key.Primary.Unbox() != nil { f.Primary_ = &Scalar{ parent: f, From 1217ff35a7d00beec37e19c1ebe547b60f1e524d Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 24 Jun 2023 15:31:58 -0700 Subject: [PATCH 113/138] d2ir: Add single glob matching to edges and make it work fully recursively --- d2ast/d2ast.go | 7 + d2ir/compile.go | 112 +- d2ir/d2ir.go | 176 ++- d2ir/pattern_test.go | 80 +- d2parser/parse.go | 15 +- .../d2ir/TestCompile/edges/chain.exp.json | 1104 +++++++++++++++++ .../d2ir/TestCompile/edges/nested.exp.json | 660 ++++++++++ testdata/d2ir/TestCompile/edges/root.exp.json | 220 ++++ .../TestCompile/edges/underscore.exp.json | 415 +++++++ .../layers/errs/4/good_edge.exp.json | 396 ++++++ .../d2ir/TestCompile/layers/root.exp.json | 220 ++++ .../TestCompile/patterns/double-glob.exp.json | 573 +++++++++ .../d2ir/TestCompile/patterns/edge/1.exp.json | 582 +++++++++ .../d2ir/TestCompile/patterns/edge/2.exp.json | 862 +++++++++++++ .../d2ir/TestCompile/patterns/edge/3.exp.json | 1022 +++++++++++++++ .../patterns/nested/prefix-suffix/3.exp.json | 997 +++++++++++++++ .../d2ir/TestCompile/scenarios/edge.exp.json | 440 +++++++ .../d2ir/TestCompile/scenarios/root.exp.json | 660 ++++++++++ .../d2ir/TestCompile/steps/recursive.exp.json | 880 +++++++++++++ testdata/d2ir/TestCompile/steps/root.exp.json | 660 ++++++++++ 20 files changed, 9975 insertions(+), 106 deletions(-) create mode 100644 testdata/d2ir/TestCompile/patterns/double-glob.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/edge/1.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/edge/2.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/edge/3.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 629612c22..83ee1b54b 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -740,6 +740,13 @@ func (kp *KeyPath) IDA() (ida []string) { return ida } +func (kp *KeyPath) Copy() *KeyPath { + kp2 := *kp + kp2.Path = nil + kp2.Path = append(kp2.Path, kp.Path...) + return &kp2 +} + type Edge struct { Range Range `json:"range"` diff --git a/d2ir/compile.go b/d2ir/compile.go index c68330542..962e1ec40 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -396,27 +396,15 @@ func (c *compiler) compileKey(refctx *RefContext) { } func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) { - us, ok := kp.Path[0].Unbox().(*d2ast.UnquotedString) - if ok && us.Pattern != nil { - for _, f := range dst.Fields { - if matchPattern(f.Name, us.Pattern) { - if len(kp.Path) == 1 { - c._compileField(f, refctx) - } else { - // TODO: recurse - } - } - } - return - } - - f, err := dst.EnsureField(kp, refctx) + fa, err := dst.EnsureField(kp, refctx) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) return } - c._compileField(f, refctx) + for _, f := range fa { + c._compileField(f, refctx) + } } func (c *compiler) _compileField(f *Field, refctx *RefContext) { @@ -424,7 +412,7 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { // For vars, if we delete the field, it may just resolve to an outer scope var of the same name // Instead we keep it around, so that resolveSubstitutions can find it if !IsVar(ParentMap(f)) { - dst.DeleteField(f.Name) + ParentMap(f).DeleteField(f.Name) return } } @@ -621,12 +609,17 @@ func (c *compiler) compileLink(refctx *RefContext) { } func (c *compiler) compileEdges(refctx *RefContext) { - if refctx.Key.Key != nil { - f, err := refctx.ScopeMap.EnsureField(refctx.Key.Key, refctx) - if err != nil { - c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) - return - } + if refctx.Key.Key == nil { + c._compileEdges(refctx) + return + } + + fa, err := refctx.ScopeMap.EnsureField(refctx.Key.Key, refctx) + if err != nil { + c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) + return + } + for _, f := range fa { if _, ok := f.Composite.(*Array); ok { c.errorf(refctx.Key.Key, "cannot index into array") return @@ -636,9 +629,13 @@ func (c *compiler) compileEdges(refctx *RefContext) { parent: f, } } - refctx.ScopeMap = f.Map() + refctx2 := *refctx + refctx2.ScopeMap = f.Map() + c._compileEdges(&refctx2) } +} +func (c *compiler) _compileEdges(refctx *RefContext) { eida := NewEdgeIDs(refctx.Key) for i, eid := range eida { if refctx.Key != nil && refctx.Key.Value.Null != nil { @@ -649,19 +646,20 @@ func (c *compiler) compileEdges(refctx *RefContext) { refctx = refctx.Copy() refctx.Edge = refctx.Key.Edges[i] - var e *Edge + var ea []*Edge if eid.Index != nil { - ea := refctx.ScopeMap.GetEdges(eid) + ea = refctx.ScopeMap.GetEdges(eid) if len(ea) == 0 { c.errorf(refctx.Edge, "indexed edge does not exist") continue } - e = ea[0] - e.References = append(e.References, &EdgeReference{ - Context: refctx, - }) - refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Src, refctx) - refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Dst, refctx) + for _, e := range ea { + e.References = append(e.References, &EdgeReference{ + Context: refctx, + }) + refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Src, refctx) + refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Dst, refctx) + } } else { _, err := refctx.ScopeMap.EnsureField(refctx.Edge.Src, refctx) if err != nil { @@ -674,41 +672,43 @@ func (c *compiler) compileEdges(refctx *RefContext) { continue } - e, err = refctx.ScopeMap.CreateEdge(eid, refctx) + ea, err = refctx.ScopeMap.CreateEdge(eid, refctx) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) continue } } - if refctx.Key.EdgeKey != nil { - if e.Map_ == nil { - e.Map_ = &Map{ - parent: e, - } - } - c.compileField(e.Map_, refctx.Key.EdgeKey, refctx) - } else { - if refctx.Key.Primary.Unbox() != nil { - e.Primary_ = &Scalar{ - parent: e, - Value: refctx.Key.Primary.Unbox(), - } - } - if refctx.Key.Value.Array != nil { - c.errorf(refctx.Key.Value.Unbox(), "edges cannot be assigned arrays") - continue - } else if refctx.Key.Value.Map != nil { + for _, e := range ea { + if refctx.Key.EdgeKey != nil { if e.Map_ == nil { e.Map_ = &Map{ parent: e, } + c.compileField(e.Map_, refctx.Key.EdgeKey, refctx) } - c.compileMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) - } else if refctx.Key.Value.ScalarBox().Unbox() != nil { - e.Primary_ = &Scalar{ - parent: e, - Value: refctx.Key.Value.ScalarBox().Unbox(), + } else { + if refctx.Key.Primary.Unbox() != nil { + e.Primary_ = &Scalar{ + parent: e, + Value: refctx.Key.Primary.Unbox(), + } + } + if refctx.Key.Value.Array != nil { + c.errorf(refctx.Key.Value.Unbox(), "edges cannot be assigned arrays") + continue + } else if refctx.Key.Value.Map != nil { + if e.Map_ == nil { + e.Map_ = &Map{ + parent: e, + } + } + c.compileMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) + } else if refctx.Key.Value.ScalarBox().Unbox() != nil { + e.Primary_ = &Scalar{ + parent: e, + Value: refctx.Key.Value.ScalarBox().Unbox(), + } } } } diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 1160021f4..28d1c6d8e 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -651,7 +651,7 @@ func (m *Map) getField(ida []string) *Field { return nil } -func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext) (*Field, error) { +func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext) ([]*Field, error) { i := 0 for kp.Path[i].Unbox().ScalarString() == "_" { m = ParentMap(m) @@ -663,29 +663,46 @@ func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext) (*Field, error) } i++ } - return m.ensureField(i, kp, refctx) + + var fa []*Field + err := m.ensureField(i, kp, refctx, &fa) + return fa, err } -func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext) (*Field, error) { +func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, fa *[]*Field) error { + us, ok := kp.Path[i].Unbox().(*d2ast.UnquotedString) + if ok && us.Pattern != nil { + for _, f := range m.Fields { + if matchPattern(f.Name, us.Pattern) { + if i == len(kp.Path)-1 { + *fa = append(*fa, f) + } else if f.Map() != nil { + f.Map().ensureField(i+1, kp, refctx, fa) + } + } + } + return nil + } + head := kp.Path[i].Unbox().ScalarString() if _, ok := d2graph.ReservedKeywords[strings.ToLower(head)]; ok { head = strings.ToLower(head) if _, ok := d2graph.CompositeReservedKeywords[head]; !ok && i < len(kp.Path)-1 { - return nil, d2parser.Errorf(kp.Path[i].Unbox(), fmt.Sprintf(`"%s" must be the last part of the key`, head)) + return d2parser.Errorf(kp.Path[i].Unbox(), fmt.Sprintf(`"%s" must be the last part of the key`, head)) } } if head == "_" { - return nil, d2parser.Errorf(kp.Path[i].Unbox(), `parent "_" can only be used in the beginning of paths, e.g. "_.x"`) + return d2parser.Errorf(kp.Path[i].Unbox(), `parent "_" can only be used in the beginning of paths, e.g. "_.x"`) } if head == "classes" && NodeBoardKind(m) == "" { - return nil, d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head) + return d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head) } if findBoardKeyword(head) != -1 && NodeBoardKind(m) == "" { - return nil, d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head) + return d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head) } for _, f := range m.Fields { @@ -703,17 +720,18 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext) (*Field, } if i+1 == len(kp.Path) { - return f, nil + *fa = append(*fa, f) + return nil } if _, ok := f.Composite.(*Array); ok { - return nil, d2parser.Errorf(kp.Path[i].Unbox(), "cannot index into array") + return d2parser.Errorf(kp.Path[i].Unbox(), "cannot index into array") } if f.Map() == nil { f.Composite = &Map{ parent: f, } } - return f.Map().ensureField(i+1, kp, refctx) + return f.Map().ensureField(i+1, kp, refctx, fa) } f := &Field{ @@ -730,12 +748,13 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext) (*Field, } m.Fields = append(m.Fields, f) if i+1 == len(kp.Path) { - return f, nil + *fa = append(*fa, f) + return nil } f.Composite = &Map{ parent: f, } - return f.Map().ensureField(i+1, kp, refctx) + return f.Map().ensureField(i+1, kp, refctx, fa) } func (m *Map) DeleteEdge(eid *EdgeID) *Edge { @@ -825,57 +844,128 @@ func (m *Map) GetEdges(eid *EdgeID) []*Edge { return ea } -func (m *Map) CreateEdge(eid *EdgeID, refctx *RefContext) (*Edge, error) { +func (m *Map) CreateEdge(eid *EdgeID, refctx *RefContext) ([]*Edge, error) { + var ea []*Edge + return ea, m.createEdge(eid, refctx, &ea) +} + +func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { if ParentEdge(m) != nil { - return nil, d2parser.Errorf(refctx.Edge, "cannot create edge inside edge") + return d2parser.Errorf(refctx.Edge, "cannot create edge inside edge") } eid, m, common, err := eid.resolve(m) if err != nil { - return nil, d2parser.Errorf(refctx.Edge, err.Error()) + return d2parser.Errorf(refctx.Edge, err.Error()) } if len(common) > 0 { - f, err := m.EnsureField(d2ast.MakeKeyPath(common), nil) + commonEnd := len(refctx.Edge.Src.Path) - len(eid.SrcPath) + commonStart := commonEnd - len(common) + commonKP := refctx.Edge.Src.Copy() + commonKP.Path = commonKP.Path[commonStart:commonEnd] + fa, err := m.EnsureField(commonKP, nil) if err != nil { - return nil, err + return err } - if _, ok := f.Composite.(*Array); ok { - return nil, d2parser.Errorf(refctx.Edge.Src, "cannot index into array") - } - if f.Map() == nil { - f.Composite = &Map{ - parent: f, + for _, f := range fa { + if _, ok := f.Composite.(*Array); ok { + return d2parser.Errorf(refctx.Edge.Src, "cannot index into array") + } + if f.Map() == nil { + f.Composite = &Map{ + parent: f, + } + } + err = f.Map().createEdge(eid, refctx, ea) + if err != nil { + return err } } - return f.Map().CreateEdge(eid, refctx) + return nil } ij := findProhibitedEdgeKeyword(eid.SrcPath...) if ij != -1 { - return nil, d2parser.Errorf(refctx.Edge.Src.Path[ij].Unbox(), "reserved keywords are prohibited in edges") + return d2parser.Errorf(refctx.Edge.Src.Path[ij].Unbox(), "reserved keywords are prohibited in edges") } ij = findBoardKeyword(eid.SrcPath...) if ij == len(eid.SrcPath)-1 { - return nil, d2parser.Errorf(refctx.Edge.Src.Path[ij].Unbox(), "edge with board keyword alone doesn't make sense") + return d2parser.Errorf(refctx.Edge.Src.Path[ij].Unbox(), "edge with board keyword alone doesn't make sense") } - src := m.GetField(eid.SrcPath...) - if NodeBoardKind(src) != "" { - return nil, d2parser.Errorf(refctx.Edge.Src, "cannot create edges between boards") + + srcStart := len(refctx.Edge.Src.Path) - len(eid.SrcPath) + if srcStart < 0 { + srcStart = 0 } + srcKP := refctx.Edge.Src.Copy() + srcKP.Path = srcKP.Path[srcStart:] ij = findProhibitedEdgeKeyword(eid.DstPath...) if ij != -1 { - return nil, d2parser.Errorf(refctx.Edge.Dst.Path[ij].Unbox(), "reserved keywords are prohibited in edges") + return d2parser.Errorf(refctx.Edge.Dst.Path[ij].Unbox(), "reserved keywords are prohibited in edges") } ij = findBoardKeyword(eid.DstPath...) if ij == len(eid.DstPath)-1 { - return nil, d2parser.Errorf(refctx.Edge.Dst.Path[ij].Unbox(), "edge with board keyword alone doesn't make sense") + return d2parser.Errorf(refctx.Edge.Dst.Path[ij].Unbox(), "edge with board keyword alone doesn't make sense") + } + + dstStart := len(refctx.Edge.Dst.Path) - len(eid.DstPath) + if dstStart < 0 { + dstStart = 0 + } + dstKP := refctx.Edge.Dst.Copy() + dstKP.Path = dstKP.Path[dstStart:] + + underscoresCountSrc := 0 + underscoresCountDst := 0 + for _, el := range refctx.Edge.Src.Path { + if el.ScalarString() == "_" { + underscoresCountSrc++ + } + } + for _, el := range refctx.Edge.Dst.Path { + if el.ScalarString() == "_" { + underscoresCountDst++ + } + } + for i := 0; i < underscoresCountDst; i++ { + srcKP.Path = append([]*d2ast.StringBox{d2ast.RawStringBox(eid.SrcPath[i], true)}, srcKP.Path...) + } + for i := 0; i < underscoresCountSrc; i++ { + dstKP.Path = append([]*d2ast.StringBox{d2ast.RawStringBox(eid.DstPath[i], true)}, dstKP.Path...) + } + + srcFA, err := m.EnsureField(srcKP, refctx) + if err != nil { + return err + } + dstFA, err := m.EnsureField(dstKP, refctx) + if err != nil { + return err + } + + for _, src := range srcFA { + for _, dst := range dstFA { + eid2 := eid.Copy() + eid2.SrcPath = RelIDA(m, src) + eid2.DstPath = RelIDA(m, dst) + e, err := m.createEdge2(eid2, refctx, src, dst) + if err != nil { + return err + } + *ea = append(*ea, e) + } + } + return nil +} + +func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, src, dst *Field) (*Edge, error) { + if NodeBoardKind(src) != "" { + return nil, d2parser.Errorf(refctx.Edge.Src, "cannot create edges between boards") } - dst := m.GetField(eid.DstPath...) if NodeBoardKind(dst) != "" { return nil, d2parser.Errorf(refctx.Edge.Dst, "cannot create edges between boards") } - if ParentBoard(src) != ParentBoard(dst) { return nil, d2parser.Errorf(refctx.Edge, "cannot create edges between boards") } @@ -1159,6 +1249,26 @@ func IDA(n Node) (ida []string) { } } +// RelIDA returns the absolute path to n relative to p. +func RelIDA(p, n Node) (ida []string) { + for { + f, ok := n.(*Field) + if ok { + ida = append(ida, f.Name) + if f.Root() { + reverseIDA(ida) + return ida + } + } + f = ParentField(n) + if f == nil || f.Root() || f == p || f.Composite == p { + reverseIDA(ida) + return ida + } + n = f + } +} + func reverseIDA(ida []string) { for i := 0; i < len(ida)/2; i++ { tmp := ida[i] diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index b1709080d..e264e5e02 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -10,6 +10,19 @@ func testCompilePatterns(t *testing.T) { t.Parallel() tca := []testCase{ + { + name: "escaped", + run: func(t testing.TB) { + m, err := compile(t, `animal: meow +action: yes +a\*: globbed`) + assert.Success(t, err) + assertQuery(t, m, 3, 0, nil, "") + assertQuery(t, m, 0, 0, "meow", "animal") + assertQuery(t, m, 0, 0, "yes", "action") + assertQuery(t, m, 0, 0, "globbed", `a\*`) + }, + }, { name: "prefix", run: func(t testing.TB) { @@ -71,16 +84,67 @@ t*ink*r*t*inke*: globbed`) }, }, { - name: "escaped", + name: "nested/prefix-suffix/3", run: func(t testing.TB) { - m, err := compile(t, `animal: meow -action: yes -a\*: globbed`) + m, err := compile(t, `animate.constant.tinkertinker: meow +astronaut.constant.thinkerthinker: yes +a*n*t*.constant.t*ink*r*t*inke*: globbed`) assert.Success(t, err) - assertQuery(t, m, 3, 0, nil, "") - assertQuery(t, m, 0, 0, "meow", "animal") - assertQuery(t, m, 0, 0, "yes", "action") - assertQuery(t, m, 0, 0, "globbed", `a\*`) + assertQuery(t, m, 6, 0, nil, "") + assertQuery(t, m, 0, 0, "globbed", "animate.constant.tinkertinker") + assertQuery(t, m, 0, 0, "globbed", "astronaut.constant.thinkerthinker") + }, + }, + { + name: "edge/1", + run: func(t testing.TB) { + m, err := compile(t, `animate +animal +an* -> an*`) + assert.Success(t, err) + assertQuery(t, m, 2, 4, nil, "") + assertQuery(t, m, 0, 0, nil, "(animate -> animal)[0]") + assertQuery(t, m, 0, 0, nil, "(animal -> animal)[0]") + }, + }, + { + name: "edge/2", + run: func(t testing.TB) { + m, err := compile(t, `shared.animate +shared.animal +sh*.(an* -> an*)`) + assert.Success(t, err) + assertQuery(t, m, 3, 4, nil, "") + assertQuery(t, m, 2, 4, nil, "shared") + assertQuery(t, m, 0, 0, nil, "shared.(animate -> animal)[0]") + assertQuery(t, m, 0, 0, nil, "shared.(animal -> animal)[0]") + }, + }, + { + name: "edge/3", + run: func(t testing.TB) { + m, err := compile(t, `shared.animate +shared.animal +sh*.an* -> sh*.an*`) + assert.Success(t, err) + assertQuery(t, m, 3, 4, nil, "") + assertQuery(t, m, 2, 4, nil, "shared") + assertQuery(t, m, 0, 0, nil, "shared.(animate -> animal)[0]") + assertQuery(t, m, 0, 0, nil, "shared.(animal -> animal)[0]") + }, + }, + { + name: "double-glob", + run: func(t testing.TB) { + m, err := compile(t, `shared.animate +shared.animal +**.style.fill: red`) + assert.Success(t, err) + assertQuery(t, m, 9, 0, nil, "") + assertQuery(t, m, 8, 0, nil, "shared") + assertQuery(t, m, 2, 0, nil, "shared.style") + assertQuery(t, m, 2, 0, nil, "shared.animate") + assertQuery(t, m, 2, 0, nil, "shared.animal") }, }, } diff --git a/d2parser/parse.go b/d2parser/parse.go index d7a540897..6f792d374 100644 --- a/d2parser/parse.go +++ b/d2parser/parse.go @@ -1030,9 +1030,15 @@ func (p *parser) parseUnquotedString(inKey bool) (s *d2ast.UnquotedString) { var sb strings.Builder var rawb strings.Builder + lastPatternIndex := 0 defer func() { sv := strings.TrimRightFunc(sb.String(), unicode.IsSpace) rawv := strings.TrimRightFunc(rawb.String(), unicode.IsSpace) + if s.Pattern != nil { + if lastPatternIndex < len(sv) { + s.Pattern = append(s.Pattern, sv[lastPatternIndex:]) + } + } if sv == "" { if len(s.Value) > 0 { return @@ -1046,15 +1052,6 @@ func (p *parser) parseUnquotedString(inKey bool) (s *d2ast.UnquotedString) { s.Value = append(s.Value, d2ast.InterpolationBox{String: &sv, StringRaw: &rawv}) }() - lastPatternIndex := 0 - defer func() { - if s.Pattern != nil { - if lastPatternIndex < sb.Len() { - s.Pattern = append(s.Pattern, sb.String()[lastPatternIndex:]) - } - } - }() - _s, eof := p.peekn(4) p.rewind() if !eof { diff --git a/testdata/d2ir/TestCompile/edges/chain.exp.json b/testdata/d2ir/TestCompile/edges/chain.exp.json index ea4624895..3708c3f1e 100644 --- a/testdata/d2ir/TestCompile/edges/chain.exp.json +++ b/testdata/d2ir/TestCompile/edges/chain.exp.json @@ -186,6 +186,190 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", + "edges": [ + { + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", + "src": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", + "src": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -376,6 +560,374 @@ } } }, + { + "string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", + "edges": [ + { + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", + "src": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", + "src": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", + "src": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", + "edges": [ + { + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", + "src": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", + "src": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, { "string": { "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", @@ -749,6 +1301,374 @@ } } }, + { + "string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", + "src": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", + "edges": [ + { + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", + "src": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", + "src": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", + "src": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", + "edges": [ + { + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", + "src": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", + "src": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, { "string": { "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", @@ -1121,6 +2041,190 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", + "src": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", + "edges": [ + { + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", + "src": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + { + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", + "src": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] } diff --git a/testdata/d2ir/TestCompile/edges/nested.exp.json b/testdata/d2ir/TestCompile/edges/nested.exp.json index 06d098b77..e49102cd2 100644 --- a/testdata/d2ir/TestCompile/edges/nested.exp.json +++ b/testdata/d2ir/TestCompile/edges/nested.exp.json @@ -171,6 +171,171 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "src": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "edges": [ + { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "src": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] } @@ -342,6 +507,171 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "src": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "edges": [ + { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "src": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -516,6 +846,171 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "src": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "edges": [ + { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "src": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] } @@ -687,6 +1182,171 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "src": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "edges": [ + { + "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", + "src": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] } diff --git a/testdata/d2ir/TestCompile/edges/root.exp.json b/testdata/d2ir/TestCompile/edges/root.exp.json index a94dd5651..3938e435b 100644 --- a/testdata/d2ir/TestCompile/edges/root.exp.json +++ b/testdata/d2ir/TestCompile/edges/root.exp.json @@ -112,6 +112,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -227,6 +337,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] } diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index 878a4cff4..f97efdddb 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -138,6 +138,148 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "p" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", + "src": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "edges": [ + { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", + "src": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] } @@ -258,6 +400,147 @@ } } } + }, + { + "string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "p" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "p" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", + "src": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "edges": [ + { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", + "src": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -406,6 +689,138 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", + "src": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "edges": [ + { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", + "src": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] } diff --git a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json index 7a7f1e434..754264164 100644 --- a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json +++ b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json @@ -450,6 +450,402 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", + "src": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", + "edges": [ + { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", + "src": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", + "src": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", + "edges": [ + { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", + "src": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] } diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index 27e7e95c6..6c8ca2fa4 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -112,6 +112,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -227,6 +337,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, diff --git a/testdata/d2ir/TestCompile/patterns/double-glob.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob.exp.json new file mode 100644 index 000000000..e50aa0ff6 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/double-glob.exp.json @@ -0,0 +1,573 @@ +{ + "fields": [ + { + "name": "shared", + "composite": { + "fields": [ + { + "name": "animate", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:14:14", + "key": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "animal", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:13:28", + "key": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/double-glob.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:18:47", + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:18:47", + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:14:14", + "key": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:13:28", + "key": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json new file mode 100644 index 000000000..dff85c37a --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json @@ -0,0 +1,582 @@ +{ + "fields": [ + { + "name": "animate", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "key": { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "animal", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "key": { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "animate" + ], + "src_arrow": false, + "dst_path": [ + "animate" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "src": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "edges": [ + { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "src": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "animate" + ], + "src_arrow": false, + "dst_path": [ + "animal" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "src": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "edges": [ + { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "src": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "animal" + ], + "src_arrow": false, + "dst_path": [ + "animate" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "src": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "edges": [ + { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "src": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "animal" + ], + "src_arrow": false, + "dst_path": [ + "animal" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "src": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "edges": [ + { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", + "src": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ] +} diff --git a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json new file mode 100644 index 000000000..b5d8b16a5 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json @@ -0,0 +1,862 @@ +{ + "fields": [ + { + "name": "shared", + "composite": { + "fields": [ + { + "name": "animate", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge/2.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:14:14", + "key": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "animal", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge/2.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:13:28", + "key": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "animate" + ], + "src_arrow": false, + "dst_path": [ + "animate" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", + "src": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:16:45", + "key": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + } + ] + }, + "edges": [ + { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", + "src": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "animate" + ], + "src_arrow": false, + "dst_path": [ + "animal" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", + "src": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:16:45", + "key": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + } + ] + }, + "edges": [ + { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", + "src": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "animal" + ], + "src_arrow": false, + "dst_path": [ + "animate" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", + "src": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:16:45", + "key": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + } + ] + }, + "edges": [ + { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", + "src": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "animal" + ], + "src_arrow": false, + "dst_path": [ + "animal" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", + "src": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:16:45", + "key": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + } + ] + }, + "edges": [ + { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", + "src": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ] + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:14:14", + "key": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:13:28", + "key": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/2.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json new file mode 100644 index 000000000..7f8948ac4 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json @@ -0,0 +1,1022 @@ +{ + "fields": [ + { + "name": "shared", + "composite": { + "fields": [ + { + "name": "animate", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge/3.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:14:14", + "key": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "animal", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge/3.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:13:28", + "key": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "animate" + ], + "src_arrow": false, + "dst_path": [ + "animate" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "src": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "edges": [ + { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "src": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "animate" + ], + "src_arrow": false, + "dst_path": [ + "animal" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "src": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "edges": [ + { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "src": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "animal" + ], + "src_arrow": false, + "dst_path": [ + "animate" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "src": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "edges": [ + { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "src": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "animal" + ], + "src_arrow": false, + "dst_path": [ + "animal" + ], + "dst_arrow": true, + "index": 0 + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "src": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "edges": [ + { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", + "src": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", + "value": [ + { + "string": "sh*", + "raw_string": "sh*" + } + ], + "pattern": [ + "sh", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", + "value": [ + { + "string": "an*", + "raw_string": "an*" + } + ], + "pattern": [ + "an", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ] + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:14:14", + "key": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:13:28", + "key": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge/3.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json b/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json new file mode 100644 index 000000000..9b5259d95 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json @@ -0,0 +1,997 @@ +{ + "fields": [ + { + "name": "animate", + "composite": { + "fields": [ + { + "name": "constant", + "composite": { + "fields": [ + { + "name": "tinkertinker", + "primary": { + "value": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:33:108-2:40:115", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:17:17-0:29:29", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:8:8-0:16:16", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:17:17-0:29:29", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:35:35", + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:8:8-0:16:16", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:17:17-0:29:29", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:31:31-0:35:35", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:8:8-0:16:16", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:8:8-0:16:16", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:17:17-0:29:29", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:35:35", + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:8:8-0:16:16", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:17:17-0:29:29", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:31:31-0:35:35", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:7:82-2:15:90", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:31:106", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:6:81", + "value": [ + { + "string": "a*n*t*", + "raw_string": "a*n*t*" + } + ], + "pattern": [ + "a", + "*", + "n", + "*", + "t", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:7:82-2:15:90", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:16:91-2:31:106", + "value": [ + { + "string": "t*ink*r*t*inke*", + "raw_string": "t*ink*r*t*inke*" + } + ], + "pattern": [ + "t", + "*", + "ink", + "*", + "r", + "*", + "t", + "*", + "inke", + "*" + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:40:115", + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:31:106", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:6:81", + "value": [ + { + "string": "a*n*t*", + "raw_string": "a*n*t*" + } + ], + "pattern": [ + "a", + "*", + "n", + "*", + "t", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:7:82-2:15:90", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:16:91-2:31:106", + "value": [ + { + "string": "t*ink*r*t*inke*", + "raw_string": "t*ink*r*t*inke*" + } + ], + "pattern": [ + "t", + "*", + "ink", + "*", + "r", + "*", + "t", + "*", + "inke", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:33:108-2:40:115", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:8:8-0:16:16", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:17:17-0:29:29", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:35:35", + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:8:8-0:16:16", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:17:17-0:29:29", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:31:31-0:35:35", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "astronaut", + "composite": { + "fields": [ + { + "name": "constant", + "composite": { + "fields": [ + { + "name": "thinkerthinker", + "primary": { + "value": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:33:108-2:40:115", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:19:55-1:33:69", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:33:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:9:45", + "value": [ + { + "string": "astronaut", + "raw_string": "astronaut" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:10:46-1:18:54", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:19:55-1:33:69", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:38:74", + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:33:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:9:45", + "value": [ + { + "string": "astronaut", + "raw_string": "astronaut" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:10:46-1:18:54", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:19:55-1:33:69", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:35:71-1:38:74", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:10:46-1:18:54", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:33:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:9:45", + "value": [ + { + "string": "astronaut", + "raw_string": "astronaut" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:10:46-1:18:54", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:19:55-1:33:69", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:38:74", + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:33:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:9:45", + "value": [ + { + "string": "astronaut", + "raw_string": "astronaut" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:10:46-1:18:54", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:19:55-1:33:69", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:35:71-1:38:74", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:7:82-2:15:90", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:31:106", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:6:81", + "value": [ + { + "string": "a*n*t*", + "raw_string": "a*n*t*" + } + ], + "pattern": [ + "a", + "*", + "n", + "*", + "t", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:7:82-2:15:90", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:16:91-2:31:106", + "value": [ + { + "string": "t*ink*r*t*inke*", + "raw_string": "t*ink*r*t*inke*" + } + ], + "pattern": [ + "t", + "*", + "ink", + "*", + "r", + "*", + "t", + "*", + "inke", + "*" + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:40:115", + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:31:106", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:0:75-2:6:81", + "value": [ + { + "string": "a*n*t*", + "raw_string": "a*n*t*" + } + ], + "pattern": [ + "a", + "*", + "n", + "*", + "t", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:7:82-2:15:90", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:16:91-2:31:106", + "value": [ + { + "string": "t*ink*r*t*inke*", + "raw_string": "t*ink*r*t*inke*" + } + ], + "pattern": [ + "t", + "*", + "ink", + "*", + "r", + "*", + "t", + "*", + "inke", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:33:108-2:40:115", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:9:45", + "value": [ + { + "string": "astronaut", + "raw_string": "astronaut" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:33:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:9:45", + "value": [ + { + "string": "astronaut", + "raw_string": "astronaut" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:10:46-1:18:54", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:19:55-1:33:69", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:38:74", + "key": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:33:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:9:45", + "value": [ + { + "string": "astronaut", + "raw_string": "astronaut" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:10:46-1:18:54", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:19:55-1:33:69", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:35:71-1:38:74", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index 37f6f502a..7bfb0dce9 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -112,6 +112,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -227,6 +337,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -351,6 +571,116 @@ } } }, + { + "string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, { "string": { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", @@ -614,6 +944,116 @@ } } }, + { + "string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, { "string": { "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index 591518abf..31100d590 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -112,6 +112,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -227,6 +337,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -350,6 +570,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -465,6 +795,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -1103,6 +1543,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -1218,6 +1768,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index 3e09926d4..f92eec4b9 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -112,6 +112,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -227,6 +337,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -350,6 +570,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -465,6 +795,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -1103,6 +1543,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -1218,6 +1768,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -1707,6 +2367,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -1822,6 +2592,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index ec142d977..51f9d002c 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -112,6 +112,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -227,6 +337,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -350,6 +570,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -465,6 +795,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -1103,6 +1543,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, @@ -1218,6 +1768,116 @@ "value": {} } } + }, + { + "string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } } ] }, From d9b4b952eed3210e3016a2402c22eed1e1702e39 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Thu, 27 Jul 2023 02:36:33 -0700 Subject: [PATCH 114/138] d2ir: Implement double globs --- d2ir/d2ir.go | 31 +- d2ir/pattern.go | 23 + d2ir/pattern_test.go | 6 +- .../TestCompile/patterns/double-glob.exp.json | 496 ++++++-- .../patterns/double-glob/1.exp.json | 1095 +++++++++++++++++ 5 files changed, 1564 insertions(+), 87 deletions(-) create mode 100644 testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 28d1c6d8e..8ef67de0b 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -672,12 +672,39 @@ func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext) ([]*Field, erro func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, fa *[]*Field) error { us, ok := kp.Path[i].Unbox().(*d2ast.UnquotedString) if ok && us.Pattern != nil { + fa2, ok := m.doubleGlob(us.Pattern) + if ok { + if i == len(kp.Path)-1 { + *fa = append(*fa, fa2...) + } else { + for _, f := range fa2 { + if f.Map() == nil { + f.Composite = &Map{ + parent: f, + } + } + err := f.Map().ensureField(i+1, kp, refctx, fa) + if err != nil { + return err + } + } + } + return nil + } for _, f := range m.Fields { if matchPattern(f.Name, us.Pattern) { if i == len(kp.Path)-1 { *fa = append(*fa, f) - } else if f.Map() != nil { - f.Map().ensureField(i+1, kp, refctx, fa) + } else { + if f.Map() == nil { + f.Composite = &Map{ + parent: f, + } + } + err := f.Map().ensureField(i+1, kp, refctx, fa) + if err != nil { + return err + } } } } diff --git a/d2ir/pattern.go b/d2ir/pattern.go index 39fd5c397..90773cca3 100644 --- a/d2ir/pattern.go +++ b/d2ir/pattern.go @@ -2,8 +2,31 @@ package d2ir import ( "strings" + + "oss.terrastruct.com/d2/d2graph" ) +func (m *Map) doubleGlob(pattern []string) ([]*Field, bool) { + if !(len(pattern) == 3 && pattern[0] == "*" && pattern[1] == "" && pattern[2] == "*") { + return nil, false + } + var fa []*Field + m._doubleGlob(&fa) + return fa, true +} + +func (m *Map) _doubleGlob(fa *[]*Field) { + for _, f := range m.Fields { + if _, ok := d2graph.ReservedKeywords[f.Name]; ok { + continue + } + *fa = append(*fa, f) + if f.Map() != nil { + f.Map()._doubleGlob(fa) + } + } +} + func matchPattern(s string, pattern []string) bool { if len(pattern) == 0 { return true diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index e264e5e02..90e6dd35c 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -134,7 +134,7 @@ sh*.an* -> sh*.an*`) }, }, { - name: "double-glob", + name: "double-glob/1", run: func(t testing.TB) { m, err := compile(t, `shared.animate shared.animal @@ -142,9 +142,11 @@ shared.animal assert.Success(t, err) assertQuery(t, m, 9, 0, nil, "") assertQuery(t, m, 8, 0, nil, "shared") - assertQuery(t, m, 2, 0, nil, "shared.style") + assertQuery(t, m, 1, 0, nil, "shared.style") assertQuery(t, m, 2, 0, nil, "shared.animate") + assertQuery(t, m, 1, 0, nil, "shared.animate.style") assertQuery(t, m, 2, 0, nil, "shared.animal") + assertQuery(t, m, 1, 0, nil, "shared.animal.style") }, }, } diff --git a/testdata/d2ir/TestCompile/patterns/double-glob.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob.exp.json index e50aa0ff6..4696f0b15 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob.exp.json @@ -6,6 +6,203 @@ "fields": [ { "name": "animate", + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/double-glob.d2,2:18:47-2:21:50", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:22:51", + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:18:47-2:21:50", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:22:51", + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:18:47-2:21:50", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, "references": [ { "string": { @@ -84,6 +281,203 @@ }, { "name": "animal", + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/double-glob.d2,2:18:47-2:21:50", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:22:51", + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:18:47-2:21:50", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:22:51", + "key": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob.d2,2:18:47-2:21:50", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, "references": [ { "string": { @@ -168,7 +562,7 @@ "name": "fill", "primary": { "value": { - "range": "TestCompile/patterns/double-glob.d2,2:15:44-2:18:47", + "range": "TestCompile/patterns/double-glob.d2,2:18:47-2:21:50", "value": [ { "string": "red", @@ -180,7 +574,7 @@ "references": [ { "string": { - "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", "value": [ { "string": "fill", @@ -189,27 +583,11 @@ ] }, "key_path": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:13:42", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", "path": [ { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:2:31", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", "value": [ { "string": "style", @@ -220,7 +598,7 @@ }, { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", "value": [ { "string": "fill", @@ -234,29 +612,13 @@ "context": { "edge": null, "key": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:18:47", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:22:51", "key": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:13:42", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", "path": [ { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:2:31", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", "value": [ { "string": "style", @@ -267,7 +629,7 @@ }, { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", "value": [ { "string": "fill", @@ -281,7 +643,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:15:44-2:18:47", + "range": "TestCompile/patterns/double-glob.d2,2:18:47-2:21:50", "value": [ { "string": "red", @@ -301,7 +663,7 @@ "references": [ { "string": { - "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", "value": [ { "string": "style", @@ -310,27 +672,11 @@ ] }, "key_path": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:13:42", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", "path": [ { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:2:31", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", "value": [ { "string": "style", @@ -341,7 +687,7 @@ }, { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", "value": [ { "string": "fill", @@ -355,29 +701,13 @@ "context": { "edge": null, "key": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:18:47", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:22:51", "key": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:13:42", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:16:45", "path": [ { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:0:29-2:2:31", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:3:32-2:8:37", + "range": "TestCompile/patterns/double-glob.d2,2:6:35-2:11:40", "value": [ { "string": "style", @@ -388,7 +718,7 @@ }, { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:9:38-2:13:42", + "range": "TestCompile/patterns/double-glob.d2,2:12:41-2:16:45", "value": [ { "string": "fill", @@ -402,7 +732,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "TestCompile/patterns/double-glob.d2,2:15:44-2:18:47", + "range": "TestCompile/patterns/double-glob.d2,2:18:47-2:21:50", "value": [ { "string": "red", diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json new file mode 100644 index 000000000..804f187d0 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json @@ -0,0 +1,1095 @@ +{ + "fields": [ + { + "name": "shared", + "composite": { + "fields": [ + { + "name": "animate", + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:18:47", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:18:47", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:14:14", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "animal", + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:18:47", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:18:47", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:13:28", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:18:47", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:18:47", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:13:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:0:29-2:2:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:14:14", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:13:28", + "key": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:13:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:0:15-1:6:21", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/1.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null +} From 0d2b0aa99c4f688f6a85c48de1110879e4a533f4 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Thu, 27 Jul 2023 02:51:43 -0700 Subject: [PATCH 115/138] d2ir: Implement edge index globs --- d2ir/compile.go | 2 +- d2ir/d2ir.go | 2 + d2ir/pattern_test.go | 15 + d2ir/query.go | 2 +- .../patterns/edge-glob-index.exp.json | 4003 +++++++++++++++++ 5 files changed, 4022 insertions(+), 2 deletions(-) create mode 100644 testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json diff --git a/d2ir/compile.go b/d2ir/compile.go index 962e1ec40..31ad34259 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -647,7 +647,7 @@ func (c *compiler) _compileEdges(refctx *RefContext) { refctx.Edge = refctx.Key.Edges[i] var ea []*Edge - if eid.Index != nil { + if eid.Index != nil || eid.Glob { ea = refctx.ScopeMap.GetEdges(eid) if len(ea) == 0 { c.errorf(refctx.Edge, "indexed edge does not exist") diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 8ef67de0b..f460d59af 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -325,6 +325,7 @@ type EdgeID struct { // If nil, then any EdgeID with equal src/dst/arrows matches. Index *int `json:"index"` + Glob bool `json:"glob"` } func NewEdgeIDs(k *d2ast.Key) (eida []*EdgeID) { @@ -337,6 +338,7 @@ func NewEdgeIDs(k *d2ast.Key) (eida []*EdgeID) { } if k.EdgeIndex != nil { eid.Index = k.EdgeIndex.Int + eid.Glob = k.EdgeIndex.Glob } eida = append(eida, eid) } diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index 90e6dd35c..a9dc163ef 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -133,6 +133,21 @@ sh*.an* -> sh*.an*`) assertQuery(t, m, 0, 0, nil, "shared.(animal -> animal)[0]") }, }, + { + name: "edge-glob-index", + run: func(t testing.TB) { + m, err := compile(t, `a -> b +a -> b +a -> b +(a -> b)[*].style.fill: red +`) + assert.Success(t, err) + assertQuery(t, m, 8, 3, nil, "") + assertQuery(t, m, 0, 0, "red", "(a -> b)[0].style.fill") + assertQuery(t, m, 0, 0, "red", "(a -> b)[1].style.fill") + assertQuery(t, m, 0, 0, "red", "(a -> b)[2].style.fill") + }, + }, { name: "double-glob/1", run: func(t testing.TB) { diff --git a/d2ir/query.go b/d2ir/query.go index e70ad88df..e2ab2e944 100644 --- a/d2ir/query.go +++ b/d2ir/query.go @@ -56,7 +56,7 @@ func (m *Map) Query(idStr string) (Node, error) { return nil, nil } if len(na) > 1 { - return nil, fmt.Errorf("expected only one query result but got: %#v", err) + return nil, fmt.Errorf("expected only one query result but got: %#v", na) } return na[0], nil } diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json new file mode 100644 index 000000000..71a40a308 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json @@ -0,0 +1,4003 @@ +{ + "fields": [ + { + "name": "a", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "name": "b", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "map": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 1, + "glob": false + }, + "map": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 2, + "glob": false + }, + "map": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:0:21-3:27:48", + "edges": [ + { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:7:28", + "src": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:1:22-3:2:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:6:27-3:7:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:8:29-3:11:32", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:22:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ] +} From b119174a0964c9b76792af6e474140001e6aca31 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 14:58:48 -0700 Subject: [PATCH 116/138] d2ir: Fix implementation of Map.createEdge --- d2ir/compile.go | 2 +- d2ir/d2ir.go | 50 +- .../nulls/basic/attribute.exp.json | 42 + .../nulls/implicit/delete-children.exp.json | 31 + .../nulls/reappear/children-reset.exp.json | 31 + .../d2ir/TestCompile/edges/chain.exp.json | 1113 +---------------- .../d2ir/TestCompile/edges/nested.exp.json | 663 +--------- testdata/d2ir/TestCompile/edges/root.exp.json | 223 +--- .../TestCompile/edges/underscore.exp.json | 418 +------ .../layers/errs/4/good_edge.exp.json | 399 +----- .../d2ir/TestCompile/layers/root.exp.json | 223 +--- .../patterns/edge-glob-index.exp.json | 660 ---------- .../d2ir/TestCompile/patterns/edge/1.exp.json | 12 +- .../d2ir/TestCompile/patterns/edge/2.exp.json | 12 +- .../d2ir/TestCompile/patterns/edge/3.exp.json | 12 +- .../d2ir/TestCompile/scenarios/edge.exp.json | 446 +------ .../d2ir/TestCompile/scenarios/root.exp.json | 669 +--------- .../d2ir/TestCompile/steps/recursive.exp.json | 892 +------------ testdata/d2ir/TestCompile/steps/root.exp.json | 669 +--------- 19 files changed, 189 insertions(+), 6378 deletions(-) diff --git a/d2ir/compile.go b/d2ir/compile.go index 31ad34259..9d97f5b6d 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -685,8 +685,8 @@ func (c *compiler) _compileEdges(refctx *RefContext) { e.Map_ = &Map{ parent: e, } - c.compileField(e.Map_, refctx.Key.EdgeKey, refctx) } + c.compileField(e.Map_, refctx.Key.EdgeKey, refctx) } else { if refctx.Key.Primary.Unbox() != nil { e.Primary_ = &Scalar{ diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index f460d59af..dbc3daa39 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -922,13 +922,6 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { return d2parser.Errorf(refctx.Edge.Src.Path[ij].Unbox(), "edge with board keyword alone doesn't make sense") } - srcStart := len(refctx.Edge.Src.Path) - len(eid.SrcPath) - if srcStart < 0 { - srcStart = 0 - } - srcKP := refctx.Edge.Src.Copy() - srcKP.Path = srcKP.Path[srcStart:] - ij = findProhibitedEdgeKeyword(eid.DstPath...) if ij != -1 { return d2parser.Errorf(refctx.Edge.Dst.Path[ij].Unbox(), "reserved keywords are prohibited in edges") @@ -938,37 +931,34 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { return d2parser.Errorf(refctx.Edge.Dst.Path[ij].Unbox(), "edge with board keyword alone doesn't make sense") } - dstStart := len(refctx.Edge.Dst.Path) - len(eid.DstPath) - if dstStart < 0 { - dstStart = 0 - } - dstKP := refctx.Edge.Dst.Copy() - dstKP.Path = dstKP.Path[dstStart:] - - underscoresCountSrc := 0 - underscoresCountDst := 0 - for _, el := range refctx.Edge.Src.Path { - if el.ScalarString() == "_" { - underscoresCountSrc++ + srcKP := d2ast.MakeKeyPath(eid.SrcPath) + lastMatch := 0 + for i, el := range srcKP.Path { + for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { + realEl := refctx.Edge.Src.Path[j] + if el.ScalarString() == realEl.ScalarString() { + srcKP.Path[i] = realEl + lastMatch += j + 1 + } } } - for _, el := range refctx.Edge.Dst.Path { - if el.ScalarString() == "_" { - underscoresCountDst++ + dstKP := d2ast.MakeKeyPath(eid.DstPath) + lastMatch = 0 + for i, el := range dstKP.Path { + for j := lastMatch; j < len(refctx.Edge.Dst.Path); j++ { + realEl := refctx.Edge.Dst.Path[j] + if el.ScalarString() == realEl.ScalarString() { + dstKP.Path[i] = realEl + lastMatch += j + 1 + } } } - for i := 0; i < underscoresCountDst; i++ { - srcKP.Path = append([]*d2ast.StringBox{d2ast.RawStringBox(eid.SrcPath[i], true)}, srcKP.Path...) - } - for i := 0; i < underscoresCountSrc; i++ { - dstKP.Path = append([]*d2ast.StringBox{d2ast.RawStringBox(eid.DstPath[i], true)}, dstKP.Path...) - } - srcFA, err := m.EnsureField(srcKP, refctx) + srcFA, err := m.EnsureField(srcKP, nil) if err != nil { return err } - dstFA, err := m.EnsureField(dstKP, refctx) + dstFA, err := m.EnsureField(dstKP, nil) if err != nil { return err } diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json index 8b29a9497..fb4a47fbd 100644 --- a/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json @@ -177,6 +177,48 @@ }, "key_path_index": 0, "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/attribute.d2,2:0:22-2:15:37", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/attribute.d2,2:0:22-2:1:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/attribute.d2,2:2:24-2:7:29", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/attribute.d2,2:8:30-2:15:37", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 } ], "attributes": { diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json index 7d93bdeea..758fbbabb 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json @@ -232,6 +232,37 @@ }, "key_path_index": 0, "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.d2,5:0:22-5:3:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.d2,5:0:22-5:1:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.d2,5:2:24-5:3:25", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 } ], "attributes": { diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json index 3e297fcec..6af8f1845 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json @@ -195,6 +195,37 @@ "key_path_index": 0, "map_key_edge_index": -1 }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.d2,2:0:7-2:3:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.d2,2:0:7-2:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.d2,2:2:9-2:3:10", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, { "key": { "range": "d2/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.d2,3:0:17-3:3:20", diff --git a/testdata/d2ir/TestCompile/edges/chain.exp.json b/testdata/d2ir/TestCompile/edges/chain.exp.json index 3708c3f1e..8484dbbdb 100644 --- a/testdata/d2ir/TestCompile/edges/chain.exp.json +++ b/testdata/d2ir/TestCompile/edges/chain.exp.json @@ -186,190 +186,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -560,374 +376,6 @@ } } }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", @@ -1301,374 +749,6 @@ } } }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", @@ -2041,190 +1121,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -2240,7 +1136,8 @@ "b" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -2414,7 +1311,8 @@ "c" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -2588,7 +1486,8 @@ "d" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/edges/nested.exp.json b/testdata/d2ir/TestCompile/edges/nested.exp.json index e49102cd2..548780974 100644 --- a/testdata/d2ir/TestCompile/edges/nested.exp.json +++ b/testdata/d2ir/TestCompile/edges/nested.exp.json @@ -171,171 +171,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "edges": [ - { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -507,171 +342,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "edges": [ - { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -846,171 +516,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "edges": [ - { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -1182,171 +687,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "edges": [ - { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -1364,7 +704,8 @@ "p" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/edges/root.exp.json b/testdata/d2ir/TestCompile/edges/root.exp.json index 3938e435b..ec08bcf95 100644 --- a/testdata/d2ir/TestCompile/edges/root.exp.json +++ b/testdata/d2ir/TestCompile/edges/root.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -462,7 +242,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index f97efdddb..066323086 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -138,148 +138,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "p" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", - "edges": [ - { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -400,147 +258,6 @@ } } } - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "p" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "p" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", - "edges": [ - { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -689,138 +406,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", - "edges": [ - { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -837,7 +422,8 @@ "z" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json index 754264164..c18033088 100644 --- a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json +++ b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json @@ -450,402 +450,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "edges": [ - { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "edges": [ - { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -861,7 +465,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index 6c8ca2fa4..82ca928ad 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1025,7 +805,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json index 71a40a308..8da87a6c9 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json @@ -113,116 +113,6 @@ } } }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", @@ -333,226 +223,6 @@ } } }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", @@ -1234,116 +904,6 @@ } } }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", @@ -1454,226 +1014,6 @@ } } }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", diff --git a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json index dff85c37a..6e38e272d 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json @@ -124,7 +124,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -240,7 +241,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -356,7 +358,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -472,7 +475,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json index b5d8b16a5..95a956c07 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json @@ -172,7 +172,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -308,7 +309,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -444,7 +446,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -580,7 +583,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json index 7f8948ac4..3316812a8 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json @@ -172,7 +172,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -348,7 +349,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -524,7 +526,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -700,7 +703,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index 7bfb0dce9..c0ef78879 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -571,116 +351,6 @@ } } }, - { - "string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", @@ -944,116 +614,6 @@ } } }, - { - "string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", @@ -1216,7 +776,8 @@ "b" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "map": { "fields": [ @@ -2108,7 +1669,8 @@ "b" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index 31100d590..0c7ae1e33 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -570,116 +350,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -795,116 +465,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1230,7 +790,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -1543,116 +1104,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1768,116 +1219,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1949,7 +1290,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -2325,7 +1667,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index f92eec4b9..bcaeb4be0 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -570,116 +350,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -795,116 +465,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1230,7 +790,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -1543,116 +1104,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1768,116 +1219,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -2367,116 +1708,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -2592,116 +1823,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -3139,7 +2260,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -3441,7 +2563,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -3979,7 +3102,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index 51f9d002c..a8b486f76 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -570,116 +350,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -795,116 +465,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1230,7 +790,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -1543,116 +1104,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1768,116 +1219,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -2259,7 +1600,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -2635,7 +1977,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { From 95667750e0e444cec6d00b1376b5c292652960a6 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 16:16:05 -0700 Subject: [PATCH 117/138] d2ir: Fix and add test for glob-edge-glob-index --- d2ir/compile.go | 10 +- d2ir/d2ir.go | 136 +- d2ir/merge.go | 2 +- d2ir/pattern_test.go | 29 +- d2ir/query.go | 2 +- .../errors/glob-edge-glob-index.exp.json | 667 +++ .../patterns/glob-edge-glob-index.exp.json | 3945 +++++++++++++++++ 7 files changed, 4766 insertions(+), 25 deletions(-) create mode 100644 testdata/d2ir/TestCompile/patterns/errors/glob-edge-glob-index.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json diff --git a/d2ir/compile.go b/d2ir/compile.go index 9d97f5b6d..c2bff5f55 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -396,7 +396,7 @@ func (c *compiler) compileKey(refctx *RefContext) { } func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) { - fa, err := dst.EnsureField(kp, refctx) + fa, err := dst.EnsureField(kp, refctx, true) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) return @@ -614,7 +614,7 @@ func (c *compiler) compileEdges(refctx *RefContext) { return } - fa, err := refctx.ScopeMap.EnsureField(refctx.Key.Key, refctx) + fa, err := refctx.ScopeMap.EnsureField(refctx.Key.Key, refctx, true) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) return @@ -648,7 +648,7 @@ func (c *compiler) _compileEdges(refctx *RefContext) { var ea []*Edge if eid.Index != nil || eid.Glob { - ea = refctx.ScopeMap.GetEdges(eid) + ea = refctx.ScopeMap.GetEdges(eid, refctx) if len(ea) == 0 { c.errorf(refctx.Edge, "indexed edge does not exist") continue @@ -661,12 +661,12 @@ func (c *compiler) _compileEdges(refctx *RefContext) { refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Dst, refctx) } } else { - _, err := refctx.ScopeMap.EnsureField(refctx.Edge.Src, refctx) + _, err := refctx.ScopeMap.EnsureField(refctx.Edge.Src, refctx, true) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) continue } - _, err = refctx.ScopeMap.EnsureField(refctx.Edge.Dst, refctx) + _, err = refctx.ScopeMap.EnsureField(refctx.Edge.Dst, refctx, true) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) continue diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index dbc3daa39..531237b05 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -653,7 +653,7 @@ func (m *Map) getField(ida []string) *Field { return nil } -func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext) ([]*Field, error) { +func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext, create bool) ([]*Field, error) { i := 0 for kp.Path[i].Unbox().ScalarString() == "_" { m = ParentMap(m) @@ -667,11 +667,11 @@ func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext) ([]*Field, erro } var fa []*Field - err := m.ensureField(i, kp, refctx, &fa) + err := m.ensureField(i, kp, refctx, create, &fa) return fa, err } -func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, fa *[]*Field) error { +func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create bool, fa *[]*Field) error { us, ok := kp.Path[i].Unbox().(*d2ast.UnquotedString) if ok && us.Pattern != nil { fa2, ok := m.doubleGlob(us.Pattern) @@ -685,7 +685,7 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, fa *[]*F parent: f, } } - err := f.Map().ensureField(i+1, kp, refctx, fa) + err := f.Map().ensureField(i+1, kp, refctx, create, fa) if err != nil { return err } @@ -703,7 +703,7 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, fa *[]*F parent: f, } } - err := f.Map().ensureField(i+1, kp, refctx, fa) + err := f.Map().ensureField(i+1, kp, refctx, create, fa) if err != nil { return err } @@ -760,9 +760,12 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, fa *[]*F parent: f, } } - return f.Map().ensureField(i+1, kp, refctx, fa) + return f.Map().ensureField(i+1, kp, refctx, create, fa) } + if !create { + return nil + } f := &Field{ parent: m, Name: head, @@ -783,7 +786,7 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, fa *[]*F f.Composite = &Map{ parent: f, } - return f.Map().ensureField(i+1, kp, refctx, fa) + return f.Map().ensureField(i+1, kp, refctx, create, fa) } func (m *Map) DeleteEdge(eid *EdgeID) *Edge { @@ -848,7 +851,13 @@ func (m *Map) DeleteField(ida ...string) *Field { return nil } -func (m *Map) GetEdges(eid *EdgeID) []*Edge { +func (m *Map) GetEdges(eid *EdgeID, refctx *RefContext) []*Edge { + if refctx != nil { + var ea []*Edge + m.getEdges(eid, refctx, &ea) + return ea + } + eid, m, common, err := eid.resolve(m) if err != nil { return nil @@ -859,7 +868,7 @@ func (m *Map) GetEdges(eid *EdgeID) []*Edge { return nil } if f.Map() != nil { - return f.Map().GetEdges(eid) + return f.Map().GetEdges(eid, nil) } return nil } @@ -873,6 +882,90 @@ func (m *Map) GetEdges(eid *EdgeID) []*Edge { return ea } +func (m *Map) getEdges(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { + eid, m, common, err := eid.resolve(m) + if err != nil { + return err + } + + if len(common) > 0 { + commonKP := d2ast.MakeKeyPath(common) + lastMatch := 0 + for i, el := range commonKP.Path { + for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { + realEl := refctx.Edge.Src.Path[j] + if el.ScalarString() == realEl.ScalarString() { + commonKP.Path[i] = realEl + lastMatch += j + 1 + } + } + } + fa, err := m.EnsureField(commonKP, nil, false) + if err != nil { + return nil + } + for _, f := range fa { + if _, ok := f.Composite.(*Array); ok { + return d2parser.Errorf(refctx.Edge.Src, "cannot index into array") + } + if f.Map() == nil { + f.Composite = &Map{ + parent: f, + } + } + err = f.Map().getEdges(eid, refctx, ea) + if err != nil { + return err + } + } + return nil + } + + srcKP := d2ast.MakeKeyPath(eid.SrcPath) + lastMatch := 0 + for i, el := range srcKP.Path { + for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { + realEl := refctx.Edge.Src.Path[j] + if el.ScalarString() == realEl.ScalarString() { + srcKP.Path[i] = realEl + lastMatch += j + 1 + } + } + } + dstKP := d2ast.MakeKeyPath(eid.DstPath) + lastMatch = 0 + for i, el := range dstKP.Path { + for j := lastMatch; j < len(refctx.Edge.Dst.Path); j++ { + realEl := refctx.Edge.Dst.Path[j] + if el.ScalarString() == realEl.ScalarString() { + dstKP.Path[i] = realEl + lastMatch += j + 1 + } + } + } + + srcFA, err := m.EnsureField(srcKP, nil, false) + if err != nil { + return err + } + dstFA, err := m.EnsureField(dstKP, nil, false) + if err != nil { + return err + } + + for _, src := range srcFA { + for _, dst := range dstFA { + eid2 := eid.Copy() + eid2.SrcPath = RelIDA(m, src) + eid2.DstPath = RelIDA(m, dst) + + ea2 := m.GetEdges(eid2, nil) + *ea = append(*ea, ea2...) + } + } + return nil +} + func (m *Map) CreateEdge(eid *EdgeID, refctx *RefContext) ([]*Edge, error) { var ea []*Edge return ea, m.createEdge(eid, refctx, &ea) @@ -888,11 +981,18 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { return d2parser.Errorf(refctx.Edge, err.Error()) } if len(common) > 0 { - commonEnd := len(refctx.Edge.Src.Path) - len(eid.SrcPath) - commonStart := commonEnd - len(common) - commonKP := refctx.Edge.Src.Copy() - commonKP.Path = commonKP.Path[commonStart:commonEnd] - fa, err := m.EnsureField(commonKP, nil) + commonKP := d2ast.MakeKeyPath(common) + lastMatch := 0 + for i, el := range commonKP.Path { + for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { + realEl := refctx.Edge.Src.Path[j] + if el.ScalarString() == realEl.ScalarString() { + commonKP.Path[i] = realEl + lastMatch += j + 1 + } + } + } + fa, err := m.EnsureField(commonKP, nil, true) if err != nil { return err } @@ -954,11 +1054,11 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { } } - srcFA, err := m.EnsureField(srcKP, nil) + srcFA, err := m.EnsureField(srcKP, nil, true) if err != nil { return err } - dstFA, err := m.EnsureField(dstKP, nil) + dstFA, err := m.EnsureField(dstKP, nil, true) if err != nil { return err } @@ -990,9 +1090,11 @@ func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, src, dst *Field) (*Ed } eid.Index = nil - ea := m.GetEdges(eid) + eid.Glob = true + ea := m.GetEdges(eid, refctx) index := len(ea) eid.Index = &index + eid.Glob = false e := &Edge{ parent: m, ID: eid, diff --git a/d2ir/merge.go b/d2ir/merge.go index 15ba2a9ec..a4a30d21f 100644 --- a/d2ir/merge.go +++ b/d2ir/merge.go @@ -11,7 +11,7 @@ func OverlayMap(base, overlay *Map) { } for _, oe := range overlay.Edges { - bea := base.GetEdges(oe.ID) + bea := base.GetEdges(oe.ID, nil) if len(bea) == 0 { base.Edges = append(base.Edges, oe.Copy(base).(*Edge)) continue diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index a9dc163ef..bae678f4a 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -148,6 +148,23 @@ a -> b assertQuery(t, m, 0, 0, "red", "(a -> b)[2].style.fill") }, }, + { + name: "glob-edge-glob-index", + run: func(t testing.TB) { + m, err := compile(t, `a -> b +a -> b +a -> b +c -> b +(* -> b)[*].style.fill: red +`) + assert.Success(t, err) + assertQuery(t, m, 11, 4, nil, "") + assertQuery(t, m, 0, 0, "red", "(a -> b)[0].style.fill") + assertQuery(t, m, 0, 0, "red", "(a -> b)[1].style.fill") + assertQuery(t, m, 0, 0, "red", "(a -> b)[2].style.fill") + assertQuery(t, m, 0, 0, "red", "(c -> b)[0].style.fill") + }, + }, { name: "double-glob/1", run: func(t testing.TB) { @@ -169,7 +186,17 @@ shared.animal runa(t, tca) t.Run("errors", func(t *testing.T) { - tca := []testCase{} + tca := []testCase{ + { + name: "glob-edge-glob-index", + run: func(t testing.TB) { + m, err := compile(t, `(* -> b)[*].style.fill: red +`) + assert.ErrorString(t, err, `TestCompile/patterns/errors/glob-edge-glob-index.d2:1:2: indexed edge does not exist`) + assertQuery(t, m, 0, 0, nil, "") + }, + }, + } runa(t, tca) }) } diff --git a/d2ir/query.go b/d2ir/query.go index e2ab2e944..0f7caddc9 100644 --- a/d2ir/query.go +++ b/d2ir/query.go @@ -30,7 +30,7 @@ func (m *Map) QueryAll(idStr string) (na []Node, _ error) { eida := NewEdgeIDs(k) for _, eid := range eida { - ea := m.GetEdges(eid) + ea := m.GetEdges(eid, nil) for _, e := range ea { if k.EdgeKey == nil { na = append(na, e) diff --git a/testdata/d2ir/TestCompile/patterns/errors/glob-edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/errors/glob-edge-glob-index.exp.json new file mode 100644 index 000000000..9735275e6 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/errors/glob-edge-glob-index.exp.json @@ -0,0 +1,667 @@ +{ + "fields": [ + { + "name": "b", + "references": [ + { + "string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:7:7", + "src": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:0:0-0:24:24", + "edges": [ + { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:7:7", + "src": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_key": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:19:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:14:14", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:15:15-0:19:19", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:21:21-0:24:24", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "b" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "map": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:21:21-0:24:24", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:15:15-0:19:19", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:19:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:14:14", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:15:15-0:19:19", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:7:7", + "src": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:0:0-0:24:24", + "edges": [ + { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:7:7", + "src": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_key": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:19:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:14:14", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:15:15-0:19:19", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:21:21-0:24:24", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:14:14", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:19:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:14:14", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:15:15-0:19:19", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:7:7", + "src": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:0:0-0:24:24", + "edges": [ + { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:7:7", + "src": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_key": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:19:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:14:14", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:15:15-0:19:19", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:21:21-0:24:24", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:7:7", + "src": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:0:0-0:24:24", + "edges": [ + { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:7:7", + "src": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:1:1-0:2:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_key": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:19:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:9:9-0:14:14", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:15:15-0:19:19", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/errors/glob-edge-glob-index.d2,0:21:21-0:24:24", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ] +} diff --git a/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json new file mode 100644 index 000000000..76ba3598f --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json @@ -0,0 +1,3945 @@ +{ + "fields": [ + { + "name": "a", + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:6:13", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:6:20", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "b", + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:6:13", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:6:20", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:6:27", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:6:27", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:6:27", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "name": "c", + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:6:27", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:6:27", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:6:27", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "map": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:6:6", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 1, + "glob": false + }, + "map": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:6:13", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:6:13", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:0:7-1:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,1:5:12-1:6:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 2, + "glob": false + }, + "map": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:6:20", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:6:20", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:0:14-2:1:15", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,2:5:19-2:6:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "c" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "map": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:6:27", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:6:27", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:6:27", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:5:26-3:6:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:0:28-4:27:55", + "edges": [ + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:7:35", + "src": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:1:29-4:2:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:6:34-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:8:36-4:11:39", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:22:50", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + } + ] +} From ff47a00abf404990042797c83ab2b16871ab45cb Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 16:43:22 -0700 Subject: [PATCH 118/138] d2ir: Make globs case insensitive to match the rest of the language note: I personally wish to change the language and make it case sensitive. --- d2ir/pattern.go | 2 +- d2ir/pattern_test.go | 12 ++ .../d2ir/TestCompile/patterns/case.exp.json | 159 ++++++++++++++++++ 3 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 testdata/d2ir/TestCompile/patterns/case.exp.json diff --git a/d2ir/pattern.go b/d2ir/pattern.go index 90773cca3..c2ccf237c 100644 --- a/d2ir/pattern.go +++ b/d2ir/pattern.go @@ -44,7 +44,7 @@ func matchPattern(s string, pattern []string) bool { i++ } } else { - if !strings.HasPrefix(s, pattern[i]) { + if !strings.HasPrefix(strings.ToLower(s), strings.ToLower(pattern[i])) { return false } s = s[len(pattern[i]):] diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index bae678f4a..ff91934d8 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -35,6 +35,18 @@ a*: globbed`) assertQuery(t, m, 0, 0, "globbed", "action") }, }, + { + name: "case", + run: func(t testing.TB) { + m, err := compile(t, `animal: meow +action: yes +A*: globbed`) + assert.Success(t, err) + assertQuery(t, m, 2, 0, nil, "") + assertQuery(t, m, 0, 0, "globbed", "animal") + assertQuery(t, m, 0, 0, "globbed", "action") + }, + }, { name: "suffix", run: func(t testing.TB) { diff --git a/testdata/d2ir/TestCompile/patterns/case.exp.json b/testdata/d2ir/TestCompile/patterns/case.exp.json new file mode 100644 index 000000000..4c0ba1765 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/case.exp.json @@ -0,0 +1,159 @@ +{ + "fields": [ + { + "name": "animal", + "primary": { + "value": { + "range": "TestCompile/patterns/case.d2,2:4:29-2:11:36", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/case.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/case.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/case.d2,0:0:0-0:12:12", + "key": { + "range": "TestCompile/patterns/case.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/case.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "action", + "primary": { + "value": { + "range": "TestCompile/patterns/case.d2,2:4:29-2:11:36", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/case.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/case.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/case.d2,1:0:13-1:11:24", + "key": { + "range": "TestCompile/patterns/case.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/case.d2,1:8:21-1:11:24", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} From 82663f044526524bd23567f742c873b44ec17c43 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 16:45:30 -0700 Subject: [PATCH 119/138] d2ir: Explain EnsureField misnomer --- d2ir/d2ir.go | 1 + 1 file changed, 1 insertion(+) diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 531237b05..53bb5a499 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -653,6 +653,7 @@ func (m *Map) getField(ida []string) *Field { return nil } +// EnsureField is a bit of a misnomer. It's more of a Query/Ensure combination function at this point. func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext, create bool) ([]*Field, error) { i := 0 for kp.Path[i].Unbox().ScalarString() == "_" { From 63efa1216070a31c4d0ee0e3dbd6abd71a93fc47 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 16:54:44 -0700 Subject: [PATCH 120/138] d2ir: Fix globs to not match reserved --- d2ir/compile_test.go | 22 +- d2ir/pattern.go | 3 + d2ir/pattern_test.go | 19 + d2ir/query.go | 10 +- .../TestCompile/patterns/reserved.exp.json | 1686 +++++++++++++++++ 5 files changed, 1729 insertions(+), 11 deletions(-) create mode 100644 testdata/d2ir/TestCompile/patterns/reserved.exp.json diff --git a/d2ir/compile_test.go b/d2ir/compile_test.go index f29b45c27..61b1f49a6 100644 --- a/d2ir/compile_test.go +++ b/d2ir/compile_test.go @@ -85,23 +85,27 @@ func assertQuery(t testing.TB, n d2ir.Node, nfields, nedges int, primary interfa m := n.Map() p := n.Primary() + var na []d2ir.Node if idStr != "" { var err error - n, err = m.Query(idStr) + na, err = m.QueryAll(idStr) assert.Success(t, err) assert.NotEqual(t, n, nil) + } else { + na = append(na, n) + } - p = n.Primary() + for _, n := range na { m = n.Map() + p = n.Primary() + assert.Equal(t, nfields, m.FieldCountRecursive()) + assert.Equal(t, nedges, m.EdgeCountRecursive()) + if !makeScalar(p).Equal(makeScalar(primary)) { + t.Fatalf("expected primary %#v but got %s", primary, p) + } } - assert.Equal(t, nfields, m.FieldCountRecursive()) - assert.Equal(t, nedges, m.EdgeCountRecursive()) - if !makeScalar(p).Equal(makeScalar(primary)) { - t.Fatalf("expected primary %#v but got %s", primary, p) - } - - return n + return na[0] } func makeScalar(v interface{}) *d2ir.Scalar { diff --git a/d2ir/pattern.go b/d2ir/pattern.go index c2ccf237c..8118fb113 100644 --- a/d2ir/pattern.go +++ b/d2ir/pattern.go @@ -31,6 +31,9 @@ func matchPattern(s string, pattern []string) bool { if len(pattern) == 0 { return true } + if _, ok := d2graph.ReservedKeywords[s]; ok { + return false + } for i := 0; i < len(pattern); i++ { if pattern[i] == "*" { diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index ff91934d8..cfecbb7e1 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -193,6 +193,25 @@ shared.animal assertQuery(t, m, 1, 0, nil, "shared.animal.style") }, }, + { + name: "reserved", + run: func(t testing.TB) { + m, err := compile(t, `vars: { + d2-config: { + layout-engine: elk + } +} + +Spiderman 1 +Spiderman 2 +Spiderman 3 + +* -> *: arrow`) + assert.Success(t, err) + assertQuery(t, m, 6, 9, nil, "") + assertQuery(t, m, 0, 0, "arrow", "(* -> *)[*]") + }, + }, } runa(t, tca) diff --git a/d2ir/query.go b/d2ir/query.go index 0f7caddc9..8534d53e5 100644 --- a/d2ir/query.go +++ b/d2ir/query.go @@ -29,8 +29,14 @@ func (m *Map) QueryAll(idStr string) (na []Node, _ error) { } eida := NewEdgeIDs(k) - for _, eid := range eida { - ea := m.GetEdges(eid, nil) + + for i, eid := range eida { + refctx := &RefContext{ + Key: k, + ScopeMap: m, + Edge: k.Edges[i], + } + ea := m.GetEdges(eid, refctx) for _, e := range ea { if k.EdgeKey == nil { na = append(na, e) diff --git a/testdata/d2ir/TestCompile/patterns/reserved.exp.json b/testdata/d2ir/TestCompile/patterns/reserved.exp.json new file mode 100644 index 000000000..091efd0df --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/reserved.exp.json @@ -0,0 +1,1686 @@ +{ + "fields": [ + { + "name": "vars", + "composite": { + "fields": [ + { + "name": "d2-config", + "composite": { + "fields": [ + { + "name": "layout-engine", + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,2:19:42-2:22:45", + "value": [ + { + "string": "elk", + "raw_string": "elk" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "value": [ + { + "string": "layout-engine", + "raw_string": "layout-engine" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "value": [ + { + "string": "layout-engine", + "raw_string": "layout-engine" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:22:45", + "key": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "value": [ + { + "string": "layout-engine", + "raw_string": "layout-engine" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,2:19:42-2:22:45", + "value": [ + { + "string": "elk", + "raw_string": "elk" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-1:11:19", + "value": [ + { + "string": "d2-config", + "raw_string": "d2-config" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-1:11:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-1:11:19", + "value": [ + { + "string": "d2-config", + "raw_string": "d2-config" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-3:3:49", + "key": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-1:11:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-1:11:19", + "value": [ + { + "string": "d2-config", + "raw_string": "d2-config" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/reserved.d2,1:13:21-3:3:49", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:22:45", + "key": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "value": [ + { + "string": "layout-engine", + "raw_string": "layout-engine" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,2:19:42-2:22:45", + "value": [ + { + "string": "elk", + "raw_string": "elk" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/reserved.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/reserved.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/reserved.d2,0:0:0-4:1:51", + "key": { + "range": "TestCompile/patterns/reserved.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/reserved.d2,0:6:6-4:1:51", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-3:3:49", + "key": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-1:11:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-1:11:19", + "value": [ + { + "string": "d2-config", + "raw_string": "d2-config" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/reserved.d2,1:13:21-3:3:49", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:22:45", + "key": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "value": [ + { + "string": "layout-engine", + "raw_string": "layout-engine" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,2:19:42-2:22:45", + "value": [ + { + "string": "elk", + "raw_string": "elk" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "Spiderman 1", + "references": [ + { + "string": { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "value": [ + { + "string": "Spiderman 1", + "raw_string": "Spiderman 1" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "value": [ + { + "string": "Spiderman 1", + "raw_string": "Spiderman 1" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "key": { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "value": [ + { + "string": "Spiderman 1", + "raw_string": "Spiderman 1" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "Spiderman 2", + "references": [ + { + "string": { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "value": [ + { + "string": "Spiderman 2", + "raw_string": "Spiderman 2" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "value": [ + { + "string": "Spiderman 2", + "raw_string": "Spiderman 2" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "key": { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "value": [ + { + "string": "Spiderman 2", + "raw_string": "Spiderman 2" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "Spiderman 3", + "references": [ + { + "string": { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "value": [ + { + "string": "Spiderman 3", + "raw_string": "Spiderman 3" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "value": [ + { + "string": "Spiderman 3", + "raw_string": "Spiderman 3" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "key": { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "value": [ + { + "string": "Spiderman 3", + "raw_string": "Spiderman 3" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "Spiderman 1" + ], + "src_arrow": false, + "dst_path": [ + "Spiderman 1" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", + "edges": [ + { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "Spiderman 1" + ], + "src_arrow": false, + "dst_path": [ + "Spiderman 2" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", + "edges": [ + { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "Spiderman 1" + ], + "src_arrow": false, + "dst_path": [ + "Spiderman 3" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", + "edges": [ + { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "Spiderman 2" + ], + "src_arrow": false, + "dst_path": [ + "Spiderman 1" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", + "edges": [ + { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "Spiderman 2" + ], + "src_arrow": false, + "dst_path": [ + "Spiderman 2" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", + "edges": [ + { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "Spiderman 2" + ], + "src_arrow": false, + "dst_path": [ + "Spiderman 3" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", + "edges": [ + { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "Spiderman 3" + ], + "src_arrow": false, + "dst_path": [ + "Spiderman 1" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", + "edges": [ + { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "Spiderman 3" + ], + "src_arrow": false, + "dst_path": [ + "Spiderman 2" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", + "edges": [ + { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "Spiderman 3" + ], + "src_arrow": false, + "dst_path": [ + "Spiderman 3" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "primary": { + "value": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", + "edges": [ + { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", + "src": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + } + ] + } + ] +} From bd2c94f7a8ea2ec17aa9d1c41473d9dfa4333683 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 21:33:41 -0700 Subject: [PATCH 121/138] d2ir: Make suffix globs case insensitive too --- d2ir/pattern.go | 2 +- d2ir/pattern_test.go | 14 +- .../d2ir/TestCompile/patterns/case/1.exp.json | 159 ++++++++++++++++++ .../d2ir/TestCompile/patterns/case/2.exp.json | 139 +++++++++++++++ 4 files changed, 312 insertions(+), 2 deletions(-) create mode 100644 testdata/d2ir/TestCompile/patterns/case/1.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/case/2.exp.json diff --git a/d2ir/pattern.go b/d2ir/pattern.go index 8118fb113..067f629e0 100644 --- a/d2ir/pattern.go +++ b/d2ir/pattern.go @@ -39,7 +39,7 @@ func matchPattern(s string, pattern []string) bool { if pattern[i] == "*" { // * so match next. if i != len(pattern)-1 { - j := strings.Index(s, pattern[i+1]) + j := strings.Index(strings.ToLower(s), strings.ToLower(pattern[i+1])) if j == -1 { return false } diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index cfecbb7e1..fdcd53af9 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -36,7 +36,7 @@ a*: globbed`) }, }, { - name: "case", + name: "case/1", run: func(t testing.TB) { m, err := compile(t, `animal: meow action: yes @@ -47,6 +47,18 @@ A*: globbed`) assertQuery(t, m, 0, 0, "globbed", "action") }, }, + { + name: "case/2", + run: func(t testing.TB) { + m, err := compile(t, `diddy kong +Donkey Kong +*kong: yes`) + assert.Success(t, err) + assertQuery(t, m, 2, 0, nil, "") + assertQuery(t, m, 0, 0, "yes", "diddy kong") + assertQuery(t, m, 0, 0, "yes", "Donkey Kong") + }, + }, { name: "suffix", run: func(t testing.TB) { diff --git a/testdata/d2ir/TestCompile/patterns/case/1.exp.json b/testdata/d2ir/TestCompile/patterns/case/1.exp.json new file mode 100644 index 000000000..292d5d24e --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/case/1.exp.json @@ -0,0 +1,159 @@ +{ + "fields": [ + { + "name": "animal", + "primary": { + "value": { + "range": "TestCompile/patterns/case/1.d2,2:4:29-2:11:36", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/case/1.d2,0:0:0-0:12:12", + "key": { + "range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/case/1.d2,0:8:8-0:12:12", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + } + } + } + ] + }, + { + "name": "action", + "primary": { + "value": { + "range": "TestCompile/patterns/case/1.d2,2:4:29-2:11:36", + "value": [ + { + "string": "globbed", + "raw_string": "globbed" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/case/1.d2,1:0:13-1:11:24", + "key": { + "range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/case/1.d2,1:8:21-1:11:24", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/case/2.exp.json b/testdata/d2ir/TestCompile/patterns/case/2.exp.json new file mode 100644 index 000000000..283008b8a --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/case/2.exp.json @@ -0,0 +1,139 @@ +{ + "fields": [ + { + "name": "diddy kong", + "primary": { + "value": { + "range": "TestCompile/patterns/case/2.d2,2:7:30-2:10:33", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10", + "value": [ + { + "string": "diddy kong", + "raw_string": "diddy kong" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10", + "value": [ + { + "string": "diddy kong", + "raw_string": "diddy kong" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10", + "key": { + "range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10", + "value": [ + { + "string": "diddy kong", + "raw_string": "diddy kong" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "Donkey Kong", + "primary": { + "value": { + "range": "TestCompile/patterns/case/2.d2,2:7:30-2:10:33", + "value": [ + { + "string": "yes", + "raw_string": "yes" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22", + "value": [ + { + "string": "Donkey Kong", + "raw_string": "Donkey Kong" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22", + "value": [ + { + "string": "Donkey Kong", + "raw_string": "Donkey Kong" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22", + "key": { + "range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22", + "value": [ + { + "string": "Donkey Kong", + "raw_string": "Donkey Kong" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null +} From 73e4e68fb8c6aa2ac5a36bd5b397959b536fd396 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 21:38:27 -0700 Subject: [PATCH 122/138] changelogs/next.md: Update --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index b7032e194..4a15bc469 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -9,6 +9,7 @@ Layout capability also takes a subtle but important step forward: you can now cu - Scale renders and disable fit to screen with `--scale` flag [#1413](https://github.com/terrastruct/d2/pull/1413) - `null` keyword can be used to un-declare. See [docs](https://d2lang.com/tour/overrides#null) [#1446](https://github.com/terrastruct/d2/pull/1446) - Develop multi-board diagrams in watch mode (links to layers/scenarios/steps work in `--watch`) [#1503](https://github.com/terrastruct/d2/pull/1503) +- Glob patterns have been implemented. See [docs](https://d2lang.com/tour/globs). [#1479](https://github.com/terrastruct/d2/pull/1479) #### Improvements 🧹 From 9c37d6dcfb0499e31218a17e13a8e0783c8f6137 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sun, 30 Jul 2023 01:15:34 -0700 Subject: [PATCH 123/138] d2ir: Make globs more ergonomic in two specific edge cases Were identified from @alixander writing documentation. --- d2ir/compile_test.go | 4 + d2ir/d2ir.go | 25 + d2ir/pattern_test.go | 47 +- .../double-glob/edge-no-container.exp.json | 1161 +++++++++++++++++ .../TestCompile/patterns/edge-nexus.exp.json | 779 +++++++++++ .../d2ir/TestCompile/patterns/edge/1.exp.json | 234 ---- .../d2ir/TestCompile/patterns/edge/2.exp.json | 274 ---- .../d2ir/TestCompile/patterns/edge/3.exp.json | 354 ----- .../TestCompile/patterns/reserved.exp.json | 402 ------ 9 files changed, 2009 insertions(+), 1271 deletions(-) create mode 100644 testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json diff --git a/d2ir/compile_test.go b/d2ir/compile_test.go index 61b1f49a6..64d16ad8d 100644 --- a/d2ir/compile_test.go +++ b/d2ir/compile_test.go @@ -105,6 +105,10 @@ func assertQuery(t testing.TB, n d2ir.Node, nfields, nedges int, primary interfa } } + if len(na) == 0 { + return nil + } + return na[0] } diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 53bb5a499..531eaea56 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -587,6 +587,19 @@ func (m *Map) FieldCountRecursive() int { return acc } +func (m *Map) IsContainer() bool { + if m == nil { + return false + } + for _, f := range m.Fields { + _, isReserved := d2graph.ReservedKeywords[f.Name] + if !isReserved { + return true + } + } + return false +} + func (m *Map) EdgeCountRecursive() int { if m == nil { return 0 @@ -1066,6 +1079,18 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { for _, src := range srcFA { for _, dst := range dstFA { + if src == dst && (len(srcFA) > 1 || len(dstFA) > 1) { + // Globs do not make self edges. + continue + } + + // If either has a double glob at the end we only select leafs, those without children. + if srcKP.Path[len(srcKP.Path)-1].ScalarString() == "**" || dstKP.Path[len(dstKP.Path)-1].ScalarString() == "**" { + if src.Map().IsContainer() || dst.Map().IsContainer() { + continue + } + } + eid2 := eid.Copy() eid2.SrcPath = RelIDA(m, src) eid2.DstPath = RelIDA(m, dst) diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index fdcd53af9..2d701a568 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -126,7 +126,7 @@ a*n*t*.constant.t*ink*r*t*inke*: globbed`) animal an* -> an*`) assert.Success(t, err) - assertQuery(t, m, 2, 4, nil, "") + assertQuery(t, m, 2, 2, nil, "") assertQuery(t, m, 0, 0, nil, "(animate -> animal)[0]") assertQuery(t, m, 0, 0, nil, "(animal -> animal)[0]") }, @@ -138,10 +138,10 @@ an* -> an*`) shared.animal sh*.(an* -> an*)`) assert.Success(t, err) - assertQuery(t, m, 3, 4, nil, "") - assertQuery(t, m, 2, 4, nil, "shared") + assertQuery(t, m, 3, 2, nil, "") + assertQuery(t, m, 2, 2, nil, "shared") assertQuery(t, m, 0, 0, nil, "shared.(animate -> animal)[0]") - assertQuery(t, m, 0, 0, nil, "shared.(animal -> animal)[0]") + assertQuery(t, m, 0, 0, nil, "shared.(animal -> animate)[0]") }, }, { @@ -151,8 +151,8 @@ sh*.(an* -> an*)`) shared.animal sh*.an* -> sh*.an*`) assert.Success(t, err) - assertQuery(t, m, 3, 4, nil, "") - assertQuery(t, m, 2, 4, nil, "shared") + assertQuery(t, m, 3, 2, nil, "") + assertQuery(t, m, 2, 2, nil, "shared") assertQuery(t, m, 0, 0, nil, "shared.(animate -> animal)[0]") assertQuery(t, m, 0, 0, nil, "shared.(animal -> animal)[0]") }, @@ -189,6 +189,23 @@ c -> b assertQuery(t, m, 0, 0, "red", "(c -> b)[0].style.fill") }, }, + { + name: "edge-nexus", + run: func(t testing.TB) { + m, err := compile(t, `a +b +c +d +* -> nexus +`) + assert.Success(t, err) + assertQuery(t, m, 5, 4, nil, "") + assertQuery(t, m, 0, 0, nil, "(a -> nexus)[0]") + assertQuery(t, m, 0, 0, nil, "(b -> nexus)[0]") + assertQuery(t, m, 0, 0, nil, "(c -> nexus)[0]") + assertQuery(t, m, 0, 0, nil, "(d -> nexus)[0]") + }, + }, { name: "double-glob/1", run: func(t testing.TB) { @@ -205,6 +222,22 @@ shared.animal assertQuery(t, m, 1, 0, nil, "shared.animal.style") }, }, + { + name: "double-glob/edge-no-container", + run: func(t testing.TB) { + m, err := compile(t, `zone A: { + machine A + machine B: { + submachine A + submachine B + } +} +zone A.** -> load balancer +`) + assert.Success(t, err) + assertQuery(t, m, 6, 3, nil, "") + }, + }, { name: "reserved", run: func(t testing.TB) { @@ -220,7 +253,7 @@ Spiderman 3 * -> *: arrow`) assert.Success(t, err) - assertQuery(t, m, 6, 9, nil, "") + assertQuery(t, m, 6, 6, nil, "") assertQuery(t, m, 0, 0, "arrow", "(* -> *)[*]") }, }, diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json new file mode 100644 index 000000000..9e115779c --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json @@ -0,0 +1,1161 @@ +{ + "fields": [ + { + "name": "zone A", + "composite": { + "fields": [ + { + "name": "machine A", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "value": [ + { + "string": "machine A", + "raw_string": "machine A" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "value": [ + { + "string": "machine A", + "raw_string": "machine A" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "value": [ + { + "string": "machine A", + "raw_string": "machine A" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "machine B", + "composite": { + "fields": [ + { + "name": "submachine A", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "value": [ + { + "string": "submachine A", + "raw_string": "submachine A" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "value": [ + { + "string": "submachine A", + "raw_string": "submachine A" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "value": [ + { + "string": "submachine A", + "raw_string": "submachine A" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "submachine B", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "value": [ + { + "string": "submachine B", + "raw_string": "submachine B" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "value": [ + { + "string": "submachine B", + "raw_string": "submachine B" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "value": [ + { + "string": "submachine B", + "raw_string": "submachine B" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "value": [ + { + "string": "machine B", + "raw_string": "machine B" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "value": [ + { + "string": "machine B", + "raw_string": "machine B" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-5:2:67", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "value": [ + { + "string": "machine B", + "raw_string": "machine B" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:12:33-5:2:67", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "value": [ + { + "string": "submachine A", + "raw_string": "submachine A" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "value": [ + { + "string": "submachine B", + "raw_string": "submachine B" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-6:1:69", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:8:8-6:1:69", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "value": [ + { + "string": "machine A", + "raw_string": "machine A" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-5:2:67", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "value": [ + { + "string": "machine B", + "raw_string": "machine B" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:12:33-5:2:67", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "value": [ + { + "string": "submachine A", + "raw_string": "submachine A" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "value": [ + { + "string": "submachine B", + "raw_string": "submachine B" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "load balancer", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "zone A", + "machine A" + ], + "src_arrow": false, + "dst_path": [ + "load balancer" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "zone A", + "machine B", + "submachine A" + ], + "src_arrow": false, + "dst_path": [ + "load balancer" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "zone A", + "machine B", + "submachine B" + ], + "src_arrow": false, + "dst_path": [ + "load balancer" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:26:96", + "src": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:9:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:0:70-7:6:76", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:7:77-7:9:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ] +} diff --git a/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json new file mode 100644 index 000000000..ee685d494 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json @@ -0,0 +1,779 @@ +{ + "fields": [ + { + "name": "a", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-nexus.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-nexus.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,0:0:0-0:1:1", + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "b", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-nexus.d2,1:0:2-1:1:3", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-nexus.d2,1:0:2-1:1:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,1:0:2-1:1:3", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,1:0:2-1:1:3", + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,1:0:2-1:1:3", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,1:0:2-1:1:3", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "c", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-nexus.d2,2:0:4-2:1:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-nexus.d2,2:0:4-2:1:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,2:0:4-2:1:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,2:0:4-2:1:5", + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,2:0:4-2:1:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,2:0:4-2:1:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "d", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-nexus.d2,3:0:6-3:1:7", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-nexus.d2,3:0:6-3:1:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,3:0:6-3:1:7", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,3:0:6-3:1:7", + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,3:0:6-3:1:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,3:0:6-3:1:7", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "nexus", + "references": [ + { + "string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "edges": [ + { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "nexus" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "edges": [ + { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "b" + ], + "src_arrow": false, + "dst_path": [ + "nexus" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "edges": [ + { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "c" + ], + "src_arrow": false, + "dst_path": [ + "nexus" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "edges": [ + { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "d" + ], + "src_arrow": false, + "dst_path": [ + "nexus" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "edges": [ + { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:10:18", + "src": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:0:8-4:1:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ] +} diff --git a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json index 6e38e272d..087072d2d 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json @@ -114,123 +114,6 @@ } ], "edges": [ - { - "edge_id": { - "src_path": [ - "animate" - ], - "src_arrow": false, - "dst_path": [ - "animate" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", - "src": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", - "edges": [ - { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", - "src": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - } - ] - }, { "edge_id": { "src_path": [ @@ -464,123 +347,6 @@ } } ] - }, - { - "edge_id": { - "src_path": [ - "animal" - ], - "src_arrow": false, - "dst_path": [ - "animal" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", - "src": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", - "edges": [ - { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:10:25", - "src": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/1.d2,2:0:15-2:3:18", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/1.d2,2:7:22-2:10:25", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - } - ] } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json index 95a956c07..016f524db 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json @@ -162,143 +162,6 @@ } ], "edges": [ - { - "edge_id": { - "src_path": [ - "animate" - ], - "src_arrow": false, - "dst_path": [ - "animate" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", - "src": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:16:45", - "key": { - "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", - "src": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - } - ] - }, { "edge_id": { "src_path": [ @@ -572,143 +435,6 @@ } } ] - }, - { - "edge_id": { - "src_path": [ - "animal" - ], - "src_arrow": false, - "dst_path": [ - "animal" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", - "src": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:16:45", - "key": { - "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:0:29-2:3:32", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:15:44", - "src": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:5:34-2:8:37", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/2.d2,2:12:41-2:15:44", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - } - ] } ] }, diff --git a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json index 3316812a8..a6a0200bc 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json @@ -162,183 +162,6 @@ } ], "edges": [ - { - "edge_id": { - "src_path": [ - "animate" - ], - "src_arrow": false, - "dst_path": [ - "animate" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", - "src": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", - "edges": [ - { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", - "src": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - } - ] - }, { "edge_id": { "src_path": [ @@ -692,183 +515,6 @@ } } ] - }, - { - "edge_id": { - "src_path": [ - "animal" - ], - "src_arrow": false, - "dst_path": [ - "animal" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", - "src": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", - "edges": [ - { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:18:47", - "src": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:7:36", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:0:29-2:3:32", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:4:33-2:7:36", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:18:47", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:11:40-2:14:43", - "value": [ - { - "string": "sh*", - "raw_string": "sh*" - } - ], - "pattern": [ - "sh", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge/3.d2,2:15:44-2:18:47", - "value": [ - { - "string": "an*", - "raw_string": "an*" - } - ], - "pattern": [ - "an", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - } - ] } ] }, diff --git a/testdata/d2ir/TestCompile/patterns/reserved.exp.json b/testdata/d2ir/TestCompile/patterns/reserved.exp.json index 091efd0df..01fb1938f 100644 --- a/testdata/d2ir/TestCompile/patterns/reserved.exp.json +++ b/testdata/d2ir/TestCompile/patterns/reserved.exp.json @@ -476,140 +476,6 @@ } ], "edges": [ - { - "edge_id": { - "src_path": [ - "Spiderman 1" - ], - "src_arrow": false, - "dst_path": [ - "Spiderman 1" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "primary": { - "value": { - "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", - "value": [ - { - "string": "arrow", - "raw_string": "arrow" - } - ] - } - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", - "src": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", - "edges": [ - { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", - "src": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", - "value": [ - { - "string": "arrow", - "raw_string": "arrow" - } - ] - } - } - } - } - } - ] - }, { "edge_id": { "src_path": [ @@ -1012,140 +878,6 @@ } ] }, - { - "edge_id": { - "src_path": [ - "Spiderman 2" - ], - "src_arrow": false, - "dst_path": [ - "Spiderman 2" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "primary": { - "value": { - "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", - "value": [ - { - "string": "arrow", - "raw_string": "arrow" - } - ] - } - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", - "src": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", - "edges": [ - { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", - "src": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", - "value": [ - { - "string": "arrow", - "raw_string": "arrow" - } - ] - } - } - } - } - } - ] - }, { "edge_id": { "src_path": [ @@ -1547,140 +1279,6 @@ } } ] - }, - { - "edge_id": { - "src_path": [ - "Spiderman 3" - ], - "src_arrow": false, - "dst_path": [ - "Spiderman 3" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "primary": { - "value": { - "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", - "value": [ - { - "string": "arrow", - "raw_string": "arrow" - } - ] - } - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", - "src": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:13:103", - "edges": [ - { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:6:96", - "src": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:0:90-10:1:91", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:5:95-10:6:96", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/reserved.d2,10:8:98-10:13:103", - "value": [ - { - "string": "arrow", - "raw_string": "arrow" - } - ] - } - } - } - } - } - ] } ] } From 6fdf4b07a5b217a3aabcc7c90b350c6020f8298a Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sun, 30 Jul 2023 03:15:33 -0700 Subject: [PATCH 124/138] d2ir: Make double globs work sanely across boards See test. --- d2ast/d2ast.go | 9 + d2ir/d2ir.go | 8 +- d2ir/pattern.go | 4 +- d2ir/pattern_test.go | 28 + .../layers/errs/3/bad_edge.exp.json | 1375 ++++++ .../TestCompile/patterns/scenarios.exp.json | 3863 +++++++++++++++++ 6 files changed, 5284 insertions(+), 3 deletions(-) create mode 100644 testdata/d2ir/TestCompile/layers/errs/3/bad_edge.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/scenarios.exp.json diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 83ee1b54b..79c256b2c 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -747,6 +747,15 @@ func (kp *KeyPath) Copy() *KeyPath { return &kp2 } +func (kp *KeyPath) HasDoubleGlob() bool { + for _, el := range kp.Path { + if el.ScalarString() == "**" { + return true + } + } + return false +} + type Edge struct { Range Range `json:"range"` diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 531eaea56..e542394fd 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -1084,11 +1084,15 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { continue } - // If either has a double glob at the end we only select leafs, those without children. - if srcKP.Path[len(srcKP.Path)-1].ScalarString() == "**" || dstKP.Path[len(dstKP.Path)-1].ScalarString() == "**" { + if srcKP.HasDoubleGlob() || dstKP.HasDoubleGlob() { + // If either has a double glob we only select leafs, those without children. if src.Map().IsContainer() || dst.Map().IsContainer() { continue } + // If either has a double glob we ignore connections across boards + if ParentBoard(src) != ParentBoard(dst) { + continue + } } eid2 := eid.Copy() diff --git a/d2ir/pattern.go b/d2ir/pattern.go index 067f629e0..9409e0363 100644 --- a/d2ir/pattern.go +++ b/d2ir/pattern.go @@ -18,7 +18,9 @@ func (m *Map) doubleGlob(pattern []string) ([]*Field, bool) { func (m *Map) _doubleGlob(fa *[]*Field) { for _, f := range m.Fields { if _, ok := d2graph.ReservedKeywords[f.Name]; ok { - continue + if _, ok := d2graph.BoardKeywords[f.Name]; !ok { + continue + } } *fa = append(*fa, f) if f.Map() != nil { diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index 2d701a568..b291e2c43 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -257,6 +257,34 @@ Spiderman 3 assertQuery(t, m, 0, 0, "arrow", "(* -> *)[*]") }, }, + { + name: "scenarios", + run: func(t testing.TB) { + m, err := compile(t, ` + +scenarios: { + meow: { + e + f + g + h + } +} + +a +b +c +d + +**: something +** -> ** +`) + assert.Success(t, err) + assertQuery(t, m, 10, 24, nil, "") + assertQuery(t, m, 0, 0, "something", "**") + assertQuery(t, m, 0, 0, nil, "(* -> *)[*]") + }, + }, } runa(t, tca) diff --git a/testdata/d2ir/TestCompile/layers/errs/3/bad_edge.exp.json b/testdata/d2ir/TestCompile/layers/errs/3/bad_edge.exp.json new file mode 100644 index 000000000..5cd2e210c --- /dev/null +++ b/testdata/d2ir/TestCompile/layers/errs/3/bad_edge.exp.json @@ -0,0 +1,1375 @@ +{ + "fields": [ + { + "name": "layers", + "composite": { + "fields": [ + { + "name": "x", + "composite": { + "fields": [ + { + "name": "y", + "references": [ + { + "string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "edges": [ + { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "edges": [ + { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "edges": [ + { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "steps", + "composite": { + "fields": [ + { + "name": "z", + "composite": { + "fields": [ + { + "name": "p", + "references": [ + { + "string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "edges": [ + { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "edges": [ + { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, + "key_path": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "edges": [ + { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:23:23", + "src": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:23:23", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:14:14-0:19:19", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:20:20-0:21:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/layers/errs/3/bad_edge.d2,0:22:22-0:23:23", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/scenarios.exp.json b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json new file mode 100644 index 000000000..4fdd38d3b --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json @@ -0,0 +1,3863 @@ +{ + "fields": [ + { + "name": "scenarios", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "composite": { + "fields": [ + { + "name": "meow", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "composite": { + "fields": [ + { + "name": "e", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "key": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "f", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "key": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "g", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "key": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "h", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "key": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-3:6:21", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-3:6:21", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-3:6:21", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-8:3:40", + "key": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-3:6:21", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-3:6:21", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/scenarios.d2,3:8:23-8:3:40", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "key": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "key": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "key": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "key": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,2:0:2-2:9:11", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,2:0:2-2:9:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,2:0:2-2:9:11", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,2:0:2-9:1:42", + "key": { + "range": "TestCompile/patterns/scenarios.d2,2:0:2-2:9:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,2:0:2-2:9:11", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/scenarios.d2,2:11:13-9:1:42", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-8:3:40", + "key": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-3:6:21", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-3:6:21", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/scenarios.d2,3:8:23-8:3:40", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "key": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "key": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "key": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "key": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "a", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "key": { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "b", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "key": { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "c", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "key": { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "d", + "primary": { + "value": { + "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", + "value": [ + { + "string": "something", + "raw_string": "something" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "key": { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "e" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "f" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "e" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "g" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "e" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "h" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "f" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "e" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "f" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "g" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "f" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "h" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "g" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "e" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "g" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "f" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "g" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "h" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "h" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "e" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "h" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "f" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "scenarios", + "meow", + "h" + ], + "src_arrow": false, + "dst_path": [ + "scenarios", + "meow", + "g" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "c" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "d" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "b" + ], + "src_arrow": false, + "dst_path": [ + "a" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "b" + ], + "src_arrow": false, + "dst_path": [ + "c" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "b" + ], + "src_arrow": false, + "dst_path": [ + "d" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "c" + ], + "src_arrow": false, + "dst_path": [ + "a" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "c" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "c" + ], + "src_arrow": false, + "dst_path": [ + "d" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "d" + ], + "src_arrow": false, + "dst_path": [ + "a" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "d" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "d" + ], + "src_arrow": false, + "dst_path": [ + "c" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "edges": [ + { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:8:75", + "src": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:0:67-17:2:69", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/scenarios.d2,17:6:73-17:8:75", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ] +} From 6ca36e6b0c0ede659bd80306830e3ce8574a63b2 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sun, 30 Jul 2023 12:41:15 -0700 Subject: [PATCH 125/138] d2ir: Glob review fixes --- d2ast/d2ast.go | 11 +- d2ir/compile.go | 12 +- d2ir/d2ir.go | 76 +- d2ir/pattern_test.go | 29 + .../patterns/double-glob/edge/1.exp.json | 811 ++++++++++++++++++ .../patterns/double-glob/edge/2.exp.json | 511 +++++++++++ 6 files changed, 1381 insertions(+), 69 deletions(-) create mode 100644 testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 79c256b2c..6b6f47389 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -749,7 +749,16 @@ func (kp *KeyPath) Copy() *KeyPath { func (kp *KeyPath) HasDoubleGlob() bool { for _, el := range kp.Path { - if el.ScalarString() == "**" { + if el.UnquotedString != nil && el.ScalarString() == "**" { + return true + } + } + return false +} + +func (kp *KeyPath) HasGlob() bool { + for _, el := range kp.Path { + if el.UnquotedString != nil && len(el.UnquotedString.Pattern) > 0 { return true } } diff --git a/d2ir/compile.go b/d2ir/compile.go index c2bff5f55..43763139d 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -661,17 +661,7 @@ func (c *compiler) _compileEdges(refctx *RefContext) { refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Dst, refctx) } } else { - _, err := refctx.ScopeMap.EnsureField(refctx.Edge.Src, refctx, true) - if err != nil { - c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) - continue - } - _, err = refctx.ScopeMap.EnsureField(refctx.Edge.Dst, refctx, true) - if err != nil { - c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) - continue - } - + var err error ea, err = refctx.ScopeMap.CreateEdge(eid, refctx) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index e542394fd..4550a9857 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -935,34 +935,11 @@ func (m *Map) getEdges(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { return nil } - srcKP := d2ast.MakeKeyPath(eid.SrcPath) - lastMatch := 0 - for i, el := range srcKP.Path { - for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { - realEl := refctx.Edge.Src.Path[j] - if el.ScalarString() == realEl.ScalarString() { - srcKP.Path[i] = realEl - lastMatch += j + 1 - } - } - } - dstKP := d2ast.MakeKeyPath(eid.DstPath) - lastMatch = 0 - for i, el := range dstKP.Path { - for j := lastMatch; j < len(refctx.Edge.Dst.Path); j++ { - realEl := refctx.Edge.Dst.Path[j] - if el.ScalarString() == realEl.ScalarString() { - dstKP.Path[i] = realEl - lastMatch += j + 1 - } - } - } - - srcFA, err := m.EnsureField(srcKP, nil, false) + srcFA, err := refctx.ScopeMap.EnsureField(refctx.Edge.Src, nil, false) if err != nil { return err } - dstFA, err := m.EnsureField(dstKP, nil, false) + dstFA, err := refctx.ScopeMap.EnsureField(refctx.Edge.Dst, nil, false) if err != nil { return err } @@ -1045,51 +1022,36 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { return d2parser.Errorf(refctx.Edge.Dst.Path[ij].Unbox(), "edge with board keyword alone doesn't make sense") } - srcKP := d2ast.MakeKeyPath(eid.SrcPath) - lastMatch := 0 - for i, el := range srcKP.Path { - for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { - realEl := refctx.Edge.Src.Path[j] - if el.ScalarString() == realEl.ScalarString() { - srcKP.Path[i] = realEl - lastMatch += j + 1 - } - } - } - dstKP := d2ast.MakeKeyPath(eid.DstPath) - lastMatch = 0 - for i, el := range dstKP.Path { - for j := lastMatch; j < len(refctx.Edge.Dst.Path); j++ { - realEl := refctx.Edge.Dst.Path[j] - if el.ScalarString() == realEl.ScalarString() { - dstKP.Path[i] = realEl - lastMatch += j + 1 - } - } - } - - srcFA, err := m.EnsureField(srcKP, nil, true) + srcFA, err := refctx.ScopeMap.EnsureField(refctx.Edge.Src, refctx, true) if err != nil { return err } - dstFA, err := m.EnsureField(dstKP, nil, true) + dstFA, err := refctx.ScopeMap.EnsureField(refctx.Edge.Dst, refctx, true) if err != nil { return err } for _, src := range srcFA { for _, dst := range dstFA { - if src == dst && (len(srcFA) > 1 || len(dstFA) > 1) { + if src == dst && (refctx.Edge.Src.HasGlob() || refctx.Edge.Dst.HasGlob()) { // Globs do not make self edges. continue } - if srcKP.HasDoubleGlob() || dstKP.HasDoubleGlob() { - // If either has a double glob we only select leafs, those without children. - if src.Map().IsContainer() || dst.Map().IsContainer() { + if refctx.Edge.Src.HasDoubleGlob() { + // If src has a double glob we only select leafs, those without children. + if src.Map().IsContainer() { + continue + } + if ParentBoard(src) != ParentBoard(dst) { + continue + } + } + if refctx.Edge.Dst.HasDoubleGlob() { + // If dst has a double glob we only select leafs, those without children. + if dst.Map().IsContainer() { continue } - // If either has a double glob we ignore connections across boards if ParentBoard(src) != ParentBoard(dst) { continue } @@ -1121,7 +1083,7 @@ func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, src, dst *Field) (*Ed eid.Index = nil eid.Glob = true - ea := m.GetEdges(eid, refctx) + ea := m.GetEdges(eid, nil) index := len(ea) eid.Index = &index eid.Glob = false @@ -1400,7 +1362,7 @@ func IDA(n Node) (ida []string) { } } -// RelIDA returns the absolute path to n relative to p. +// RelIDA returns the path to n relative to p. func RelIDA(p, n Node) (ida []string) { for { f, ok := n.(*Field) diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index b291e2c43..aabd8be58 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -285,6 +285,35 @@ d assertQuery(t, m, 0, 0, nil, "(* -> *)[*]") }, }, + { + name: "double-glob/edge/1", + run: func(t testing.TB) { + m, err := compile(t, `fast: { + a + far +} + +task: { + a +} + +task.** -> fast +`) + assert.Success(t, err) + assertQuery(t, m, 5, 1, nil, "") + }, + }, + { + name: "double-glob/edge/2", + run: func(t testing.TB) { + m, err := compile(t, `a + +**.b -> c +`) + assert.Success(t, err) + assertQuery(t, m, 3, 1, nil, "") + }, + }, } runa(t, tca) diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json new file mode 100644 index 000000000..209501268 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json @@ -0,0 +1,811 @@ +{ + "fields": [ + { + "name": "fast", + "composite": { + "fields": [ + { + "name": "a", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "far", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "value": [ + { + "string": "far", + "raw_string": "far" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "value": [ + { + "string": "far", + "raw_string": "far" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "value": [ + { + "string": "far", + "raw_string": "far" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:0:0-0:4:4", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:0:0-0:4:4", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:0:0-3:1:19", + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:0:0-0:4:4", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:6:6-3:1:19", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "value": [ + { + "string": "far", + "raw_string": "far" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:15:51", + "src": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:7:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:4:40", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:5:41-9:7:43", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:15:51", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:15:51", + "src": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:7:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:4:40", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:5:41-9:7:43", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "task", + "composite": { + "fields": [ + { + "name": "a", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:0:21-5:4:25", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:0:21-5:4:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:0:21-5:4:25", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:0:21-7:1:34", + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:0:21-5:4:25", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:0:21-5:4:25", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:6:27-7:1:34", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:4:40", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:7:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:4:40", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:5:41-9:7:43", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:15:51", + "src": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:7:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:4:40", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:5:41-9:7:43", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:15:51", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:15:51", + "src": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:7:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:4:40", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:5:41-9:7:43", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "task", + "a" + ], + "src_arrow": false, + "dst_path": [ + "fast" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:15:51", + "src": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:7:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:4:40", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:5:41-9:7:43", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:15:51", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:15:51", + "src": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:7:43", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:0:36-9:4:40", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:5:41-9:7:43", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,9:11:47-9:15:51", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ] +} diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json new file mode 100644 index 000000000..ec8c116c4 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json @@ -0,0 +1,511 @@ +{ + "fields": [ + { + "name": "a", + "composite": { + "fields": [ + { + "name": "b", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:4:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:2:5", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:9:12", + "src": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:4:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:2:5", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:9:12", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:9:12", + "src": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:4:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:2:5", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,0:0:0-0:1:1", + "key": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + } + ] + }, + { + "name": "c", + "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:9:12", + "src": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:4:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:2:5", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:9:12", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:9:12", + "src": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:4:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:2:5", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "a", + "b" + ], + "src_arrow": false, + "dst_path": [ + "c" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:9:12", + "src": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:4:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:2:5", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:9:12", + "edges": [ + { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:9:12", + "src": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:4:7", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:0:3-2:2:5", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ] +} From 0002817b0a9621741195d49dc4661acbfb9baf05 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 15:09:29 -0700 Subject: [PATCH 126/138] d2ir: Implement ampersand filters --- d2ast/d2ast.go | 2 +- d2ir/compile.go | 25 + d2ir/compile_test.go | 1 + d2ir/filter_test.go | 36 + .../d2ir/TestCompile/filters/escaped.exp.json | 637 ++++++++++++++++++ 5 files changed, 700 insertions(+), 1 deletion(-) create mode 100644 d2ir/filter_test.go create mode 100644 testdata/d2ir/TestCompile/filters/escaped.exp.json diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 6b6f47389..102429b7a 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -610,7 +610,7 @@ func (m *Map) IsFileMap() bool { type Key struct { Range Range `json:"range"` - // Indicates this MapKey is an override selector. + // Indicates this MapKey is a filter selector. Ampersand bool `json:"ampersand,omitempty"` // At least one of Key and Edges will be set but all four can also be set. diff --git a/d2ir/compile.go b/d2ir/compile.go index 43763139d..c422eaa79 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -408,6 +408,31 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } func (c *compiler) _compileField(f *Field, refctx *RefContext) { + if refctx.Key.Ampersand { + f2 := ParentMap(f).Map().GetField(refctx.Key.Key.IDA()...) + if f2 == nil { + return + } + if refctx.Key.Primary.Unbox() != nil { + if f2.Primary_ == nil { + return + } + if refctx.Key.Primary.Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { + return + } + } + if refctx.Key.Value.ScalarBox().Unbox() != nil { + if f2.Primary_ == nil { + return + } + if refctx.Key.Value.ScalarBox().Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { + println(refctx.Key.Value.ScalarBox().Unbox().ScalarString()) + println(f2.Primary_.Value.ScalarString()) + return + } + } + } + if len(refctx.Key.Edges) == 0 && refctx.Key.Value.Null != nil { // For vars, if we delete the field, it may just resolve to an outer scope var of the same name // Instead we keep it around, so that resolveSubstitutions can find it diff --git a/d2ir/compile_test.go b/d2ir/compile_test.go index 64d16ad8d..9fc96b228 100644 --- a/d2ir/compile_test.go +++ b/d2ir/compile_test.go @@ -27,6 +27,7 @@ func TestCompile(t *testing.T) { t.Run("steps", testCompileSteps) t.Run("imports", testCompileImports) t.Run("patterns", testCompilePatterns) + t.Run("filters", testCompileFilters) } type testCase struct { diff --git a/d2ir/filter_test.go b/d2ir/filter_test.go new file mode 100644 index 000000000..9ba4c3559 --- /dev/null +++ b/d2ir/filter_test.go @@ -0,0 +1,36 @@ +package d2ir_test + +import ( + "testing" + + "oss.terrastruct.com/util-go/assert" +) + +func testCompileFilters(t *testing.T) { + t.Parallel() + + tca := []testCase{ + { + name: "escaped", + run: func(t testing.TB) { + m, err := compile(t, `jacob: { + shape: circle +} +jeremy: { + shape: rectangle +} +*: { + &shape: rectangle + label: I'm a rectangle +}`) + assert.Success(t, err) + t.Log(m.String()) + assertQuery(t, m, 1, 0, nil, "jacob") + assertQuery(t, m, 2, 0, "", "jeremy") + assertQuery(t, m, 0, 0, "I'm a rectangle", "jeremy.label") + }, + }, + } + + runa(t, tca) +} diff --git a/testdata/d2ir/TestCompile/filters/escaped.exp.json b/testdata/d2ir/TestCompile/filters/escaped.exp.json new file mode 100644 index 000000000..6553327a5 --- /dev/null +++ b/testdata/d2ir/TestCompile/filters/escaped.exp.json @@ -0,0 +1,637 @@ +{ + "fields": [ + { + "name": "jacob", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/escaped.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/escaped.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/escaped.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/escaped.d2,1:1:10-1:14:23", + "key": { + "range": "TestCompile/filters/escaped.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/escaped.d2,7:1:62-7:18:79", + "ampersand": true, + "key": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + } + ] + }, + { + "name": "label", + "primary": { + "value": { + "range": "TestCompile/filters/escaped.d2,8:8:88-8:23:103", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:23:103", + "key": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,8:8:88-8:23:103", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/escaped.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/escaped.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/escaped.d2,0:0:0-2:1:25", + "key": { + "range": "TestCompile/filters/escaped.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/escaped.d2,0:7:7-2:1:25", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/escaped.d2,1:1:10-1:14:23", + "key": { + "range": "TestCompile/filters/escaped.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "jeremy", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/escaped.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/escaped.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/escaped.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/escaped.d2,4:1:37-4:17:53", + "key": { + "range": "TestCompile/filters/escaped.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,4:8:44-4:17:53", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/escaped.d2,7:1:62-7:18:79", + "ampersand": true, + "key": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + } + ] + }, + { + "name": "label", + "primary": { + "value": { + "range": "TestCompile/filters/escaped.d2,8:8:88-8:23:103", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:23:103", + "key": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,8:8:88-8:23:103", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/escaped.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/escaped.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/escaped.d2,3:0:26-5:1:55", + "key": { + "range": "TestCompile/filters/escaped.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/escaped.d2,3:8:34-5:1:55", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/escaped.d2,4:1:37-4:17:53", + "key": { + "range": "TestCompile/filters/escaped.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/escaped.d2,4:8:44-4:17:53", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} From 43166110b89dc537638f6e3be0fcac633abf5664 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 16:32:30 -0700 Subject: [PATCH 127/138] d2ir: Add single field filtering See test. --- d2ir/compile.go | 81 ++- d2ir/filter_test.go | 24 +- .../d2ir/TestCompile/filters/base#01.exp.json | 560 ++++++++++++++++ .../d2ir/TestCompile/filters/base.exp.json | 622 ++++++++++++++++++ .../d2ir/TestCompile/filters/escaped.exp.json | 77 --- .../d2ir/TestCompile/filters/order.exp.json | 622 ++++++++++++++++++ 6 files changed, 1885 insertions(+), 101 deletions(-) create mode 100644 testdata/d2ir/TestCompile/filters/base#01.exp.json create mode 100644 testdata/d2ir/TestCompile/filters/base.exp.json create mode 100644 testdata/d2ir/TestCompile/filters/order.exp.json diff --git a/d2ir/compile.go b/d2ir/compile.go index c422eaa79..b2e4752b0 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -344,6 +344,20 @@ func (c *compiler) overlay(base *Map, f *Field) { } func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { + for _, n := range ast.Nodes { + switch { + case n.MapKey != nil: + ok := c.ampersandFilter(&RefContext{ + Key: n.MapKey, + Scope: ast, + ScopeMap: dst, + ScopeAST: scopeAST, + }) + if !ok { + return + } + } + } for _, n := range ast.Nodes { switch { case n.MapKey != nil: @@ -407,32 +421,57 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } } -func (c *compiler) _compileField(f *Field, refctx *RefContext) { - if refctx.Key.Ampersand { - f2 := ParentMap(f).Map().GetField(refctx.Key.Key.IDA()...) - if f2 == nil { - return +func (c *compiler) ampersandFilter(refctx *RefContext) bool { + if !refctx.Key.Ampersand { + return true + } + if len(refctx.Key.Edges) > 0 { + return true + } + + fa, err := refctx.ScopeMap.EnsureField(refctx.Key.Key, refctx, false) + if err != nil { + c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) + return false + } + if len(fa) == 0 { + return false + } + for _, f := range fa { + ok := c._ampersandFilter(f, refctx) + if !ok { + return false } - if refctx.Key.Primary.Unbox() != nil { - if f2.Primary_ == nil { - return - } - if refctx.Key.Primary.Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { - return - } + } + return true +} + +func (c *compiler) _ampersandFilter(f *Field, refctx *RefContext) bool { + f2 := ParentMap(f).Map().GetField(refctx.Key.Key.IDA()...) + if f2 == nil { + return false + } + if refctx.Key.Primary.Unbox() != nil { + if f2.Primary_ == nil { + return false } - if refctx.Key.Value.ScalarBox().Unbox() != nil { - if f2.Primary_ == nil { - return - } - if refctx.Key.Value.ScalarBox().Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { - println(refctx.Key.Value.ScalarBox().Unbox().ScalarString()) - println(f2.Primary_.Value.ScalarString()) - return - } + if refctx.Key.Primary.Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { + return false + } + } + if refctx.Key.Value.ScalarBox().Unbox() != nil { + if f2.Primary_ == nil { + return false + } + if refctx.Key.Value.ScalarBox().Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { + return false } } + return true +} + +func (c *compiler) _compileField(f *Field, refctx *RefContext) { if len(refctx.Key.Edges) == 0 && refctx.Key.Value.Null != nil { // For vars, if we delete the field, it may just resolve to an outer scope var of the same name // Instead we keep it around, so that resolveSubstitutions can find it diff --git a/d2ir/filter_test.go b/d2ir/filter_test.go index 9ba4c3559..fa9d80761 100644 --- a/d2ir/filter_test.go +++ b/d2ir/filter_test.go @@ -11,7 +11,7 @@ func testCompileFilters(t *testing.T) { tca := []testCase{ { - name: "escaped", + name: "base", run: func(t testing.TB) { m, err := compile(t, `jacob: { shape: circle @@ -24,9 +24,27 @@ jeremy: { label: I'm a rectangle }`) assert.Success(t, err) - t.Log(m.String()) assertQuery(t, m, 1, 0, nil, "jacob") - assertQuery(t, m, 2, 0, "", "jeremy") + assertQuery(t, m, 2, 0, nil, "jeremy") + assertQuery(t, m, 0, 0, "I'm a rectangle", "jeremy.label") + }, + }, + { + name: "order", + run: func(t testing.TB) { + m, err := compile(t, `jacob: { + shape: circle +} +jeremy: { + shape: rectangle +} +*: { + label: I'm a rectangle + &shape: rectangle +}`) + assert.Success(t, err) + assertQuery(t, m, 1, 0, nil, "jacob") + assertQuery(t, m, 2, 0, nil, "jeremy") assertQuery(t, m, 0, 0, "I'm a rectangle", "jeremy.label") }, }, diff --git a/testdata/d2ir/TestCompile/filters/base#01.exp.json b/testdata/d2ir/TestCompile/filters/base#01.exp.json new file mode 100644 index 000000000..0521ab4f3 --- /dev/null +++ b/testdata/d2ir/TestCompile/filters/base#01.exp.json @@ -0,0 +1,560 @@ +{ + "fields": [ + { + "name": "jacob", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/base#01.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base#01.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base#01.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base#01.d2,1:1:10-1:14:23", + "key": { + "range": "TestCompile/filters/base#01.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base#01.d2,7:1:62-7:18:79", + "ampersand": true, + "key": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base#01.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base#01.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base#01.d2,0:0:0-2:1:25", + "key": { + "range": "TestCompile/filters/base#01.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/base#01.d2,0:7:7-2:1:25", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/base#01.d2,1:1:10-1:14:23", + "key": { + "range": "TestCompile/filters/base#01.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "jeremy", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/base#01.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base#01.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base#01.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base#01.d2,4:1:37-4:17:53", + "key": { + "range": "TestCompile/filters/base#01.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,4:8:44-4:17:53", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base#01.d2,7:1:62-7:18:79", + "ampersand": true, + "key": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + } + ] + }, + { + "name": "label", + "primary": { + "value": { + "range": "TestCompile/filters/base#01.d2,8:8:88-8:23:103", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base#01.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base#01.d2,8:1:81-8:6:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base#01.d2,8:1:81-8:23:103", + "key": { + "range": "TestCompile/filters/base#01.d2,8:1:81-8:6:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,8:8:88-8:23:103", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base#01.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base#01.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base#01.d2,3:0:26-5:1:55", + "key": { + "range": "TestCompile/filters/base#01.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/base#01.d2,3:8:34-5:1:55", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/base#01.d2,4:1:37-4:17:53", + "key": { + "range": "TestCompile/filters/base#01.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base#01.d2,4:8:44-4:17:53", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/filters/base.exp.json b/testdata/d2ir/TestCompile/filters/base.exp.json new file mode 100644 index 000000000..7e7ac0481 --- /dev/null +++ b/testdata/d2ir/TestCompile/filters/base.exp.json @@ -0,0 +1,622 @@ +{ + "fields": [ + { + "name": "jacob", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/base.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base.d2,1:1:10-1:14:23", + "key": { + "range": "TestCompile/filters/base.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base.d2,7:1:62-7:18:79", + "ampersand": true, + "key": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base.d2,0:0:0-2:1:25", + "key": { + "range": "TestCompile/filters/base.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/base.d2,0:7:7-2:1:25", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/base.d2,1:1:10-1:14:23", + "key": { + "range": "TestCompile/filters/base.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "jeremy", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/base.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base.d2,4:1:37-4:17:53", + "key": { + "range": "TestCompile/filters/base.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,4:8:44-4:17:53", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base.d2,7:1:62-7:18:79", + "ampersand": true, + "key": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base.d2,7:1:62-7:18:79", + "ampersand": true, + "key": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,7:9:70-7:18:79", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + } + ] + }, + { + "name": "label", + "primary": { + "value": { + "range": "TestCompile/filters/base.d2,8:8:88-8:23:103", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base.d2,8:1:81-8:6:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base.d2,8:1:81-8:23:103", + "key": { + "range": "TestCompile/filters/base.d2,8:1:81-8:6:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,8:8:88-8:23:103", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/base.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/base.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/base.d2,3:0:26-5:1:55", + "key": { + "range": "TestCompile/filters/base.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/base.d2,3:8:34-5:1:55", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/base.d2,4:1:37-4:17:53", + "key": { + "range": "TestCompile/filters/base.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/base.d2,4:8:44-4:17:53", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/filters/escaped.exp.json b/testdata/d2ir/TestCompile/filters/escaped.exp.json index 6553327a5..c6257902d 100644 --- a/testdata/d2ir/TestCompile/filters/escaped.exp.json +++ b/testdata/d2ir/TestCompile/filters/escaped.exp.json @@ -142,83 +142,6 @@ } } ] - }, - { - "name": "label", - "primary": { - "value": { - "range": "TestCompile/filters/escaped.d2,8:8:88-8:23:103", - "value": [ - { - "string": "I'm a rectangle", - "raw_string": "I'm a rectangle" - } - ] - } - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/escaped.d2,8:1:81-8:23:103", - "key": { - "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/escaped.d2,8:1:81-8:6:86", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/escaped.d2,8:8:88-8:23:103", - "value": [ - { - "string": "I'm a rectangle", - "raw_string": "I'm a rectangle" - } - ] - } - } - } - } - } - ] } ], "edges": null diff --git a/testdata/d2ir/TestCompile/filters/order.exp.json b/testdata/d2ir/TestCompile/filters/order.exp.json new file mode 100644 index 000000000..68d9f7314 --- /dev/null +++ b/testdata/d2ir/TestCompile/filters/order.exp.json @@ -0,0 +1,622 @@ +{ + "fields": [ + { + "name": "jacob", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/order.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/order.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/order.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/order.d2,1:1:10-1:14:23", + "key": { + "range": "TestCompile/filters/order.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/order.d2,8:1:86-8:18:103", + "ampersand": true, + "key": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,8:9:94-8:18:103", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/order.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/order.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/order.d2,0:0:0-2:1:25", + "key": { + "range": "TestCompile/filters/order.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/order.d2,0:7:7-2:1:25", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/order.d2,1:1:10-1:14:23", + "key": { + "range": "TestCompile/filters/order.d2,1:1:10-1:6:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,1:8:17-1:14:23", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "jeremy", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/order.d2,8:9:94-8:18:103", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/order.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/order.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/order.d2,4:1:37-4:17:53", + "key": { + "range": "TestCompile/filters/order.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,4:8:44-4:17:53", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/order.d2,8:1:86-8:18:103", + "ampersand": true, + "key": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,8:9:94-8:18:103", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/order.d2,8:1:86-8:18:103", + "ampersand": true, + "key": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,8:9:94-8:18:103", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + } + ] + }, + { + "name": "label", + "primary": { + "value": { + "range": "TestCompile/filters/order.d2,7:8:69-7:23:84", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/order.d2,7:1:62-7:6:67", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/order.d2,7:1:62-7:6:67", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,7:1:62-7:6:67", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/order.d2,7:1:62-7:23:84", + "key": { + "range": "TestCompile/filters/order.d2,7:1:62-7:6:67", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,7:1:62-7:6:67", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,7:8:69-7:23:84", + "value": [ + { + "string": "I'm a rectangle", + "raw_string": "I'm a rectangle" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/order.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/order.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/order.d2,3:0:26-5:1:55", + "key": { + "range": "TestCompile/filters/order.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/order.d2,3:8:34-5:1:55", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/order.d2,4:1:37-4:17:53", + "key": { + "range": "TestCompile/filters/order.d2,4:1:37-4:6:42", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/order.d2,4:8:44-4:17:53", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} From 6b73a61bd298f1522104ddcb19f6e33312be62f2 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 17:09:20 -0700 Subject: [PATCH 128/138] d2ir: Add filter error tests --- d2ir/compile.go | 3 + d2ir/filter_test.go | 40 + d2ir/pattern_test.go | 3 +- d2parser/parse.go | 2 +- .../filters/errors/bad-syntax.exp.json | 749 ++++++++++++++++++ .../filters/errors/composite.exp.json | 449 +++++++++++ 6 files changed, 1243 insertions(+), 3 deletions(-) create mode 100644 testdata/d2ir/TestCompile/filters/errors/bad-syntax.exp.json create mode 100644 testdata/d2ir/TestCompile/filters/errors/composite.exp.json diff --git a/d2ir/compile.go b/d2ir/compile.go index b2e4752b0..0c08f2086 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -466,6 +466,9 @@ func (c *compiler) _ampersandFilter(f *Field, refctx *RefContext) bool { if refctx.Key.Value.ScalarBox().Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { return false } + } else if refctx.Key.Value.Unbox() != nil { + c.errorf(refctx.Key, "ampersand filters cannot be composites") + return false } return true diff --git a/d2ir/filter_test.go b/d2ir/filter_test.go index fa9d80761..39f938cd0 100644 --- a/d2ir/filter_test.go +++ b/d2ir/filter_test.go @@ -51,4 +51,44 @@ jeremy: { } runa(t, tca) + + t.Run("errors", func(t *testing.T) { + tca := []testCase{ + { + name: "bad-syntax", + run: func(t testing.TB) { + _, err := compile(t, `jacob.style: { + fill: red + multiple: true +} + +*.&style: { + fill: red + multiple: true +} +`) + assert.ErrorString(t, err, `TestCompile/filters/errors/bad-syntax.d2:6:3: unexpected text after map key +TestCompile/filters/errors/bad-syntax.d2:9:1: unexpected map termination character } in file map`) + }, + }, + { + name: "composite", + run: func(t testing.TB) { + _, err := compile(t, `jacob.style: { + fill: red + multiple: true +} +*: { + &style: { + fill: red + multiple: true + } +} +`) + assert.ErrorString(t, err, `TestCompile/filters/errors/composite.d2:6:2: ampersand filters cannot be composites`) + }, + }, + } + runa(t, tca) + }) } diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index aabd8be58..613751ab3 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -323,10 +323,9 @@ task.** -> fast { name: "glob-edge-glob-index", run: func(t testing.TB) { - m, err := compile(t, `(* -> b)[*].style.fill: red + _, err := compile(t, `(* -> b)[*].style.fill: red `) assert.ErrorString(t, err, `TestCompile/patterns/errors/glob-edge-glob-index.d2:1:2: indexed edge does not exist`) - assertQuery(t, m, 0, 0, nil, "") }, }, } diff --git a/d2parser/parse.go b/d2parser/parse.go index 6f792d374..50f6c91c1 100644 --- a/d2parser/parse.go +++ b/d2parser/parse.go @@ -1098,7 +1098,7 @@ func (p *parser) parseUnquotedString(inKey bool) (s *d2ast.UnquotedString) { } if inKey { switch r { - case ':', '.', '<', '>': + case ':', '.', '<', '>', '&': p.rewind() return s case '-': diff --git a/testdata/d2ir/TestCompile/filters/errors/bad-syntax.exp.json b/testdata/d2ir/TestCompile/filters/errors/bad-syntax.exp.json new file mode 100644 index 000000000..a91868c61 --- /dev/null +++ b/testdata/d2ir/TestCompile/filters/errors/bad-syntax.exp.json @@ -0,0 +1,749 @@ +{ + "fields": [ + { + "name": "jacob", + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:7:22-1:10:25", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:5:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:10:25", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:5:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:7:22-1:10:25", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "name": "multiple", + "primary": { + "value": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:11:37-2:15:41", + "value": true + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:9:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:15:41", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:9:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:11:37-2:15:41", + "value": true + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-3:1:43", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:13:13-3:1:43", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:10:25", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:5:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:7:22-1:10:25", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:15:41", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:9:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:11:37-2:15:41", + "value": true + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "&style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:8:65-6:11:68", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:2:59-6:6:63", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:2:59-6:6:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:2:59-6:6:63", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:2:59-6:11:68", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:2:59-6:6:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:2:59-6:6:63", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:8:65-6:11:68", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "name": "multiple", + "primary": { + "value": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:12:81-7:16:85", + "value": true + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:2:71-7:10:79", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:2:71-7:10:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:2:71-7:10:79", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:2:71-7:16:85", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:2:71-7:10:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:2:71-7:10:79", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:12:81-7:16:85", + "value": true + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,5:2:47-5:8:53", + "value": [ + { + "string": "&style", + "raw_string": "&style" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/bad-syntax.d2,5:0:45-5:8:53", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,5:0:45-5:1:46", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,5:2:47-5:8:53", + "value": [ + { + "string": "&style", + "raw_string": "&style" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,5:0:45-8:1:87", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,5:0:45-5:8:53", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,5:0:45-5:1:46", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,5:2:47-5:8:53", + "value": [ + { + "string": "&style", + "raw_string": "&style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/errors/bad-syntax.d2,5:10:55-8:1:87", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:2:59-6:11:68", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:2:59-6:6:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:2:59-6:6:63", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,6:8:65-6:11:68", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:2:71-7:16:85", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:2:71-7:10:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:2:71-7:10:79", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/bad-syntax.d2,7:12:81-7:16:85", + "value": true + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-3:1:43", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/errors/bad-syntax.d2,0:13:13-3:1:43", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:10:25", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:5:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,1:7:22-1:10:25", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:15:41", + "key": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:9:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/bad-syntax.d2,2:11:37-2:15:41", + "value": true + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/filters/errors/composite.exp.json b/testdata/d2ir/TestCompile/filters/errors/composite.exp.json new file mode 100644 index 000000000..8aa7bec36 --- /dev/null +++ b/testdata/d2ir/TestCompile/filters/errors/composite.exp.json @@ -0,0 +1,449 @@ +{ + "fields": [ + { + "name": "jacob", + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/filters/errors/composite.d2,8:7:73-8:10:76", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:5:71", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:5:71", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:5:71", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:10:76", + "key": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:5:71", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:5:71", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,8:7:73-8:10:76", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "name": "multiple", + "primary": { + "value": { + "range": "TestCompile/filters/errors/composite.d2,9:11:88-9:15:92", + "value": true + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:9:86", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:9:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:9:86", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:15:92", + "key": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:9:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:9:86", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/composite.d2,9:11:88-9:15:92", + "value": true + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/composite.d2,7:6:57-7:11:62", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-7:11:62", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-7:5:56", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,7:6:57-7:11:62", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-10:1:94", + "key": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-7:11:62", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-7:5:56", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,7:6:57-7:11:62", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/errors/composite.d2,7:13:64-10:1:94", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:10:76", + "key": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:5:71", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:5:71", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,8:7:73-8:10:76", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:15:92", + "key": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:9:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:9:86", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/composite.d2,9:11:88-9:15:92", + "value": true + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-7:5:56", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-7:11:62", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-7:5:56", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,7:6:57-7:11:62", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-10:1:94", + "key": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-7:11:62", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,7:0:51-7:5:56", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,7:6:57-7:11:62", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/errors/composite.d2,7:13:64-10:1:94", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:10:76", + "key": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:5:71", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,8:1:67-8:5:71", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,8:7:73-8:10:76", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:15:92", + "key": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:9:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/composite.d2,9:1:78-9:9:86", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/composite.d2,9:11:88-9:15:92", + "value": true + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} From 60a19cffde14420073fc032da18853f8f8ffb188 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 17:15:03 -0700 Subject: [PATCH 129/138] e2etests: Fix ampersand-escape test --- e2etests/regression_test.go | 4 +- .../ampersand-escape/dagre/board.exp.json | 84 +-------- .../ampersand-escape/dagre/sketch.exp.svg | 160 +++++++++--------- .../ampersand-escape/elk/board.exp.json | 84 +-------- .../ampersand-escape/elk/sketch.exp.svg | 160 +++++++++--------- 5 files changed, 161 insertions(+), 331 deletions(-) diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index 55bc62b14..24a0d0edd 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -648,11 +648,9 @@ group: { }, { name: "ampersand-escape", - script: `h&y: &∈ { + script: `hy: &∈ { tooltip: beans & rice } -&foo -&&bar `, }, { diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json index 924c38e6b..f5f27d395 100644 --- a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json +++ b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json @@ -4,7 +4,7 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "h&y", + "id": "hy", "type": "rectangle", "pos": { "x": 0, @@ -43,88 +43,6 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 - }, - { - "id": "foo", - "type": "rectangle", - "pos": { - "x": 158, - "y": 0 - }, - "width": 69, - "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": "foo", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 24, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, - { - "id": "\"&bar\"", - "type": "rectangle", - "pos": { - "x": 287, - "y": 0 - }, - "width": 81, - "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": "&bar", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 36, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 } ], "connections": [], diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg index 34b6f853f..8f189785c 100644 --- a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -&∈beans & ricefoo&barbeans & rice + .d2-1658760307 .fill-N1{fill:#0A0F25;} + .d2-1658760307 .fill-N2{fill:#676C7E;} + .d2-1658760307 .fill-N3{fill:#9499AB;} + .d2-1658760307 .fill-N4{fill:#CFD2DD;} + .d2-1658760307 .fill-N5{fill:#DEE1EB;} + .d2-1658760307 .fill-N6{fill:#EEF1F8;} + .d2-1658760307 .fill-N7{fill:#FFFFFF;} + .d2-1658760307 .fill-B1{fill:#0D32B2;} + .d2-1658760307 .fill-B2{fill:#0D32B2;} + .d2-1658760307 .fill-B3{fill:#E3E9FD;} + .d2-1658760307 .fill-B4{fill:#E3E9FD;} + .d2-1658760307 .fill-B5{fill:#EDF0FD;} + .d2-1658760307 .fill-B6{fill:#F7F8FE;} + .d2-1658760307 .fill-AA2{fill:#4A6FF3;} + .d2-1658760307 .fill-AA4{fill:#EDF0FD;} + .d2-1658760307 .fill-AA5{fill:#F7F8FE;} + .d2-1658760307 .fill-AB4{fill:#EDF0FD;} + .d2-1658760307 .fill-AB5{fill:#F7F8FE;} + .d2-1658760307 .stroke-N1{stroke:#0A0F25;} + .d2-1658760307 .stroke-N2{stroke:#676C7E;} + .d2-1658760307 .stroke-N3{stroke:#9499AB;} + .d2-1658760307 .stroke-N4{stroke:#CFD2DD;} + .d2-1658760307 .stroke-N5{stroke:#DEE1EB;} + .d2-1658760307 .stroke-N6{stroke:#EEF1F8;} + .d2-1658760307 .stroke-N7{stroke:#FFFFFF;} + .d2-1658760307 .stroke-B1{stroke:#0D32B2;} + .d2-1658760307 .stroke-B2{stroke:#0D32B2;} + .d2-1658760307 .stroke-B3{stroke:#E3E9FD;} + .d2-1658760307 .stroke-B4{stroke:#E3E9FD;} + .d2-1658760307 .stroke-B5{stroke:#EDF0FD;} + .d2-1658760307 .stroke-B6{stroke:#F7F8FE;} + .d2-1658760307 .stroke-AA2{stroke:#4A6FF3;} + .d2-1658760307 .stroke-AA4{stroke:#EDF0FD;} + .d2-1658760307 .stroke-AA5{stroke:#F7F8FE;} + .d2-1658760307 .stroke-AB4{stroke:#EDF0FD;} + .d2-1658760307 .stroke-AB5{stroke:#F7F8FE;} + .d2-1658760307 .background-color-N1{background-color:#0A0F25;} + .d2-1658760307 .background-color-N2{background-color:#676C7E;} + .d2-1658760307 .background-color-N3{background-color:#9499AB;} + .d2-1658760307 .background-color-N4{background-color:#CFD2DD;} + .d2-1658760307 .background-color-N5{background-color:#DEE1EB;} + .d2-1658760307 .background-color-N6{background-color:#EEF1F8;} + .d2-1658760307 .background-color-N7{background-color:#FFFFFF;} + .d2-1658760307 .background-color-B1{background-color:#0D32B2;} + .d2-1658760307 .background-color-B2{background-color:#0D32B2;} + .d2-1658760307 .background-color-B3{background-color:#E3E9FD;} + .d2-1658760307 .background-color-B4{background-color:#E3E9FD;} + .d2-1658760307 .background-color-B5{background-color:#EDF0FD;} + .d2-1658760307 .background-color-B6{background-color:#F7F8FE;} + .d2-1658760307 .background-color-AA2{background-color:#4A6FF3;} + .d2-1658760307 .background-color-AA4{background-color:#EDF0FD;} + .d2-1658760307 .background-color-AA5{background-color:#F7F8FE;} + .d2-1658760307 .background-color-AB4{background-color:#EDF0FD;} + .d2-1658760307 .background-color-AB5{background-color:#F7F8FE;} + .d2-1658760307 .color-N1{color:#0A0F25;} + .d2-1658760307 .color-N2{color:#676C7E;} + .d2-1658760307 .color-N3{color:#9499AB;} + .d2-1658760307 .color-N4{color:#CFD2DD;} + .d2-1658760307 .color-N5{color:#DEE1EB;} + .d2-1658760307 .color-N6{color:#EEF1F8;} + .d2-1658760307 .color-N7{color:#FFFFFF;} + .d2-1658760307 .color-B1{color:#0D32B2;} + .d2-1658760307 .color-B2{color:#0D32B2;} + .d2-1658760307 .color-B3{color:#E3E9FD;} + .d2-1658760307 .color-B4{color:#E3E9FD;} + .d2-1658760307 .color-B5{color:#EDF0FD;} + .d2-1658760307 .color-B6{color:#F7F8FE;} + .d2-1658760307 .color-AA2{color:#4A6FF3;} + .d2-1658760307 .color-AA4{color:#EDF0FD;} + .d2-1658760307 .color-AA5{color:#F7F8FE;} + .d2-1658760307 .color-AB4{color:#EDF0FD;} + .d2-1658760307 .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}]]>&∈beans & ricebeans & rice @@ -105,9 +105,7 @@ - - + + - - \ No newline at end of file diff --git a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json index 29afa3817..c135331d8 100644 --- a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json +++ b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json @@ -4,7 +4,7 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "h&y", + "id": "hy", "type": "rectangle", "pos": { "x": 12, @@ -43,88 +43,6 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 - }, - { - "id": "foo", - "type": "rectangle", - "pos": { - "x": 130, - "y": 12 - }, - "width": 69, - "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": "foo", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 24, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, - { - "id": "\"&bar\"", - "type": "rectangle", - "pos": { - "x": 219, - "y": 12 - }, - "width": 81, - "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": "&bar", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 36, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 } ], "connections": [], diff --git a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg index 90424ee6b..eff889432 100644 --- a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -&∈beans & ricefoo&barbeans & rice + .d2-616571211 .fill-N1{fill:#0A0F25;} + .d2-616571211 .fill-N2{fill:#676C7E;} + .d2-616571211 .fill-N3{fill:#9499AB;} + .d2-616571211 .fill-N4{fill:#CFD2DD;} + .d2-616571211 .fill-N5{fill:#DEE1EB;} + .d2-616571211 .fill-N6{fill:#EEF1F8;} + .d2-616571211 .fill-N7{fill:#FFFFFF;} + .d2-616571211 .fill-B1{fill:#0D32B2;} + .d2-616571211 .fill-B2{fill:#0D32B2;} + .d2-616571211 .fill-B3{fill:#E3E9FD;} + .d2-616571211 .fill-B4{fill:#E3E9FD;} + .d2-616571211 .fill-B5{fill:#EDF0FD;} + .d2-616571211 .fill-B6{fill:#F7F8FE;} + .d2-616571211 .fill-AA2{fill:#4A6FF3;} + .d2-616571211 .fill-AA4{fill:#EDF0FD;} + .d2-616571211 .fill-AA5{fill:#F7F8FE;} + .d2-616571211 .fill-AB4{fill:#EDF0FD;} + .d2-616571211 .fill-AB5{fill:#F7F8FE;} + .d2-616571211 .stroke-N1{stroke:#0A0F25;} + .d2-616571211 .stroke-N2{stroke:#676C7E;} + .d2-616571211 .stroke-N3{stroke:#9499AB;} + .d2-616571211 .stroke-N4{stroke:#CFD2DD;} + .d2-616571211 .stroke-N5{stroke:#DEE1EB;} + .d2-616571211 .stroke-N6{stroke:#EEF1F8;} + .d2-616571211 .stroke-N7{stroke:#FFFFFF;} + .d2-616571211 .stroke-B1{stroke:#0D32B2;} + .d2-616571211 .stroke-B2{stroke:#0D32B2;} + .d2-616571211 .stroke-B3{stroke:#E3E9FD;} + .d2-616571211 .stroke-B4{stroke:#E3E9FD;} + .d2-616571211 .stroke-B5{stroke:#EDF0FD;} + .d2-616571211 .stroke-B6{stroke:#F7F8FE;} + .d2-616571211 .stroke-AA2{stroke:#4A6FF3;} + .d2-616571211 .stroke-AA4{stroke:#EDF0FD;} + .d2-616571211 .stroke-AA5{stroke:#F7F8FE;} + .d2-616571211 .stroke-AB4{stroke:#EDF0FD;} + .d2-616571211 .stroke-AB5{stroke:#F7F8FE;} + .d2-616571211 .background-color-N1{background-color:#0A0F25;} + .d2-616571211 .background-color-N2{background-color:#676C7E;} + .d2-616571211 .background-color-N3{background-color:#9499AB;} + .d2-616571211 .background-color-N4{background-color:#CFD2DD;} + .d2-616571211 .background-color-N5{background-color:#DEE1EB;} + .d2-616571211 .background-color-N6{background-color:#EEF1F8;} + .d2-616571211 .background-color-N7{background-color:#FFFFFF;} + .d2-616571211 .background-color-B1{background-color:#0D32B2;} + .d2-616571211 .background-color-B2{background-color:#0D32B2;} + .d2-616571211 .background-color-B3{background-color:#E3E9FD;} + .d2-616571211 .background-color-B4{background-color:#E3E9FD;} + .d2-616571211 .background-color-B5{background-color:#EDF0FD;} + .d2-616571211 .background-color-B6{background-color:#F7F8FE;} + .d2-616571211 .background-color-AA2{background-color:#4A6FF3;} + .d2-616571211 .background-color-AA4{background-color:#EDF0FD;} + .d2-616571211 .background-color-AA5{background-color:#F7F8FE;} + .d2-616571211 .background-color-AB4{background-color:#EDF0FD;} + .d2-616571211 .background-color-AB5{background-color:#F7F8FE;} + .d2-616571211 .color-N1{color:#0A0F25;} + .d2-616571211 .color-N2{color:#676C7E;} + .d2-616571211 .color-N3{color:#9499AB;} + .d2-616571211 .color-N4{color:#CFD2DD;} + .d2-616571211 .color-N5{color:#DEE1EB;} + .d2-616571211 .color-N6{color:#EEF1F8;} + .d2-616571211 .color-N7{color:#FFFFFF;} + .d2-616571211 .color-B1{color:#0D32B2;} + .d2-616571211 .color-B2{color:#0D32B2;} + .d2-616571211 .color-B3{color:#E3E9FD;} + .d2-616571211 .color-B4{color:#E3E9FD;} + .d2-616571211 .color-B5{color:#EDF0FD;} + .d2-616571211 .color-B6{color:#F7F8FE;} + .d2-616571211 .color-AA2{color:#4A6FF3;} + .d2-616571211 .color-AA4{color:#EDF0FD;} + .d2-616571211 .color-AA5{color:#F7F8FE;} + .d2-616571211 .color-AB4{color:#EDF0FD;} + .d2-616571211 .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}]]>&∈beans & ricebeans & rice @@ -105,9 +105,7 @@ - - + + - - \ No newline at end of file From 0f45d2b08274ec9bc096d6b9204d28315b3b957d Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 17:50:40 -0700 Subject: [PATCH 130/138] d2ast: Fix RawString test with ampersand --- d2ast/d2ast.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 102429b7a..3f9c99ad1 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -1099,12 +1099,11 @@ 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 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. -// TODO: Return StringBox func RawString(s string, inKey bool) String { if s == "" { return FlatDoubleQuotedString(s) @@ -1117,10 +1116,6 @@ func RawString(s string, inKey bool) String { if i+1 < len(s) && s[i+1] != '-' { continue } - case '&': - if i > 0 { - continue - } } if strings.ContainsRune(UnquotedKeySpecials, r) { if !strings.ContainsRune(s, '"') { From 7ae2d788348ad00d4330ecb1fcc835ccb92de608 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 18:02:09 -0700 Subject: [PATCH 131/138] d2ir: Add filtering on class arrays --- d2ir/compile.go | 37 +- d2ir/filter_test.go | 26 + .../d2ir/TestCompile/filters/array.exp.json | 1229 +++++++++++++++++ .../d2ir/TestCompile/filters/base.exp.json | 64 +- .../d2ir/TestCompile/filters/order.exp.json | 64 +- 5 files changed, 1279 insertions(+), 141 deletions(-) create mode 100644 testdata/d2ir/TestCompile/filters/array.exp.json diff --git a/d2ir/compile.go b/d2ir/compile.go index 0c08f2086..f88a4abdf 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -410,6 +410,10 @@ func (c *compiler) compileKey(refctx *RefContext) { } func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) { + if refctx.Key.Ampersand { + return + } + fa, err := dst.EnsureField(kp, refctx, true) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) @@ -451,23 +455,26 @@ func (c *compiler) _ampersandFilter(f *Field, refctx *RefContext) bool { if f2 == nil { return false } - if refctx.Key.Primary.Unbox() != nil { - if f2.Primary_ == nil { - return false - } - if refctx.Key.Primary.Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { - return false + if refctx.Key.Value.ScalarBox().Unbox() == nil { + c.errorf(refctx.Key, "ampersand filters cannot be composites") + return false + } + + if a, ok := f2.Composite.(*Array); ok { + for _, v := range a.Values { + if s, ok := v.(*Scalar); ok { + if refctx.Key.Value.ScalarBox().Unbox().ScalarString() == s.Value.ScalarString() { + return true + } + } } } - if refctx.Key.Value.ScalarBox().Unbox() != nil { - if f2.Primary_ == nil { - return false - } - if refctx.Key.Value.ScalarBox().Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { - return false - } - } else if refctx.Key.Value.Unbox() != nil { - c.errorf(refctx.Key, "ampersand filters cannot be composites") + + if f2.Primary_ == nil { + return false + } + + if refctx.Key.Value.ScalarBox().Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { return false } diff --git a/d2ir/filter_test.go b/d2ir/filter_test.go index 39f938cd0..54cfdba21 100644 --- a/d2ir/filter_test.go +++ b/d2ir/filter_test.go @@ -43,11 +43,37 @@ jeremy: { &shape: rectangle }`) assert.Success(t, err) + assertQuery(t, m, 5, 0, nil, "") assertQuery(t, m, 1, 0, nil, "jacob") assertQuery(t, m, 2, 0, nil, "jeremy") assertQuery(t, m, 0, 0, "I'm a rectangle", "jeremy.label") }, }, + { + name: "array", + run: func(t testing.TB) { + m, err := compile(t, `the-little-cannon: { + class: [server; deployed] +} +dino: { + class: [internal; deployed] +} +catapult: { + class: [jacob; server] +} + +*: { + &class: server + style.multiple: true +} +`) + assert.Success(t, err) + assertQuery(t, m, 10, 0, nil, "") + assertQuery(t, m, 3, 0, nil, "the-little-cannon") + assertQuery(t, m, 1, 0, nil, "dino") + assertQuery(t, m, 3, 0, nil, "catapult") + }, + }, } runa(t, tca) diff --git a/testdata/d2ir/TestCompile/filters/array.exp.json b/testdata/d2ir/TestCompile/filters/array.exp.json new file mode 100644 index 000000000..1fc271233 --- /dev/null +++ b/testdata/d2ir/TestCompile/filters/array.exp.json @@ -0,0 +1,1229 @@ +{ + "fields": [ + { + "name": "the-little-cannon", + "composite": { + "fields": [ + { + "name": "class", + "composite": { + "values": [ + { + "value": { + "range": "TestCompile/filters/array.d2,1:9:30-1:15:36", + "value": [ + { + "string": "server", + "raw_string": "server" + } + ] + } + }, + { + "value": { + "range": "TestCompile/filters/array.d2,1:17:38-1:25:46", + "value": [ + { + "string": "deployed", + "raw_string": "deployed" + } + ] + } + } + ] + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,1:1:22-1:6:27", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,1:1:22-1:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,1:1:22-1:6:27", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,1:1:22-1:26:47", + "key": { + "range": "TestCompile/filters/array.d2,1:1:22-1:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,1:1:22-1:6:27", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "TestCompile/filters/array.d2,1:8:29-1:25:46", + "nodes": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,1:9:30-1:15:36", + "value": [ + { + "string": "server", + "raw_string": "server" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,1:17:38-1:25:46", + "value": [ + { + "string": "deployed", + "raw_string": "deployed" + } + ] + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,11:1:134-11:15:148", + "ampersand": true, + "key": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,11:9:142-11:15:148", + "value": [ + { + "string": "server", + "raw_string": "server" + } + ] + } + } + } + } + } + ] + }, + { + "name": "style", + "composite": { + "fields": [ + { + "name": "multiple", + "primary": { + "value": { + "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", + "value": true + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,12:1:150-12:15:164", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,12:1:150-12:21:170", + "key": { + "range": "TestCompile/filters/array.d2,12:1:150-12:15:164", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", + "value": true + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,12:1:150-12:15:164", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,12:1:150-12:21:170", + "key": { + "range": "TestCompile/filters/array.d2,12:1:150-12:15:164", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", + "value": true + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,0:0:0-0:17:17", + "value": [ + { + "string": "the-little-cannon", + "raw_string": "the-little-cannon" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,0:0:0-0:17:17", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,0:0:0-0:17:17", + "value": [ + { + "string": "the-little-cannon", + "raw_string": "the-little-cannon" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,0:0:0-2:1:49", + "key": { + "range": "TestCompile/filters/array.d2,0:0:0-0:17:17", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,0:0:0-0:17:17", + "value": [ + { + "string": "the-little-cannon", + "raw_string": "the-little-cannon" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/array.d2,0:19:19-2:1:49", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/array.d2,1:1:22-1:26:47", + "key": { + "range": "TestCompile/filters/array.d2,1:1:22-1:6:27", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,1:1:22-1:6:27", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "TestCompile/filters/array.d2,1:8:29-1:25:46", + "nodes": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,1:9:30-1:15:36", + "value": [ + { + "string": "server", + "raw_string": "server" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,1:17:38-1:25:46", + "value": [ + { + "string": "deployed", + "raw_string": "deployed" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "dino", + "composite": { + "fields": [ + { + "name": "class", + "composite": { + "values": [ + { + "value": { + "range": "TestCompile/filters/array.d2,4:9:67-4:17:75", + "value": [ + { + "string": "internal", + "raw_string": "internal" + } + ] + } + }, + { + "value": { + "range": "TestCompile/filters/array.d2,4:19:77-4:27:85", + "value": [ + { + "string": "deployed", + "raw_string": "deployed" + } + ] + } + } + ] + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,4:1:59-4:6:64", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,4:1:59-4:6:64", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,4:1:59-4:6:64", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,4:1:59-4:28:86", + "key": { + "range": "TestCompile/filters/array.d2,4:1:59-4:6:64", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,4:1:59-4:6:64", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "TestCompile/filters/array.d2,4:8:66-4:27:85", + "nodes": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,4:9:67-4:17:75", + "value": [ + { + "string": "internal", + "raw_string": "internal" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,4:19:77-4:27:85", + "value": [ + { + "string": "deployed", + "raw_string": "deployed" + } + ] + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,11:1:134-11:15:148", + "ampersand": true, + "key": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,11:9:142-11:15:148", + "value": [ + { + "string": "server", + "raw_string": "server" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,3:0:50-3:4:54", + "value": [ + { + "string": "dino", + "raw_string": "dino" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,3:0:50-3:4:54", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,3:0:50-3:4:54", + "value": [ + { + "string": "dino", + "raw_string": "dino" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,3:0:50-5:1:88", + "key": { + "range": "TestCompile/filters/array.d2,3:0:50-3:4:54", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,3:0:50-3:4:54", + "value": [ + { + "string": "dino", + "raw_string": "dino" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/array.d2,3:6:56-5:1:88", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/array.d2,4:1:59-4:28:86", + "key": { + "range": "TestCompile/filters/array.d2,4:1:59-4:6:64", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,4:1:59-4:6:64", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "TestCompile/filters/array.d2,4:8:66-4:27:85", + "nodes": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,4:9:67-4:17:75", + "value": [ + { + "string": "internal", + "raw_string": "internal" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,4:19:77-4:27:85", + "value": [ + { + "string": "deployed", + "raw_string": "deployed" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "catapult", + "composite": { + "fields": [ + { + "name": "class", + "composite": { + "values": [ + { + "value": { + "range": "TestCompile/filters/array.d2,7:9:110-7:14:115", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "value": { + "range": "TestCompile/filters/array.d2,7:16:117-7:22:123", + "value": [ + { + "string": "server", + "raw_string": "server" + } + ] + } + } + ] + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,7:1:102-7:6:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,7:1:102-7:6:107", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,7:1:102-7:6:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,7:1:102-7:23:124", + "key": { + "range": "TestCompile/filters/array.d2,7:1:102-7:6:107", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,7:1:102-7:6:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "TestCompile/filters/array.d2,7:8:109-7:22:123", + "nodes": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,7:9:110-7:14:115", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,7:16:117-7:22:123", + "value": [ + { + "string": "server", + "raw_string": "server" + } + ] + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,11:1:134-11:15:148", + "ampersand": true, + "key": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,11:2:135-11:7:140", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,11:9:142-11:15:148", + "value": [ + { + "string": "server", + "raw_string": "server" + } + ] + } + } + } + } + } + ] + }, + { + "name": "style", + "composite": { + "fields": [ + { + "name": "multiple", + "primary": { + "value": { + "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", + "value": true + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,12:1:150-12:15:164", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,12:1:150-12:21:170", + "key": { + "range": "TestCompile/filters/array.d2,12:1:150-12:15:164", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", + "value": true + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,12:1:150-12:15:164", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,12:1:150-12:21:170", + "key": { + "range": "TestCompile/filters/array.d2,12:1:150-12:15:164", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", + "value": true + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/array.d2,6:0:89-6:8:97", + "value": [ + { + "string": "catapult", + "raw_string": "catapult" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/array.d2,6:0:89-6:8:97", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,6:0:89-6:8:97", + "value": [ + { + "string": "catapult", + "raw_string": "catapult" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/array.d2,6:0:89-8:1:126", + "key": { + "range": "TestCompile/filters/array.d2,6:0:89-6:8:97", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,6:0:89-6:8:97", + "value": [ + { + "string": "catapult", + "raw_string": "catapult" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/array.d2,6:10:99-8:1:126", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/array.d2,7:1:102-7:23:124", + "key": { + "range": "TestCompile/filters/array.d2,7:1:102-7:6:107", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,7:1:102-7:6:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "TestCompile/filters/array.d2,7:8:109-7:22:123", + "nodes": [ + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,7:9:110-7:14:115", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/array.d2,7:16:117-7:22:123", + "value": [ + { + "string": "server", + "raw_string": "server" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/filters/base.exp.json b/testdata/d2ir/TestCompile/filters/base.exp.json index 7e7ac0481..c8a934bbc 100644 --- a/testdata/d2ir/TestCompile/filters/base.exp.json +++ b/testdata/d2ir/TestCompile/filters/base.exp.json @@ -247,7 +247,7 @@ "name": "shape", "primary": { "value": { - "range": "TestCompile/filters/base.d2,7:9:70-7:18:79", + "range": "TestCompile/filters/base.d2,4:8:44-4:17:53", "value": [ { "string": "rectangle", @@ -318,68 +318,6 @@ } } }, - { - "string": { - "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/base.d2,7:1:62-7:18:79", - "ampersand": true, - "key": { - "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/base.d2,7:9:70-7:18:79", - "value": [ - { - "string": "rectangle", - "raw_string": "rectangle" - } - ] - } - } - } - } - }, { "string": { "range": "TestCompile/filters/base.d2,7:2:63-7:7:68", diff --git a/testdata/d2ir/TestCompile/filters/order.exp.json b/testdata/d2ir/TestCompile/filters/order.exp.json index 68d9f7314..d7a77a374 100644 --- a/testdata/d2ir/TestCompile/filters/order.exp.json +++ b/testdata/d2ir/TestCompile/filters/order.exp.json @@ -247,7 +247,7 @@ "name": "shape", "primary": { "value": { - "range": "TestCompile/filters/order.d2,8:9:94-8:18:103", + "range": "TestCompile/filters/order.d2,4:8:44-4:17:53", "value": [ { "string": "rectangle", @@ -318,68 +318,6 @@ } } }, - { - "string": { - "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/order.d2,8:1:86-8:18:103", - "ampersand": true, - "key": { - "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/order.d2,8:9:94-8:18:103", - "value": [ - { - "string": "rectangle", - "raw_string": "rectangle" - } - ] - } - } - } - } - }, { "string": { "range": "TestCompile/filters/order.d2,8:2:87-8:7:92", From 6358a44fcbcffddb2f3c19a73a6cccff20b3a7d2 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 21:39:41 -0700 Subject: [PATCH 132/138] changelogs/next.md: Update --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 4a15bc469..bd1d4c41c 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -10,6 +10,7 @@ Layout capability also takes a subtle but important step forward: you can now cu - `null` keyword can be used to un-declare. See [docs](https://d2lang.com/tour/overrides#null) [#1446](https://github.com/terrastruct/d2/pull/1446) - Develop multi-board diagrams in watch mode (links to layers/scenarios/steps work in `--watch`) [#1503](https://github.com/terrastruct/d2/pull/1503) - Glob patterns have been implemented. See [docs](https://d2lang.com/tour/globs). [#1479](https://github.com/terrastruct/d2/pull/1479) +- Ampersand filters have been implemented. See [docs](https://d2lang.com/tour/filters). [#1509](https://github.com/terrastruct/d2/pull/1509) #### Improvements 🧹 From d0d3ebe17e2f10618450b2ea13cf5f436da3e0fa Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sun, 30 Jul 2023 13:16:56 -0700 Subject: [PATCH 133/138] d2ir: Fix filters on nested fields See test on edges --- d2ast/d2ast.go | 19 + d2ir/compile.go | 22 +- d2ir/filter_test.go | 40 +- .../d2ir/TestCompile/filters/edge.exp.json | 2696 +++++++++++++++++ .../filters/errors/no-glob.exp.json | 750 +++++ 5 files changed, 3518 insertions(+), 9 deletions(-) create mode 100644 testdata/d2ir/TestCompile/filters/edge.exp.json create mode 100644 testdata/d2ir/TestCompile/filters/errors/no-glob.exp.json diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 3f9c99ad1..fdbe9c9c3 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -720,6 +720,19 @@ func (mk *Key) SetScalar(scalar ScalarBox) { } } +func (mk *Key) HasQueryGlob() bool { + if mk.Key.HasGlob() && len(mk.Edges) == 0 { + return true + } + if mk.EdgeIndex != nil && mk.EdgeIndex.Glob && mk.EdgeKey == nil { + return true + } + if mk.EdgeKey.HasGlob() { + return true + } + return false +} + type KeyPath struct { Range Range `json:"range"` Path []*StringBox `json:"path"` @@ -748,6 +761,9 @@ func (kp *KeyPath) Copy() *KeyPath { } func (kp *KeyPath) HasDoubleGlob() bool { + if kp == nil { + return false + } for _, el := range kp.Path { if el.UnquotedString != nil && el.ScalarString() == "**" { return true @@ -757,6 +773,9 @@ func (kp *KeyPath) HasDoubleGlob() bool { } func (kp *KeyPath) HasGlob() bool { + if kp == nil { + return false + } for _, el := range kp.Path { if el.UnquotedString != nil && len(el.UnquotedString.Pattern) > 0 { return true diff --git a/d2ir/compile.go b/d2ir/compile.go index f88a4abdf..a0783923e 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -22,6 +22,8 @@ type compiler struct { // importCache enables reuse of files imported multiple times. importCache map[string]*Map utf16 bool + + globStack []bool } type CompileOptions struct { @@ -429,6 +431,10 @@ func (c *compiler) ampersandFilter(refctx *RefContext) bool { if !refctx.Key.Ampersand { return true } + if len(c.globStack) == 0 || !c.globStack[len(c.globStack)-1] { + c.errorf(refctx.Key, "glob filters cannot be used outside globs") + return false + } if len(refctx.Key.Edges) > 0 { return true } @@ -451,16 +457,12 @@ func (c *compiler) ampersandFilter(refctx *RefContext) bool { } func (c *compiler) _ampersandFilter(f *Field, refctx *RefContext) bool { - f2 := ParentMap(f).Map().GetField(refctx.Key.Key.IDA()...) - if f2 == nil { - return false - } if refctx.Key.Value.ScalarBox().Unbox() == nil { - c.errorf(refctx.Key, "ampersand filters cannot be composites") + c.errorf(refctx.Key, "glob filters cannot be composites") return false } - if a, ok := f2.Composite.(*Array); ok { + if a, ok := f.Composite.(*Array); ok { for _, v := range a.Values { if s, ok := v.(*Scalar); ok { if refctx.Key.Value.ScalarBox().Unbox().ScalarString() == s.Value.ScalarString() { @@ -470,11 +472,11 @@ func (c *compiler) _ampersandFilter(f *Field, refctx *RefContext) bool { } } - if f2.Primary_ == nil { + if f.Primary_ == nil { return false } - if refctx.Key.Value.ScalarBox().Unbox().ScalarString() != f2.Primary_.Value.ScalarString() { + if refctx.Key.Value.ScalarBox().Unbox().ScalarString() != f.Primary_.Value.ScalarString() { return false } @@ -530,7 +532,9 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { // If new board type, use that as the new scope AST, otherwise, carry on scopeAST = refctx.ScopeAST } + c.globStack = append(c.globStack, refctx.Key.HasQueryGlob()) c.compileMap(f.Map(), refctx.Key.Value.Map, scopeAST) + c.globStack = c.globStack[:len(c.globStack)-1] switch NodeBoardKind(f) { case BoardScenario, BoardStep: c.overlayClasses(f.Map()) @@ -767,7 +771,9 @@ func (c *compiler) _compileEdges(refctx *RefContext) { parent: e, } } + c.globStack = append(c.globStack, refctx.Key.HasQueryGlob()) c.compileMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) + c.globStack = c.globStack[:len(c.globStack)-1] } else if refctx.Key.Value.ScalarBox().Unbox() != nil { e.Primary_ = &Scalar{ parent: e, diff --git a/d2ir/filter_test.go b/d2ir/filter_test.go index 54cfdba21..710ba0803 100644 --- a/d2ir/filter_test.go +++ b/d2ir/filter_test.go @@ -74,6 +74,28 @@ catapult: { assertQuery(t, m, 3, 0, nil, "catapult") }, }, + { + name: "edge", + run: func(t testing.TB) { + m, err := compile(t, `x -> y: { + source-arrowhead.shape: diamond + target-arrowhead.shape: diamond +} +x -> y + +(x -> *)[*]: { + &source-arrowhead.shape: diamond + &target-arrowhead.shape: diamond + label: diamond shape arrowheads +} +`) + assert.Success(t, err) + assertQuery(t, m, 7, 2, nil, "") + assertQuery(t, m, 5, 0, nil, "(x -> y)[0]") + assertQuery(t, m, 0, 0, "diamond shape arrowheads", "(x -> y)[0].label") + assertQuery(t, m, 0, 0, nil, "(x -> y)[1]") + }, + }, } runa(t, tca) @@ -97,6 +119,22 @@ catapult: { TestCompile/filters/errors/bad-syntax.d2:9:1: unexpected map termination character } in file map`) }, }, + { + name: "no-glob", + run: func(t testing.TB) { + _, err := compile(t, `jacob.style: { + fill: red + multiple: true +} + +jasmine.style: { + &fill: red + multiple: false +} +`) + assert.ErrorString(t, err, `TestCompile/filters/errors/no-glob.d2:7:3: glob filters cannot be used outside globs`) + }, + }, { name: "composite", run: func(t testing.TB) { @@ -111,7 +149,7 @@ TestCompile/filters/errors/bad-syntax.d2:9:1: unexpected map termination charact } } `) - assert.ErrorString(t, err, `TestCompile/filters/errors/composite.d2:6:2: ampersand filters cannot be composites`) + assert.ErrorString(t, err, `TestCompile/filters/errors/composite.d2:6:2: glob filters cannot be composites`) }, }, } diff --git a/testdata/d2ir/TestCompile/filters/edge.exp.json b/testdata/d2ir/TestCompile/filters/edge.exp.json new file mode 100644 index 000000000..7e65c4f85 --- /dev/null +++ b/testdata/d2ir/TestCompile/filters/edge.exp.json @@ -0,0 +1,2696 @@ +{ + "fields": [ + { + "name": "x", + "references": [ + { + "string": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,0:0:0-3:1:77", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/edge.d2,0:8:8-3:1:77", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:32:42", + "key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:23:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:25:35-1:32:42", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:32:75", + "key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:23:66", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:25:68-2:32:75", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:6:84", + "src": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:6:84", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,4:0:78-4:6:84", + "src": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", + "src": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,6:0:86-10:1:203", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", + "src": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/filters/edge.d2,6:8:94-6:11:97", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/edge.d2,6:13:99-10:1:203", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:32:201", + "key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", + "value": [ + { + "string": "diamond shape arrowheads", + "raw_string": "diamond shape arrowheads" + } + ] + } + } + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", + "src": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,6:0:86-10:1:203", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", + "src": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/filters/edge.d2,6:8:94-6:11:97", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/edge.d2,6:13:99-10:1:203", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:32:201", + "key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", + "value": [ + { + "string": "diamond shape arrowheads", + "raw_string": "diamond shape arrowheads" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "y", + "references": [ + { + "string": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,0:0:0-3:1:77", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/edge.d2,0:8:8-3:1:77", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:32:42", + "key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:23:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:25:35-1:32:42", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:32:75", + "key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:23:66", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:25:68-2:32:75", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:6:84", + "src": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:6:84", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,4:0:78-4:6:84", + "src": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "x" + ], + "src_arrow": false, + "dst_path": [ + "y" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "map": { + "fields": [ + { + "name": "source-arrowhead", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/edge.d2,1:25:35-1:32:42", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:23:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:32:42", + "key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:23:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:25:35-1:32:42", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:23:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:32:42", + "key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:23:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:25:35-1:32:42", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + } + ] + }, + { + "name": "target-arrowhead", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/filters/edge.d2,2:25:68-2:32:75", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:23:66", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:32:75", + "key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:23:66", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:25:68-2:32:75", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:23:66", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:32:75", + "key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:23:66", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:25:68-2:32:75", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + }, + { + "string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + } + ] + }, + { + "name": "label", + "primary": { + "value": { + "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", + "value": [ + { + "string": "diamond shape arrowheads", + "raw_string": "diamond shape arrowheads" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:32:201", + "key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", + "value": [ + { + "string": "diamond shape arrowheads", + "raw_string": "diamond shape arrowheads" + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,0:0:0-3:1:77", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,0:0:0-0:6:6", + "src": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/edge.d2,0:8:8-3:1:77", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:32:42", + "key": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:23:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,1:25:35-1:32:42", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:32:75", + "key": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:23:66", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,2:25:68-2:32:75", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + } + ] + } + } + } + } + }, + { + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", + "src": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,6:0:86-10:1:203", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", + "src": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/filters/edge.d2,6:8:94-6:11:97", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/edge.d2,6:13:99-10:1:203", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:32:201", + "key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", + "value": [ + { + "string": "diamond shape arrowheads", + "raw_string": "diamond shape arrowheads" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "edge_id": { + "src_path": [ + "x" + ], + "src_arrow": false, + "dst_path": [ + "y" + ], + "dst_arrow": true, + "index": 1, + "glob": false + }, + "map": { + "fields": null, + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:6:84", + "src": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:6:84", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,4:0:78-4:6:84", + "src": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:0:78-4:1:79", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,4:5:83-4:6:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + }, + { + "context": { + "edge": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", + "src": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/filters/edge.d2,6:0:86-10:1:203", + "edges": [ + { + "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", + "src": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/filters/edge.d2,6:8:94-6:11:97", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/edge.d2,6:13:99-10:1:203", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:32:201", + "key": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", + "value": [ + { + "string": "diamond shape arrowheads", + "raw_string": "diamond shape arrowheads" + } + ] + } + } + } + } + ] + } + } + } + } + } + ] + } + ] +} diff --git a/testdata/d2ir/TestCompile/filters/errors/no-glob.exp.json b/testdata/d2ir/TestCompile/filters/errors/no-glob.exp.json new file mode 100644 index 000000000..549e146b6 --- /dev/null +++ b/testdata/d2ir/TestCompile/filters/errors/no-glob.exp.json @@ -0,0 +1,750 @@ +{ + "fields": [ + { + "name": "jacob", + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/filters/errors/no-glob.d2,1:7:22-1:10:25", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:5:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:10:25", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:5:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,1:7:22-1:10:25", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + } + ] + }, + { + "name": "multiple", + "primary": { + "value": { + "range": "TestCompile/filters/errors/no-glob.d2,2:11:37-2:15:41", + "value": true + } + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:9:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:15:41", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:9:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/no-glob.d2,2:11:37-2:15:41", + "value": true + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-3:1:43", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/errors/no-glob.d2,0:13:13-3:1:43", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:10:25", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:5:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,1:7:22-1:10:25", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:15:41", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:9:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/no-glob.d2,2:11:37-2:15:41", + "value": true + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-3:1:43", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/errors/no-glob.d2,0:13:13-3:1:43", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:10:25", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:5:20", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,1:1:16-1:5:20", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,1:7:22-1:10:25", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:15:41", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:9:35", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,2:1:27-2:9:35", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/no-glob.d2,2:11:37-2:15:41", + "value": true + } + } + } + } + ] + } + } + } + } + } + ] + }, + { + "name": "jasmine", + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": null, + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:8:53-5:13:58", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-5:13:58", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-5:7:52", + "value": [ + { + "string": "jasmine", + "raw_string": "jasmine" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:8:53-5:13:58", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-8:1:94", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-5:13:58", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-5:7:52", + "value": [ + { + "string": "jasmine", + "raw_string": "jasmine" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:8:53-5:13:58", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/errors/no-glob.d2,5:15:60-8:1:94", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/errors/no-glob.d2,6:2:64-6:12:74", + "ampersand": true, + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,6:3:65-6:7:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,6:3:65-6:7:69", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,6:9:71-6:12:74", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/errors/no-glob.d2,7:2:77-7:17:92", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,7:2:77-7:10:85", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,7:2:77-7:10:85", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/no-glob.d2,7:12:87-7:17:92", + "value": false + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-5:7:52", + "value": [ + { + "string": "jasmine", + "raw_string": "jasmine" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-5:13:58", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-5:7:52", + "value": [ + { + "string": "jasmine", + "raw_string": "jasmine" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:8:53-5:13:58", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-8:1:94", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-5:13:58", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:0:45-5:7:52", + "value": [ + { + "string": "jasmine", + "raw_string": "jasmine" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,5:8:53-5:13:58", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/filters/errors/no-glob.d2,5:15:60-8:1:94", + "nodes": [ + { + "map_key": { + "range": "TestCompile/filters/errors/no-glob.d2,6:2:64-6:12:74", + "ampersand": true, + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,6:3:65-6:7:69", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,6:3:65-6:7:69", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,6:9:71-6:12:74", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/filters/errors/no-glob.d2,7:2:77-7:17:92", + "key": { + "range": "TestCompile/filters/errors/no-glob.d2,7:2:77-7:10:85", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/errors/no-glob.d2,7:2:77-7:10:85", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "TestCompile/filters/errors/no-glob.d2,7:12:87-7:17:92", + "value": false + } + } + } + } + ] + } + } + } + } + } + ] + } + ], + "edges": null +} From 311d8ca8cc9ec7193f6931ff01de55a88956797d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 30 Jul 2023 20:04:37 -0700 Subject: [PATCH 134/138] Update next.md --- ci/release/changelogs/next.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index bd1d4c41c..16c5d4747 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,4 +1,26 @@ -D2 v0.6 introduces variable substitutions. The only major language feature left that were in the intial language design is globs, then we'll stamp it 1.0! +D2 v0.6 introduces variable substitutions and globs. These two were the last of the features planned in the initial designs for D2, and v1 is now very close! + +The power of variables and globs in a programming language need no introduction, so here's two minimal examples to get started: + +**Variables**: +```d2 +vars: { + color: aquamarine +} + +x.style.fill: ${color} +``` + +**Globs**: +```d2 +x +y +z + +*.style.fill: aquamarine +``` + +Both are live on [D2 Playground](https://play.d2lang.com) so give it a try! Looking forward to your issues and iterating Layout capability also takes a subtle but important step forward: you can now customize the position of labels and icons. From 62f8d8aa0252417eb698716bfedb55dd03f15ddb Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 30 Jul 2023 22:31:18 -0700 Subject: [PATCH 135/138] [ci-force] debian -> ubuntu for docker --- ci/release/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/docker/Dockerfile b/ci/release/docker/Dockerfile index 0d7789a26..b534b02ff 100644 --- a/ci/release/docker/Dockerfile +++ b/ci/release/docker/Dockerfile @@ -1,5 +1,5 @@ # https://hub.docker.com/repository/docker/terrastruct/d2 -FROM debian:latest +FROM ubuntu:latest ARG TARGETARCH From c2dea55d1bcf3a3c6589d81f26fa932bb5ff0705 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 30 Jul 2023 22:34:57 -0700 Subject: [PATCH 136/138] v0.6.0 --- ci/release/changelogs/next.md | 49 ------------------------------ ci/release/changelogs/v0.6.0.md | 54 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 49 deletions(-) create mode 100644 ci/release/changelogs/v0.6.0.md diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 16c5d4747..f3c0d2a77 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,54 +1,5 @@ -D2 v0.6 introduces variable substitutions and globs. These two were the last of the features planned in the initial designs for D2, and v1 is now very close! - -The power of variables and globs in a programming language need no introduction, so here's two minimal examples to get started: - -**Variables**: -```d2 -vars: { - color: aquamarine -} - -x.style.fill: ${color} -``` - -**Globs**: -```d2 -x -y -z - -*.style.fill: aquamarine -``` - -Both are live on [D2 Playground](https://play.d2lang.com) so give it a try! Looking forward to your issues and iterating - -Layout capability also takes a subtle but important step forward: you can now customize the position of labels and icons. - #### Features 🚀 -- Variables and substitutions are implemented. See [docs](https://d2lang.com/tour/vars). [#1473](https://github.com/terrastruct/d2/pull/1473) -- Configure timeout value with D2_TIMEOUT env var [#1392](https://github.com/terrastruct/d2/pull/1392) -- Scale renders and disable fit to screen with `--scale` flag [#1413](https://github.com/terrastruct/d2/pull/1413) -- `null` keyword can be used to un-declare. See [docs](https://d2lang.com/tour/overrides#null) [#1446](https://github.com/terrastruct/d2/pull/1446) -- Develop multi-board diagrams in watch mode (links to layers/scenarios/steps work in `--watch`) [#1503](https://github.com/terrastruct/d2/pull/1503) -- Glob patterns have been implemented. See [docs](https://d2lang.com/tour/globs). [#1479](https://github.com/terrastruct/d2/pull/1479) -- Ampersand filters have been implemented. See [docs](https://d2lang.com/tour/filters). [#1509](https://github.com/terrastruct/d2/pull/1509) - #### Improvements 🧹 -- 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) -- Improved rendering and text measurement for code shapes [#1425](https://github.com/terrastruct/d2/pull/1425) -- The autoformatter moves board declarations to the bottom of its scope [#1424](https://github.com/terrastruct/d2/pull/1424) -- All font styles in sketch mode use a consistent font-family [#1463](https://github.com/terrastruct/d2/pull/1463) -- Tooltip and link icons are positioned on shape border [#1466](https://github.com/terrastruct/d2/pull/1466) -- Tooltip and link icons are always rendered over shapes [#1467](https://github.com/terrastruct/d2/pull/1467) -- Boards with no objects are considered folders [#1504](https://github.com/terrastruct/d2/pull/1504) -- `DEBUG` environment variable ignored if set incorrectly [#1505](https://github.com/terrastruct/d2/pull/1505) - #### Bugfixes ⛑️ - -- 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) -- Fixes person shape label positioning with `multiple` or `3d` [#1478](https://github.com/terrastruct/d2/pull/1478) diff --git a/ci/release/changelogs/v0.6.0.md b/ci/release/changelogs/v0.6.0.md new file mode 100644 index 000000000..16c5d4747 --- /dev/null +++ b/ci/release/changelogs/v0.6.0.md @@ -0,0 +1,54 @@ +D2 v0.6 introduces variable substitutions and globs. These two were the last of the features planned in the initial designs for D2, and v1 is now very close! + +The power of variables and globs in a programming language need no introduction, so here's two minimal examples to get started: + +**Variables**: +```d2 +vars: { + color: aquamarine +} + +x.style.fill: ${color} +``` + +**Globs**: +```d2 +x +y +z + +*.style.fill: aquamarine +``` + +Both are live on [D2 Playground](https://play.d2lang.com) so give it a try! Looking forward to your issues and iterating + +Layout capability also takes a subtle but important step forward: you can now customize the position of labels and icons. + +#### Features 🚀 + +- Variables and substitutions are implemented. See [docs](https://d2lang.com/tour/vars). [#1473](https://github.com/terrastruct/d2/pull/1473) +- Configure timeout value with D2_TIMEOUT env var [#1392](https://github.com/terrastruct/d2/pull/1392) +- Scale renders and disable fit to screen with `--scale` flag [#1413](https://github.com/terrastruct/d2/pull/1413) +- `null` keyword can be used to un-declare. See [docs](https://d2lang.com/tour/overrides#null) [#1446](https://github.com/terrastruct/d2/pull/1446) +- Develop multi-board diagrams in watch mode (links to layers/scenarios/steps work in `--watch`) [#1503](https://github.com/terrastruct/d2/pull/1503) +- Glob patterns have been implemented. See [docs](https://d2lang.com/tour/globs). [#1479](https://github.com/terrastruct/d2/pull/1479) +- Ampersand filters have been implemented. See [docs](https://d2lang.com/tour/filters). [#1509](https://github.com/terrastruct/d2/pull/1509) + +#### Improvements 🧹 + +- 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) +- Improved rendering and text measurement for code shapes [#1425](https://github.com/terrastruct/d2/pull/1425) +- The autoformatter moves board declarations to the bottom of its scope [#1424](https://github.com/terrastruct/d2/pull/1424) +- All font styles in sketch mode use a consistent font-family [#1463](https://github.com/terrastruct/d2/pull/1463) +- Tooltip and link icons are positioned on shape border [#1466](https://github.com/terrastruct/d2/pull/1466) +- Tooltip and link icons are always rendered over shapes [#1467](https://github.com/terrastruct/d2/pull/1467) +- Boards with no objects are considered folders [#1504](https://github.com/terrastruct/d2/pull/1504) +- `DEBUG` environment variable ignored if set incorrectly [#1505](https://github.com/terrastruct/d2/pull/1505) + +#### Bugfixes ⛑️ + +- 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) +- Fixes person shape label positioning with `multiple` or `3d` [#1478](https://github.com/terrastruct/d2/pull/1478) From cd11c8fa5fca6a8996705c1442a30a1834fda4ea Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Mon, 31 Jul 2023 21:24:52 -0700 Subject: [PATCH 137/138] ci: Fix daily Preinstall playwright deps to avoid conflict between test and race. --- .github/workflows/daily.yml | 2 +- make.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 3883537f4..0f9f15eb3 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -16,7 +16,7 @@ jobs: with: go-version-file: ./go.mod cache: true - - run: COLOR=1 CI_FORCE=1 ./make.sh all race + - run: DAILY=1 COLOR=1 CI_FORCE=1 ./make.sh all race env: GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} diff --git a/make.sh b/make.sh index b39aabbfa..a2615001f 100755 --- a/make.sh +++ b/make.sh @@ -14,4 +14,8 @@ if ! go version | grep -qF '1.20'; then exit 1 fi +if [ "${DAILY-}" ]; then + export FORCE_COLOR=1 + npx playwright@1.31.1 install --with-deps chromium +fi _make "$@" From 339c0b3d812b0968a0b8379b754d3febf571d69f Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 1 Aug 2023 10:30:02 -0700 Subject: [PATCH 138/138] [ci-force] fix fmt in example --- docs/examples/wcc/wcc.d2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/examples/wcc/wcc.d2 b/docs/examples/wcc/wcc.d2 index bd9dcdf2b..f47593792 100644 --- a/docs/examples/wcc/wcc.d2 +++ b/docs/examples/wcc/wcc.d2 @@ -34,6 +34,7 @@ layers: { link: steps.1 style.font-size: 24 } + steps: { 1: { titled: Earn pre-requisite titles (IM) @@ -149,7 +150,7 @@ layers: { best of 14 games -> tiebreaks: if needed tiebreaks.link: layers.tiebreaks - + layers: { tiebreaks: { description: |md