feat: add Range to DocType nodes (#1302)

AdamVig · web-flow · commit dc31b64fb016 · 2025-12-31T19:23:42.000Z
diff --git a/parser/v2/doctypeparser.go b/parser/v2/doctypeparser.go
@@ -27,6 +27,7 @@ var docType = parse.Func(func(pi *parse.Input) (n Node, ok bool, err error) {
 		err = parse.Error("unclosed DOCTYPE", start)
 		return
 	}
+	r.Range = NewRange(start, pi.Position())
 
 	return r, true, nil
 })
diff --git a/parser/v2/doctypeparser_test.go b/parser/v2/doctypeparser_test.go
@@ -17,27 +17,43 @@ func TestDocTypeParser(t *testing.T) {
 			name:  "HTML 5 doctype - uppercase",
 			input: `<!DOCTYPE html>`,
 			expected: &DocType{
+				Range: Range{
+					From: Position{},
+					To:   Position{Index: 15, Line: 0, Col: 15},
+				},
 				Value: "html",
 			},
 		},
 		{
 			name:  "HTML 5 doctype - lowercase",
 			input: `<!doctype html>`,
 			expected: &DocType{
+				Range: Range{
+					From: Position{},
+					To:   Position{Index: 15, Line: 0, Col: 15},
+				},
 				Value: "html",
 			},
 		},
 		{
 			name:  "HTML 4.01 doctype",
 			input: `<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">`,
 			expected: &DocType{
+				Range: Range{
+					From: Position{},
+					To:   Position{Index: 102, Line: 0, Col: 102},
+				},
 				Value: `HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"`,
 			},
 		},
 		{
 			name:  "XHTML 1.1",
 			input: `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">`,
 			expected: &DocType{
+				Range: Range{
+					From: Position{},
+					To:   Position{Index: 97, Line: 0, Col: 97},
+				},
 				Value: `html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"`,
 			},
 		},
diff --git a/parser/v2/templateparser_test.go b/parser/v2/templateparser_test.go
@@ -669,6 +669,10 @@ func TestTemplateParser(t *testing.T) {
 				},
 				Children: []Node{
 					&DocType{
+						Range: Range{
+							From: Position{Index: 15, Line: 1, Col: 0},
+							To:   Position{Index: 30, Line: 1, Col: 15},
+						},
 						Value: "html",
 					},
 					&Whitespace{Range: Range{
diff --git a/parser/v2/types.go b/parser/v2/types.go
@@ -364,6 +364,7 @@ func (c *ExpressionCSSProperty) Visit(v Visitor) error {
 
 // <!DOCTYPE html>
 type DocType struct {
+	Range Range
 	Value string
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ var docType = parse.Func(func(pi *parse.Input) (n Node, ok bool, err error) {`
`27`	`27`	`err = parse.Error("unclosed DOCTYPE", start)`
`28`	`28`	`return`
`29`	`29`	`}`
	`30`	`+ r.Range = NewRange(start, pi.Position())`
`30`	`31`
`31`	`32`	`return r, true, nil`
`32`	`33`	`})`
Original file line number	Diff line number	Diff line change
`@@ -364,6 +364,7 @@ func (c *ExpressionCSSProperty) Visit(v Visitor) error {`
`364`	`364`
`365`	`365`	`// <!DOCTYPE html>`
`366`	`366`	`type DocType struct {`
	`367`	`+ Range Range`
`367`	`368`	`Value string`
`368`	`369`	`}`
`369`	`370`