updated templater

go.mod

@@ -7,7 +7,7 @@ replace github.com/angelbeltran/templater v0.1.0 => ../../github.com/angelbeltra
 require github.com/jackc/pgx/v5 v5.7.6
 
 require (
-	github.com/angelbeltran/templater v0.1.0
+	github.com/angelbeltran/templater v0.2.1
 	github.com/coreos/go-oidc/v3 v3.8.0
 	github.com/gin-gonic/gin v1.9.1
 	github.com/google/uuid v1.5.0
@@ -67,12 +67,12 @@ require (
 	github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
 	github.com/woodsbury/decimal128 v1.3.0 // indirect
 	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/crypto v0.47.0 // indirect
 	golang.org/x/mod v0.31.0 // indirect
-	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/net v0.49.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
-	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
 	golang.org/x/tools v0.40.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect

go.sum

@@ -9,6 +9,8 @@ github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4
 github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/angelbeltran/concurry v0.0.0-20260109231127-8e2678d8928c h1:BIa061RHaIVP9TjpIQf0PldVpQmeln/2U1Cf2w8ALNI=
 github.com/angelbeltran/concurry v0.0.0-20260109231127-8e2678d8928c/go.mod h1:Aii6F8lZCJb8Ns0d1FH35bDxNoyiuvwXd5BYJroJnks=
+github.com/angelbeltran/templater v0.2.1 h1:9N2eNRE5/sYUgu7nZrU6VSSrrpKcOTlAw+UeeK3kyhk=
+github.com/angelbeltran/templater v0.2.1/go.mod h1:ZA0T/ZmXxPi3gFjgp+RwEkcY9Q+JGyMStGw0c1jvgqA=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
@@ -199,6 +201,8 @@ github.com/vmware-labs/yaml-jsonpath v0.3.2 h1:/5QKeCBGdsInyDCyVNLbXyilb61MXGi9N
 github.com/vmware-labs/yaml-jsonpath v0.3.2/go.mod h1:U6whw1z03QyqgWdgXxvVnQ90zN1BWz5V+51Ewf8k+rQ=
 github.com/woodsbury/decimal128 v1.3.0 h1:8pffMNWIlC0O5vbyHWFZAt5yWvWcrHA+3ovIIjVWss0=
 github.com/woodsbury/decimal128 v1.3.0/go.mod h1:C5UTmyTjW3JftjUFzOVhC20BEQa2a4ZKOB5I6Zjb+ds=
+github.com/yosssi/gohtml v0.0.0-20201013000340-ee4748c638f4 h1:0sw0nJM544SpsihWx1bkXdYLQDlzRflMgFJQ4Yih9ts=
+github.com/yosssi/gohtml v0.0.0-20201013000340-ee4748c638f4/go.mod h1:+ccdNT0xMY1dtc5XBxumbYfOUhmduiGudqaDgD2rVRE=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
@@ -210,8 +214,8 @@ golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
@@ -225,8 +229,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
 golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
 golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -253,8 +257,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -262,8 +266,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=

internal/server/api/templates/router.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"os"
 	"path"
 	"path/filepath"
 	"strconv"
@@ -85,9 +84,12 @@ func SetupRoutes(
 // func (s *Server) serveTemplates(r *http.Request) (response.Response, error) {
 func (s *webpageRouter) serveTemplates(c *gin.Context) (response.Response, error) {
 	r := c.Request
-	name, args := s.getTemplateNameAndArgs(r, s.contentDir+"/templates/component_bodies")
+	name, args := s.getTemplateNameAndArgs(r, s.contentDir+"/templates/components")
+	fmt.Println("name:", name)
+	fmt.Println("args:", args)
 
-	b, err := s.templater.ExecuteComponentBody(name, args...)
+	// TODO: update
+	b, err := s.templater.ExecuteComponent(name, args...)
 	if err == nil {
 		return response.HTML(b), nil
 	}
@@ -96,7 +98,9 @@ func (s *webpageRouter) serveTemplates(c *gin.Context) (response.Response, error
 		return s.handleTemplateError(err, args...)
 	}
 
-	name, args = s.getTemplateNameAndArgs(r, s.contentDir+"/templates/page_bodies")
+	name, args = s.getTemplateNameAndArgs(r, s.contentDir+"/templates/pages")
+	fmt.Println("name (page):", name)
+	fmt.Println("args (page):", args)
 
 	if b, err = s.templater.ExecutePage(name, args...); err == nil {
 		return response.HTML(b), nil
@@ -219,10 +223,15 @@ func (s *webpageRouter) handleTemplateError(err error, templateArgs ...any) (res
 }
 
 func isFileNotFoundError(err error) bool {
+	/*
 		var pe *os.PathError
 		isPathErr := errors.As(err, &pe)
 
 		return isPathErr && pe.Err != nil && pe.Err.Error() == "no such file or directory"
+	*/
+
+	var te *templater.ErrNotTemplateFileFound
+	return errors.As(err, &te)
 }
 
 func getHTTPStatusCode(err error) int {

internal/server/server.go

@@ -73,9 +73,9 @@ func Router(
 		logger.WithGroup("templates"),
 		r.Group("/ui"),
 		contentDir,
-		templater.NewTemplater(
+		// TODO: move this constructor call up to main.go
-			contentDir+"/templates",
+		new(templater.Templater).With(templater.Config{
-			func() template.FuncMap {
+			Funcs: func(name string, props map[string]any) template.FuncMap {
 				return template.FuncMap{
 					// params
 					"addPathParam": func(k string, v any, args map[string]any) (map[string]any, error) {
@@ -121,7 +121,7 @@ func Router(
 					},
 				}
 			},
-		),
+		}),
 		rawEvents,
 		accts,
 		etsy,

templates/components/accounts/{acctID}/inventory/sync-groups/draft/listings/{orderIndex}.html.tmpl

@@ -116,7 +116,7 @@
 	</td>
 
 	<td data-id="remove">
-		{{ componentBody "button"
+		{{ component "button"
 			"HXDelete" (printf "/api/accounts/%d/inventory/sync-groups/draft/listings/%d" $acctID $orderIndex)
 			"HXTarget" "#accounts-acct-id-inventory-sync-groups-draft-table"
 			"HXSwap" "outerHTML"

templates/components/accounts/{acctID}/inventory/sync-groups/draft/table.html.tmpl

@@ -60,7 +60,7 @@
 	>
 		{{- $listings := $dot.Accounts.GetSyncGroupListingDrafts $acctID }}
 		{{- range $listing := $listings }}
-			{{- componentBody "accounts/{acctID}/inventory/sync-groups/draft/listings/{orderIndex}"
+			{{- component "accounts/{acctID}/inventory/sync-groups/draft/listings/{orderIndex}"
 				"dot" ($dot | addPathParam "orderIndex" $listing.OrderIndex)
 			}}
 		{{- end }}

templates/layout.html.tmpl

@@ -18,7 +18,7 @@
 		<link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
 		<link rel="manifest" href="/favicon/site.webmanifest">
 
-		{{/* This is where the page_head template will be inserted into the page */}}
+		{{/* This can be set by the template in ./pages being rendered */}}
 		{{- block "head" . }}{{ end }}
 	</head>
 

templates/pages/accounts/{acctID}/inventory.html.tmpl

@@ -17,10 +17,10 @@
 	<h4>
 		(Draft 2)
 	</h4>
-	{{ componentBody "accounts/{acctID}/inventory/sync-groups/draft/table" "dot" . }}
+	{{ component "accounts/{acctID}/inventory/sync-groups/draft/table" "dot" . }}
 
 	<div>
-		{{ componentBody "button"
+		{{ component "button"
 			"HXPost" (printf "/api/accounts/%d/inventory/sync-groups/draft/listings" $acctID)
 			"HXTarget" "#accounts-acct-id-inventory-sync-groups-draft-table"
 			"HXSwap" "outerHTML"
@@ -34,7 +34,7 @@
 
 		{{/* TODO: enable the button when all listings are filled and there are at least two listings */}}
 		{{/* TODO: save the listings as a sync group on click */}}
-		{{ componentBody "button"
+		{{ component "button"
 			"ID" "create-sync-group-button"
 			"HXPost" (printf "/api/accounts/%d/sync-groups" $acctID)
 			"Class" "mt-[1em] mb-[1em]"