Enhance: use html parser in preprocessor #240
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,67 @@ | ||
| import MagicString from 'magic-string'; | ||
| import { parseTag } from '../utils/htmlParser'; | ||
|
|
||
| const stringifyExpression = (s) => (s ? `{JSON.stringify(${s})}` : '""'); | ||
|
|
||
| const createReplacementString = (content, tag) => { | ||
| let options = ''; | ||
| let clientProps = ''; | ||
| let styleProps = ''; | ||
| let stylePropsRaw = ''; | ||
| let serverProps = ''; | ||
| for (const attr of tag.attrs) { | ||
| if (/^hydrate-client$/i.test(attr.name)) { | ||
| if (attr.value) { | ||
| clientProps = content.slice(attr.value.exp.start, attr.value.exp.end); | ||
| } | ||
| } else if (/^hydrate-options$/i.test(attr.name)) { | ||
| options = content.slice(attr.value.exp.start, attr.value.exp.end); | ||
| } else if (/^--/i.test(attr.name)) { | ||
| stylePropsRaw += ` ${content.slice(attr.start, attr.end)}`; | ||
| styleProps += ` style:${attr.name}=${content.slice(attr.value.start, attr.value.end)}`; | ||
| } else { | ||
| serverProps += ` ${content.slice(attr.start, attr.end)}`; | ||
| } | ||
| } | ||
| const spreadClientProps = clientProps ? ` {...(${clientProps})}` : ''; | ||
| // FIXME: it should be possible to merge three attributes into one | ||
|
There was a problem hiding this comment. Ideally, we should be able to generate simpler code in the preprocessor e.g. `<div ejs-component=${stringifyExpression(`["${tag.name}",${clientProps},${options}]`)}>`Then we just have to search for There was a problem hiding this comment. Definitely. This would be a huge simplification. |
||
| // FIXME: use hydrateOptions.element instead of 'div' | ||
|
There was a problem hiding this comment.
If this is needed, we can try to find the element via regex: const rx = /\belement['"]?\s*:\s*['"]([^'"]+)/i;
const element = options.match(rx)?.[1];This will work if the options is written in the source: But won't work in other cases: <script>
const o = {element: 'span'};
</script>
<Component hydrate-client hydrate-options={o} />There was a problem hiding this comment. This was the implementation. There was a problem hiding this comment. Another solution is to use a special tag e.g. <ejswrapper ... ></ejswrapper>And replace it with the real tag name in There was a problem hiding this comment. @eight04 Not strongly opinionated either way. Whatever you think is best. |
||
| const wrapper = | ||
| `<div class="ejs-component" data-ejs-component="${tag.name}"` + | ||
| ` data-ejs-props=${stringifyExpression(clientProps)}` + | ||
| ` data-ejs-options=${stringifyExpression(options)}` + | ||
| `${styleProps}>` + | ||
| `<${tag.name}${spreadClientProps}${serverProps}/></div>`; | ||
| if (!options) { | ||
| return wrapper; | ||
| } | ||
| return ( | ||
| `{#if (${options}).loading === 'none'}<${tag.name}${spreadClientProps}${stylePropsRaw}${serverProps}/>` + | ||
| `{:else}${wrapper}{/if}` | ||
| ); | ||
| }; | ||
|
|
||
| export const preprocessSvelteContent = (content) => { | ||
| // Note: this regex only supports self closing components. | ||
| // Slots aren't supported for client hydration either. | ||
| let dirty = false; | ||
| const hydrateableComponentPattern = /<([a-zA-Z]+)[^>]+hydrate-client/gim; | ||
| const s = new MagicString(content); | ||
|
There was a problem hiding this comment. Great work here. Huge simplification. |
||
| for (const match of content.matchAll(hydrateableComponentPattern)) { | ||
| const tag = parseTag(content, match.index); | ||
| if (!tag.selfClosed) { | ||
| throw new Error( | ||
| `Elder.js only supports self-closing syntax on hydrated components. This means <Foo /> not <Foo></Foo> or <Foo>Something</Foo>. Offending component: ${content.slice( | ||
| tag.start, | ||
| tag.end, | ||
| )}. Slots and child components aren't supported during hydration as it would result in huge HTML payloads. If you need this functionality try wrapping the offending component in a parent component without slots or child components and hydrate the parent component.`, | ||
| ); | ||
| } | ||
| const repl = createReplacementString(content, tag); | ||
| s.overwrite(tag.start, tag.end, repl); | ||
| dirty = true; | ||
| } | ||
| return dirty ? s.toString() : content; | ||
| }; | ||
|
|
||
| const partialHydration = { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
escapeHtmlandreplaceSpecialCharactersare moved tohtmlParser.ts.