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

combine resolveUnderscore and trimCommon

Browse source
This commit is contained in:
Alexander Wang 2023-02-14 21:06:57 -08:00
parent 5a021b8918
commit 34b839c7bd
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
d2ir/d2ir.go
View file

@ -379,7 +379,7 @@ func (eid *EdgeID) Match(eid2 *EdgeID) bool {
return true return true
} }
func (eid *EdgeID) resolveUnderscores(m *Map) (*EdgeID, *Map, error) { func (eid *EdgeID) resolveToCommon(m *Map) (*d2ast.KeyPath, *EdgeID, *Map, error) {
eid = eid.Copy() eid = eid.Copy()
maxUnderscores := go2.Max(countUnderscores(eid.SrcPath), countUnderscores(eid.DstPath)) maxUnderscores := go2.Max(countUnderscores(eid.SrcPath), countUnderscores(eid.DstPath))
for i := 0; i < maxUnderscores; i++ { for i := 0; i < maxUnderscores; i++ {
@ -397,23 +397,21 @@ func (eid *EdgeID) resolveUnderscores(m *Map) (*EdgeID, *Map, error) {
} }
m = ParentMap(m) m = ParentMap(m)
if m == nil { if m == nil {
return nil, nil, errors.New("invalid underscore") return nil, nil, nil, errors.New("invalid underscore")
} }
} }
return eid, m, nil
}
func (eid *EdgeID) trimCommon() (common []string, _ *EdgeID) { common := &d2ast.KeyPath{}
eid = eid.Copy()
for len(eid.SrcPath) > 1 && len(eid.DstPath) > 1 { for len(eid.SrcPath) > 1 && len(eid.DstPath) > 1 {
if !strings.EqualFold(eid.SrcPath[0], eid.DstPath[0]) { if !strings.EqualFold(eid.SrcPath[0], eid.DstPath[0]) {
return common, eid return common, eid, m, nil
} }
common = append(common, eid.SrcPath[0]) common.Path = append(common.Path, d2ast.MakeValueBox(d2ast.RawString(eid.SrcPath[0], true)).StringBox())
eid.SrcPath = eid.SrcPath[1:] eid.SrcPath = eid.SrcPath[1:]
eid.DstPath = eid.DstPath[1:] eid.DstPath = eid.DstPath[1:]
} }
return common, eid
return common, eid, m, nil
} }
type Edge struct { type Edge struct {
@ -732,13 +730,12 @@ func (m *Map) DeleteField(ida ...string) *Field {
} }
func (m *Map) GetEdges(eid *EdgeID) []*Edge { func (m *Map) GetEdges(eid *EdgeID) []*Edge {
eid, m, err := eid.resolveUnderscores(m) common, eid, m, err := eid.resolveToCommon(m)
if err != nil { if err != nil {
return nil return nil
} }
common, eid := eid.trimCommon() if len(common.Path) > 0 {
if len(common) > 0 { f := m.GetField(common.IDA()...)
f := m.GetField(common...)
if f == nil { if f == nil {
return nil return nil
} }
@ -762,17 +759,12 @@ func (m *Map) CreateEdge(eid *EdgeID, refctx *RefContext) (*Edge, error) {
return nil, d2parser.Errorf(refctx.Edge, "cannot create edge inside edge") return nil, d2parser.Errorf(refctx.Edge, "cannot create edge inside edge")
} }
eid, m, err := eid.resolveUnderscores(m) common, eid, m, err := eid.resolveToCommon(m)
if err != nil { if err != nil {
return nil, d2parser.Errorf(refctx.Edge, err.Error()) return nil, d2parser.Errorf(refctx.Edge, err.Error())
} }
common, eid := eid.trimCommon() if len(common.Path) > 0 {
if len(common) > 0 { f, err := m.EnsureField(common, nil)
tmp := *refctx.Edge.Src
kp := &tmp
underscores := countUnderscores(kp.IDA())
kp.Path = kp.Path[underscores : len(common)+underscores]
f, err := m.EnsureField(kp, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }