luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Gavin Nishizawa 2023-09-13 21:02:23 -07:00
parent f84e3381db
commit 56126d90ee
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
6 changed files with 290 additions and 290 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci/release/changelogs/next.md
View file

@ -1,7 +1,7 @@
#### Features 🚀 #### Features 🚀
- UTF-16 files are automatically detected and supported [#1525](https://github.com/terrastruct/d2/pull/1525) - UTF-16 files are automatically detected and supported [#1525](https://github.com/terrastruct/d2/pull/1525)
- Grid diagrams can now have edges between cells [#1586](https://github.com/terrastruct/d2/pull/1586) - Grid diagrams can now have simple edges between cells [#1586](https://github.com/terrastruct/d2/pull/1586)
#### Improvements 🧹 #### Improvements 🧹

70
e2etests/testdata/files/simple_grid_edges.d2 vendored
View file

@ -4,7 +4,7 @@ horizontal-gap: 20
*.class: [text; blue] *.class: [text; blue]
a: { 0,0: {
label: "npm i -g\n@forge/cli" label: "npm i -g\n@forge/cli"
style: { style: {
fill: "#30304c" fill: "#30304c"
@ -16,26 +16,26 @@ a: {
} }
} }
b: { 0,1: {
label: "Set up an\nAtlassian site" label: "Set up an\nAtlassian site"
class: [text; gray] class: [text; gray]
} }
c.class: empty 0,2.class: empty
d: { 0,3: {
label: "View the hello\nworld app" label: "View the hello\nworld app"
class: [text; gray] class: [text; gray]
} }
e: forge\ntunnel 0,4: forge\ntunnel
f: forge\nlogin 1,0: forge\nlogin
g: forge\ncreate 1,1: forge\ncreate
h: forge\ndeploy 1,2: forge\ndeploy
i: forge\ninstall 1,3: forge\ninstall
j: { 1,4: {
shape: diamond shape: diamond
label: "Hot reload\nchanges?" label: "Hot reload\nchanges?"
class: [text; gray] class: [text; gray]
} }
k: "" { 2,0: "" {
grid-rows: 3 grid-rows: 3
grid-columns: 1 grid-columns: 1
grid-gap: 0 grid-gap: 0
@ -67,10 +67,30 @@ k: "" {
style.font-color: "#cecece" style.font-color: "#cecece"
} }
} }
l.class: empty 2,1.class: empty
m.class: empty 2,2.class: empty
n.class: empty 2,3.class: empty
o: forge\ndeploy 2,4: forge\ndeploy
0,0 -> 1,0 -> 1,1 -> 1,2 -> 1,3 -> 1,4: {
class: arrow
}
1,1 -> 0,1: {
class: arrow
style.stroke: "#cecece"
}
1,3 -> 0,3: {
class: arrow
style.stroke: "#cecece"
}
1,4 -> 0,4: Yes {
class: arrow
style.font-size: 10
}
1,4 -> 2,4: No {
class: arrow
style.font-size: 10
}
classes: { classes: {
text.style: { text.style: {
@ -111,23 +131,3 @@ classes: {
} }
} }
} }
a -> f -> g -> h -> i -> j: {
class: arrow
}
g -> b: {
class: arrow
style.stroke: "#cecece"
}
i -> d: {
class: arrow
style.stroke: "#cecece"
}
j -> e: Yes {
class: arrow
style.font-size: 10
}
j -> o: No {
class: arrow
style.font-size: 10
}

90
e2etests/testdata/stable/simple_grid_edges/dagre/board.exp.json generated vendored
View file

@ -4,7 +4,7 @@
"fontFamily": "SourceSansPro", "fontFamily": "SourceSansPro",
"shapes": [ "shapes": [
{ {
"id": "a", "id": "0,0",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -49,7 +49,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "b", "id": "0,1",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -94,7 +94,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "c", "id": "0,2",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"empty" "empty"
@ -138,7 +138,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "d", "id": "0,3",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -183,7 +183,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "e", "id": "0,4",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -228,7 +228,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "f", "id": "1,0",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -273,7 +273,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "g", "id": "1,1",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -318,7 +318,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "h", "id": "1,2",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -363,7 +363,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "i", "id": "1,3",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -408,7 +408,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "j", "id": "1,4",
"type": "diamond", "type": "diamond",
"classes": [ "classes": [
"text", "text",
@ -453,7 +453,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "k", "id": "2,0",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 0, "x": 0,
@ -494,7 +494,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "k.a", "id": "2,0.a",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 0, "x": 0,
@ -535,7 +535,7 @@
"level": 2 "level": 2
}, },
{ {
"id": "k.b", "id": "2,0.b",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 0, "x": 0,
@ -576,7 +576,7 @@
"level": 2 "level": 2
}, },
{ {
"id": "k.c", "id": "2,0.c",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 0, "x": 0,
@ -617,7 +617,7 @@
"level": 2 "level": 2
}, },
{ {
"id": "l", "id": "2,1",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"empty" "empty"
@ -661,7 +661,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "m", "id": "2,2",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"empty" "empty"
@ -705,7 +705,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "n", "id": "2,3",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"empty" "empty"
@ -749,7 +749,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "o", "id": "2,4",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -796,13 +796,13 @@
], ],
"connections": [ "connections": [
{ {
"id": "(a -> f)[0]", "id": "(0,0 -> 1,0)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "a", "src": "0,0",
"srcArrow": "none", "srcArrow": "none",
"dst": "f", "dst": "1,0",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -837,13 +837,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(f -> g)[0]", "id": "(1,0 -> 1,1)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "f", "src": "1,0",
"srcArrow": "none", "srcArrow": "none",
"dst": "g", "dst": "1,1",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -878,13 +878,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(g -> h)[0]", "id": "(1,1 -> 1,2)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "g", "src": "1,1",
"srcArrow": "none", "srcArrow": "none",
"dst": "h", "dst": "1,2",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -919,13 +919,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(h -> i)[0]", "id": "(1,2 -> 1,3)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "h", "src": "1,2",
"srcArrow": "none", "srcArrow": "none",
"dst": "i", "dst": "1,3",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -960,13 +960,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(i -> j)[0]", "id": "(1,3 -> 1,4)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "i", "src": "1,3",
"srcArrow": "none", "srcArrow": "none",
"dst": "j", "dst": "1,4",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -1001,13 +1001,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(g -> b)[0]", "id": "(1,1 -> 0,1)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "g", "src": "1,1",
"srcArrow": "none", "srcArrow": "none",
"dst": "b", "dst": "0,1",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -1042,13 +1042,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(i -> d)[0]", "id": "(1,3 -> 0,3)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "i", "src": "1,3",
"srcArrow": "none", "srcArrow": "none",
"dst": "d", "dst": "0,3",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -1083,13 +1083,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(j -> e)[0]", "id": "(1,4 -> 0,4)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "j", "src": "1,4",
"srcArrow": "none", "srcArrow": "none",
"dst": "e", "dst": "0,4",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -1124,13 +1124,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(j -> o)[0]", "id": "(1,4 -> 2,4)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "j", "src": "1,4",
"srcArrow": "none", "srcArrow": "none",
"dst": "o", "dst": "2,4",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,

164
e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

90
e2etests/testdata/stable/simple_grid_edges/elk/board.exp.json generated vendored
View file

@ -4,7 +4,7 @@
"fontFamily": "SourceSansPro", "fontFamily": "SourceSansPro",
"shapes": [ "shapes": [
{ {
"id": "a", "id": "0,0",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -49,7 +49,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "b", "id": "0,1",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -94,7 +94,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "c", "id": "0,2",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"empty" "empty"
@ -138,7 +138,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "d", "id": "0,3",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -183,7 +183,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "e", "id": "0,4",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -228,7 +228,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "f", "id": "1,0",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -273,7 +273,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "g", "id": "1,1",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -318,7 +318,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "h", "id": "1,2",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -363,7 +363,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "i", "id": "1,3",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -408,7 +408,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "j", "id": "1,4",
"type": "diamond", "type": "diamond",
"classes": [ "classes": [
"text", "text",
@ -453,7 +453,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "k", "id": "2,0",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 0, "x": 0,
@ -494,7 +494,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "k.a", "id": "2,0.a",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 0, "x": 0,
@ -535,7 +535,7 @@
"level": 2 "level": 2
}, },
{ {
"id": "k.b", "id": "2,0.b",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 0, "x": 0,
@ -576,7 +576,7 @@
"level": 2 "level": 2
}, },
{ {
"id": "k.c", "id": "2,0.c",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 0, "x": 0,
@ -617,7 +617,7 @@
"level": 2 "level": 2
}, },
{ {
"id": "l", "id": "2,1",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"empty" "empty"
@ -661,7 +661,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "m", "id": "2,2",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"empty" "empty"
@ -705,7 +705,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "n", "id": "2,3",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"empty" "empty"
@ -749,7 +749,7 @@
"level": 1 "level": 1
}, },
{ {
"id": "o", "id": "2,4",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"text", "text",
@ -796,13 +796,13 @@
], ],
"connections": [ "connections": [
{ {
"id": "(a -> f)[0]", "id": "(0,0 -> 1,0)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "a", "src": "0,0",
"srcArrow": "none", "srcArrow": "none",
"dst": "f", "dst": "1,0",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -837,13 +837,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(f -> g)[0]", "id": "(1,0 -> 1,1)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "f", "src": "1,0",
"srcArrow": "none", "srcArrow": "none",
"dst": "g", "dst": "1,1",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -878,13 +878,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(g -> h)[0]", "id": "(1,1 -> 1,2)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "g", "src": "1,1",
"srcArrow": "none", "srcArrow": "none",
"dst": "h", "dst": "1,2",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -919,13 +919,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(h -> i)[0]", "id": "(1,2 -> 1,3)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "h", "src": "1,2",
"srcArrow": "none", "srcArrow": "none",
"dst": "i", "dst": "1,3",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -960,13 +960,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(i -> j)[0]", "id": "(1,3 -> 1,4)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "i", "src": "1,3",
"srcArrow": "none", "srcArrow": "none",
"dst": "j", "dst": "1,4",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -1001,13 +1001,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(g -> b)[0]", "id": "(1,1 -> 0,1)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "g", "src": "1,1",
"srcArrow": "none", "srcArrow": "none",
"dst": "b", "dst": "0,1",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -1042,13 +1042,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(i -> d)[0]", "id": "(1,3 -> 0,3)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "i", "src": "1,3",
"srcArrow": "none", "srcArrow": "none",
"dst": "d", "dst": "0,3",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -1083,13 +1083,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(j -> e)[0]", "id": "(1,4 -> 0,4)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "j", "src": "1,4",
"srcArrow": "none", "srcArrow": "none",
"dst": "e", "dst": "0,4",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -1124,13 +1124,13 @@
"zIndex": 0 "zIndex": 0
}, },
{ {
"id": "(j -> o)[0]", "id": "(1,4 -> 2,4)[0]",
"classes": [ "classes": [
"arrow" "arrow"
], ],
"src": "j", "src": "1,4",
"srcArrow": "none", "srcArrow": "none",
"dst": "o", "dst": "2,4",
"dstArrow": "arrow", "dstArrow": "arrow",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,

164
e2etests/testdata/stable/simple_grid_edges/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB