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(xml/parser): bugfixes and tests #6566

Merged
merged 23 commits into from
Dec 3, 2022
Merged

fix(xml/parser): bugfixes and tests #6566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e5a444e
test: more
alexander-akait Dec 1, 2022
cbd7f19
fix(xml/parser): attribute unquoted reporting
alexander-akait Dec 1, 2022
980ea42
test: more
alexander-akait Dec 1, 2022
b1c0a43
fix: errors
alexander-akait Dec 1, 2022
6bbcdd5
test: more
alexander-akait Dec 1, 2022
2c68385
fix: errors
alexander-akait Dec 1, 2022
3873c13
test: more
alexander-akait Dec 1, 2022
8cc55ef
fix: more
alexander-akait Dec 1, 2022
f0a7242
fix: error reporting
alexander-akait Dec 1, 2022
b9cc7e9
fix: error reporting
alexander-akait Dec 1, 2022
c1a0650
test: more
alexander-akait Dec 1, 2022
89b7a0d
test: more
alexander-akait Dec 1, 2022
fe51029
test: more
alexander-akait Dec 1, 2022
a479773
test: more
alexander-akait Dec 1, 2022
29ff959
test: more
alexander-akait Dec 1, 2022
d0e419c
test: more
alexander-akait Dec 1, 2022
63dcdbf
test: more
alexander-akait Dec 1, 2022
d326488
fix: entity parsing
alexander-akait Dec 1, 2022
91a4783
fix: whitespaces
alexander-akait Dec 1, 2022
1881630
test: more
alexander-akait Dec 1, 2022
46faefd
fix: codegen
alexander-akait Dec 1, 2022
51c478a
test: fix
alexander-akait Dec 2, 2022
5751a8f
Merge branch 'main' into fix-xml-parsing-attributes
swc-bot Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/swc_xml_codegen/src/lib.rs
View file
Open in desktop
Expand Up @@ -352,7 +352,7 @@ fn normalize_attribute_value(value: &str) -> String {
let mut normalized = String::with_capacity(value.len() + 2);

normalized.push('"');
normalized.push_str(value);
normalized.push_str(&escape_string(value, true));
normalized.push('"');

normalized
Expand Down Expand Up @@ -463,7 +463,7 @@ fn escape_string(value: &str, is_attribute_mode: bool) -> String {
result.push_str("&");
}
'"' if is_attribute_mode => result.push_str("""),
'<' if !is_attribute_mode => {
'<' if is_attribute_mode => {
result.push_str("&lt;");
}
'>' if !is_attribute_mode => {
Expand Down
6 changes: 6 additions & 0 deletions crates/swc_xml_codegen/tests/fixture/base/input.xml
View file
Open in desktop
Expand Up @@ -4,4 +4,10 @@
<from>Jani</from>
<heading>Reminder</heading>
<body>Don't forget me this weekend!</body>
<foo attributeName="He said &quot;OK&quot;"></foo>
<foo attributeName="He said &lt;OK&lt;"></foo>
<foo attributeName="He said &gt;OK&gt;"></foo>
<foo attributeName="He said >OK>"></foo>
<foo attributeName="He said &apos;OK&apos;"></foo>
<foo attributeName="He said &amp;OK&amp;"></foo>
</note>
6 changes: 6 additions & 0 deletions crates/swc_xml_codegen/tests/fixture/base/output.min.xml
View file
Open in desktop
Expand Up @@ -3,4 +3,10 @@
<from>Jani</from>
<heading>Reminder</heading>
<body>Don't forget me this weekend!</body>
<foo attributeName="He said &quot;OK&quot;"/>
<foo attributeName="He said &lt;OK&lt;"/>
<foo attributeName="He said >OK>"/>
<foo attributeName="He said >OK>"/>
<foo attributeName="He said 'OK'"/>
<foo attributeName="He said &amp;OK&amp;"/>
</note>
6 changes: 6 additions & 0 deletions crates/swc_xml_codegen/tests/fixture/base/output.xml
View file
Open in desktop
Expand Up @@ -3,4 +3,10 @@
<from>Jani</from>
<heading>Reminder</heading>
<body>Don't forget me this weekend!</body>
<foo attributeName="He said &quot;OK&quot;" />
<foo attributeName="He said &lt;OK&lt;" />
<foo attributeName="He said >OK>" />
<foo attributeName="He said >OK>" />
<foo attributeName="He said 'OK'" />
<foo attributeName="He said &amp;OK&amp;" />
</note>
16 changes: 16 additions & 0 deletions crates/swc_xml_parser/src/error.rs
View file
Open in desktop
Expand Up @@ -57,6 +57,7 @@ impl Error {
"Invalid character of processing instruction".into()
}
ErrorKind::InvalidCharacterInTag => "Invalid character in tag".into(),
ErrorKind::InvalidEntityCharacter => "Invalid entity character".into(),
ErrorKind::MissingDoctypeName => "Missing doctype name".into(),
ErrorKind::MissingDoctypePublicIdentifier => "Missing doctype public identifier".into(),
ErrorKind::MissingQuoteBeforeDoctypePublicIdentifier => {
Expand All @@ -81,6 +82,13 @@ impl Error {
"Missing whitespace between doctype public and system identifiers".into()
}
ErrorKind::MissingEndTagName => "Missing end tag name".into(),
ErrorKind::MissingQuoteBeforeAttributeValue => {
"Missing quote before attribute value".into()
}
ErrorKind::MissingEqualAfterAttributeName => {
"Missing equal after attribute name".into()
}
ErrorKind::MissingSpaceBetweenAttributes => "Missing space between attributes".into(),
ErrorKind::NestedComment => "Nested comment".into(),
ErrorKind::DoubleHyphenWithInComment => "Double hyper within comment".into(),
ErrorKind::NoncharacterInInputStream => "Noncharacter in input stream".into(),
Expand All @@ -97,6 +105,9 @@ impl Error {
ErrorKind::MissingWhitespaceBeforeQuestionInProcessingInstruction => {
"Missing whitespace before '?'".into()
}
ErrorKind::UnescapedCharacterInAttributeValue(c) => {
format!("Unescaped \"{}\" not allowed in attribute values", c).into()
}

// Parser errors
ErrorKind::UnexpectedTokenInStartPhase => "Unexpected token in start phase".into(),
Expand Down Expand Up @@ -142,6 +153,7 @@ pub enum ErrorKind {
InvalidFirstCharacterOfTagName,
InvalidCharacterOfProcessingInstruction,
InvalidCharacterInTag,
InvalidEntityCharacter,
MissingDoctypeName,
MissingDoctypePublicIdentifier,
MissingQuoteBeforeDoctypePublicIdentifier,
Expand All @@ -152,6 +164,9 @@ pub enum ErrorKind {
MissingWhitespaceBeforeDoctypeName,
MissingWhitespaceBetweenDoctypePublicAndSystemIdentifiers,
MissingEndTagName,
MissingQuoteBeforeAttributeValue,
MissingEqualAfterAttributeName,
MissingSpaceBetweenAttributes,
NestedComment,
DoubleHyphenWithInComment,
NoncharacterInInputStream,
Expand All @@ -162,6 +177,7 @@ pub enum ErrorKind {
UnexpectedSolidusInTag,
NoTargetNameInProcessingInstruction,
MissingWhitespaceBeforeQuestionInProcessingInstruction,
UnescapedCharacterInAttributeValue(char),

// Parser errors
UnexpectedTokenInStartPhase,
Expand Down