Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

d2oracle: make get writeable refs public #1874

Merged
merged 5 commits into from
Mar 20, 2024
Merged

d2oracle: make get writeable refs public #1874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59f1006
make get writeable refs public
alixander Mar 20, 2024
600bc09
prevent cycle in d2chaos sequence diagram
alixander Mar 20, 2024
b18e6ee
ta
alixander Mar 20, 2024
07156b1
what
alixander Mar 20, 2024
2187bf7
fix
alixander Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions d2chaos/d2chaos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ func (gs *dslGenState) edge() error {
}
}

if src == dst && gs.nodeShapes[dst] == d2target.ShapeSequenceDiagram {
return nil
}

srcArrow := "-"
if gs.randBool() {
srcArrow = "<"
Expand Down
32 changes: 7 additions & 25 deletions d2oracle/edit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func ReconnectEdge(g *d2graph.Graph, boardPath []string, edgeKey string, srcKey,

refs := edge.References
if baseAST != g.AST {
refs = getWriteableEdgeRefs(edge, baseAST)
refs = GetWriteableEdgeRefs(edge, baseAST)
if len(refs) == 0 || refs[0].ScopeAST != baseAST {
// TODO null
return nil, OutsideScopeError{}
Expand Down Expand Up @@ -387,7 +387,7 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string)

var maybeNewScope *d2ast.Map
if baseAST != g.AST || imported {
writeableRefs := getWriteableRefs(obj, baseAST)
writeableRefs := GetWriteableRefs(obj, baseAST)
for _, ref := range writeableRefs {
if ref.MapKey != nil && ref.MapKey.Value.Map != nil {
maybeNewScope = ref.MapKey.Value.Map
Expand All @@ -414,7 +414,7 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string)
writeableLabelMK := true
var objK *d2ast.Key
if baseAST != g.AST || imported {
writeableRefs := getWriteableRefs(obj, baseAST)
writeableRefs := GetWriteableRefs(obj, baseAST)
if len(writeableRefs) > 0 {
objK = writeableRefs[0].MapKey
}
Expand Down Expand Up @@ -497,7 +497,7 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string)
imported = IsImportedEdge(baseAST, edge)
refs := edge.References
if baseAST != g.AST || imported {
refs = getWriteableEdgeRefs(edge, baseAST)
refs = GetWriteableEdgeRefs(edge, baseAST)
}
onlyInChain := true
for _, ref := range refs {
Expand Down Expand Up @@ -920,7 +920,7 @@ func Delete(g *d2graph.Graph, boardPath []string, key string) (_ *d2graph.Graph,
} else {
refs := e.References
if len(boardPath) > 0 {
refs := getWriteableEdgeRefs(e, baseAST)
refs := GetWriteableEdgeRefs(e, baseAST)
if len(refs) != len(e.References) {
mk.Value = d2ast.MakeValueBox(&d2ast.Null{})
}
Expand Down Expand Up @@ -991,7 +991,7 @@ func Delete(g *d2graph.Graph, boardPath []string, key string) (_ *d2graph.Graph,
return g, nil
}
if len(boardPath) > 0 {
writeableRefs := getWriteableRefs(obj, baseAST)
writeableRefs := GetWriteableRefs(obj, baseAST)
if len(writeableRefs) != len(obj.References) {
mk.Value = d2ast.MakeValueBox(&d2ast.Null{})
}
Expand Down Expand Up @@ -1759,7 +1759,7 @@ func move(g *d2graph.Graph, boardPath []string, key, newKey string, includeDesce
}

if len(boardPath) > 0 {
writeableRefs := getWriteableRefs(obj, baseAST)
writeableRefs := GetWriteableRefs(obj, baseAST)
if len(writeableRefs) != len(obj.References) {
return nil, OutsideScopeError{}
}
Expand Down Expand Up @@ -3226,21 +3226,3 @@ func filterReservedPath(path []*d2ast.StringBox) (filtered []*d2ast.StringBox) {
}
return
}

func getWriteableRefs(obj *d2graph.Object, writeableAST *d2ast.Map) (out []d2graph.Reference) {
for i, ref := range obj.References {
if ref.ScopeAST == writeableAST && ref.Key.Range.Path == writeableAST.Range.Path {
out = append(out, obj.References[i])
}
}
return
}

func getWriteableEdgeRefs(edge *d2graph.Edge, writeableAST *d2ast.Map) (out []d2graph.EdgeReference) {
for i, ref := range edge.References {
if ref.ScopeAST == writeableAST {
out = append(out, edge.References[i])
}
}
return
}
18 changes: 18 additions & 0 deletions d2oracle/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,21 @@ func GetID(key string) string {

return d2format.Format(d2ast.RawString(mk.Key.Path[len(mk.Key.Path)-1].Unbox().ScalarString(), true))
}

func GetWriteableRefs(obj *d2graph.Object, writeableAST *d2ast.Map) (out []d2graph.Reference) {
for i, ref := range obj.References {
if ref.ScopeAST == writeableAST && ref.Key.Range.Path == writeableAST.Range.Path {
out = append(out, obj.References[i])
}
}
return
}

func GetWriteableEdgeRefs(edge *d2graph.Edge, writeableAST *d2ast.Map) (out []d2graph.EdgeReference) {
for i, ref := range edge.References {
if ref.ScopeAST == writeableAST {
out = append(out, edge.References[i])
}
}
return
}
Loading