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

Refactor SUI core to improve import parsing and aliasing

Browse source
This commit is contained in:
Max 2024-07-28 19:27:16 +08:00
parent 1763a4f2e7
commit 4c5278938c
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sui/core/build.go
View file

@ -248,15 +248,15 @@ func (page *Page) BuildAsComponent(sel *goquery.Selection, ctx *BuildContext, op
} }
func (page *Page) parseImports(doc *goquery.Document) { func (page *Page) parseImports(doc *goquery.Document) {
imports := doc.Find("s\\:import") imports := doc.Find("import")
mapping := map[string]PageImport{} mapping := map[string]PageImport{}
for i := 0; i < imports.Length(); i++ { for i := 0; i < imports.Length(); i++ {
defer imports.Eq(i).Remove() name := imports.Eq(i).AttrOr("s:as", "")
name := imports.Eq(i).AttrOr("s:name", "")
from := imports.Eq(i).AttrOr("s:from", "") from := imports.Eq(i).AttrOr("s:from", "")
if name == "" || from == "" { if name == "" || from == "" {
continue continue
} }
defer imports.Eq(i).Remove()
if _, has := mapping[name]; has { if _, has := mapping[name]; has {
continue continue
} }
@ -295,10 +295,9 @@ func (page *Page) parseImports(doc *goquery.Document) {
// Copy the attributes // Copy the attributes
selection.SetAttr("is", imp.is) selection.SetAttr("is", imp.is)
for _, attr := range imp.selection.Get(0).Attr { for _, attr := range imp.selection.Get(0).Attr {
if strings.HasPrefix(attr.Key, "s:") { if attr.Key == "s:as" || attr.Key == "s:from" {
continue continue
} }
if _, has := selection.Attr(attr.Key); !has { if _, has := selection.Attr(attr.Key); !has {
selection.SetAttr(attr.Key, attr.Val) selection.SetAttr(attr.Key, attr.Val)
} }