Merge pull request #1832 from alixander/fix-edge-delete

Fix d2oracle.set and d2oracle.delete on imported edges
terrastruct · Feb 9, 2024 · 20c3598 · 20c3598
2 parents 86f96fc + 706951b
commit 20c3598
Show file tree

Hide file tree

Showing 5 changed files with 598 additions and 36 deletions.
diff --git a/d2oracle/edit.go b/d2oracle/edit.go
@@ -383,7 +383,7 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string)
 				break
 			}
 			obj = o
-			imported = IsImported(baseAST, obj)
+			imported = IsImportedObj(baseAST, obj)
 
 			var maybeNewScope *d2ast.Map
 			if baseAST != g.AST || imported {
@@ -481,8 +481,9 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string)
 		if !ok {
 			return errors.New("edge not found")
 		}
+		imported = IsImportedEdge(baseAST, edge)
 		refs := edge.References
-		if baseAST != g.AST {
+		if baseAST != g.AST || imported {
 			refs = getWriteableEdgeRefs(edge, baseAST)
 		}
 		onlyInChain := true
@@ -868,45 +869,52 @@ func Delete(g *d2graph.Graph, boardPath []string, key string) (_ *d2graph.Graph,
 			return g, nil
 		}
 
-		refs := e.References
-		if len(boardPath) > 0 {
-			refs := getWriteableEdgeRefs(e, baseAST)
-			if len(refs) != len(e.References) {
-				mk.Value = d2ast.MakeValueBox(&d2ast.Null{})
-			}
-		}
+		imported := IsImportedEdge(baseAST, e)
 
-		if _, ok := mk.Value.Unbox().(*d2ast.Null); !ok {
-			ref := refs[0]
-			var refEdges []*d2ast.Edge
-			for _, ref := range refs {
-				refEdges = append(refEdges, ref.Edge)
+		if imported {
+			mk.Value = d2ast.MakeValueBox(&d2ast.Null{})
+			appendMapKey(baseAST, mk)
+		} else {
+			refs := e.References
+			if len(boardPath) > 0 {
+				refs := getWriteableEdgeRefs(e, baseAST)
+				if len(refs) != len(e.References) {
+					mk.Value = d2ast.MakeValueBox(&d2ast.Null{})
+				}
 			}
-			ensureNode(g, refEdges, ref.ScopeObj, ref.Scope, ref.MapKey, ref.MapKey.Edges[ref.MapKeyEdgeIndex].Src, true)
-			ensureNode(g, refEdges, ref.ScopeObj, ref.Scope, ref.MapKey, ref.MapKey.Edges[ref.MapKeyEdgeIndex].Dst, false)
 
-			for i := len(e.References) - 1; i >= 0; i-- {
-				ref := e.References[i]
-				deleteEdge(g, ref.Scope, ref.MapKey, ref.MapKeyEdgeIndex)
-			}
+			if _, ok := mk.Value.Unbox().(*d2ast.Null); !ok {
+				ref := refs[0]
+				var refEdges []*d2ast.Edge
+				for _, ref := range refs {
+					refEdges = append(refEdges, ref.Edge)
+				}
+				ensureNode(g, refEdges, ref.ScopeObj, ref.Scope, ref.MapKey, ref.MapKey.Edges[ref.MapKeyEdgeIndex].Src, true)
+				ensureNode(g, refEdges, ref.ScopeObj, ref.Scope, ref.MapKey, ref.MapKey.Edges[ref.MapKeyEdgeIndex].Dst, false)
 
-			edges, ok := obj.FindEdges(mk)
-			if ok {
-				for _, e2 := range edges {
-					if e2.Index <= e.Index {
-						continue
-					}
-					for i := len(e2.References) - 1; i >= 0; i-- {
-						ref := e2.References[i]
-						if ref.MapKey.EdgeIndex != nil {
-							*ref.MapKey.EdgeIndex.Int--
+				for i := len(e.References) - 1; i >= 0; i-- {
+					ref := e.References[i]
+					deleteEdge(g, ref.Scope, ref.MapKey, ref.MapKeyEdgeIndex)
+				}
+
+				edges, ok := obj.FindEdges(mk)
+				if ok {
+					for _, e2 := range edges {
+						if e2.Index <= e.Index {
+							continue
+						}
+						for i := len(e2.References) - 1; i >= 0; i-- {
+							ref := e2.References[i]
+							if ref.MapKey.EdgeIndex != nil {
+								*ref.MapKey.EdgeIndex.Int--
+							}
 						}
 					}
 				}
+			} else {
+				// NOTE: it only needs to be after the last ref, but perhaps simplest and cleanest to append all nulls at the end
+				appendMapKey(baseAST, mk)
 			}
-		} else {
-			// NOTE: it only needs to be after the last ref, but perhaps simplest and cleanest to append all nulls at the end
-			appendMapKey(baseAST, mk)
 		}
 		if len(boardPath) > 0 {
 			replaced := ReplaceBoardNode(g.AST, baseAST, boardPath)
@@ -925,10 +933,9 @@ func Delete(g *d2graph.Graph, boardPath []string, key string) (_ *d2graph.Graph,
 		return g, nil
 	}
 
-	imported := IsImported(baseAST, obj)
+	imported := IsImportedObj(baseAST, obj)
 
 	if imported {
-		println(d2format.Format(boardG.AST))
 		mk.Value = d2ast.MakeValueBox(&d2ast.Null{})
 		appendMapKey(baseAST, mk)
 	} else {

diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go
@@ -2171,6 +2171,20 @@ layers: {
     b.style.fill: red
   }
 }
+`,
+		},
+		{
+			name: "import/9",
+
+			text: `...@yo
+`,
+			fsTexts: map[string]string{
+				"yo.d2": `a -> b`,
+			},
+			key:   `(a -> b)[0].style.stroke`,
+			value: go2.Pointer(`red`),
+			exp: `...@yo
+(a -> b)[0].style.stroke: red
 `,
 		},
 	}
@@ -7205,6 +7219,20 @@ scenarios: {
     x: null
   }
 }
+`,
+		},
+		{
+			name: "import/3",
+
+			text: `...@meow
+`,
+			fsTexts: map[string]string{
+				"meow.d2": `a -> b
+`,
+			},
+			key: `(a -> b)[0]`,
+			exp: `...@meow
+(a -> b)[0]: null
 `,
 		},
 	}

diff --git a/d2oracle/get.go b/d2oracle/get.go
@@ -140,7 +140,7 @@ func GetParentID(g *d2graph.Graph, boardPath []string, absID string) (string, er
 	return obj.Parent.AbsID(), nil
 }
 
-func IsImported(ast *d2ast.Map, obj *d2graph.Object) bool {
+func IsImportedObj(ast *d2ast.Map, obj *d2graph.Object) bool {
 	for _, ref := range obj.References {
 		if ref.Key.Range.Path != ast.Range.Path {
 			return true
@@ -150,6 +150,16 @@ func IsImported(ast *d2ast.Map, obj *d2graph.Object) bool {
 	return false
 }
 
+func IsImportedEdge(ast *d2ast.Map, edge *d2graph.Edge) bool {
+	for _, ref := range edge.References {
+		if ref.Edge.Range.Path != ast.Range.Path {
+			return true
+		}
+	}
+
+	return false
+}
+
 func GetObj(g *d2graph.Graph, boardPath []string, absID string) *d2graph.Object {
 	g = GetBoardGraph(g, boardPath)
 	if g == nil {

diff --git a/testdata/d2oracle/TestDelete/import/3.exp.json b/testdata/d2oracle/TestDelete/import/3.exp.json