From 5ce77a1325ef6b2cf487c48c63854a4a0516c28b Mon Sep 17 00:00:00 2001
From: melsonic <work.melsonic@gmail.com>
Date: Sat, 29 Mar 2025 22:09:11 +0530
Subject: [PATCH] removed blank lines & capitalized ID's

---
 d2compiler/compile.go                                  |  2 --
 d2renderers/d2svg/d2svg.go                             | 10 +++++-----
 d2renderers/d2svg/table.go                             |  2 +-
 .../dagre/sketch.exp.svg                               |  2 +-
 .../elk/sketch.exp.svg                                 |  2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/d2compiler/compile.go b/d2compiler/compile.go
index bfc4a8bc2..651238afe 100644
--- a/d2compiler/compile.go
+++ b/d2compiler/compile.go
@@ -766,11 +766,9 @@ func (c *compiler) compileStyleField(styles *d2graph.Style, f *d2ir.Field) {
 	if f.Primary() == nil {
 		return
 	}
-
 	compileStyleFieldInit(styles, f)
 	scalar := f.Primary().Value
 	err := styles.Apply(f.Name.ScalarString(), scalar.ScalarString())
-
 	if err != nil {
 		c.errorf(scalar, err.Error())
 		return
diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
index a71580121..234a1b44b 100644
--- a/d2renderers/d2svg/d2svg.go
+++ b/d2renderers/d2svg/d2svg.go
@@ -1441,9 +1441,9 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape
 		el.Stroke = stroke
 		el.Style = style
 		if targetShape.IconBorderRadius != 0 {
-			clipPathId := fmt.Sprintf("%v-%v-icon", diagramHash, svg.SVGID(targetShape.ID))
-			fmt.Fprint(writer, applyIconBorderRadius(clipPathId, targetShape))
-			el.ClipPath = clipPathId
+			clipPathID := fmt.Sprintf("%v-%v-icon", diagramHash, svg.SVGID(targetShape.ID))
+			fmt.Fprint(writer, applyIconBorderRadius(clipPathID, targetShape))
+			el.ClipPath = clipPathID
 		}
 		fmt.Fprint(writer, el.Render())
 
@@ -1877,7 +1877,7 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape
 	return labelMask, nil
 }
 
-func applyIconBorderRadius(clipPathId string, shape d2target.Shape) string {
+func applyIconBorderRadius(clipPathID string, shape d2target.Shape) string {
 	box := geo.NewBox(
 		geo.NewPoint(float64(shape.Pos.X), float64(shape.Pos.Y)),
 		float64(shape.Width),
@@ -1885,7 +1885,7 @@ func applyIconBorderRadius(clipPathId string, shape d2target.Shape) string {
 	)
 	topX, topY := box.TopLeft.X+box.Width, box.TopLeft.Y
 
-	out := fmt.Sprintf(`<clipPath id="%s">`, clipPathId)
+	out := fmt.Sprintf(`<clipPath id="%s">`, clipPathID)
 	out += fmt.Sprintf(`<path d="M %f %f L %f %f S %f %f %f %f `, box.TopLeft.X, box.TopLeft.Y+float64(shape.IconBorderRadius), box.TopLeft.X, box.TopLeft.Y+float64(shape.IconBorderRadius), box.TopLeft.X, box.TopLeft.Y, box.TopLeft.X+float64(shape.IconBorderRadius), box.TopLeft.Y)
 	out += fmt.Sprintf(`L %f %f L %f %f `, box.TopLeft.X+box.Width-float64(shape.IconBorderRadius), box.TopLeft.Y, topX-float64(shape.IconBorderRadius), topY)
 
diff --git a/d2renderers/d2svg/table.go b/d2renderers/d2svg/table.go
index f7b2782db..86f5438e4 100644
--- a/d2renderers/d2svg/table.go
+++ b/d2renderers/d2svg/table.go
@@ -22,7 +22,7 @@ func clipPathForBorderRadius(diagramHash string, shape d2target.Shape) string {
 	)
 	topX, topY := box.TopLeft.X+box.Width, box.TopLeft.Y
 
-	out := fmt.Sprintf(`<clipPath id="%v-%v">`, diagramHash, shape.ID)
+	out := fmt.Sprintf(`<clipPath id="%v-%v">`, diagramHash, svg.SVGID(shape.ID))
 	out += fmt.Sprintf(`<path d="M %f %f L %f %f S %f %f %f %f `, box.TopLeft.X, box.TopLeft.Y+float64(shape.BorderRadius), box.TopLeft.X, box.TopLeft.Y+float64(shape.BorderRadius), box.TopLeft.X, box.TopLeft.Y, box.TopLeft.X+float64(shape.BorderRadius), box.TopLeft.Y)
 	out += fmt.Sprintf(`L %f %f L %f %f `, box.TopLeft.X+box.Width-float64(shape.BorderRadius), box.TopLeft.Y, topX-float64(shape.BorderRadius), topY)
 
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 e0cd65a28..1db526936 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
@@ -96,7 +96,7 @@
 		.d2-1154201599 .color-AA4{color:#EDF0FD;}
 		.d2-1154201599 .color-AA5{color:#F7F8FE;}
 		.d2-1154201599 .color-AB4{color:#EDF0FD;}
-		.d2-1154201599 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1154201599);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1154201599);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1154201599);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1154201599);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><clipPath id="d2-1154201599-a"><path d="M 0.000000 12.000000 L 0.000000 12.000000 S 0.000000 2.000000 10.000000 2.000000 L 427.000000 2.000000 L 427.000000 2.000000 S 437.000000 2.000000 437.000000 12.000000 L 437.000000 172.000000 L 437.000000 182.000000 L 0.000000 182.000000Z 0.000000 2.000000" fill="none" /> </clipPath><g class="YQ=="><g class="shape" ><rect x="0.000000" y="2.000000" width="437.000000" height="180.000000" rx="10.000000" ry="10.000000" stroke="red" fill="#FFFFFF" class="shape fill-N7" style="stroke-width:2;" /><rect x="0.000000" y="2.000000" width="437.000000" height="36.000000" fill="red" class="class_header" clip-path="url(#d2-1154201599-a)" /><text x="10.000000" y="27.750000" fill="#FFFFFF" class="text fill-N7" style="text-anchor:start;font-size:24px">a</text><text x="10.000000" y="61.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">id</text><text x="140.000000" y="61.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">int</text><text x="427.000000" y="61.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">PK</text><line x1="0.000000" x2="437.000000" y1="74.000000" y2="74.000000" stroke="red" style="stroke-width:2" /><text x="10.000000" y="97.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">disk</text><text x="140.000000" y="97.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">int</text><text x="427.000000" y="97.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">FK</text><line x1="0.000000" x2="437.000000" y1="110.000000" y2="110.000000" stroke="red" style="stroke-width:2" /><text x="10.000000" y="133.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">json</text><text x="140.000000" y="133.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">jsonb</text><text x="427.000000" y="133.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">UNQ</text><line x1="0.000000" x2="437.000000" y1="146.000000" y2="146.000000" stroke="red" style="stroke-width:2" /><text x="10.000000" y="169.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">last_updated</text><text x="140.000000" y="169.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">timestamp with time zone</text><text x="427.000000" y="169.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px" /><line x1="10.000000" x2="427.000000" y1="182.000000" y2="182.000000" stroke="red" style="stroke-width:2" /></g></g><clipPath id="d2-1154201599-b"><path d="M 497.000000 10.000000 L 497.000000 10.000000 S 497.000000 0.000000 507.000000 0.000000 L 894.000000 0.000000 L 894.000000 0.000000 S 904.000000 0.000000 904.000000 10.000000 L 904.000000 174.000000 S 904.000000  184.000000 894.000000 184.000000 L 507.000000 184.000000 S 497.000000 184.000000 497.000000 174.000000L 497.000000 10.000000Z 497.000000 0.000000" fill="none" /> </clipPath><g class="Yg=="><g class="shape" ><rect x="497.000000" y="0.000000" width="407.000000" height="184.000000" rx="10.000000" ry="10.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="497.000000" y="0.000000" width="407.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1154201599-b)" /><text x="700.500000" y="50.500000" fill="#FFFFFF" class="text-mono fill-N7" style="text-anchor:middle;font-size:24px;">b</text><text x="507.000000" y="120.000000" fill="#0D32B2" class="text-mono fill-B2" style="text-anchor:start;font-size:20px">+</text><text x="527.000000" y="120.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:start;font-size:20px">field</text><text x="884.000000" y="120.000000" fill="#4A6FF3" class="text-mono fill-AA2" style="text-anchor:end;font-size:20px">[]string</text><line x1="497.000000" x2="904.000000" y1="138.000000" y2="138.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /><text x="507.000000" y="166.000000" fill="#0D32B2" class="text-mono fill-B2" style="text-anchor:start;font-size:20px">+</text><text x="527.000000" y="166.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:start;font-size:20px">method(a uint64)</text><text x="884.000000" y="166.000000" fill="#4A6FF3" class="text-mono fill-AA2" style="text-anchor:end;font-size:20px">(x, y int)</text></g></g><clipPath id="d2-1154201599-c"><path d="M 964.000000 51.000000 L 964.000000 51.000000 S 964.000000 46.000000 969.000000 46.000000 L 1076.000000 46.000000 L 1076.000000 46.000000 S 1081.000000 46.000000 1081.000000 51.000000 L 1081.000000 133.000000 S 1081.000000  138.000000 1076.000000 138.000000 L 969.000000 138.000000 S 964.000000 138.000000 964.000000 133.000000L 964.000000 51.000000Z 964.000000 46.000000" fill="none" /> </clipPath><g class="Yw=="><g class="shape" ><rect x="964.000000" y="46.000000" width="117.000000" height="92.000000" rx="5.000000" ry="5.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="964.000000" y="46.000000" width="117.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1154201599-c)" /><text x="1022.500000" y="96.500000" fill="#FFFFFF" class="text-mono fill-N7" style="text-anchor:middle;font-size:24px;">c</text><line x1="969.000000" x2="1076.000000" y1="138.000000" y2="138.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /></g></g><clipPath id="d2-1154201599-d"><path d="M 1141.000000 79.000000 L 1141.000000 79.000000 S 1141.000000 74.000000 1146.000000 74.000000 L 1186.000000 74.000000 L 1186.000000 74.000000 S 1191.000000 74.000000 1191.000000 79.000000 L 1191.000000 105.000000 S 1191.000000  110.000000 1186.000000 110.000000 L 1146.000000 110.000000 S 1141.000000 110.000000 1141.000000 105.000000L 1141.000000 79.000000Z 1141.000000 74.000000" fill="none" /> </clipPath><g class="ZA=="><g class="shape" ><rect x="1141.000000" y="74.000000" width="50.000000" height="36.000000" rx="5.000000" ry="5.000000" stroke="#0A0F25" fill="#FFFFFF" class="shape stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="1141.000000" y="74.000000" width="50.000000" height="36.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1154201599-d)" /><text x="1151.000000" y="99.750000" fill="#FFFFFF" class="text fill-N7" style="text-anchor:start;font-size:24px">d</text></g></g><mask id="d2-1154201599" maskUnits="userSpaceOnUse" x="-1" y="-1" width="1193" height="186">
+		.d2-1154201599 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1154201599);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1154201599);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1154201599);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1154201599);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><clipPath id="d2-1154201599-ME"><path d="M 0.000000 12.000000 L 0.000000 12.000000 S 0.000000 2.000000 10.000000 2.000000 L 427.000000 2.000000 L 427.000000 2.000000 S 437.000000 2.000000 437.000000 12.000000 L 437.000000 172.000000 L 437.000000 182.000000 L 0.000000 182.000000Z 0.000000 2.000000" fill="none" /> </clipPath><g class="YQ=="><g class="shape" ><rect x="0.000000" y="2.000000" width="437.000000" height="180.000000" rx="10.000000" ry="10.000000" stroke="red" fill="#FFFFFF" class="shape fill-N7" style="stroke-width:2;" /><rect x="0.000000" y="2.000000" width="437.000000" height="36.000000" fill="red" class="class_header" clip-path="url(#d2-1154201599-a)" /><text x="10.000000" y="27.750000" fill="#FFFFFF" class="text fill-N7" style="text-anchor:start;font-size:24px">a</text><text x="10.000000" y="61.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">id</text><text x="140.000000" y="61.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">int</text><text x="427.000000" y="61.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">PK</text><line x1="0.000000" x2="437.000000" y1="74.000000" y2="74.000000" stroke="red" style="stroke-width:2" /><text x="10.000000" y="97.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">disk</text><text x="140.000000" y="97.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">int</text><text x="427.000000" y="97.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">FK</text><line x1="0.000000" x2="437.000000" y1="110.000000" y2="110.000000" stroke="red" style="stroke-width:2" /><text x="10.000000" y="133.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">json</text><text x="140.000000" y="133.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">jsonb</text><text x="427.000000" y="133.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">UNQ</text><line x1="0.000000" x2="437.000000" y1="146.000000" y2="146.000000" stroke="red" style="stroke-width:2" /><text x="10.000000" y="169.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">last_updated</text><text x="140.000000" y="169.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">timestamp with time zone</text><text x="427.000000" y="169.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px" /><line x1="10.000000" x2="427.000000" y1="182.000000" y2="182.000000" stroke="red" style="stroke-width:2" /></g></g><clipPath id="d2-1154201599-MI"><path d="M 497.000000 10.000000 L 497.000000 10.000000 S 497.000000 0.000000 507.000000 0.000000 L 894.000000 0.000000 L 894.000000 0.000000 S 904.000000 0.000000 904.000000 10.000000 L 904.000000 174.000000 S 904.000000  184.000000 894.000000 184.000000 L 507.000000 184.000000 S 497.000000 184.000000 497.000000 174.000000L 497.000000 10.000000Z 497.000000 0.000000" fill="none" /> </clipPath><g class="Yg=="><g class="shape" ><rect x="497.000000" y="0.000000" width="407.000000" height="184.000000" rx="10.000000" ry="10.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="497.000000" y="0.000000" width="407.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1154201599-b)" /><text x="700.500000" y="50.500000" fill="#FFFFFF" class="text-mono fill-N7" style="text-anchor:middle;font-size:24px;">b</text><text x="507.000000" y="120.000000" fill="#0D32B2" class="text-mono fill-B2" style="text-anchor:start;font-size:20px">+</text><text x="527.000000" y="120.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:start;font-size:20px">field</text><text x="884.000000" y="120.000000" fill="#4A6FF3" class="text-mono fill-AA2" style="text-anchor:end;font-size:20px">[]string</text><line x1="497.000000" x2="904.000000" y1="138.000000" y2="138.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /><text x="507.000000" y="166.000000" fill="#0D32B2" class="text-mono fill-B2" style="text-anchor:start;font-size:20px">+</text><text x="527.000000" y="166.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:start;font-size:20px">method(a uint64)</text><text x="884.000000" y="166.000000" fill="#4A6FF3" class="text-mono fill-AA2" style="text-anchor:end;font-size:20px">(x, y int)</text></g></g><clipPath id="d2-1154201599-MM"><path d="M 964.000000 51.000000 L 964.000000 51.000000 S 964.000000 46.000000 969.000000 46.000000 L 1076.000000 46.000000 L 1076.000000 46.000000 S 1081.000000 46.000000 1081.000000 51.000000 L 1081.000000 133.000000 S 1081.000000  138.000000 1076.000000 138.000000 L 969.000000 138.000000 S 964.000000 138.000000 964.000000 133.000000L 964.000000 51.000000Z 964.000000 46.000000" fill="none" /> </clipPath><g class="Yw=="><g class="shape" ><rect x="964.000000" y="46.000000" width="117.000000" height="92.000000" rx="5.000000" ry="5.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="964.000000" y="46.000000" width="117.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1154201599-c)" /><text x="1022.500000" y="96.500000" fill="#FFFFFF" class="text-mono fill-N7" style="text-anchor:middle;font-size:24px;">c</text><line x1="969.000000" x2="1076.000000" y1="138.000000" y2="138.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /></g></g><clipPath id="d2-1154201599-MQ"><path d="M 1141.000000 79.000000 L 1141.000000 79.000000 S 1141.000000 74.000000 1146.000000 74.000000 L 1186.000000 74.000000 L 1186.000000 74.000000 S 1191.000000 74.000000 1191.000000 79.000000 L 1191.000000 105.000000 S 1191.000000  110.000000 1186.000000 110.000000 L 1146.000000 110.000000 S 1141.000000 110.000000 1141.000000 105.000000L 1141.000000 79.000000Z 1141.000000 74.000000" fill="none" /> </clipPath><g class="ZA=="><g class="shape" ><rect x="1141.000000" y="74.000000" width="50.000000" height="36.000000" rx="5.000000" ry="5.000000" stroke="#0A0F25" fill="#FFFFFF" class="shape stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="1141.000000" y="74.000000" width="50.000000" height="36.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1154201599-d)" /><text x="1151.000000" y="99.750000" fill="#FFFFFF" class="text fill-N7" style="text-anchor:start;font-size:24px">d</text></g></g><mask id="d2-1154201599" maskUnits="userSpaceOnUse" x="-1" y="-1" width="1193" height="186">
 <rect x="-1" y="-1" width="1193" height="186" fill="white"></rect>
 
 </mask></svg></svg>
\ 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 e321d494a..0f955d794 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
@@ -96,7 +96,7 @@
 		.d2-1612823801 .color-AA4{color:#EDF0FD;}
 		.d2-1612823801 .color-AA5{color:#F7F8FE;}
 		.d2-1612823801 .color-AB4{color:#EDF0FD;}
-		.d2-1612823801 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><clipPath id="d2-1612823801-a"><path d="M 12.000000 24.000000 L 12.000000 24.000000 S 12.000000 14.000000 22.000000 14.000000 L 439.000000 14.000000 L 439.000000 14.000000 S 449.000000 14.000000 449.000000 24.000000 L 449.000000 184.000000 L 449.000000 194.000000 L 12.000000 194.000000Z 12.000000 14.000000" fill="none" /> </clipPath><g class="YQ=="><g class="shape" ><rect x="12.000000" y="14.000000" width="437.000000" height="180.000000" rx="10.000000" ry="10.000000" stroke="red" fill="#FFFFFF" class="shape fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="14.000000" width="437.000000" height="36.000000" fill="red" class="class_header" clip-path="url(#d2-1612823801-a)" /><text x="22.000000" y="39.750000" fill="#FFFFFF" class="text fill-N7" style="text-anchor:start;font-size:24px">a</text><text x="22.000000" y="73.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">id</text><text x="152.000000" y="73.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">int</text><text x="439.000000" y="73.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">PK</text><line x1="12.000000" x2="449.000000" y1="86.000000" y2="86.000000" stroke="red" style="stroke-width:2" /><text x="22.000000" y="109.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">disk</text><text x="152.000000" y="109.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">int</text><text x="439.000000" y="109.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">FK</text><line x1="12.000000" x2="449.000000" y1="122.000000" y2="122.000000" stroke="red" style="stroke-width:2" /><text x="22.000000" y="145.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">json</text><text x="152.000000" y="145.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">jsonb</text><text x="439.000000" y="145.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">UNQ</text><line x1="12.000000" x2="449.000000" y1="158.000000" y2="158.000000" stroke="red" style="stroke-width:2" /><text x="22.000000" y="181.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">last_updated</text><text x="152.000000" y="181.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">timestamp with time zone</text><text x="439.000000" y="181.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px" /><line x1="22.000000" x2="439.000000" y1="194.000000" y2="194.000000" stroke="red" style="stroke-width:2" /></g></g><clipPath id="d2-1612823801-b"><path d="M 469.000000 22.000000 L 469.000000 22.000000 S 469.000000 12.000000 479.000000 12.000000 L 866.000000 12.000000 L 866.000000 12.000000 S 876.000000 12.000000 876.000000 22.000000 L 876.000000 186.000000 S 876.000000  196.000000 866.000000 196.000000 L 479.000000 196.000000 S 469.000000 196.000000 469.000000 186.000000L 469.000000 22.000000Z 469.000000 12.000000" fill="none" /> </clipPath><g class="Yg=="><g class="shape" ><rect x="469.000000" y="12.000000" width="407.000000" height="184.000000" rx="10.000000" ry="10.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="469.000000" y="12.000000" width="407.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1612823801-b)" /><text x="672.500000" y="62.500000" fill="#FFFFFF" class="text-mono fill-N7" style="text-anchor:middle;font-size:24px;">b</text><text x="479.000000" y="132.000000" fill="#0D32B2" class="text-mono fill-B2" style="text-anchor:start;font-size:20px">+</text><text x="499.000000" y="132.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:start;font-size:20px">field</text><text x="856.000000" y="132.000000" fill="#4A6FF3" class="text-mono fill-AA2" style="text-anchor:end;font-size:20px">[]string</text><line x1="469.000000" x2="876.000000" y1="150.000000" y2="150.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /><text x="479.000000" y="178.000000" fill="#0D32B2" class="text-mono fill-B2" style="text-anchor:start;font-size:20px">+</text><text x="499.000000" y="178.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:start;font-size:20px">method(a uint64)</text><text x="856.000000" y="178.000000" fill="#4A6FF3" class="text-mono fill-AA2" style="text-anchor:end;font-size:20px">(x, y int)</text></g></g><clipPath id="d2-1612823801-c"><path d="M 896.000000 63.000000 L 896.000000 63.000000 S 896.000000 58.000000 901.000000 58.000000 L 1008.000000 58.000000 L 1008.000000 58.000000 S 1013.000000 58.000000 1013.000000 63.000000 L 1013.000000 145.000000 S 1013.000000  150.000000 1008.000000 150.000000 L 901.000000 150.000000 S 896.000000 150.000000 896.000000 145.000000L 896.000000 63.000000Z 896.000000 58.000000" fill="none" /> </clipPath><g class="Yw=="><g class="shape" ><rect x="896.000000" y="58.000000" width="117.000000" height="92.000000" rx="5.000000" ry="5.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="896.000000" y="58.000000" width="117.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1612823801-c)" /><text x="954.500000" y="108.500000" fill="#FFFFFF" class="text-mono fill-N7" style="text-anchor:middle;font-size:24px;">c</text><line x1="901.000000" x2="1008.000000" y1="150.000000" y2="150.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /></g></g><clipPath id="d2-1612823801-d"><path d="M 1033.000000 91.000000 L 1033.000000 91.000000 S 1033.000000 86.000000 1038.000000 86.000000 L 1078.000000 86.000000 L 1078.000000 86.000000 S 1083.000000 86.000000 1083.000000 91.000000 L 1083.000000 117.000000 S 1083.000000  122.000000 1078.000000 122.000000 L 1038.000000 122.000000 S 1033.000000 122.000000 1033.000000 117.000000L 1033.000000 91.000000Z 1033.000000 86.000000" fill="none" /> </clipPath><g class="ZA=="><g class="shape" ><rect x="1033.000000" y="86.000000" width="50.000000" height="36.000000" rx="5.000000" ry="5.000000" stroke="#0A0F25" fill="#FFFFFF" class="shape stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="1033.000000" y="86.000000" width="50.000000" height="36.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1612823801-d)" /><text x="1043.000000" y="111.750000" fill="#FFFFFF" class="text fill-N7" style="text-anchor:start;font-size:24px">d</text></g></g><mask id="d2-1612823801" maskUnits="userSpaceOnUse" x="11" y="11" width="1073" height="186">
+		.d2-1612823801 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><clipPath id="d2-1612823801-ME"><path d="M 12.000000 24.000000 L 12.000000 24.000000 S 12.000000 14.000000 22.000000 14.000000 L 439.000000 14.000000 L 439.000000 14.000000 S 449.000000 14.000000 449.000000 24.000000 L 449.000000 184.000000 L 449.000000 194.000000 L 12.000000 194.000000Z 12.000000 14.000000" fill="none" /> </clipPath><g class="YQ=="><g class="shape" ><rect x="12.000000" y="14.000000" width="437.000000" height="180.000000" rx="10.000000" ry="10.000000" stroke="red" fill="#FFFFFF" class="shape fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="14.000000" width="437.000000" height="36.000000" fill="red" class="class_header" clip-path="url(#d2-1612823801-a)" /><text x="22.000000" y="39.750000" fill="#FFFFFF" class="text fill-N7" style="text-anchor:start;font-size:24px">a</text><text x="22.000000" y="73.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">id</text><text x="152.000000" y="73.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">int</text><text x="439.000000" y="73.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">PK</text><line x1="12.000000" x2="449.000000" y1="86.000000" y2="86.000000" stroke="red" style="stroke-width:2" /><text x="22.000000" y="109.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">disk</text><text x="152.000000" y="109.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">int</text><text x="439.000000" y="109.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">FK</text><line x1="12.000000" x2="449.000000" y1="122.000000" y2="122.000000" stroke="red" style="stroke-width:2" /><text x="22.000000" y="145.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">json</text><text x="152.000000" y="145.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">jsonb</text><text x="439.000000" y="145.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px">UNQ</text><line x1="12.000000" x2="449.000000" y1="158.000000" y2="158.000000" stroke="red" style="stroke-width:2" /><text x="22.000000" y="181.000000" fill="#0D32B2" class="text fill-B2" style="text-anchor:start;font-size:20px">last_updated</text><text x="152.000000" y="181.000000" fill="#676C7E" class="text fill-N2" style="text-anchor:start;font-size:20px">timestamp with time zone</text><text x="439.000000" y="181.000000" fill="#4A6FF3" class="text fill-AA2" style="text-anchor:end;font-size:20px" /><line x1="22.000000" x2="439.000000" y1="194.000000" y2="194.000000" stroke="red" style="stroke-width:2" /></g></g><clipPath id="d2-1612823801-MI"><path d="M 469.000000 22.000000 L 469.000000 22.000000 S 469.000000 12.000000 479.000000 12.000000 L 866.000000 12.000000 L 866.000000 12.000000 S 876.000000 12.000000 876.000000 22.000000 L 876.000000 186.000000 S 876.000000  196.000000 866.000000 196.000000 L 479.000000 196.000000 S 469.000000 196.000000 469.000000 186.000000L 469.000000 22.000000Z 469.000000 12.000000" fill="none" /> </clipPath><g class="Yg=="><g class="shape" ><rect x="469.000000" y="12.000000" width="407.000000" height="184.000000" rx="10.000000" ry="10.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="469.000000" y="12.000000" width="407.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1612823801-b)" /><text x="672.500000" y="62.500000" fill="#FFFFFF" class="text-mono fill-N7" style="text-anchor:middle;font-size:24px;">b</text><text x="479.000000" y="132.000000" fill="#0D32B2" class="text-mono fill-B2" style="text-anchor:start;font-size:20px">+</text><text x="499.000000" y="132.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:start;font-size:20px">field</text><text x="856.000000" y="132.000000" fill="#4A6FF3" class="text-mono fill-AA2" style="text-anchor:end;font-size:20px">[]string</text><line x1="469.000000" x2="876.000000" y1="150.000000" y2="150.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /><text x="479.000000" y="178.000000" fill="#0D32B2" class="text-mono fill-B2" style="text-anchor:start;font-size:20px">+</text><text x="499.000000" y="178.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:start;font-size:20px">method(a uint64)</text><text x="856.000000" y="178.000000" fill="#4A6FF3" class="text-mono fill-AA2" style="text-anchor:end;font-size:20px">(x, y int)</text></g></g><clipPath id="d2-1612823801-MM"><path d="M 896.000000 63.000000 L 896.000000 63.000000 S 896.000000 58.000000 901.000000 58.000000 L 1008.000000 58.000000 L 1008.000000 58.000000 S 1013.000000 58.000000 1013.000000 63.000000 L 1013.000000 145.000000 S 1013.000000  150.000000 1008.000000 150.000000 L 901.000000 150.000000 S 896.000000 150.000000 896.000000 145.000000L 896.000000 63.000000Z 896.000000 58.000000" fill="none" /> </clipPath><g class="Yw=="><g class="shape" ><rect x="896.000000" y="58.000000" width="117.000000" height="92.000000" rx="5.000000" ry="5.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="896.000000" y="58.000000" width="117.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1612823801-c)" /><text x="954.500000" y="108.500000" fill="#FFFFFF" class="text-mono fill-N7" style="text-anchor:middle;font-size:24px;">c</text><line x1="901.000000" x2="1008.000000" y1="150.000000" y2="150.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /></g></g><clipPath id="d2-1612823801-MQ"><path d="M 1033.000000 91.000000 L 1033.000000 91.000000 S 1033.000000 86.000000 1038.000000 86.000000 L 1078.000000 86.000000 L 1078.000000 86.000000 S 1083.000000 86.000000 1083.000000 91.000000 L 1083.000000 117.000000 S 1083.000000  122.000000 1078.000000 122.000000 L 1038.000000 122.000000 S 1033.000000 122.000000 1033.000000 117.000000L 1033.000000 91.000000Z 1033.000000 86.000000" fill="none" /> </clipPath><g class="ZA=="><g class="shape" ><rect x="1033.000000" y="86.000000" width="50.000000" height="36.000000" rx="5.000000" ry="5.000000" stroke="#0A0F25" fill="#FFFFFF" class="shape stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="1033.000000" y="86.000000" width="50.000000" height="36.000000" fill="#0A0F25" class="class_header fill-N1" clip-path="url(#d2-1612823801-d)" /><text x="1043.000000" y="111.750000" fill="#FFFFFF" class="text fill-N7" style="text-anchor:start;font-size:24px">d</text></g></g><mask id="d2-1612823801" maskUnits="userSpaceOnUse" x="11" y="11" width="1073" height="186">
 <rect x="11" y="11" width="1073" height="186" fill="white"></rect>
 
 </mask></svg></svg>
\ No newline at end of file