Vars

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)

d2ast/d2ast.go

@@ -502,6 +502,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}},
@@ -513,6 +524,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}},

d2compiler/compile.go

@@ -277,6 +277,13 @@ 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)
 		return
@@ -329,7 +336,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)
 		}
@@ -725,7 +732,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)
 		}