goembed v0.3.3

gopherjs · visualfc · Sep 9, 2022 · Sep 9, 2022 · Sep 9, 2022 · Sep 10, 2022
commit 8fb8e58bba47ab9105956e4117d19b2591d081b6
diff --git a/build/build.go b/build/build.go
@@ -395,20 +395,6 @@ func (p *PackageData) InternalBuildContext() *build.Context {
 	return p.bctx
 }
 
-func joinEmbedPatternPos(m1, m2 map[string][]token.Position) map[string][]token.Position {
-	if len(m1) == 0 && len(m2) == 0 {
-		return nil
-	}
-	m := make(map[string][]token.Position)
-	for k, v := range m1 {
-		m[k] = v
-	}
-	for k, v := range m2 {
-		m[k] = append(m[k], v...)
-	}
-	return m
-}
-
 // TestPackage returns a variant of the package with "internal" tests.
 func (p *PackageData) TestPackage() *PackageData {
 	return &PackageData{

diff --git a/build/embed.go b/build/embed.go
@@ -31,44 +31,44 @@ func __gopherjs_embed_buildFS__(list []struct {
 `
 
 // embedFiles generates an additional source file, which initializes all variables in the package with a go:embed directive.
-func embedFiles(bp *PackageData, fset *token.FileSet, files []*ast.File) (*ast.File, error) {
-	if len(bp.EmbedPatternPos) == 0 {
+func embedFiles(pkg *PackageData, fset *token.FileSet, files []*ast.File) (*ast.File, error) {
+	if len(pkg.EmbedPatternPos) == 0 {
 		return nil, nil
 	}
 
-	ems, err := goembed.CheckEmbed(bp.EmbedPatternPos, fset, files)
+	ems, err := goembed.CheckEmbed(pkg.EmbedPatternPos, fset, files)
 	if err != nil {
 		return nil, err
 	}
 
 	r := goembed.NewResolve()
-	for _, v := range ems {
-		fs, err := r.Load(bp.Dir, fset, v)
+	for _, em := range ems {
+		fs, err := r.Load(pkg.Dir, fset, em)
 		if err != nil {
 			return nil, err
 		}
-		switch v.Kind {
+		switch em.Kind {
 		case goembed.EmbedMaybeAlias:
 			// value = Type(data)
 			// valid alias string or []byte type used by types.check
-			v.Spec.Values = []ast.Expr{
+			em.Spec.Values = []ast.Expr{
 				&ast.CallExpr{
-					Fun: v.Spec.Type,
+					Fun: em.Spec.Type,
 					Args: []ast.Expr{
 						&ast.Ident{Name: buildIdent(fs[0].Name),
-							NamePos: v.Spec.Names[0].NamePos},
+							NamePos: em.Spec.Names[0].NamePos},
 					},
 				}}
 		case goembed.EmbedBytes:
 			// value = []byte(data)
-			v.Spec.Values = []ast.Expr{
+			em.Spec.Values = []ast.Expr{
 				&ast.CallExpr{
-					Fun:  v.Spec.Type,
+					Fun:  em.Spec.Type,
 					Args: []ast.Expr{ast.NewIdent(buildIdent(fs[0].Name))},
 				}}
 		case goembed.EmbedString:
 			// value = data
-			v.Spec.Values = []ast.Expr{ast.NewIdent(buildIdent(fs[0].Name))}
+			em.Spec.Values = []ast.Expr{ast.NewIdent(buildIdent(fs[0].Name))}
 		case goembed.EmbedFiles:
 			// value = __gopherjs_embed_buildFS__([]struct{name string; data string; hash [16]byte}{...})
 			fs = goembed.BuildFS(fs)
@@ -138,12 +138,12 @@ func embedFiles(bp *PackageData, fset *token.FileSet, files []*ast.File) (*ast.F
 					},
 				},
 			}
-			v.Spec.Values = []ast.Expr{call}
+			em.Spec.Values = []ast.Expr{call}
 		}
 	}
 
 	var buf bytes.Buffer
-	fmt.Fprintf(&buf, embed_head, bp.Name)
+	fmt.Fprintf(&buf, embed_head, pkg.Name)
 	buf.WriteString("\nconst (\n")
 	for _, f := range r.Files() {
 		if len(f.Data) == 0 {
@@ -159,3 +159,17 @@ func embedFiles(bp *PackageData, fset *token.FileSet, files []*ast.File) (*ast.F
 	}
 	return f, nil
 }
+
+func joinEmbedPatternPos(m1, m2 map[string][]token.Position) map[string][]token.Position {
+	if len(m1) == 0 && len(m2) == 0 {
+		return nil
+	}
+	m := make(map[string][]token.Position)
+	for k, v := range m1 {
+		m[k] = v
+	}
+	for k, v := range m2 {
+		m[k] = append(m[k], v...)
+	}
+	return m
+}
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
-	github.com/visualfc/goembed v0.3.2
+	github.com/visualfc/goembed v0.3.3
 	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad

diff --git a/go.sum b/go.sum
@@ -235,8 +235,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/visualfc/goembed v0.3.2 h1:a9m6o9VTzNk3mEF98C8cHp8f8P8BblyjsjajXGfTp8w=
-github.com/visualfc/goembed v0.3.2/go.mod h1:jCVCz/yTJGyslo6Hta+pYxWWBuq9ADCcIVZBTQ0/iVI=
+github.com/visualfc/goembed v0.3.3 h1:pOL02L715tHKsLQVMcZz06tTzRDAHkJKJLRnCA22G9Q=
+github.com/visualfc/goembed v0.3.3/go.mod h1:jCVCz/yTJGyslo6Hta+pYxWWBuq9ADCcIVZBTQ0/iVI=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=