empty html element support https://developer.mozilla.org/en-US/docs/Glossary/Empty_element

sunfmin · sunfmin · commit 3879865fd8a5 · 2021-09-18T17:31:50.000+08:00
diff --git a/elements.go b/elements.go
@@ -19,8 +19,8 @@ func Address(children ...HTMLComponent) (r *HTMLTagBuilder) {
 // Not support
 
 //     "area": HTMLAreaElement;
-func Area(children ...HTMLComponent) (r *HTMLTagBuilder) {
-	return Tag("area").Children(children...)
+func Area() (r *HTMLTagBuilder) {
+	return Tag("area").OmitEndTag()
 }
 
 //     "article": HTMLElement;
@@ -44,8 +44,8 @@ func B(text string) (r *HTMLTagBuilder) {
 }
 
 //     "base": HTMLBaseElement;
-func Base(children ...HTMLComponent) (r *HTMLTagBuilder) {
-	return Tag("base").Children(children...)
+func Base() (r *HTMLTagBuilder) {
+	return Tag("base").OmitEndTag()
 }
 
 //     "basefont": HTMLBaseFontElement;
@@ -102,8 +102,8 @@ func Code(text string) (r *HTMLTagBuilder) {
 }
 
 //     "col": HTMLTableColElement;
-func Col(children ...HTMLComponent) (r *HTMLTagBuilder) {
-	return Tag("col").Children(children...)
+func Col() (r *HTMLTagBuilder) {
+	return Tag("col").OmitEndTag()
 }
 
 //     "colgroup": HTMLTableColElement;
@@ -171,8 +171,8 @@ func Em(text string) (r *HTMLTagBuilder) {
 }
 
 //     "embed": HTMLEmbedElement;
-func Embed(children ...HTMLComponent) (r *HTMLTagBuilder) {
-	return Tag("embed").Children(children...)
+func Embed() (r *HTMLTagBuilder) {
+	return Tag("embed").OmitEndTag()
 }
 
 //     "fieldset": HTMLFieldSetElement;
@@ -257,7 +257,7 @@ func Hgroup(children ...HTMLComponent) (r *HTMLTagBuilder) {
 
 //     "hr": HTMLHRElement;
 func Hr() (r *HTMLTagBuilder) {
-	return Tag("hr")
+	return Tag("hr").OmitEndTag()
 }
 
 //     "html": HTMLHtmlElement;
@@ -280,13 +280,13 @@ func Iframe(children ...HTMLComponent) (r *HTMLTagBuilder) {
 
 //     "img": HTMLImageElement;
 func Img(src string) (r *HTMLTagBuilder) {
-	return Tag("img").Attr("src", src)
+	return Tag("img").OmitEndTag().Attr("src", src)
 }
 
 //     "input": HTMLInputElement;
 
 func Input(name string) (r *HTMLTagBuilder) {
-	return Tag("input").Attr("name", name)
+	return Tag("input").OmitEndTag().Attr("name", name)
 }
 
 //     "ins": HTMLModElement;
@@ -316,7 +316,7 @@ func Li(children ...HTMLComponent) (r *HTMLTagBuilder) {
 
 //     "link": HTMLLinkElement;
 func Link(href string) (r *HTMLTagBuilder) {
-	return Tag("link").Attr("href", href)
+	return Tag("link").OmitEndTag().Attr("href", href)
 }
 
 //     "main": HTMLElement;
@@ -345,7 +345,7 @@ func Menu(children ...HTMLComponent) (r *HTMLTagBuilder) {
 //     "meta": HTMLMetaElement;
 
 func Meta() (r *HTMLTagBuilder) {
-	return Tag("meta")
+	return Tag("meta").OmitEndTag()
 }
 
 //     "meter": HTMLMeterElement;
@@ -395,7 +395,7 @@ func P(children ...HTMLComponent) (r *HTMLTagBuilder) {
 
 //     "param": HTMLParamElement;
 func Param(name string) (r *HTMLTagBuilder) {
-	return Tag("param").Attr("name", name)
+	return Tag("param").OmitEndTag().Attr("name", name)
 }
 
 //     "picture": HTMLPictureElement;
@@ -473,7 +473,7 @@ func Small(text string) (r *HTMLTagBuilder) {
 
 //     "source": HTMLSourceElement;
 func Source(src string) (r *HTMLTagBuilder) {
-	return Tag("source").Attr("src", src)
+	return Tag("source").OmitEndTag().Attr("src", src)
 }
 
 //     "span": HTMLSpanElement;
@@ -565,7 +565,7 @@ func Tr(children ...HTMLComponent) (r *HTMLTagBuilder) {
 
 //     "track": HTMLTrackElement;
 func Track(src string) (r *HTMLTagBuilder) {
-	return Tag("track").Attr("src", src)
+	return Tag("track").OmitEndTag().Attr("src", src)
 }
 
 //     "u": HTMLElement;
@@ -589,6 +589,6 @@ func Video(children ...HTMLComponent) (r *HTMLTagBuilder) {
 }
 
 //     "wbr": HTMLElement;
-func Wbr(text string) (r *HTMLTagBuilder) {
-	return Tag("wbr").Text(text)
+func Wbr() (r *HTMLTagBuilder) {
+	return Tag("wbr").OmitEndTag()
 }
diff --git a/example_test.go b/example_test.go
@@ -23,7 +23,8 @@ func ExampleTag_01simplediv() {
 	Fprint(os.Stdout, comp, context.TODO())
 	//Output:
 	// <div>123&lt;h1&gt;Hello, We write html in Go
-	// <br></div>
+	// <br>
+	// </div>
 }
 
 /*
@@ -45,13 +46,13 @@ func ExampleTag_02fullhtml() {
 	//
 	// <html>
 	// <head>
-	// <meta charset='utf8'></meta>
+	// <meta charset='utf8'>
 	//
 	// <title>My test page</title>
 	// </head>
 	//
 	// <body>
-	// <img src='images/firefox-icon.png' alt='My test image'></img>
+	// <img src='images/firefox-icon.png' alt='My test image'>
 	// </body>
 	// </html>
 }
@@ -85,7 +86,7 @@ func ExampleTag_03rawhtmlandcomponent() {
 	// <div class='userProfile'>
 	// <h1 class='profileName'>felix&lt;h1&gt;</h1>
 	//
-	// <img src='http://image.com/img1.png' class='profileImage'></img>
+	// <img src='http://image.com/img1.png' class='profileImage'>
 	// <svg>complicated svg</svg>
 	// </div>
 	// </li>
@@ -94,7 +95,7 @@ func ExampleTag_03rawhtmlandcomponent() {
 	// <div class='userProfile'>
 	// <h1 class='profileName'>john</h1>
 	//
-	// <img src='http://image.com/img2.png' class='profileImage'></img>
+	// <img src='http://image.com/img2.png' class='profileImage'>
 	// <svg>complicated svg</svg>
 	// </div>
 	// </li>
@@ -305,7 +306,7 @@ func ExampleTag_06httphandler() {
 	//
 	// <html>
 	// <head>
-	// <meta charset='utf8'></meta>
+	// <meta charset='utf8'>
 	// </head>
 	//
 	// <body>
@@ -341,9 +342,9 @@ func ExampleTag_07MutipleTypeAttrs() {
 	Fprint(os.Stdout, comp, context.TODO())
 	//Output:
 	// <div>
-	// <input name='username' type='checkbox' checked more-data='{"Name":"felix","Count":100}' max-length='10'></input>
+	// <input name='username' type='checkbox' checked more-data='{"Name":"felix","Count":100}' max-length='10'>
 	//
-	// <input name='username2' type='checkbox'></input>
+	// <input name='username2' type='checkbox'>
 	// </div>
 }
 
diff --git a/go.mod b/go.mod
@@ -0,0 +1,7 @@
+module github.com/theplant/htmlgo
+
+go 1.17
+
+require github.com/theplant/testingutils v0.0.0-20190603093022-26d8b4d95c61
+
+require github.com/pmezard/go-difflib v1.0.0 // indirect
diff --git a/go.sum b/go.sum
@@ -0,0 +1,4 @@
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/theplant/testingutils v0.0.0-20190603093022-26d8b4d95c61 h1:757/ruZNgTsOf5EkQBo0i3Bx/P2wgF5ljVkODeUX/uA=
+github.com/theplant/testingutils v0.0.0-20190603093022-26d8b4d95c61/go.mod h1:p22Q3Bg5ML+hdI3QSQkB/pZ2+CjfOnGugoQIoyE2Ub8=
diff --git a/tag.go b/tag.go
@@ -332,7 +332,12 @@ func (b *HTMLTagBuilder) MarshalHTML(ctx context.Context) (r []byte, err error)
 	}
 
 	buf := bytes.NewBuffer(nil)
-	buf.WriteString(fmt.Sprintf("\n<%s%s>", b.tag, attrStr))
+	newline := ""
+
+	if b.omitEndTag {
+		newline = "\n"
+	}
+	buf.WriteString(fmt.Sprintf("\n<%s%s>%s", b.tag, attrStr, newline))
 	if !b.omitEndTag {
 		if len(cs) > 0 {
 			// buf.WriteString("\n")

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ func Address(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`19`	`19`	`// Not support`
`20`	`20`
`21`	`21`	`// "area": HTMLAreaElement;`
`22`		`-func Area(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`23`		`- return Tag("area").Children(children...)`
	`22`	`+func Area() (r *HTMLTagBuilder) {`
	`23`	`+ return Tag("area").OmitEndTag()`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// "article": HTMLElement;`
`@@ -44,8 +44,8 @@ func B(text string) (r *HTMLTagBuilder) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// "base": HTMLBaseElement;`
`47`		`-func Base(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`48`		`- return Tag("base").Children(children...)`
	`47`	`+func Base() (r *HTMLTagBuilder) {`
	`48`	`+ return Tag("base").OmitEndTag()`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`// "basefont": HTMLBaseFontElement;`
`@@ -102,8 +102,8 @@ func Code(text string) (r *HTMLTagBuilder) {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`// "col": HTMLTableColElement;`
`105`		`-func Col(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`106`		`- return Tag("col").Children(children...)`
	`105`	`+func Col() (r *HTMLTagBuilder) {`
	`106`	`+ return Tag("col").OmitEndTag()`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`// "colgroup": HTMLTableColElement;`
`@@ -171,8 +171,8 @@ func Em(text string) (r *HTMLTagBuilder) {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`// "embed": HTMLEmbedElement;`
`174`		`-func Embed(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`175`		`- return Tag("embed").Children(children...)`
	`174`	`+func Embed() (r *HTMLTagBuilder) {`
	`175`	`+ return Tag("embed").OmitEndTag()`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`// "fieldset": HTMLFieldSetElement;`
`@@ -257,7 +257,7 @@ func Hgroup(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`257`	`257`
`258`	`258`	`// "hr": HTMLHRElement;`
`259`	`259`	`func Hr() (r *HTMLTagBuilder) {`
`260`		`- return Tag("hr")`
	`260`	`+ return Tag("hr").OmitEndTag()`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`// "html": HTMLHtmlElement;`
`@@ -280,13 +280,13 @@ func Iframe(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`280`	`280`
`281`	`281`	`// "img": HTMLImageElement;`
`282`	`282`	`func Img(src string) (r *HTMLTagBuilder) {`
`283`		`- return Tag("img").Attr("src", src)`
	`283`	`+ return Tag("img").OmitEndTag().Attr("src", src)`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`// "input": HTMLInputElement;`
`287`	`287`
`288`	`288`	`func Input(name string) (r *HTMLTagBuilder) {`
`289`		`- return Tag("input").Attr("name", name)`
	`289`	`+ return Tag("input").OmitEndTag().Attr("name", name)`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`// "ins": HTMLModElement;`
`@@ -316,7 +316,7 @@ func Li(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`316`	`316`
`317`	`317`	`// "link": HTMLLinkElement;`
`318`	`318`	`func Link(href string) (r *HTMLTagBuilder) {`
`319`		`- return Tag("link").Attr("href", href)`
	`319`	`+ return Tag("link").OmitEndTag().Attr("href", href)`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`// "main": HTMLElement;`
`@@ -345,7 +345,7 @@ func Menu(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`345`	`345`	`// "meta": HTMLMetaElement;`
`346`	`346`
`347`	`347`	`func Meta() (r *HTMLTagBuilder) {`
`348`		`- return Tag("meta")`
	`348`	`+ return Tag("meta").OmitEndTag()`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`// "meter": HTMLMeterElement;`
`@@ -395,7 +395,7 @@ func P(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`395`	`395`
`396`	`396`	`// "param": HTMLParamElement;`
`397`	`397`	`func Param(name string) (r *HTMLTagBuilder) {`
`398`		`- return Tag("param").Attr("name", name)`
	`398`	`+ return Tag("param").OmitEndTag().Attr("name", name)`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`// "picture": HTMLPictureElement;`
`@@ -473,7 +473,7 @@ func Small(text string) (r *HTMLTagBuilder) {`
`473`	`473`
`474`	`474`	`// "source": HTMLSourceElement;`
`475`	`475`	`func Source(src string) (r *HTMLTagBuilder) {`
`476`		`- return Tag("source").Attr("src", src)`
	`476`	`+ return Tag("source").OmitEndTag().Attr("src", src)`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`// "span": HTMLSpanElement;`
`@@ -565,7 +565,7 @@ func Tr(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`565`	`565`
`566`	`566`	`// "track": HTMLTrackElement;`
`567`	`567`	`func Track(src string) (r *HTMLTagBuilder) {`
`568`		`- return Tag("track").Attr("src", src)`
	`568`	`+ return Tag("track").OmitEndTag().Attr("src", src)`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`// "u": HTMLElement;`
`@@ -589,6 +589,6 @@ func Video(children ...HTMLComponent) (r *HTMLTagBuilder) {`
`589`	`589`	`}`
`590`	`590`
`591`	`591`	`// "wbr": HTMLElement;`
`592`		`-func Wbr(text string) (r *HTMLTagBuilder) {`
`593`		`- return Tag("wbr").Text(text)`
	`592`	`+func Wbr() (r *HTMLTagBuilder) {`
	`593`	`+ return Tag("wbr").OmitEndTag()`
`594`	`594`	`}`