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

Merge pull request #550 from trheyi/main

Browse source 
Refactor attribute handling in build and parser functions
This commit is contained in:
Max 2024-01-10 15:00:00 +08:00 • committed by GitHub
commit 887de058b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
sui/core/build.go
View file

@ -25,7 +25,7 @@ func (page *Page) Build(option *BuildOption) (*goquery.Document, []string, error
} }
// Add Style & Script & Warning // Add Style & Script & Warning
doc, err := NewDocument([]byte(html)) doc, err := NewDocumentString(html)
if err != nil { if err != nil {
warnings = append(warnings, err.Error()) warnings = append(warnings, err.Error())
} }
@ -81,7 +81,7 @@ func (page *Page) BuildForImport(option *BuildOption, slots map[string]interface
} }
// Add Style & Script & Warning // Add Style & Script & Warning
doc, err := NewDocument([]byte(html)) doc, err := NewDocumentString(html)
if err != nil { if err != nil {
warnings = append(warnings, err.Error()) warnings = append(warnings, err.Error())
} }
@ -121,7 +121,21 @@ func (page *Page) BuildForImport(option *BuildOption, slots map[string]interface
} }
func (page *Page) parse(doc *goquery.Document, option *BuildOption, warnings []string) error { func (page *Page) parse(doc *goquery.Document, option *BuildOption, warnings []string) error {
pages := doc.Find("page")
pages := doc.Find("*").FilterFunction(func(i int, sel *goquery.Selection) bool {
tagName := sel.Get(0).Data
if tagName == "page" {
return true
}
if tagName == "slot" {
return false
}
_, has := sel.Attr("is")
return has
})
sui := SUIs[page.SuiID] sui := SUIs[page.SuiID]
if sui == nil { if sui == nil {
return fmt.Errorf("SUI %s not found", page.SuiID) return fmt.Errorf("SUI %s not found", page.SuiID)
@ -175,21 +189,16 @@ func (page *Page) parse(doc *goquery.Document, option *BuildOption, warnings []s
// Set Attrs // Set Attrs
attrs := map[string]string{} attrs := map[string]string{}
if sel.Length() > 0 { if sel.Length() > 0 {
if page.Attrs != nil { for _, attr := range sel.Nodes[0].Attr {
parentProps := Data{"$prop": page.Attrs} if attr.Key == "is" || attr.Key == "parsed" {
for k, v := range page.Attrs { continue
if k == "is" {
continue
}
attrs[k], _ = parentProps.ReplaceUse(slotRe, v)
} }
} else { val := attr.Val
for _, attr := range sel.Nodes[0].Attr { if page.Attrs != nil {
if attr.Key == "is" { parentProps := Data{"$prop": page.Attrs}
continue val, _ = parentProps.ReplaceUse(slotRe, val)
}
attrs[attr.Key] = attr.Val
} }
attrs[attr.Key] = val
} }
} }

20
sui/core/parser.go
View file

@ -1,7 +1,6 @@
package core package core
import ( import (
"bytes"
"fmt" "fmt"
"strings" "strings"
@ -58,8 +57,7 @@ func (parser *TemplateParser) Render(html string) (string, error) {
html = fmt.Sprintf(`<!DOCTYPE html><html lang="en">%s</html>`, html) html = fmt.Sprintf(`<!DOCTYPE html><html lang="en">%s</html>`, html)
} }
reader := bytes.NewReader([]byte(html)) doc, err := NewDocumentString(html)
doc, err := goquery.NewDocumentFromReader(reader)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -145,7 +143,7 @@ func (parser *TemplateParser) parseElementNode(sel *goquery.Selection) {
parser.forStatementNode(sel) parser.forStatementNode(sel)
} }
if 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)
} }
@ -161,14 +159,18 @@ func (parser *TemplateParser) setStatementNode(sel *goquery.Selection) {
} }
valueExp := sel.AttrOr("value", "") valueExp := sel.AttrOr("value", "")
val, err := parser.data.Exec(valueExp) if stmtRe.MatchString(valueExp) {
if err != nil { val, err := parser.data.Exec(valueExp)
log.Warn("Set %s: %s", valueExp, err) if err != nil {
parser.data[name] = nil log.Warn("Set %s: %s", valueExp, err)
parser.data[name] = valueExp
return
}
parser.data[name] = val
return return
} }
parser.data[name] = val parser.data[name] = valueExp
} }
func (parser *TemplateParser) parseElementAttrs(sel *goquery.Selection) { func (parser *TemplateParser) parseElementAttrs(sel *goquery.Selection) {

17
sui/core/utils.go
View file

@ -5,14 +5,23 @@ import (
"strings" "strings"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
"golang.org/x/net/html"
) )
// NewDocument create a new document // NewDocument create a new document
func NewDocument(html []byte) (*goquery.Document, error) { func NewDocument(htmlContent []byte) (*goquery.Document, error) {
return goquery.NewDocumentFromReader(bytes.NewReader(html)) docNode, err := html.Parse(bytes.NewReader(htmlContent))
if err != nil {
return nil, err
}
return goquery.NewDocumentFromNode(docNode), nil
} }
// NewDocumentString create a new document // NewDocumentString create a new document
func NewDocumentString(html string) (*goquery.Document, error) { func NewDocumentString(htmlContent string) (*goquery.Document, error) {
return goquery.NewDocumentFromReader(strings.NewReader(html)) docNode, err := html.Parse(strings.NewReader(htmlContent))
if err != nil {
return nil, err
}
return goquery.NewDocumentFromNode(docNode), nil
} }