Merge branch 'master' into archs

Author: alixander

README.md

@@ -42,6 +42,7 @@ https://user-images.githubusercontent.com/3120367/206125010-bd1fea8e-248a-43e7-8
   - <a href="#community-plugins" id="toc-community-plugins">Community plugins</a>
   - <a href="#misc" id="toc-misc">Misc</a>
 - <a href="#faq" id="toc-faq">FAQ</a>
+- <a href="#open-source-projects-documenting-with-d2" id="toc-open-source-projects-documenting-with-d2">Open-source projects documenting with D2</a>
 
 ## What does D2 look like?
 
@@ -130,7 +131,9 @@ improved security but the install script is by no means insecure.
 In addition to being a runnable CLI tool, D2 can also be used to produce diagrams from
 Go programs.
 
-For examples, see [./docs/examples/lib](./docs/examples/lib).
+For examples, see [./docs/examples/lib](./docs/examples/lib). This [blog
+post](https://terrastruct.com/blog/post/generate-diagrams-programmatically/) also demos a
+complete, runnable example of using D2 as a library for a real-world use case.
 
 ## Themes
 
@@ -218,6 +221,7 @@ let us know and we'll be happy to include it here!
 - **D2 org-mode support**: [https://github.com/xcapaldi/ob-d2](https://github.com/xcapaldi/ob-d2)
 - **Python D2 diagram builder**: [https://github.com/MrBlenny/py-d2](https://github.com/MrBlenny/py-d2)
 - **Clojure D2 transpiler**: [https://github.com/judepayne/dictim](https://github.com/judepayne/dictim)
+- **JavaScript D2 diagram builder**: [https://github.com/Kreshnik/d2lang-js](https://github.com/Kreshnik/d2lang-js)
 
 ### Misc
 
@@ -240,3 +244,21 @@ let us know and we'll be happy to include it here!
   - Please open up a Github Issue.
 - I have a private inquiry.
   - Please reach out at [hi@d2lang.com](hi@d2lang.com).
+
+## Open-source projects documenting with D2
+
+Do you have or see an open-source project with `.d2` files? Please submit a PR adding to
+this list (ordered by star count, desc).
+
+- [Block Protocol](https://github.com/blockprotocol/blockprotocol) - The Block Protocol is
+  an open standard for building and using data-driven blocks.
+- [Ivy Wallet](https://github.com/Ivy-Apps/ivy-wallet) - Ivy Wallet is an open-source
+  money manager app for Android.
+- [Learn EVM Attacks](https://github.com/coinspect/learn-evm-attacks) - Learn & Contribute
+  on previously exploited vulnerabilities across several EVM projects.
+- [BYCEPS](https://github.com/byceps/byceps) - BYCEPS is a self-hosted web platform to run
+  LAN parties.
+- [Re:Earth](https://github.com/reearth/reearth-web) - A free, open and highly extensible
+  WebGIS platform.
+- [Terraform OCI VSCode Server](https://github.com/timoa/terraform-oci-vscode-server) -
+  Terraform project that deploys VSCode Server on Oracle Cloud Infrastructure.

ci/release/changelogs/next.md

@@ -1,8 +1,33 @@
+Many meaningful quality of life improvements and bug fixes, along with a few small features. Overall, a stabilizing set of changes, while some huge features are brewing in the background for the next release!
+
+Thank you to the new contributors that have been joining us. If you want to get involved, there's lots of issues tagged with "good first issue" that are relatively easy to pick up. We're always around to lend a hand, and feel free to drop by our Discord if you're not sure where to start.
+
+Have you enjoyed using D2? We're redesigning some of the site and will have a section for testimonials. If you'd like to be included with a few words alongside your name or public profile, please email us at hi@d2lang.com (or just post it somewhere and let us know)!
+
 #### Features 🚀
 
+- `animated` keyword implemented for connections. [#652](https://github.com/terrastruct/d2/pull/652)
+![animated connection example](https://user-images.githubusercontent.com/3120367/213055161-e6f1918b-150c-4beb-b61c-3ea05cc29f00.svg)
+- `border-radius` keyword implemented for squares/rectangles. [#688](https://github.com/terrastruct/d2/pull/688)
+- `circle` arrowheads. [#634](https://github.com/terrastruct/d2/pull/634)
+
 #### Improvements 🧹
 
 - ELK layouts tuned to have better defaults. [#627](https://github.com/terrastruct/d2/pull/627)
 - Code snippets of unrecognized languages will render (just without syntax highlighting). [#650](https://github.com/terrastruct/d2/pull/650)
+- Adds sketched versions of arrowheads. [#656](https://github.com/terrastruct/d2/pull/656)
 
 #### Bugfixes ⛑️
+
+- Fixes code snippets not being tall enough with leading newlines. [#664](https://github.com/terrastruct/d2/pull/664)
+- Opacity was not being applied to labels of shapes (and other edge cases). [#677](https://github.com/terrastruct/d2/pull/677)
+- Fixes arrowheads sometimes appearing broken with sketch on. [#656](https://github.com/terrastruct/d2/pull/656)
+- Fixes attributes being ignored for `sql_table` to `sql_table` connections. [#658](https://github.com/terrastruct/d2/pull/658)
+- Icon URLs that needed escaping (e.g. with ampersands) are handled correctly by CLI. [#666](https://github.com/terrastruct/d2/pull/666)
+- Fixes self-connections inside layouts when using ELK. [#676](https://github.com/terrastruct/d2/pull/676)
+- Fixes inter-span messages between spans of the same actor in sequence diagrams. [#694](https://github.com/terrastruct/d2/pull/694)
+- Fixes arrowheads sometimes appearing broken in Dagre layouts. [#649](https://github.com/terrastruct/d2/pull/649)
+- Fixes tooltip/link attributes being ignored for `sql_table` and `class`. [#658](https://github.com/terrastruct/d2/pull/658)
+- Bounding box was not accounting for dimensions added by `multiple` and `3d` keywords, which made them look cut off with 0 padding. [#684](https://github.com/terrastruct/d2/pull/684), [#685](https://github.com/terrastruct/d2/pull/685)
+- Fixes markdown shapes being slightly too short for their text in some cases. [#665](https://github.com/terrastruct/d2/pull/665)
+- Fixes panic when the only diagram object has `near` set to a constant. [#687](https://github.com/terrastruct/d2/pull/687)

ci/sub

@@ -757,13 +757,15 @@ func flattenContainer(g *d2graph.Graph, obj *d2graph.Object) {
 		// TODO more attributes
 		if e.SrcTableColumnIndex != nil {
 			newEdge.SrcTableColumnIndex = new(int)
+			newEdge.SrcArrowhead = e.SrcArrowhead
 			*newEdge.SrcTableColumnIndex = *e.SrcTableColumnIndex
 		}
 		if e.DstTableColumnIndex != nil {
 			newEdge.DstTableColumnIndex = new(int)
+			newEdge.DstArrowhead = e.DstArrowhead
 			*newEdge.DstTableColumnIndex = *e.DstTableColumnIndex
 		}
-		newEdge.Attributes.Label = e.Attributes.Label
+		newEdge.Attributes = e.Attributes
 		newEdge.References = e.References
 	}
 	updatedEdges := []*d2graph.Edge{}

d2compiler/compile.go

@@ -1597,6 +1597,25 @@ b`, g.Objects[0].Attributes.Label.Value)
 				}
 			},
 		},
+		{
+			name: "table_connection_attr",
+
+			text: `x: {
+  shape: sql_table
+  y
+}
+a: {
+  shape: sql_table
+  b
+}
+x.y -> a.b: {
+  style.animated: true
+}
+`,
+			assertions: func(t *testing.T, g *d2graph.Graph) {
+				tassert.Equal(t, "true", g.Edges[0].Attributes.Style.Animated.Value)
+			},
+		},
 		{
 			name: "class_paren",
 

d2compiler/compile_test.go

@@ -1027,6 +1027,27 @@ func GetTextDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler, t *d2
 		var h int
 		if t.Language != "" {
 			w, h = ruler.Measure(d2fonts.SourceCodePro.Font(t.FontSize, d2fonts.FONT_STYLE_REGULAR), t.Text)
+
+			// count empty leading and trailing lines since ruler will not be able to measure it
+			lines := strings.Split(t.Text, "\n")
+			leadingLines := 0
+			for _, line := range lines {
+				if strings.TrimSpace(line) == "" {
+					leadingLines++
+				} else {
+					break
+				}
+			}
+			trailingLines := 0
+			for i := len(lines) - 1; i >= 0; i-- {
+				if strings.TrimSpace(lines[i]) == "" {
+					trailingLines++
+				} else {
+					break
+				}
+			}
+			h += t.FontSize * (leadingLines + trailingLines)
+
 			// padding
 			w += 12
 			h += 12

d2graph/d2graph.go

@@ -30,6 +30,8 @@ var setupJS string
 //go:embed dagre.js
 var dagreJS string
 
+const MIN_SEGMENT_LEN = 10
+
 type ConfigurableOpts struct {
 	NodeSep int `json:"nodesep"`
 	EdgeSep int `json:"edgesep"`
@@ -247,6 +249,47 @@ 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) {
+			newStartingSegment := *geo.NewSegment(start, points[startIndex+1])
+			if newStartingSegment.Length() < MIN_SEGMENT_LEN {
+				// we don't want a very short segment right next to the source because it will mess up the arrowhead
+				// instead we want to extend the next segment into the shape border if possible
+				nextStart := points[startIndex+1]
+				nextEnd := points[startIndex+2]
+
+				// Note: in other direction to extend towards source
+				nextSegment := *geo.NewSegment(nextStart, nextEnd)
+				v := nextSegment.ToVector()
+				extendedStart := nextEnd.ToVector().Add(v.AddLength(MIN_SEGMENT_LEN)).ToPoint()
+				extended := *geo.NewSegment(nextEnd, extendedStart)
+
+				if intersections := edge.Src.Box.Intersections(extended); len(intersections) > 0 {
+					start = intersections[0]
+					startIndex += 1
+				}
+			}
+		}
+		if !end.Equals(points[len(points)-1]) && endIndex-2 >= 0 {
+			newEndingSegment := *geo.NewSegment(end, points[endIndex-1])
+			if newEndingSegment.Length() < MIN_SEGMENT_LEN {
+				// extend the prev segment into the shape border if possible
+				prevStart := points[endIndex-2]
+				prevEnd := points[endIndex-1]
+
+				prevSegment := *geo.NewSegment(prevStart, prevEnd)
+				v := prevSegment.ToVector()
+				extendedEnd := prevStart.ToVector().Add(v.AddLength(MIN_SEGMENT_LEN)).ToPoint()
+				extended := *geo.NewSegment(prevStart, extendedEnd)
+
+				if intersections := edge.Dst.Box.Intersections(extended); len(intersections) > 0 {
+					end = intersections[0]
+					endIndex -= 1
+				}
+			}
+		}
+
 		srcShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Src.Attributes.Shape.Value)], edge.Src.Box)
 		dstShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Dst.Attributes.Shape.Value)], edge.Dst.Box)
 
@@ -263,18 +306,20 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 
 		path := make([]*geo.Point, 0)
 		path = append(path, points[0])
-		path = append(path, points[0].AddVector(vectors[0].Multiply(.8)))
-		for i := 1; i < len(vectors)-2; i++ {
-			p := points[i]
-			v := vectors[i]
-			path = append(path, p.AddVector(v.Multiply(.2)))
-			path = append(path, p.AddVector(v.Multiply(.5)))
-			path = append(path, p.AddVector(v.Multiply(.8)))
+		if len(vectors) > 1 {
+			path = append(path, points[0].AddVector(vectors[0].Multiply(.8)))
+			for i := 1; i < len(vectors)-2; i++ {
+				p := points[i]
+				v := vectors[i]
+				path = append(path, p.AddVector(v.Multiply(.2)))
+				path = append(path, p.AddVector(v.Multiply(.5)))
+				path = append(path, p.AddVector(v.Multiply(.8)))
+			}
+			path = append(path, points[len(points)-2].AddVector(vectors[len(vectors)-1].Multiply(.2)))
+			edge.IsCurve = true
 		}
-		path = append(path, points[len(points)-2].AddVector(vectors[len(vectors)-1].Multiply(.2)))
 		path = append(path, points[len(points)-1])
 
-		edge.IsCurve = true
 		edge.Route = path
 		// compile needs to assign edge label positions
 		if edge.Attributes.Label.Value != "" {

d2layouts/d2dagrelayout/layout.go

@@ -195,6 +195,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 				ConfigurableOpts: ConfigurableOpts{
 					NodeSpacing:     opts.NodeSpacing,
 					EdgeNodeSpacing: opts.EdgeNodeSpacing,
+					SelfLoopSpacing: opts.SelfLoopSpacing,
 					Padding:         opts.Padding,
 				},
 			}

d2layouts/d2elklayout/layout.go

@@ -27,12 +27,12 @@ func Layout(ctx context.Context, g *d2graph.Graph, constantNears []*d2graph.Obje
 	// So place the center ones first, then the later ones will consider them for bounding box
 	for _, processCenters := range []bool{true, false} {
 		for _, obj := range constantNears {
-			if processCenters == strings.Contains(d2graph.Key(obj.Attributes.NearKey)[0], "center") {
+			if processCenters == strings.Contains(d2graph.Key(obj.Attributes.NearKey)[0], "-center") {
 				obj.TopLeft = geo.NewPoint(place(obj))
 			}
 		}
 		for _, obj := range constantNears {
-			if processCenters == strings.Contains(d2graph.Key(obj.Attributes.NearKey)[0], "center") {
+			if processCenters == strings.Contains(d2graph.Key(obj.Attributes.NearKey)[0], "-center") {
 				// The z-index for constant nears does not matter, as it will not collide
 				g.Objects = append(g.Objects, obj)
 				obj.Parent.Children[obj.ID] = obj
@@ -152,5 +152,14 @@ func boundingBox(g *d2graph.Graph) (tl, br *geo.Point) {
 		}
 	}
 
+	if math.IsInf(x1, 1) && math.IsInf(x2, -1) {
+		x1 = 0
+		x2 = 0
+	}
+	if math.IsInf(y1, 1) && math.IsInf(y2, -1) {
+		y1 = 0
+		y2 = 0
+	}
+
 	return geo.NewPoint(x1, y1), geo.NewPoint(x2, y2)
 }

d2layouts/d2near/layout.go

@@ -17,43 +17,45 @@ func WithoutSequenceDiagrams(ctx context.Context, g *d2graph.Graph) (map[string]
 	edgesToRemove := make(map[*d2graph.Edge]struct{})
 	sequenceDiagrams := make(map[string]*sequenceDiagram)
 
-	queue := make([]*d2graph.Object, 1, len(g.Objects))
-	queue[0] = g.Root
-	for len(queue) > 0 {
-		obj := queue[0]
-		queue = queue[1:]
-		if len(obj.ChildrenArray) == 0 {
-			continue
-		}
-		if obj.Attributes.Shape.Value != d2target.ShapeSequenceDiagram {
-			queue = append(queue, obj.ChildrenArray...)
-			continue
-		}
-
-		sd, err := layoutSequenceDiagram(g, obj)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-		obj.Children = make(map[string]*d2graph.Object)
-		obj.ChildrenArray = nil
-		obj.Box = geo.NewBox(nil, sd.getWidth()+GROUP_CONTAINER_PADDING*2, sd.getHeight()+GROUP_CONTAINER_PADDING*2)
-		obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter))
-		sequenceDiagrams[obj.AbsID()] = sd
+	if len(g.Objects) > 0 {
+		queue := make([]*d2graph.Object, 1, len(g.Objects))
+		queue[0] = g.Root
+		for len(queue) > 0 {
+			obj := queue[0]
+			queue = queue[1:]
+			if len(obj.ChildrenArray) == 0 {
+				continue
+			}
+			if obj.Attributes.Shape.Value != d2target.ShapeSequenceDiagram {
+				queue = append(queue, obj.ChildrenArray...)
+				continue
+			}
 
-		for _, edge := range sd.messages {
-			edgesToRemove[edge] = struct{}{}
-		}
-		for _, obj := range sd.actors {
-			objectsToRemove[obj] = struct{}{}
-		}
-		for _, obj := range sd.notes {
-			objectsToRemove[obj] = struct{}{}
-		}
-		for _, obj := range sd.groups {
-			objectsToRemove[obj] = struct{}{}
-		}
-		for _, obj := range sd.spans {
-			objectsToRemove[obj] = struct{}{}
+			sd, err := layoutSequenceDiagram(g, obj)
+			if err != nil {
+				return nil, nil, nil, err
+			}
+			obj.Children = make(map[string]*d2graph.Object)
+			obj.ChildrenArray = nil
+			obj.Box = geo.NewBox(nil, sd.getWidth()+GROUP_CONTAINER_PADDING*2, sd.getHeight()+GROUP_CONTAINER_PADDING*2)
+			obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter))
+			sequenceDiagrams[obj.AbsID()] = sd
+
+			for _, edge := range sd.messages {
+				edgesToRemove[edge] = struct{}{}
+			}
+			for _, obj := range sd.actors {
+				objectsToRemove[obj] = struct{}{}
+			}
+			for _, obj := range sd.notes {
+				objectsToRemove[obj] = struct{}{}
+			}
+			for _, obj := range sd.groups {
+				objectsToRemove[obj] = struct{}{}
+			}
+			for _, obj := range sd.spans {
+				objectsToRemove[obj] = struct{}{}
+			}
 		}
 	}
 

d2layouts/d2sequence/layout.go

@@ -471,7 +471,17 @@ func (sd *sequenceDiagram) routeMessages() error {
 		isFromDescendant := strings.HasPrefix(message.Src.AbsID(), message.Dst.AbsID()+".")
 		isSelfMessage := message.Src == message.Dst
 
-		if isSelfMessage || isToDescendant || isFromDescendant {
+		currSrc := message.Src
+		for !currSrc.Parent.IsSequenceDiagram() {
+			currSrc = currSrc.Parent
+		}
+		currDst := message.Dst
+		for !currDst.Parent.IsSequenceDiagram() {
+			currDst = currDst.Parent
+		}
+		isToSibling := currSrc == currDst
+
+		if isSelfMessage || isToDescendant || isFromDescendant || isToSibling {
 			midX := startX + SELF_MESSAGE_HORIZONTAL_TRAVEL
 			endY := startY + MIN_MESSAGE_DISTANCE
 			message.Route = []*geo.Point{