Merge pull request #665 from trheyi/main

optimize sui page injection script

sui/core/injections.go

@@ -0,0 +1,45 @@
+package core
+
+import "fmt"
+
+const initScriptTmpl = `
+	try {
+		var __sui_data = %s;
+	} catch (e) { console.log('init data error:', e); }
+
+	document.addEventListener("DOMContentLoaded", function () {
+		try {
+			document.querySelectorAll("[s\\:ready]").forEach(function (element) {
+				const method = element.getAttribute("s:ready");
+				const cn = element.getAttribute("s:cn");
+				if (method && typeof window[cn] === "function") {
+					try {
+						window[cn](element);
+					} catch (e) {
+						const message = e.message || e || "An error occurred";
+						console.error(` + "`[SUI] ${cn} Error: ${message}`" + `);
+					}
+				}
+			});
+		} catch (e) {}
+	});
+	%s
+`
+
+const i118nScriptTmpl = `
+	function L(key) {
+		return key;
+	}
+`
+
+func bodyInjectionScript(jsonRaw string, debug bool) string {
+	jsPrintData := ""
+	if debug {
+		jsPrintData = `console.log(__sui_data);`
+	}
+	return fmt.Sprintf(`<script type="text/javascript">`+initScriptTmpl+`</script>`, jsonRaw, jsPrintData)
+}
+
+func headInjectionScript() string {
+	return fmt.Sprintf(`<script type="text/javascript">` + i118nScriptTmpl + `</script>`)
+}

sui/core/page_test.go

@@ -28,6 +28,6 @@ func TestPageExec(t *testing.T) {
 
 	res := any.Of(data).Map().Dot()
 	assert.Equal(t, "yes", res.Get("array[3][0].query"))
-	assert.Equal(t, "Article Search", res.Get("articles.data[0].description"))
+	assert.Equal(t, "Article Search 1", res.Get("articles.data[0].description"))
 	assert.Equal(t, "/test/path", res.Get("url.path"))
 }

sui/core/parser.go

@@ -199,10 +199,10 @@ func (parser *TemplateParser) Render(html string) (string, error) {
 		delete(parser.replace, sel)
 	}
 
-	// Print the data
+	// Append the head
-	jsPrintData := ""
+	head := doc.Find("head")
-	if parser.option != nil && parser.option.Debug {
+	if head.Length() > 0 {
-		jsPrintData = "console.log(__sui_data);\n"
+		head.AppendHtml(headInjectionScript())
 	}
 
 	// Append the data to the body
@@ -212,19 +212,7 @@ func (parser *TemplateParser) Render(html string) (string, error) {
 		if err != nil {
 			data, _ = jsoniter.MarshalToString(map[string]string{"error": err.Error()})
 		}
-		body.AppendHtml("<script>\n" +
+		body.AppendHtml(bodyInjectionScript(data, parser.debug()))
-			"try { " +
-			`var __sui_data = ` + data + ";\n" +
-			"} catch (e) { console.log('init data error:', e); }\n" +
-
-			`document.addEventListener("DOMContentLoaded", function () {` + "\n" +
-			`	try {` + "\n" +
-			`		__sui_data_ready( __sui_data );` + "\n" +
-			`	} catch(e) {}` + "\n" +
-			`});` + "\n" + jsPrintData +
-
-			"</script>\n",
-		)
 	}
 
 	// For editor
@@ -756,6 +744,10 @@ func (parser *TemplateParser) hasParsed(sel *goquery.Selection) bool {
 	return false
 }
 
+func (parser *TemplateParser) debug() bool {
+	return parser.option != nil && parser.option.Debug
+}
+
 func (parser *TemplateParser) toArray(value interface{}) ([]interface{}, error) {
 	switch values := value.(type) {
 

sui/storages/local/page_render_test.go

@@ -31,7 +31,7 @@ func TestPageEditorRender(t *testing.T) {
 	assert.NotEmpty(t, res.Scripts)
 	assert.NotEmpty(t, res.Styles)
 	assert.GreaterOrEqual(t, len(res.Styles), 1)
-	assert.GreaterOrEqual(t, len(res.Scripts), 2)
+	assert.GreaterOrEqual(t, len(res.Scripts), 1)
 
 }