refactor: use packages.Package in Templates parser

crhntr · Oct 22, 2024 · 3416a35 · 3416a35
1 parent f39e75a
commit 3416a35
Show file tree

Hide file tree

Showing 3 changed files with 156 additions and 249 deletions.
diff --git a/cmd/muxt/generate.go b/cmd/muxt/generate.go
@@ -98,7 +98,7 @@ func generateCommand(args []string, workingDirectory string, getEnv func(string)
 		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)
+	ts, err := source.Templates(workingDirectory, g.templatesVariable, g.Package)
 	if err != nil {
 		return err
 	}

diff --git a/internal/source/template.go b/internal/source/template.go
@@ -9,22 +9,24 @@ import (
 	"slices"
 	"strings"
 	"unicode"
+
+	"golang.org/x/tools/go/packages"
 )
 
-func Templates(workingDirectory, templatesVariable string, fileSet *token.FileSet, files []*ast.File, embeddedAbsolutePath []string) (*template.Template, error) {
-	for _, tv := range IterateValueSpecs(files) {
+func Templates(workingDirectory, templatesVariable string, pkg *packages.Package) (*template.Template, error) {
+	for _, tv := range IterateValueSpecs(pkg.Syntax) {
 		i := slices.IndexFunc(tv.Names, func(e *ast.Ident) bool {
 			return e.Name == templatesVariable
 		})
 		if i < 0 || i >= len(tv.Values) {
 			continue
 		}
-		embeddedPaths, err := relFilepaths(workingDirectory, embeddedAbsolutePath...)
+		embeddedPaths, err := relFilepaths(workingDirectory, pkg.EmbedFiles...)
 		if err != nil {
 			return nil, fmt.Errorf("failed to calculate relative path for embedded files: %w", err)
 		}
 		const templatePackageIdent = "template"
-		ts, err := evaluateTemplateSelector(nil, tv.Values[i], workingDirectory, templatesVariable, templatePackageIdent, "", "", fileSet, files, embeddedPaths)
+		ts, err := evaluateTemplateSelector(nil, tv.Values[i], workingDirectory, templatesVariable, templatePackageIdent, "", "", pkg.Fset, pkg.Syntax, embeddedPaths)
 		if err != nil {
 			return nil, fmt.Errorf("run template %s failed at %w", templatesVariable, err)
 		}