From 71e80e909e68ca0fcdcee2ef17eaf85aa6e3b72d Mon Sep 17 00:00:00 2001
From: Lz <imlangzi@qq.com>
Date: Fri, 20 Dec 2024 09:13:23 +0800
Subject: [PATCH] chore(tests): added tests for empty/nil content file in
 static viewengine

---
 app.go             |  12 +++--
 app_test.go        |  28 ++++++++++
 html_template.go   | 130 +++++++++++++++++++++++++++++++++++++++++++++
 viewengine_html.go | 123 ++----------------------------------------
 viewer_html.go     |   2 +-
 5 files changed, 169 insertions(+), 126 deletions(-)
 create mode 100644 html_template.go

diff --git a/app.go b/app.go
index 629bd26..40793d0 100644
--- a/app.go
+++ b/app.go
@@ -38,16 +38,11 @@ func New(opts ...Option) *App {
 		routes:  make(map[string]*Routing),
 		viewers: make(map[string]Viewer),
 		viewer:  &JsonViewer{},
-		viewEngines: []ViewEngine{
-			&StaticViewEngine{},
-			// &HtmlViewEngine{},
-		},
 	}
 
 	for _, o := range opts {
 		o(app)
 	}
-
 	if app.logger == nil {
 		app.logger = slog.Default()
 	}
@@ -56,6 +51,13 @@ func New(opts ...Option) *App {
 		app.mux = http.DefaultServeMux
 	}
 
+	if app.viewEngines == nil {
+		app.viewEngines = []ViewEngine{
+			&StaticViewEngine{},
+			&HtmlViewEngine{},
+		}
+	}
+
 	if app.fsys != nil {
 		for _, ve := range app.viewEngines {
 			err := ve.Load(app.fsys, app)
diff --git a/app_test.go b/app_test.go
index 3d1d1f9..67728fb 100644
--- a/app_test.go
+++ b/app_test.go
@@ -151,6 +151,12 @@ func TestStaticViewer(t *testing.T) {
 			background: red;
 		}`),
 		},
+		"public/assets/empty.js": &fstest.MapFile{
+			Data: []byte(``),
+		},
+		"public/assets/nil.js": &fstest.MapFile{
+			Data: nil,
+		},
 	}
 
 	mux := http.NewServeMux()
@@ -197,6 +203,28 @@ func TestStaticViewer(t *testing.T) {
 
 	require.Equal(t, fsys["public/assets/skin.css"].Data, buf)
 
+	req, err = http.NewRequest("GET", srv.URL+"/assets/empty.js", nil)
+	require.NoError(t, err)
+	resp, err = client.Do(req)
+	require.NoError(t, err)
+
+	buf, err = io.ReadAll(resp.Body)
+	require.NoError(t, err)
+	resp.Body.Close()
+
+	require.Equal(t, 0, len(buf))
+
+	req, err = http.NewRequest("GET", srv.URL+"/assets/nil.js", nil)
+	require.NoError(t, err)
+	resp, err = client.Do(req)
+	require.NoError(t, err)
+
+	buf, err = io.ReadAll(resp.Body)
+	require.NoError(t, err)
+	resp.Body.Close()
+
+	require.Equal(t, 0, len(buf))
+
 }
 
 func TestApp(t *testing.T) {
diff --git a/html_template.go b/html_template.go
new file mode 100644
index 0000000..18f9c53
--- /dev/null
+++ b/html_template.go
@@ -0,0 +1,130 @@
+package htmx
+
+import (
+	"bufio"
+	"bytes"
+	"io"
+	"io/fs"
+	"strings"
+	"text/template"
+)
+
+type HtmlTemplate struct {
+	template *template.Template
+
+	name   string
+	path   string
+	layout string
+
+	dependencies map[string]struct{}
+	dependents   map[string]*HtmlTemplate
+}
+
+func NewHtmlTemplate(name, path string) *HtmlTemplate {
+	return &HtmlTemplate{
+		name:         name,
+		path:         path,
+		dependencies: make(map[string]struct{}),
+		dependents:   make(map[string]*HtmlTemplate),
+	}
+}
+
+func (t *HtmlTemplate) Load(fsys fs.FS, templates map[string]*HtmlTemplate) error {
+	buf, err := fs.ReadFile(fsys, t.path)
+	if err != nil {
+		return err
+	}
+
+	nt := template.New(t.name)
+	dependencies := make(map[string]struct{})
+
+	defer func() {
+		t.template = nt
+		t.dependencies = dependencies
+	}()
+
+	if len(buf) == 0 {
+		return nil
+	}
+
+	nt, err = nt.Parse(string(buf))
+	if err != nil {
+		return err
+	}
+
+	for _, it := range nt.Templates() {
+		tn := it.Name()
+		if strings.EqualFold(tn, t.name) {
+			continue
+		}
+
+		dependencies[tn] = struct{}{}
+	}
+
+	r := bufio.NewReader(bytes.NewReader(buf))
+	layoutName, err := r.ReadString('\n')
+	if err != nil {
+		return err
+	}
+
+	layoutName = strings.ReplaceAll(layoutName, " ", "")
+	//<!--layout:home-->\n
+	if layoutName != "" && strings.HasSuffix(layoutName, "-->\n") && strings.HasPrefix(layoutName, "<!--layout:") {
+		layoutName = "layouts/" + layoutName[11:len(layoutName)-4]
+
+		layout, ok := templates[layoutName]
+		if ok {
+			_, err = nt.AddParseTree(layoutName, layout.template.Tree)
+			if err != nil {
+				return err
+			}
+
+			layout.dependents[t.name] = t
+
+			for tn := range layout.dependencies {
+				dependencies[tn] = struct{}{}
+			}
+
+		}
+
+		for tn := range t.dependencies {
+			it, ok := templates[tn]
+			if ok {
+				_, err = nt.AddParseTree(tn, it.template.Tree)
+				if err != nil {
+					return err
+				}
+
+				it.dependents[t.name] = t
+			}
+		}
+
+		t.layout = layoutName
+	} else {
+		t.layout = ""
+	}
+
+	return nil
+}
+
+func (t *HtmlTemplate) Reload(fsys fs.FS, templates map[string]*HtmlTemplate) error {
+	err := t.Load(fsys, templates)
+	if err != nil {
+		return err
+	}
+
+	for _, it := range t.dependents {
+		err := it.Reload(fsys, templates)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (t *HtmlTemplate) Execute(wr io.Writer, data any) error {
+	if t.layout != "" {
+		return t.template.ExecuteTemplate(wr, t.layout, data)
+	}
+	return t.template.Execute(wr, data)
+}
diff --git a/viewengine_html.go b/viewengine_html.go
index 02ee5e3..d0675af 100644
--- a/viewengine_html.go
+++ b/viewengine_html.go
@@ -1,10 +1,6 @@
 package htmx
 
 import (
-	"bufio"
-	"bytes"
-	"html/template"
-	"io"
 	"io/fs"
 	"path/filepath"
 	"strings"
@@ -12,129 +8,16 @@ import (
 	"github.com/yaitoo/htmx/fsnotify"
 )
 
-type Template struct {
-	template *template.Template
-
-	name   string
-	path   string
-	layout string
-
-	dependencies map[string]struct{}
-	dependents   map[string]*Template
-}
-
-func NewHtmlTemplate(name, path string) *Template {
-	return &Template{
-		name:         name,
-		path:         path,
-		dependencies: make(map[string]struct{}),
-		dependents:   make(map[string]*Template),
-	}
-}
-
-func (t *Template) Load(fsys fs.FS, templates map[string]*Template) error {
-	buf, err := fs.ReadFile(fsys, t.path)
-	if err != nil {
-		return err
-	}
-
-	nt, err := template.New(t.name).Parse(string(buf))
-	if err != nil {
-		return err
-	}
-
-	dependencies := make(map[string]struct{})
-
-	for _, it := range nt.Templates() {
-		tn := it.Name()
-		if strings.EqualFold(tn, t.name) {
-			continue
-		}
-
-		dependencies[tn] = struct{}{}
-	}
-
-	r := bufio.NewReader(bytes.NewReader(buf))
-	layoutName, err := r.ReadString('\n')
-	if err != nil {
-		return err
-	}
-
-	layoutName = strings.ReplaceAll(layoutName, " ", "")
-	//<!--layout:home-->\n
-	if layoutName != "" && strings.HasSuffix(layoutName, "-->\n") && strings.HasPrefix(layoutName, "<!--layout:") {
-		layoutName = "layouts/" + layoutName[11:len(layoutName)-4]
-
-		layout, ok := templates[layoutName]
-		if ok {
-			_, err = nt.AddParseTree(layoutName, layout.template.Tree)
-			if err != nil {
-				return err
-			}
-
-			layout.dependents[t.name] = t
-
-			for tn := range layout.dependencies {
-				dependencies[tn] = struct{}{}
-			}
-
-		}
-
-		for tn := range t.dependencies {
-			it, ok := templates[tn]
-			if ok {
-				_, err = nt.AddParseTree(tn, it.template.Tree)
-				if err != nil {
-					return err
-				}
-
-				it.dependents[t.name] = t
-			}
-		}
-
-		t.layout = layoutName
-	} else {
-		t.layout = ""
-	}
-
-	t.template = nt
-	t.dependencies = dependencies
-
-	return nil
-}
-
-func (t *Template) Reload(fsys fs.FS, templates map[string]*Template) error {
-	err := t.Load(fsys, templates)
-	if err != nil {
-		return err
-	}
-
-	for _, it := range t.dependents {
-		err := it.Reload(fsys, templates)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (t *Template) Execute(wr io.Writer, data any) error {
-	if t.layout != "" {
-		return t.template.ExecuteTemplate(wr, t.layout, data)
-	}
-	return t.template.Execute(wr, data)
-}
-
 type HtmlViewEngine struct {
 	fsys fs.FS
 	app  *App
 
-	templates map[string]*Template
+	templates map[string]*HtmlTemplate
 }
 
 func (ve *HtmlViewEngine) Load(fsys fs.FS, app *App) error {
 	if ve.templates == nil {
-		ve.templates = map[string]*Template{}
+		ve.templates = map[string]*HtmlTemplate{}
 	}
 
 	ve.fsys = fsys
@@ -206,7 +89,7 @@ func (ve *HtmlViewEngine) loadComponents() error {
 
 }
 
-func (ve *HtmlViewEngine) loadTemplate(path string) (*Template, error) {
+func (ve *HtmlViewEngine) loadTemplate(path string) (*HtmlTemplate, error) {
 	name := path[:len(path)-5]
 
 	t := NewHtmlTemplate(name, path)
diff --git a/viewer_html.go b/viewer_html.go
index 0c86f3a..1940bd4 100644
--- a/viewer_html.go
+++ b/viewer_html.go
@@ -11,7 +11,7 @@ func init() {
 }
 
 type HtmlViewer struct {
-	template *Template
+	template *HtmlTemplate
 }
 
 func (*HtmlViewer) MimeType() string {