diff --git a/d2ir/compile.go b/d2ir/compile.go index ab087470f..20a03b103 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -155,9 +155,6 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) return } - if f.Inherited { - f.Inherited = false - } if refctx.Key.Primary.Unbox() != nil { f.Primary_ = &Scalar{ diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 89b82081b..711d61f2a 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -197,24 +197,7 @@ func (m *Map) CopyBase(newParent Node) *Map { scenarios := m.DeleteField("scenarios") steps := m.DeleteField("steps") - had := make(map[string]struct{}) - if parentM, ok := newParent.(*Map); ok { - for _, f := range parentM.Fields { - had[f.Name] = struct{}{} - } - } - // TODO pretty sure you don't need one for edges. - // Maybe if both boards had a (x -> y)[0]? - m2 := m.Copy(newParent).(*Map) - for i := range m2.Fields { - // if _, ok := had[m2.Fields[i].Name]; !ok { - m2.Fields[i].Inherited = true - // } - } - for i := range m2.Edges { - m2.Edges[i].Inherited = true - } if layers != nil { m.Fields = append(m.Fields, layers) } @@ -295,9 +278,6 @@ type Field struct { Composite Composite `json:"composite,omitempty"` References []*FieldReference `json:"references,omitempty"` - - // Whether it's from a parent board or imported - Inherited bool `json:"inherited"` } func (f *Field) Copy(newParent Node) Node { @@ -452,8 +432,6 @@ type Edge struct { Map_ *Map `json:"map,omitempty"` References []*EdgeReference `json:"references,omitempty"` - - Inherited bool `json:"inherited"` } func (e *Edge) Copy(newParent Node) Node { diff --git a/d2ir/merge.go b/d2ir/merge.go index 7cb4748aa..15ba2a9ec 100644 --- a/d2ir/merge.go +++ b/d2ir/merge.go @@ -4,9 +4,7 @@ func OverlayMap(base, overlay *Map) { for _, of := range overlay.Fields { bf := base.GetField(of.Name) if bf == nil { - f := of.Copy(base).(*Field) - f.Inherited = true - base.Fields = append(base.Fields, f) + base.Fields = append(base.Fields, of.Copy(base).(*Field)) continue } OverlayField(bf, of) @@ -15,9 +13,7 @@ func OverlayMap(base, overlay *Map) { for _, oe := range overlay.Edges { bea := base.GetEdges(oe.ID) if len(bea) == 0 { - e := oe.Copy(base).(*Edge) - e.Inherited = true - base.Edges = append(base.Edges, e) + base.Edges = append(base.Edges, oe.Copy(base).(*Edge)) continue } be := bea[0]