Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: allow hyperscript style attributes, and attributeNameSubsequent … #107

Merged
merged 1 commit into from
Jun 27, 2023
Merged

fix: allow hyperscript style attributes, and attributeNameSubsequent … #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 74 additions & 68 deletions parser/v2/elementparser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,64 +72,68 @@ var elementCloseTagParser = parse.Func(func(in *parse.Input) (ect elementCloseTa
})

// Attribute name.
var attributeNameFirst = "abcdefghijklmnopqrstuvwxyz@:"
var attributeNameSubsequent = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:-"
var attributeNameParser = parse.Func(func(in *parse.Input) (name string, ok bool, err error) {
start := in.Index()
var prefix, suffix string
if prefix, ok, err = parse.RuneIn(attributeNameFirst).Parse(in); err != nil || !ok {
return
}
if suffix, ok, err = parse.StringUntil(parse.RuneNotIn(attributeNameSubsequent)).Parse(in); err != nil {
in.Seek(start)
return
}
if len(suffix)+1 > 128 {
ok = false
err = parse.Error("attribute names must be < 128 characters long", in.Position())
return
}
return prefix + suffix, true, nil
})
var (
attributeNameFirst = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ:_@"
attributeNameSubsequent = attributeNameFirst + "-.0123456789"
attributeNameParser = parse.Func(func(in *parse.Input) (name string, ok bool, err error) {
start := in.Index()
var prefix, suffix string
if prefix, ok, err = parse.RuneIn(attributeNameFirst).Parse(in); err != nil || !ok {
return
}
if suffix, ok, err = parse.StringUntil(parse.RuneNotIn(attributeNameSubsequent)).Parse(in); err != nil {
in.Seek(start)
return
}
if len(suffix)+1 > 128 {
ok = false
err = parse.Error("attribute names must be < 128 characters long", in.Position())
return
}
return prefix + suffix, true, nil
})
)

// Constant attribute.
var attributeConstantValueParser = parse.StringUntil(parse.Rune('"'))
var constantAttributeParser = parse.Func(func(pi *parse.Input) (attr ConstantAttribute, ok bool, err error) {
start := pi.Index()
var (
attributeConstantValueParser = parse.StringUntil(parse.Rune('"'))
constantAttributeParser = parse.Func(func(pi *parse.Input) (attr ConstantAttribute, ok bool, err error) {
start := pi.Index()

// Optional whitespace leader.
if _, ok, err = parse.OptionalWhitespace.Parse(pi); err != nil || !ok {
return
}
// Optional whitespace leader.
if _, ok, err = parse.OptionalWhitespace.Parse(pi); err != nil || !ok {
return
}

// Attribute name.
if attr.Name, ok, err = attributeNameParser.Parse(pi); err != nil || !ok {
pi.Seek(start)
return
}
// Attribute name.
if attr.Name, ok, err = attributeNameParser.Parse(pi); err != nil || !ok {
pi.Seek(start)
return
}

// ="
if _, ok, err = parse.String(`="`).Parse(pi); err != nil || !ok {
pi.Seek(start)
return
}
// ="
if _, ok, err = parse.String(`="`).Parse(pi); err != nil || !ok {
pi.Seek(start)
return
}

// Attribute value.
if attr.Value, ok, err = attributeConstantValueParser.Parse(pi); err != nil || !ok {
pi.Seek(start)
return
}
// Attribute value.
if attr.Value, ok, err = attributeConstantValueParser.Parse(pi); err != nil || !ok {
pi.Seek(start)
return
}

attr.Value = html.UnescapeString(attr.Value)
attr.Value = html.UnescapeString(attr.Value)

// " - closing quote.
if _, ok, err = Must(parse.String(`"`), fmt.Sprintf("missing closing quote on attribute %q", attr.Name)).Parse(pi); err != nil || !ok {
pi.Seek(start)
return
}
// " - closing quote.
if _, ok, err = Must(parse.String(`"`), fmt.Sprintf("missing closing quote on attribute %q", attr.Name)).Parse(pi); err != nil || !ok {
pi.Seek(start)
return
}

return attr, true, nil
})
return attr, true, nil
})
)

// BoolConstantAttribute.
var boolConstantAttributeParser = parse.Func(func(pi *parse.Input) (attr BoolConstantAttribute, ok bool, err error) {
Expand Down Expand Up @@ -280,25 +284,27 @@ func (attributesParser) Parse(in *parse.Input) (attributes []Attribute, ok bool,
}

// Element name.
var elementNameFirst = "abcdefghijklmnopqrstuvwxyz"
var elementNameSubsequent = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-"
var elementNameParser = parse.Func(func(in *parse.Input) (name string, ok bool, err error) {
start := in.Index()
var prefix, suffix string
if prefix, ok, err = parse.RuneIn(elementNameFirst).Parse(in); err != nil || !ok {
return
}
if suffix, ok, err = parse.StringUntil(parse.RuneNotIn(elementNameSubsequent)).Parse(in); err != nil || !ok {
in.Seek(start)
return
}
if len(suffix)+1 > 16 {
ok = false
err = parse.Error("element property names must be < 16 characters long", in.Position())
return
}
return prefix + suffix, true, nil
})
var (
elementNameFirst = "abcdefghijklmnopqrstuvwxyz"
elementNameSubsequent = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-"
elementNameParser = parse.Func(func(in *parse.Input) (name string, ok bool, err error) {
start := in.Index()
var prefix, suffix string
if prefix, ok, err = parse.RuneIn(elementNameFirst).Parse(in); err != nil || !ok {
return
}
if suffix, ok, err = parse.StringUntil(parse.RuneNotIn(elementNameSubsequent)).Parse(in); err != nil || !ok {
in.Seek(start)
return
}
if len(suffix)+1 > 16 {
ok = false
err = parse.Error("element property names must be < 16 characters long", in.Position())
return
}
return prefix + suffix, true, nil
})
)

// Element.
var elementOpenClose elementOpenCloseParser
Expand Down
24 changes: 17 additions & 7 deletions parser/v2/elementparser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type attributeTest[T any] struct {
}

func TestAttributeParser(t *testing.T) {
var tests = []attributeTest[any]{
tests := []attributeTest[any]{
{
name: "element: open",
input: `<a>`,
Expand All @@ -33,6 +33,20 @@ func TestAttributeParser(t *testing.T) {
Name: "turbo-frame",
},
},
{
name: "element: open with hyperscript attribute",
input: `<div _="show = true">`,
parser: StripType(elementOpenTagParser),
expected: elementOpenTag{
Name: "div",
Attributes: []Attribute{
ConstantAttribute{
Name: "_",
Value: "show = true",
},
},
},
},
{
name: "element: open with complex attributes",
input: `<div @click="show = true" :class="{'foo': true}">`,
Expand Down Expand Up @@ -281,7 +295,7 @@ if test {
}

func TestElementParser(t *testing.T) {
var tests = []struct {
tests := []struct {
name string
input string
expected Element
Expand Down Expand Up @@ -316,7 +330,6 @@ func TestElementParser(t *testing.T) {
Col: 15,
},
To: Position{

Index: 19,
Line: 0,
Col: 19,
Expand Down Expand Up @@ -344,7 +357,6 @@ func TestElementParser(t *testing.T) {
Col: 10,
},
To: Position{

Index: 16,
Line: 0,
Col: 16,
Expand Down Expand Up @@ -392,7 +404,6 @@ func TestElementParser(t *testing.T) {
Col: 23,
},
To: Position{

Index: 27,
Line: 0,
Col: 27,
Expand Down Expand Up @@ -428,7 +439,6 @@ func TestElementParser(t *testing.T) {
Col: 23,
},
To: Position{

Index: 50,
Line: 0,
Col: 50,
Expand Down Expand Up @@ -775,7 +785,7 @@ func TestElementParser(t *testing.T) {
}

func TestElementParserErrors(t *testing.T) {
var tests = []struct {
tests := []struct {
name string
input string
expected error
Expand Down