diff --git a/cmd/muxt/generate.go b/cmd/muxt/generate.go index 16b0abb..e30e89f 100644 --- a/cmd/muxt/generate.go +++ b/cmd/muxt/generate.go @@ -90,6 +90,7 @@ func generateCommand(args []string, workingDirectory string, getEnv func(string) g.Package = list[i] } else if len(list) > 0 { g.Package = list[0] + g.goPackage = list[0].ID } ts, err := source.Templates(workingDirectory, g.templatesVariable, g.Package.Fset, g.Package.Syntax, g.Package.EmbedFiles) if err != nil { diff --git a/cmd/muxt/testdata/generate/argument_context.txtar b/cmd/muxt/testdata/generate/argument_context.txtar index 44103c0..3cd98fe 100644 --- a/cmd/muxt/testdata/generate/argument_context.txtar +++ b/cmd/muxt/testdata/generate/argument_context.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes exec go test -cover @@ -25,7 +21,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/argument_path_param.txtar b/cmd/muxt/testdata/generate/argument_path_param.txtar index 8702e3b..1aa6e91 100644 --- a/cmd/muxt/testdata/generate/argument_path_param.txtar +++ b/cmd/muxt/testdata/generate/argument_path_param.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes exec go test -cover @@ -25,7 +21,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/argument_request.txtar b/cmd/muxt/testdata/generate/argument_request.txtar index 925b102..cdd50c6 100644 --- a/cmd/muxt/testdata/generate/argument_request.txtar +++ b/cmd/muxt/testdata/generate/argument_request.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes exec go test -cover @@ -25,7 +21,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/argument_response.txtar b/cmd/muxt/testdata/generate/argument_response.txtar index 2f5e8b0..f8f7c26 100644 --- a/cmd/muxt/testdata/generate/argument_response.txtar +++ b/cmd/muxt/testdata/generate/argument_response.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes exec go test -cover @@ -25,7 +21,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/error_duplicate_pattern.txtar b/cmd/muxt/testdata/generate/error_duplicate_pattern.txtar index 196018a..c389f81 100644 --- a/cmd/muxt/testdata/generate/error_duplicate_pattern.txtar +++ b/cmd/muxt/testdata/generate/error_duplicate_pattern.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - ! muxt generate --routes-func=TemplateRoutes stderr 'duplicate route pattern: GET /' @@ -30,5 +26,4 @@ import ( //go:embed template.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) diff --git a/cmd/muxt/testdata/generate/error_unknown_flag.txtar b/cmd/muxt/testdata/generate/error_unknown_flag.txtar index dbc1b72..86ea1cf 100644 --- a/cmd/muxt/testdata/generate/error_unknown_flag.txtar +++ b/cmd/muxt/testdata/generate/error_unknown_flag.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - ! muxt generate --routes-func=TemplateRoutes --unknown stderr 'flag' @@ -22,5 +18,4 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.New() diff --git a/cmd/muxt/testdata/generate/error_wrong_gopacakge.txtar b/cmd/muxt/testdata/generate/error_wrong_gopacakge.txtar deleted file mode 100644 index a9f6ab2..0000000 --- a/cmd/muxt/testdata/generate/error_wrong_gopacakge.txtar +++ /dev/null @@ -1,26 +0,0 @@ -env GOLINE=11 -env GOPACKAGE=unexpected -env GOFILE=template.go - -! muxt generate --routes-func=TemplateRoutes -stderr 'package unexpected not loaded' - --- template.gohtml -- -{{printf "Hello, %s!", "world"}} --- go.mod -- -module server - -go 1.22 --- template.go -- -package server - -import ( - "embed" - "html/template" -) - -//go:embed *.gohtml -var formHTML embed.FS - -//go:generate go run github.com/crhntr/muxt/cmd/muxt -var templates = template.New() diff --git a/cmd/muxt/testdata/generate/override_execute.txtar b/cmd/muxt/testdata/generate/override_execute.txtar index 5f68614..e067441 100644 --- a/cmd/muxt/testdata/generate/override_execute.txtar +++ b/cmd/muxt/testdata/generate/override_execute.txtar @@ -1,7 +1,3 @@ -env GOLINE=13 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes ! stdout execute @@ -31,7 +27,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) func execute(res http.ResponseWriter, _ *http.Request, t *template.Template, code int, data any) { diff --git a/cmd/muxt/testdata/generate/path_end.txtar b/cmd/muxt/testdata/generate/path_end.txtar index 0e8b096..f42deda 100644 --- a/cmd/muxt/testdata/generate/path_end.txtar +++ b/cmd/muxt/testdata/generate/path_end.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes exec go test -cover @@ -27,7 +23,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/path_param.txtar b/cmd/muxt/testdata/generate/path_param.txtar index 26454c6..02240fd 100644 --- a/cmd/muxt/testdata/generate/path_param.txtar +++ b/cmd/muxt/testdata/generate/path_param.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes exec go test -cover @@ -27,7 +23,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/simple_get.txtar b/cmd/muxt/testdata/generate/simple_get.txtar index 431416e..44f116f 100644 --- a/cmd/muxt/testdata/generate/simple_get.txtar +++ b/cmd/muxt/testdata/generate/simple_get.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes exec go test -cover @@ -27,7 +23,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/simple_handler.txtar b/cmd/muxt/testdata/generate/simple_handler.txtar index 0c39a1a..68e3fa0 100644 --- a/cmd/muxt/testdata/generate/simple_handler.txtar +++ b/cmd/muxt/testdata/generate/simple_handler.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes exec go test -cover @@ -25,7 +21,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/simple_patch.txtar b/cmd/muxt/testdata/generate/simple_patch.txtar index b0dd9d7..6a2c43e 100644 --- a/cmd/muxt/testdata/generate/simple_patch.txtar +++ b/cmd/muxt/testdata/generate/simple_patch.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes exec go test -cover @@ -27,7 +23,6 @@ import ( //go:embed *.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/templates_and_embed_in_gen_decl.txtar b/cmd/muxt/testdata/generate/templates_and_embed_in_gen_decl.txtar index b0653a9..1d0a575 100644 --- a/cmd/muxt/testdata/generate/templates_and_embed_in_gen_decl.txtar +++ b/cmd/muxt/testdata/generate/templates_and_embed_in_gen_decl.txtar @@ -1,7 +1,3 @@ -env GOLINE=12 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes stdout 'Routes has route for GET /' @@ -27,6 +23,5 @@ var ( //go:embed *.gohtml formHTML embed.FS - //go:generate go run github.com/crhntr/muxt/cmd/muxt templates = template.Must(template.ParseFS(formHTML, "*")) ) diff --git a/cmd/muxt/testdata/generate/templates_glob_filter.txtar b/cmd/muxt/testdata/generate/templates_glob_filter.txtar index e9ec3bf..c2358a3 100644 --- a/cmd/muxt/testdata/generate/templates_glob_filter.txtar +++ b/cmd/muxt/testdata/generate/templates_glob_filter.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes ! stdout 'Routes has route for GET /example' @@ -46,7 +42,6 @@ import ( //go:embed assets var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "assets/*.gohtml")) -- template_test.go -- package server diff --git a/cmd/muxt/testdata/generate/templates_multiple_embed_lines.txtar b/cmd/muxt/testdata/generate/templates_multiple_embed_lines.txtar index 3c64047..94dbf29 100644 --- a/cmd/muxt/testdata/generate/templates_multiple_embed_lines.txtar +++ b/cmd/muxt/testdata/generate/templates_multiple_embed_lines.txtar @@ -1,7 +1,3 @@ -env GOLINE=12 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes stdout 'Routes has route for GET /' stdout 'Routes has route for GET /form' @@ -38,5 +34,4 @@ import ( //go:embed form.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) diff --git a/cmd/muxt/testdata/generate/templates_multiple_globs.txtar b/cmd/muxt/testdata/generate/templates_multiple_globs.txtar index 6015d01..0ecc7a5 100644 --- a/cmd/muxt/testdata/generate/templates_multiple_globs.txtar +++ b/cmd/muxt/testdata/generate/templates_multiple_globs.txtar @@ -1,7 +1,3 @@ -env GOLINE=11 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes stdout 'Routes has route for GET /' stdout 'Routes has route for GET /form' @@ -37,5 +33,4 @@ import ( //go:embed index.gohtml form.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.ParseFS(formHTML, "*")) diff --git a/cmd/muxt/testdata/generate/templates_multiple_parsefs.txtar b/cmd/muxt/testdata/generate/templates_multiple_parsefs.txtar index b092f60..7edb8c9 100644 --- a/cmd/muxt/testdata/generate/templates_multiple_parsefs.txtar +++ b/cmd/muxt/testdata/generate/templates_multiple_parsefs.txtar @@ -1,7 +1,3 @@ -env GOLINE=14 -env GOPACKAGE=server -env GOFILE=template.go - muxt generate --routes-func=TemplateRoutes stdout 'Routes has route for GET /' stdout 'Routes has route for GET /form' @@ -40,5 +36,4 @@ var indexHTML embed.FS //go:embed form.gohtml var formHTML embed.FS -//go:generate go run github.com/crhntr/muxt/cmd/muxt var templates = template.Must(template.Must(template.ParseFS(formHTML, "*")).ParseFS(indexHTML, "*"))