opencode/yao
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #661 from trheyi/main

Browse source 
refactor: Update parsing logic for JIT components
This commit is contained in:
Max 2024-07-07 02:34:00 +08:00 • committed by GitHub
commit c719d1e1cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sui/core/build.go
View file

@ -261,8 +261,6 @@ func (page *Page) buildComponents(doc *goquery.Document, ctx *BuildContext, opti
return return
} }
sel.SetAttr("parsed", "true")
// Check if Just-In-Time Component ( "is" has variable ) // Check if Just-In-Time Component ( "is" has variable )
if ctx.isJitComponent(name) { if ctx.isJitComponent(name) {
sel.SetAttr("s:jit", "true") sel.SetAttr("s:jit", "true")
@ -271,6 +269,7 @@ func (page *Page) buildComponents(doc *goquery.Document, ctx *BuildContext, opti
return return
} }
sel.SetAttr("parsed", "true")
ipage, err := tmpl.Page(name) ipage, err := tmpl.Page(name)
if err != nil { if err != nil {
setError(sel, err) setError(sel, err)

33
sui/core/parser.go
View file

@ -271,14 +271,14 @@ func (parser *TemplateParser) parseNode(node *html.Node) {
func (parser *TemplateParser) parseElementNode(sel *goquery.Selection) { func (parser *TemplateParser) parseElementNode(sel *goquery.Selection) {
if _, exist := sel.Attr("s:if"); exist {
parser.ifStatementNode(sel)
}
if _, exist := sel.Attr("s:for"); exist { if _, exist := sel.Attr("s:for"); exist {
parser.forStatementNode(sel) parser.forStatementNode(sel)
} }
if _, exist := sel.Attr("s:if"); exist {
parser.ifStatementNode(sel)
}
if _, exist := sel.Attr("s:set"); exist || sel.Get(0).Data == "s:set" { if _, exist := sel.Attr("s:set"); exist || sel.Get(0).Data == "s:set" {
parser.setStatementNode(sel) parser.setStatementNode(sel)
} }
@ -303,6 +303,7 @@ func (parser *TemplateParser) parseJitElementNode(sel *goquery.Selection) {
return return
} }
parser.parsed(sel)
// Render the JIT component Data // Render the JIT component Data
is, _ = parser.data.Replace(is) is, _ = parser.data.Replace(is)
root := sel.AttrOr("s:root", "/") root := sel.AttrOr("s:root", "/")
@ -312,23 +313,25 @@ func (parser *TemplateParser) parseJitElementNode(sel *goquery.Selection) {
content, err := application.App.Read(file) content, err := application.App.Read(file)
if err != nil { if err != nil {
log.Error("[parser] %s JIT %s", file, err.Error()) log.Error("[parser] %s JIT %s", file, err.Error())
setError(sel, err)
return return
} }
sel.ReplaceWith(string(content))
// With Properties // With Properties
// copy options // // copy options
option := *parser.option // option := *parser.option
option.Component = true // option.Component = true
p := NewTemplateParser(parser.data, &option) // p := NewTemplateParser(parser.data, &option)
html, err := p.Render(string(content)) // html, err := p.Render(string(content))
if err != nil { // if err != nil {
log.Error("[parser] %s JIT %s", file, err.Error()) // log.Error("[parser] %s JIT %s", file, err.Error())
return // return
} // }
// Replace the node // // Replace the node
sel.ReplaceWithHtml(html) // sel.ReplaceWithHtml(html)
} }
func (parser *TemplateParser) transElementNode(sel *goquery.Selection) { func (parser *TemplateParser) transElementNode(sel *goquery.Selection) {