Skip to content

Add support for HTML comments #84

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

Merged
jviide merged 6 commits into from
Jul 25, 2019
Merged

Add support for HTML comments #84

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11d1cc7
Support HTML comments
jviide Apr 19, 2019
3835bac
Add HTML comment tests
jviide Apr 19, 2019
2a0a0e0
Merge branch 'master' into comment-support
jviide Jul 9, 2019
3acbc02
Compress code a bit
jviide Jul 9, 2019
315705f
Merge branch 'master' into comment-support
jviide Jul 16, 2019
124dad8
Merge branch 'master' into comment-support
jviide Jul 25, 2019
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
20 changes: 18 additions & 2 deletions src/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ const CHILD_APPEND = 0;
const MODE_SLASH = 0;
const MODE_TEXT = 1;
const MODE_WHITESPACE = 2;
const MODE_TAGNAME = 3;
const MODE_ATTRIBUTE = 4;
const MODE_ATTRIBUTE = 3;
const MODE_TAGNAME = 4;
const MODE_COMMENT = 5;

const evaluate = (h, current, fields, args) => {
for (let i = 1; i < current.length; i++) {
Expand Down Expand Up @@ -135,6 +136,16 @@ const build = function(statics) {
buffer += char;
}
}
else if (mode === MODE_COMMENT) {
// Ignore everything until the last three characters are '-', '-' and '>'
if (buffer === '--' && char === '>') {
mode = MODE_TEXT;
buffer = '';
}
else {
buffer = char + buffer[0];
}
}
else if (quote) {
if (char === quote) {
quote = '';
Expand Down Expand Up @@ -180,6 +191,11 @@ const build = function(statics) {
else {
buffer += char;
}

if (mode === MODE_TAGNAME && buffer === '!--') {
mode = MODE_COMMENT;
current = current[0];
}
}
}
commit();
Expand Down
7 changes: 7 additions & 0 deletions test/index.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,11 @@ describe('htm', () => {
html`<a ...${obj} b="1" />`;
expect(obj).toEqual({});
});

test('ignore HTML comments', () => {
expect(html`<a><!-- Hello, world! --></a>`).toEqual(h('a', null));
expect(html`<a><!-- Hello,\nworld! --></a>`).toEqual(h('a', null));
expect(html`<a><!-- ${'Hello, world!'} --></a>`).toEqual(h('a', null));
expect(html`<a><!--> Hello, world <!--></a>`).toEqual(h('a', null));
});
});