luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1068 from alixander/move-container-out-fix

Browse source 
fix id delta
This commit is contained in:
Alexander Wang 2023-03-20 14:28:34 -07:00 committed by GitHub
commit 431dbbc003
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
d2oracle/edit.go
View file

@ -2032,6 +2032,25 @@ func DeleteIDDeltas(g *d2graph.Graph, key string) (deltas map[string]string, err
return nil, nil
}
for _, ch := range obj.ChildrenArray {
// Record siblings as the unique key generated should not conflict with any siblings either
var siblingsToBeHoisted []string
for _, ch2 := range obj.ChildrenArray {
if ch2 != ch {
chMK, err := d2parser.ParseMapKey(ch2.AbsID())
if err != nil {
return nil, err
}
ida := d2graph.Key(chMK.Key)
if ida[len(ida)-1] == ida[len(ida)-2] {
continue
}
hoistedAbsID := ch2.ID
if obj.Parent != g.Root {
hoistedAbsID = obj.Parent.AbsID() + "." + ch2.ID
}
siblingsToBeHoisted = append(siblingsToBeHoisted, hoistedAbsID)
}
}
chMK, err := d2parser.ParseMapKey(ch.AbsID())
if err != nil {
return nil, err
@ -2058,7 +2077,7 @@ func DeleteIDDeltas(g *d2graph.Graph, key string) (deltas map[string]string, err
}
if conflictingObj, ok := g.Root.HasChild(d2graph.Key(hoistedMK.Key)); (ok && conflictingObj != obj) || conflictsWithNewID {
newKey, _, err := generateUniqueKey(g, hoistedAbsID, obj, newIDs)
newKey, _, err := generateUniqueKey(g, hoistedAbsID, obj, append(newIDs, siblingsToBeHoisted...))
if err != nil {
return nil, err
}

6
d2oracle/edit_test.go
View file

@ -5616,9 +5616,9 @@ Square: {
key: "Square",
exp: `{
"Square.Text": "Text 2",
"Square.Text 4": "Text",
"Square.Text 4.Text 2": "Text.Text 2"
"Square.Text": "Text",
"Square.Text 4": "Text 2",
"Square.Text 4.Text 2": "Text 2.Text 2"
}`,
},
{