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

Avoid regexp for expression continuations #130

Merged
merged 7 commits into from
Aug 8, 2022
+817 −421
Merged

Avoid regexp for expression continuations #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34cc9e8
refactor: avoid regexp parsing for expression continuations
DylanPiercey Aug 5, 2022
f886c27
feat: improve continue expressions with equals
DylanPiercey Aug 6, 2022
eb9f52c
fix: allow hyphen continuation inside concise attr groups
DylanPiercey Aug 6, 2022
00cce1f
refactor: move terminator logic out of expressions state
DylanPiercey Aug 8, 2022
9bc1010
refactor: make the expression operators config opt-in instead of opt-out
DylanPiercey Aug 8, 2022
65a2935
fix: remove special cases for binary operators not supported in older…
DylanPiercey Aug 8, 2022
f923c5e
refactor: cleanup template literal state
DylanPiercey Aug 8, 2022
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
5 changes: 5 additions & 0 deletions .changeset/tame-geese-drop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"htmljs-parser": patch
---

Switch from regexp based parsing for the expression continuations. This slightly improves performance and more importantly fixes usage of the parser in safari.
28 changes: 26 additions & 2 deletions ...tests__/fixtures/attr-complex-functions/__snapshots__/attr-complex-functions.expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,39 @@
│ ├─ closeTagEnd(tag)
│ ├─ openTagEnd
╰─ ╰─ tagName "tag"
4╭─ tag a = async x => { console.log("y") } b
4╭─ tag a = x => y b
│ │ │ │ │ ╰─ attrName
│ │ │ │ ╰─ attrValue.value "x => y"
│ │ │ ╰─ attrValue "= x => y"
│ │ ╰─ attrName
│ ├─ closeTagEnd(tag)
│ ├─ openTagEnd
╰─ ╰─ tagName "tag"
5╭─ tag a = x => y + 1 b
│ │ │ │ │ ╰─ attrName
│ │ │ │ ╰─ attrValue.value "x => y + 1"
│ │ │ ╰─ attrValue "= x => y + 1"
│ │ ╰─ attrName
│ ├─ closeTagEnd(tag)
│ ├─ openTagEnd
╰─ ╰─ tagName "tag"
6╭─ tag a = x => y = 1 b
│ │ │ │ │ ╰─ attrName
│ │ │ │ ╰─ attrValue.value "x => y = 1"
│ │ │ ╰─ attrValue "= x => y = 1"
│ │ ╰─ attrName
│ ├─ closeTagEnd(tag)
│ ├─ openTagEnd
╰─ ╰─ tagName "tag"
7╭─ tag a = async x => { console.log("y") } b
│ │ │ │ │ ╰─ attrName
│ │ │ │ ╰─ attrValue.value "async x => { console.log(\"y\") }"
│ │ │ ╰─ attrValue "= async x => { console.log(\"y\") }"
│ │ ╰─ attrName
│ ├─ closeTagEnd(tag)
│ ├─ openTagEnd
╰─ ╰─ tagName "tag"
5╭─ tag a = async function (x) { console.log("y") } b
8╭─ tag a = async function (x) { console.log("y") } b
│ │ │ │ │ │├─ closeTagEnd(tag)
│ │ │ │ │ │╰─ openTagEnd
│ │ │ │ │ ╰─ attrName
Expand Down
3 changes: 3 additions & 0 deletions src/__tests__/fixtures/attr-complex-functions/input.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
tag a = function (x) { console.log("y") } b
tag a = (x) => { console.log("y") } b
tag a = x => { console.log("y") } b
tag a = x => y b
tag a = x => y + 1 b
tag a = x => y = 1 b
tag a = async x => { console.log("y") } b
tag a = async function (x) { console.log("y") } b
21 changes: 20 additions & 1 deletion ...sts__/fixtures/attr-complex-instanceof/__snapshots__/attr-complex-instanceof.expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,23 @@
│ ││ │ ╰─ attrValue "= 'foo'"
│ ││ ╰─ attrName
│ │╰─ tagName "tag"
╰─ ╰─ openTagStart
╰─ ╰─ openTagStart
12├─
13╭─ tag a = 'foo' instanceofthing String
│ │ │ │ │ │ ╰─ attrName "String"
│ │ │ │ │ ╰─ attrName "instanceofthing"
│ │ │ │ ╰─ attrValue.value "'foo'"
│ │ │ ╰─ attrValue "= 'foo'"
│ │ ╰─ attrName
╰─ ╰─ tagName "tag"
14╭─
╰─ ╰─ openTagEnd
15╭─ tag a = 'foo' instanceof
│ │ │ │ │ │ ├─ closeTagEnd(tag)
│ │ │ │ │ │ ╰─ openTagEnd
│ │ │ │ │ ╰─ attrName "instanceof"
│ │ │ │ ╰─ attrValue.value "'foo'"
│ │ │ ╰─ attrValue "= 'foo'"
│ │ ╰─ attrName
│ ├─ closeTagEnd(tag)
╰─ ╰─ tagName "tag"
6 changes: 5 additions & 1 deletion src/__tests__/fixtures/attr-complex-instanceof/input.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ tag a = 'foo' instanceof;
tag a = 'foo' instanceof, b

<tag a = 'foo' instanceof></tag>
<tag a = 'foo' instanceof/>
<tag a = 'foo' instanceof/>

tag a = 'foo' instanceofthing String

tag a = 'foo' instanceof
18 changes: 18 additions & 0 deletions src/__tests__/fixtures/attr-concise-hyphens/__snapshots__/attr-concise-hyphens.expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
1╭─ a b=c -- y
│ │ │││ │ ╰─ text
│ │ │││ ╰─ openTagEnd
│ │ ││╰─ attrValue.value
│ │ │╰─ attrValue "=c"
│ │ ╰─ attrName
╰─ ╰─ tagName
2├─
3╭─ a [b=c -- y]
│ │ │││ ╰─ attrName
│ │ ││╰─ attrValue.value "c --"
│ │ │╰─ attrValue "=c --"
│ │ ╰─ attrName
│ ├─ closeTagEnd(a)
╰─ ╰─ tagName
4╭─
│ ├─ openTagEnd
╰─ ╰─ closeTagEnd(a)
3 changes: 3 additions & 0 deletions src/__tests__/fixtures/attr-concise-hyphens/input.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
a b=c -- y

a [b=c -- y]
9 changes: 9 additions & 0 deletions ...ures/attr-operator-whitespace-eof/__snapshots__/attr-operator-whitespace-eof.expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
1╭─ tag a = 'foo' instanceof
│ │ │ │ │ ╰─ attrName "instanceof"
│ │ │ │ ╰─ attrValue.value "'foo'"
│ │ │ ╰─ attrValue "= 'foo'"
│ │ ╰─ attrName
╰─ ╰─ tagName "tag"
2╭─
│ ├─ openTagEnd
╰─ ╰─ closeTagEnd(tag)
1 change: 1 addition & 0 deletions src/__tests__/fixtures/attr-operator-whitespace-eof/input.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tag a = 'foo' instanceof
65 changes: 40 additions & 25 deletions ...ures/attr-operators-newline-after/__snapshots__/attr-operators-newline-after.expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,14 +683,17 @@
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
159╭─ <a=x >=
│ │││╰─ attrValue.value "x >=\ny"
│ ││├─ attrValue "=x >=\ny"
│ ││││ │╰─ text "=\ny "
│ ││││ ╰─ openTagEnd
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
160╭─ y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
160╭─ y </a>
│ │ │╰─ closeTagEnd(a)
│ │ ╰─ closeTagName
╰─ ╰─ closeTagStart "</"
161╭─ <a=x &=
│ │││╰─ attrValue.value "x &=\ny"
│ ││├─ attrValue "=x &=\ny"
Expand Down Expand Up @@ -746,23 +749,29 @@
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
173╭─ <a=x >>=
│ │││╰─ attrValue.value "x >>=\ny"
│ ││├─ attrValue "=x >>=\ny"
│ ││││ │╰─ text ">=\ny "
│ ││││ ╰─ openTagEnd
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
174╭─ y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
174╭─ y </a>
│ │ │╰─ closeTagEnd(a)
│ │ ╰─ closeTagName
╰─ ╰─ closeTagStart "</"
175╭─ <a=x >>>=
│ │││╰─ attrValue.value "x >>>=\ny"
│ ││├─ attrValue "=x >>>=\ny"
│ ││││ │╰─ text ">>=\ny "
│ ││││ ╰─ openTagEnd
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
176╭─ y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
176╭─ y </a>
│ │ │╰─ closeTagEnd(a)
│ │ ╰─ closeTagName
╰─ ╰─ closeTagStart "</"
177╭─ <a=x -=
│ │││╰─ attrValue.value "x -=\ny"
│ ││├─ attrValue "=x -=\ny"
Expand Down Expand Up @@ -836,23 +845,29 @@
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
193╭─ <a=x >>
│ │││╰─ attrValue.value "x >>\ny"
│ ││├─ attrValue "=x >>\ny"
│ ││││ │╰─ text ">\ny "
│ ││││ ╰─ openTagEnd
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
194╭─ y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
194╭─ y </a>
│ │ │╰─ closeTagEnd(a)
│ │ ╰─ closeTagName
╰─ ╰─ closeTagStart "</"
195╭─ <a=x >>>
│ │││╰─ attrValue.value "x >>>\ny"
│ ││├─ attrValue "=x >>>\ny"
│ ││││ │╰─ text ">>\ny "
│ ││││ ╰─ openTagEnd
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
196╭─ y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
196╭─ y </a>
│ │ │╰─ closeTagEnd(a)
│ │ ╰─ closeTagName
╰─ ╰─ closeTagStart "</"
197╭─ <a=x
│ │││╰─ attrValue.value "x\n( y )"
│ ││├─ attrValue "=x\n( y )"
Expand Down
10 changes: 5 additions & 5 deletions src/__tests__/fixtures/attr-operators-newline-after/input.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ y a/>
<a=x <=
y a/>
<a=x >=
y a/>
y </a>
<a=x &=
y a/>
<a=x &&=
Expand All @@ -171,9 +171,9 @@ y a/>
<a=x ~=
y a/>
<a=x >>=
y a/>
y </a>
<a=x >>>=
y a/>
y </a>
<a=x -=
y a/>
<a=x /=
Expand All @@ -191,9 +191,9 @@ y a/>
<a=x +
++ y a/>
<a=x >>
y a/>
y </a>
<a=x >>>
y a/>
y </a>
<a=x
( y ) a/>
<a=x
Expand Down
65 changes: 40 additions & 25 deletions ...es/attr-operators-newline-before/__snapshots__/attr-operators-newline-before.expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,17 @@
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
45╭─ <a=x
│ │││╰─ attrValue.value "x\n>= y"
│ ││├─ attrValue "=x\n>= y"
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
46╭─ >= y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
46╭─ >= y </a>
│ ││ │ │╰─ closeTagEnd(a)
│ ││ │ ╰─ closeTagName
│ ││ ╰─ closeTagStart "</"
│ │╰─ text "= y "
╰─ ╰─ openTagEnd
47╭─ <a=x
│ │││╰─ attrValue.value "x\n&= y"
│ ││├─ attrValue "=x\n&= y"
Expand Down Expand Up @@ -254,23 +257,29 @@
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
59╭─ <a=x
│ │││╰─ attrValue.value "x\n>>= y"
│ ││├─ attrValue "=x\n>>= y"
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
60╭─ >>= y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
60╭─ >>= y </a>
│ ││ │ │╰─ closeTagEnd(a)
│ ││ │ ╰─ closeTagName
│ ││ ╰─ closeTagStart "</"
│ │╰─ text ">= y "
╰─ ╰─ openTagEnd
61╭─ <a=x
│ │││╰─ attrValue.value "x\n>>>= y"
│ ││├─ attrValue "=x\n>>>= y"
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
62╭─ >>>= y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
62╭─ >>>= y </a>
│ ││ │ │╰─ closeTagEnd(a)
│ ││ │ ╰─ closeTagName
│ ││ ╰─ closeTagStart "</"
│ │╰─ text ">>= y "
╰─ ╰─ openTagEnd
63╭─ <a=x
│ │││╰─ attrValue.value "x\n-= y"
│ ││├─ attrValue "=x\n-= y"
Expand Down Expand Up @@ -344,23 +353,29 @@
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
79╭─ <a=x
│ │││╰─ attrValue.value "x\n>>y"
│ ││├─ attrValue "=x\n>>y"
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
80╭─ >>y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
80╭─ >>y </a>
│ ││ │ │╰─ closeTagEnd(a)
│ ││ │ ╰─ closeTagName
│ ││ ╰─ closeTagStart "</"
│ │╰─ text ">y "
╰─ ╰─ openTagEnd
81╭─ <a=x
│ │││╰─ attrValue.value "x\n>>> y"
│ ││├─ attrValue "=x\n>>> y"
│ │││╰─ attrValue.value
│ ││├─ attrValue "=x"
│ ││╰─ attrName
│ │╰─ tagName
╰─ ╰─ openTagStart
82╭─ >>> y a/>
│ │╰─ openTagEnd:selfClosed "/>"
╰─ ╰─ attrName
82╭─ >>> y </a>
│ ││ │ │╰─ closeTagEnd(a)
│ ││ │ ╰─ closeTagName
│ ││ ╰─ closeTagStart "</"
│ │╰─ text ">> y "
╰─ ╰─ openTagEnd
83╭─ <a=x
│ │││╰─ attrValue.value "x\n( y )"
│ ││├─ attrValue "=x\n( y )"
Expand Down
Loading