give err msg for invalid edge style

terrastruct · Mar 7, 2023 · d4cfc67 · d4cfc67
1 parent 4e53c27
commit d4cfc67
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 0 deletions.
diff --git a/d2compiler/compile.go b/d2compiler/compile.go
@@ -450,6 +450,11 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) {
 
 func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) {
 	keyword := strings.ToLower(f.Name)
+	_, isStyleReserved := d2graph.StyleKeywords[keyword]
+	if isStyleReserved {
+		c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name, f.Name)
+		return
+	}
 	_, isReserved := d2graph.SimpleReservedKeywords[keyword]
 	if isReserved {
 		c.compileReserved(edge.Attributes, f)

diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
@@ -1117,6 +1117,24 @@ x: {
 `,
 			expErr: `d2/testdata/d2compiler/TestCompile/shape_edge_style.d2:3:2: key "animated" can only be applied to edges`,
 		},
+		{
+			name: "edge_invalid_style",
+
+			text: `x -> y: {
+  opacity: 0.5
+}
+`,
+			expErr: `d2/testdata/d2compiler/TestCompile/edge_invalid_style.d2:2:3: opacity must be style.opacity`,
+		},
+		{
+			name: "obj_invalid_style",
+
+			text: `x: {
+  opacity: 0.5
+}
+`,
+			expErr: `d2/testdata/d2compiler/TestCompile/obj_invalid_style.d2:2:3: opacity must be style.opacity`,
+		},
 		{
 			name: "edge_chain_map",
 

diff --git a/testdata/d2compiler/TestCompile/edge_invalid_style.exp.json b/testdata/d2compiler/TestCompile/edge_invalid_style.exp.json
diff --git a/testdata/d2compiler/TestCompile/obj_invalid_style.exp.json b/testdata/d2compiler/TestCompile/obj_invalid_style.exp.json