allow edges in vars

terrastruct · Jul 13, 2023 · d275a45 · d275a45
1 parent e95f619
commit d275a45
Show file tree

Hide file tree

Showing 6 changed files with 391 additions and 75 deletions.
diff --git 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
@@ -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 {