Merge pull request #1835 from alixander/set-label-near

d2oracle: fix label near setting

d2oracle/edit.go

@@ -771,9 +771,20 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string)
 					}
 				}
 			case "label":
-				if inlined(&attrs.Label) {
-					attrs.Label.MapKey.SetScalar(mk.Value.ScalarBox())
-					return nil
+				if len(mk.Key.Path[reservedIndex:]) > 1 {
+					reservedTargetKey = mk.Key.Path[reservedIndex+1].Unbox().ScalarString()
+					switch reservedTargetKey {
+					case "near":
+						if inlined(attrs.LabelPosition) {
+							attrs.LabelPosition.MapKey.SetScalar(mk.Value.ScalarBox())
+							return nil
+						}
+					}
+				} else {
+					if inlined(&attrs.Label) {
+						attrs.Label.MapKey.SetScalar(mk.Value.ScalarBox())
+						return nil
+					}
 				}
 			}
 		}

d2oracle/edit_test.go

@@ -2185,6 +2185,76 @@ layers: {
 			value: go2.Pointer(`red`),
 			exp: `...@yo
 (a -> b)[0].style.stroke: red
+`,
+		},
+		{
+			name: "label-near/1",
+
+			text: `x
+`,
+			key:   `x.label.near`,
+			value: go2.Pointer(`bottom-right`),
+			exp: `x: {label.near: bottom-right}
+`,
+		},
+		{
+			name: "label-near/2",
+
+			text: `x.label.near: bottom-left
+`,
+			key:   `x.label.near`,
+			value: go2.Pointer(`bottom-right`),
+			exp: `x.label.near: bottom-right
+`,
+		},
+		{
+			name: "label-near/3",
+
+			text: `x: {
+  label.near: bottom-left
+}
+`,
+			key:   `x.label.near`,
+			value: go2.Pointer(`bottom-right`),
+			exp: `x: {
+  label.near: bottom-right
+}
+`,
+		},
+		{
+			name: "label-near/4",
+
+			text: `x: {
+  label: hi {
+    near: bottom-left
+  }
+}
+`,
+			key:   `x.label.near`,
+			value: go2.Pointer(`bottom-right`),
+			exp: `x: {
+  label: hi {
+    near: bottom-right
+  }
+}
+`,
+		},
+		{
+			name: "label-near/5",
+
+			text: `x: hi {
+	label: {
+    near: bottom-left
+	}
+}
+`,
+			key:   `x.label.near`,
+			value: go2.Pointer(`bottom-right`),
+			exp: `x: hi {
+  label: {
+    near: bottom-right
+  }
+}
 `,
 		},
 	}