Merge pull request #1847 from alixander/d2oracle-arrowhead-fill

d2oracle: fix set arrowhead fill
terrastruct · Feb 27, 2024 · edc3088 · edc3088
2 parents 5117d2b + c8fcd11
commit edc3088
Show file tree

Hide file tree

Showing 5 changed files with 1,000 additions and 2 deletions.
diff --git a/d2oracle/edit.go b/d2oracle/edit.go
@@ -653,8 +653,8 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string)
 				}
 				if arrowhead != nil {
 					if reservedTargetKey == "" {
-						if len(mk.Key.Path[reservedIndex:]) != 2 {
-							return errors.New("malformed style setting, expected 2 part path")
+						if len(mk.Key.Path[reservedIndex:]) < 2 {
+							return errors.New("malformed style setting, expected >= 2 part path")
 						}
 						reservedTargetKey = mk.Key.Path[reservedIndex+1].Unbox().ScalarString()
 					}

diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go
@@ -1518,6 +1518,50 @@ a.b -> a.c: {style.animated: true}
 			value: go2.Pointer(`diamond`),
 
 			exp: `x -> y: {target-arrowhead.shape: diamond}
+`,
+		},
+		{
+			name: "edge-arrowhead-filled/1",
+			text: `x -> y
+`,
+			key:   `(x -> y)[0].target-arrowhead.style.filled`,
+			value: go2.Pointer(`true`),
+
+			exp: `x -> y: {target-arrowhead.style.filled: true}
+`,
+		},
+		{
+			name: "edge-arrowhead-filled/2",
+			text: `x -> y: {
+  target-arrowhead: * {
+    shape: diamond
+  }
+}
+`,
+			key:   `(x -> y)[0].target-arrowhead.style.filled`,
+			value: go2.Pointer(`true`),
+
+			exp: `x -> y: {
+  target-arrowhead: * {
+    shape: diamond
+    style.filled: true
+  }
+}
+`,
+		},
+		{
+			name: "edge-arrowhead-filled/3",
+			text: `x -> y: {
+	target-arrowhead.shape: diamond
+}
+`,
+			key:   `(x -> y)[0].target-arrowhead.style.filled`,
+			value: go2.Pointer(`true`),
+
+			exp: `x -> y: {
+  target-arrowhead.shape: diamond
+  target-arrowhead.style.filled: true
+}
 `,
 		},
 		{

diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json