v0.1.1 fix deeply nested template names

- add a test for deeply nested template
- if there is a go syntax error - render the unformatted go code - for debugging

README.md

@@ -1,7 +1,7 @@
 # GoHTML
 Generate type-safe(ish) wrapper code for Go HTML templates.
 
-[![Version](https://img.shields.io/badge/version-v0.1.0-blue.svg)](https://github.com/fritzkeyzer/gohtml/tags)
+[![Version](https://img.shields.io/badge/version-v0.1.1-blue.svg)](https://github.com/fritzkeyzer/gohtml/tags)
 
 > Detailed documentation available in the `docs` directory
 
@@ -23,14 +23,14 @@ Generate type-safe(ish) wrapper code for Go HTML templates.
 
 ## Installation
 ```sh
-go install github.com/fritzkeyzer/gohtml/cmd/[email protected].0
+go install github.com/fritzkeyzer/gohtml/cmd/[email protected].1
 ```
 
 ## Quick start
 
 1. Create `gohtml.yaml`:
 ```yaml
-version: "0.1.0"
+version: "0.1.1"
 directories:
   - path: "app/pages"
   - path: "app/components"
@@ -78,6 +78,9 @@ Issues and PRs welcome!
 
 # Changelog
 
+### v0.1.1
+- Fix deeply nested template directories causing bad generation
+
 ### v0.1.0
 - Fix generation for conditionals with operators (not, eq, etc)
 - Define multiple template components per file (sub-templates can be reused within the same package)

docs/config.md

@@ -7,7 +7,7 @@ You can specify a config file, if needed, with the -c flag.
 ### Structure
 Example with one target directory.
 ```yaml
-version: "0.1.0"
+version: "0.1.1"
 directories:
 - path: "path/to/templates/dir"
   output_file: "gohtml.gen.go"               # default value
@@ -16,7 +16,7 @@ directories:
 ### Example
 This example targets 4 directories. All gohtml templates in these directories will be used to generate code.
 ```yaml
-version: "0.1.0"
+version: "0.1.1"
 directories:
 - path: "app/page"
 - path: "app/partial"

example/gohtml.yaml

@@ -1,4 +1,4 @@
-version: "0.1.0"
+version: "0.1.1"
 directories:
   - path: "views"
 

field.go

@@ -74,7 +74,10 @@ func parseNode(path []string, node parse.Node) []Field {
 	case *parse.ContinueNode: // A continue action.
 	}
 
-	logz.Debug("parsed node", "path", path, "fields", fields, "node", node.String())
+	if len(fields) > 0 {
+		logz.Debug("parsed node", "path", path, "fields", fields, "node", node.String())
+	}
+
 	return fields
 }
 

generate.go

@@ -22,6 +22,9 @@ func (t *GoHTML) Generate(w io.Writer) error {
 	// apply std go formatting
 	formatted, err := format.Source(buf.Bytes())
 	if err != nil {
+		// write the unformatted file (so we can inspect the error)
+		_, _ = w.Write(buf.Bytes())
+
 		return fmt.Errorf("go syntax error: %w", err)
 	}
 

gohtml.go

@@ -78,7 +78,8 @@ func ParseDir(dir string) (*GoHTML, error) {
 	})
 
 	for _, tmpl := range orderedTemplates {
-		if tmpl.Name() == path.Base(dir) {
+		// skip the package template
+		if path.Base(tmpl.Name()) == path.Base(dir) {
 			continue
 		}
 

gohtml_test.go

@@ -22,6 +22,10 @@ func TestDirectory(t *testing.T) {
 			dir:        "tests",
 			goldenFile: "tests/gohtml.gen.go.golden",
 		},
+		{
+			dir:        "tests/nested/views",
+			goldenFile: "tests/nested/views/gohtml.gen.go.golden",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.dir, func(t *testing.T) {

tests/nested/views/gohtml.gen.go.golden

@@ -0,0 +1,65 @@
+// Code generated by gohtml. DO NOT EDIT
+
+package views
+
+import (
+	"bytes"
+	"embed"
+	"html/template"
+	"io"
+	"net/http"
+	"os"
+)
+
+var LiveReload = os.Getenv("GOHTML_LIVERELOAD") != ""
+
+//go:embed *.gohtml
+var tmplFiles embed.FS
+var templates = template.Must(template.ParseFS(tmplFiles, "*.gohtml"))
+
+func tmpl() *template.Template {
+	if LiveReload {
+		return template.Must(template.ParseFS(os.DirFS("tests/nested/views"), "*.gohtml"))
+	}
+	return templates
+}
+
+func mustHTML[T any](fn func(w io.Writer, data T) error, data T) template.HTML {
+	w := new(bytes.Buffer)
+	err := fn(w, data)
+	if err != nil {
+		panic(err)
+	}
+	return template.HTML(w.String())
+}
+
+func mustHTMLNoArgs(fn func(w io.Writer) error) template.HTML {
+	w := new(bytes.Buffer)
+	err := fn(w)
+	if err != nil {
+		panic(err)
+	}
+	return template.HTML(w.String())
+}
+
+// BEGIN: Nested - - - - - - - -
+
+type NestedData struct {
+	Name any
+}
+
+// Nested renders the "Nested" template as an HTML fragment
+func Nested(data NestedData) template.HTML {
+	return mustHTML(RenderNested, data)
+}
+
+// RenderNested renders the "Nested" template to a writer
+func RenderNested(w io.Writer, data NestedData) error {
+	return tmpl().ExecuteTemplate(w, "nested.gohtml", data)
+}
+
+// RenderNestedHTTP renders nested.gohtml to an http.ResponseWriter
+func RenderNestedHTTP(w http.ResponseWriter, data NestedData) error {
+	w.Header().Set("Content-Type", "text/html; charset=utf-8")
+	return tmpl().ExecuteTemplate(w, "nested.gohtml", data)
+}

tests/nested/views/nested.gohtml

@@ -0,0 +1 @@
+<h1>Nested: {{.Name}}</h1>