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

Merge pull request #728 from trheyi/main

Browse source 
Optimize $backend function call
This commit is contained in:
Max 2024-08-04 11:45:04 +08:00 • committed by GitHub
commit 19ff6c7b5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 140 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
data/bindata.go
View file

File diff suppressed because one or more lines are too long

2
sui/api/build_test.go
View file

@ -12,7 +12,7 @@ func TestCompile(t *testing.T) {
defer clean()
page := testPage(t)
html, warnings, err := page.Compile(nil, &core.BuildOption{KeepPageTag: false})
html, _, warnings, err := page.Compile(nil, &core.BuildOption{KeepPageTag: false})
if err != nil {
t.Fatalf("Compile error: %v", err)
}

31
sui/api/run.go
View file

@ -1,6 +1,8 @@
package api
import (
"path/filepath"
"github.com/gin-gonic/gin"
"github.com/yaoapp/gou/process"
"github.com/yaoapp/kun/exception"
@ -36,6 +38,17 @@ func Run(process *process.Process) interface{} {
return nil
}
if payload["page"] == nil {
exception.New("The page is required", 400).Throw()
return nil
}
page, ok := payload["page"].(string)
if !ok {
exception.New("The page must be a string", 400).Throw()
return nil
}
args := []interface{}{}
if payload["args"] != nil {
args, ok = payload["args"].([]interface{})
@ -45,7 +58,7 @@ func Run(process *process.Process) interface{} {
}
}
ctx.Request.URL.Path = route
ctx.Request.URL.Path = page
r, _, err := NewRequestContext(ctx)
if err != nil {
exception.Err(err, 500).Throw()
@ -61,7 +74,7 @@ func Run(process *process.Process) interface{} {
c, _, err = r.MakeCache()
if err != nil {
log.Error("[SUI] Can't make cache, %s %s error: %s", route, method, err.Error())
exception.New("Can't make cache, please the route and method is correct, get more information from the log.", 500).Throw()
exception.New("Can't make cache, the route and method is correct, get more information from the log.", 500).Throw()
return nil
}
}
@ -78,12 +91,20 @@ func Run(process *process.Process) interface{} {
return nil
}
if c.Script == nil {
exception.New("Script not found", 500).Throw()
// Load the script
file := filepath.Join("/public", route)
script, err := core.LoadScript(file, r.Request.DisableCache())
if err != nil {
exception.New("Can't load the script (%s), get more information from the log.", 500, route).Throw()
return nil
}
scriptCtx, err := c.Script.NewContext(process.Sid, nil)
if script == nil {
exception.New("Script not found (%s)", 404, route)
return nil
}
scriptCtx, err := script.NewContext(process.Sid, nil)
if err != nil {
exception.Err(err, 500).Throw()
return nil

6
sui/core/build.go
View file

@ -58,6 +58,9 @@ func (page *Page) Build(ctx *BuildContext, option *BuildOption) (*goquery.Docume
body := doc.Find("body")
body.SetAttr("s:ns", namespace)
body.SetAttr("s:public", option.PublicRoot) // Save public root
body.SetAttr("s:assets", option.AssetRoot)
// Bind the Page events
if !option.JitMode {
page.BindEvent(ctx, doc.Selection, "__page", true)
@ -218,6 +221,9 @@ func (page *Page) BuildAsComponent(sel *goquery.Selection, ctx *BuildContext, op
// Pass the component props
first := body.Children().First()
first.SetAttr("s:public", option.PublicRoot) // Save public root
first.SetAttr("s:assets", option.AssetRoot)
// page.copyProps(ctx, sel, first, attrs...)
page.parseProps(sel, first, attrs...)
page.copySlots(sel, first)

12
sui/core/compile.go
View file

@ -19,11 +19,11 @@ var importAssetsRe = regexp.MustCompile(`import\s*\t*\n*\s*['"]@assets\/([^'"]+)
var AssetsRe = regexp.MustCompile(`[` + quoteRe + `]@assets\/([^` + quoteRe + `]+)[` + quoteRe + `]`) // '@assets/foo.js' or "@assets/foo.js" or `@assets/foo`
// Compile the page
func (page *Page) Compile(ctx *BuildContext, option *BuildOption) (string, []string, error) {
func (page *Page) Compile(ctx *BuildContext, option *BuildOption) (string, string, []string, error) {
doc, warnings, err := page.Build(ctx, option)
if err != nil {
return "", warnings, fmt.Errorf("Page build error: %s", err.Error())
return "", "", warnings, fmt.Errorf("Page build error: %s", err.Error())
}
if warnings != nil && len(warnings) > 0 {
@ -62,9 +62,11 @@ func (page *Page) Compile(ctx *BuildContext, option *BuildOption) (string, []str
page.Config = page.GetConfig()
// Config Data
config := ""
if page.Config != nil {
config = page.ExportConfig()
body.AppendHtml("\n\n" + `<script name="config" type="json">` + "\n" +
page.ExportConfig() +
config +
"\n</script>\n\n",
)
}
@ -94,11 +96,11 @@ func (page *Page) Compile(ctx *BuildContext, option *BuildOption) (string, []str
page.ReplaceDocument(doc)
html, err := doc.Html()
if err != nil {
return "", warnings, fmt.Errorf("Generate html error: %s", err.Error())
return "", "", warnings, fmt.Errorf("Generate html error: %s", err.Error())
}
// @todo: Minify the html
return html, warnings, nil
return html, config, warnings, nil
}
// CompileAsComponent compile the page as component

4
sui/core/parser.go
View file

@ -74,6 +74,8 @@ var allowUsePropAttrs = map[string]bool{
"s:event": true,
"s:event-cn": true,
"s:render": true,
"s:public": true,
"s:assets": true,
}
var keepAttrs = map[string]bool{
@ -83,6 +85,8 @@ var keepAttrs = map[string]bool{
"s:event": true,
"s:event-cn": true,
"s:render": true,
"s:public": true,
"s:assets": true,
}
// NewTemplateParser create a new template parser

3
sui/libsui/index.ts
View file

@ -221,6 +221,7 @@ function __sui_store(elm) {
async function __sui_backend_call(
route: string,
page: string,
method: string,
...args: any
): Promise<any> {
@ -229,7 +230,7 @@ async function __sui_backend_call(
"Content-Type": "application/json",
Cookie: document.cookie,
};
const payload = { method, args };
const payload = { method, args, page };
try {
const body = JSON.stringify(payload);
const response = await fetch(url, { method: "POST", headers, body: body });

14
sui/libsui/utils.ts
View file

@ -177,18 +177,24 @@ class __Render {
}
function $Backend(route?: string) {
route = route || window.location.pathname;
return new __Backend(route);
const page = window.location.pathname;
const root = document.body.getAttribute("s:public") || "/";
route = route || page;
const re = new RegExp("^" + root);
route = root + route.replace(re, "");
return new __Backend(route, page);
}
class __Backend {
route = "";
constructor(route) {
page = "";
constructor(route: string, page: string) {
this.route = route;
this.page = page;
}
async Call(method: string, ...args: any): Promise<any> {
// @ts-ignore
return await __sui_backend_call(this.route, method, ...args);
return await __sui_backend_call(this.route, this.page, method, ...args);
}
}

25
sui/storages/local/build.go
View file

@ -398,7 +398,7 @@ func (page *Page) Build(globalCtx *core.GlobalBuildContext, option *core.BuildOp
}
page.Root = root
html, warnings, err := page.Page.Compile(ctx, option)
html, config, warnings, err := page.Page.Compile(ctx, option)
if err != nil {
return warnings, fmt.Errorf("Compile the page %s error: %s", page.Route, err.Error())
}
@ -421,6 +421,12 @@ func (page *Page) Build(globalCtx *core.GlobalBuildContext, option *core.BuildOp
return warnings, err
}
// Save the config file
err = page.writeConfig([]byte(config), option.Data)
if err != nil {
return warnings, err
}
// Jit Components
if globalCtx == nil {
jitComponents, err := page.tmpl.GlobRoutes(ctx.GetJitComponents(), true)
@ -528,7 +534,7 @@ func (page *Page) Trans(globalCtx *core.GlobalBuildContext, option *core.BuildOp
warnings := []string{}
ctx := core.NewBuildContext(globalCtx)
_, messages, err := page.Page.Compile(ctx, option)
_, _, messages, err := page.Page.Compile(ctx, option)
if err != nil {
return warnings, err
}
@ -768,6 +774,21 @@ func (page *Page) writeHTML(html []byte, data map[string]interface{}) error {
return nil
}
// writeHTMLTo write the html to file
func (page *Page) writeConfig(config []byte, data map[string]interface{}) error {
configFile := fmt.Sprintf("%s.cfg", page.publicFile(data))
configFileAbs := filepath.Join(application.App.Root(), configFile)
dir := filepath.Dir(configFileAbs)
if exist, _ := os.Stat(dir); exist == nil {
os.MkdirAll(dir, os.ModePerm)
}
err := os.WriteFile(configFileAbs, config, 0644)
if err != nil {
return err
}
return nil
}
// writeHTMLTo write the html to file
func (page *Page) writeJitHTML(html []byte, data map[string]interface{}) error {
htmlFile := fmt.Sprintf("%s.jit", page.publicFile(data))