feat: Allow extend/include nodes to apply attribute overwrites

Author: bbfh-dev

Makefile

@@ -1,4 +1,4 @@
-VERSION := v0.1.1
+VERSION := v0.1.2
 BINARY_NAME := mend
 
 run:

example/header.html

@@ -1,4 +1,4 @@
 <header>
-    <mend:include src="icon.svg" :color="{{ .color }}" />
+    <mend:include src="icon.svg" @fill="{{ .color }}" />
     This is a header!
 </header>

example/icon.svg

@@ -40,6 +40,28 @@ func (attrs Attributes) ParamKeys() map[string]string {
 	return out
 }
 
+func (attrs Attributes) InheritAttributes() Attributes {
+	out := New([]html.Attribute{})
+	for _, key := range attrs.order {
+		if strings.HasPrefix(key, "@") {
+			out.order = append(out.order, key[1:])
+			out.values[key[1:]] = attrs.values[key]
+		}
+	}
+	return out
+}
+
+func (attrs Attributes) Merge(overwrite Attributes) Attributes {
+	for _, key := range overwrite.order {
+		_, ok := attrs.values[key]
+		if !ok {
+			attrs.order = append(attrs.order, key)
+		}
+		attrs.values[key] = overwrite.values[key]
+	}
+	return attrs
+}
+
 func (attrs Attributes) ParseExpressions(
 	source string,
 	fn func(string, string) (string, error),

mend/attrs/attributes.go

@@ -15,6 +15,7 @@ type Node interface {
 	ParseExpressions(string, expressionFunc) error
 	ReplaceText(text string, with string)
 	Clone() Node
+	MergeAttributes(attrs attrs.Attributes) (ok bool)
 }
 
 type NodeWithChildren interface {
@@ -114,3 +115,12 @@ func (node *pairedNode) Clone() *pairedNode {
 	clone.Children = children
 	return &clone
 }
+
+func (node *pairedNode) MergeAttributes(attrs attrs.Attributes) bool {
+	for _, child := range node.Children {
+		if child.MergeAttributes(attrs) {
+			return true
+		}
+	}
+	return false
+}

mend/tags/node.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/bbfh-dev/mend/mend/attrs"
 	"github.com/bbfh-dev/mend/mend/settings"
 )
 
@@ -40,3 +41,7 @@ func (node *CommentNode) Clone() Node {
 	clone := *node
 	return &clone
 }
+
+func (node *CommentNode) MergeAttributes(attrs attrs.Attributes) bool {
+	return false
+}

mend/tags/node_comment.go

@@ -3,6 +3,7 @@ package tags
 import (
 	"fmt"
 
+	"github.com/bbfh-dev/mend/mend/attrs"
 	"github.com/bbfh-dev/mend/mend/settings"
 )
 
@@ -36,3 +37,7 @@ func (node *DoctypeNode) Clone() Node {
 	clone := *node
 	return &clone
 }
+
+func (node *DoctypeNode) MergeAttributes(attrs attrs.Attributes) bool {
+	return false
+}

mend/tags/node_doctype.go

@@ -56,3 +56,8 @@ func (node *TagNode) Clone() Node {
 	clone.pairedNode = clone.pairedNode.Clone()
 	return &clone
 }
+
+func (node *TagNode) MergeAttributes(attrs attrs.Attributes) bool {
+	node.Attributes = node.Attributes.Merge(attrs)
+	return true
+}

mend/tags/node_tag.go

@@ -3,6 +3,7 @@ package tags
 import (
 	"strings"
 
+	"github.com/bbfh-dev/mend/mend/attrs"
 	"github.com/bbfh-dev/mend/mend/settings"
 )
 
@@ -39,3 +40,7 @@ func (node *TextNode) Clone() Node {
 	clone := *node
 	return &clone
 }
+
+func (node *TextNode) MergeAttributes(attrs attrs.Attributes) bool {
+	return false
+}

mend/tags/node_text.go

@@ -41,3 +41,8 @@ func (node *VoidNode) Clone() Node {
 	clone := *node
 	return &clone
 }
+
+func (node *VoidNode) MergeAttributes(attrs attrs.Attributes) bool {
+	node.Attributes = node.Attributes.Merge(attrs)
+	return true
+}