fix: do not organize imports for wasm

Author: walterwanderley

README.md

@@ -2,6 +2,40 @@
 
 [Sqlc plugin](https://sqlc.dev) to generate [gRPC](https://grpc.io/) or [Connect](https://connectrpc.com/) server from SQL.
 
+## Post-process
+
+After execute `sqlc generate` you need to organize imorts, compile protocol buffer and fix go.mod.
+
+1. Install the required tools:
+
+```sh
+go install golang.org/x/tools/cmd/goimports@latest
+go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest
+go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@latest
+go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
+go install github.com/bufbuild/buf/cmd/buf@latest
+```
+
+2. Organize imports:
+
+```sh
+goimports -w *.go **/*.go **/**/*.go
+```
+
+3. Compile the generated protocol buffer:
+
+```sh
+buf mod update proto
+buf generate
+```
+
+4. Fix go.mod:
+
+```sh
+go mod tidy
+```
+
 ## Building from source
 
 Assuming you have the Go toolchain set up, from the project root you can simply `make all`.
@@ -58,30 +92,3 @@ sql:
       migration_path: "" # If you want to execute database migrations on startup
       skip_go_mod: false # If true, skip the generation of the go.mod
 ```
-
-## Post-process
-
-After execute `sqlc generate` you need to compile protocol buffer and fix go.mod.
-
-1. Install the required tools:
-
-```sh
-go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest
-go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@latest
-go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
-go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-go install github.com/bufbuild/buf/cmd/buf@latest
-```
-
-2. Compile the generated protocol buffer:
-
-```sh
-buf mod update proto
-buf generate
-```
-
-3. Fix go.mod:
-
-```sh
-go mod tidy
-```

go.mod

@@ -7,16 +7,14 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/jinzhu/inflection v1.0.0
 	github.com/sqlc-dev/plugin-sdk-go v1.23.0
-	github.com/walterwanderley/sqlc-connect v0.2.3
-	github.com/walterwanderley/sqlc-grpc v0.18.2
-	golang.org/x/tools v0.17.0
+	github.com/walterwanderley/sqlc-connect v0.2.5
+	github.com/walterwanderley/sqlc-grpc v0.18.3
 )
 
 require (
 	github.com/emicklei/proto v1.13.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect

go.sum

@@ -16,19 +16,17 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/sqlc-dev/plugin-sdk-go v1.23.0 h1:iSeJhnXPlbDXlbzUEebw/DxsGzE9rdDJArl8Hvt0RMM=
 github.com/sqlc-dev/plugin-sdk-go v1.23.0/go.mod h1:I1r4THOfyETD+LI2gogN2LX8wCjwUZrgy/NU4In3llA=
-github.com/walterwanderley/sqlc-connect v0.2.3 h1:W1+lOKgSg5TehPceELAilyR0Wf2k2DCiAbqrp7anN18=
-github.com/walterwanderley/sqlc-connect v0.2.3/go.mod h1:qId0WvvjEq+hkjn03ma1Q9jXmdBFx3i3CHEvG2IKzC0=
-github.com/walterwanderley/sqlc-grpc v0.18.2 h1:lyTdw0To6wjZ0FK1mcbWsozSm1sGckJYnElhtq1Xd90=
-github.com/walterwanderley/sqlc-grpc v0.18.2/go.mod h1:bfMjDJUNyUkk3+OM/we8OKDYPVodms+ekOgHvV2hXFY=
+github.com/walterwanderley/sqlc-connect v0.2.5 h1:60QcbtAsynbmyIimkRpwouzhcjMMftUq6WC9qSWTvFQ=
+github.com/walterwanderley/sqlc-connect v0.2.5/go.mod h1:qId0WvvjEq+hkjn03ma1Q9jXmdBFx3i3CHEvG2IKzC0=
+github.com/walterwanderley/sqlc-grpc v0.18.3 h1:cEfURGJQgXpvSdUL23QgEsMjY4Yh/CnfKRhq7nD3HzQ=
+github.com/walterwanderley/sqlc-grpc v0.18.3/go.mod h1:bfMjDJUNyUkk3+OM/we8OKDYPVodms+ekOgHvV2hXFY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -51,8 +49,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
-golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/server.go

@@ -1,8 +1,15 @@
 package golang
 
 import (
+	"bytes"
+	"fmt"
+	"go/format"
+	"io"
+	"io/fs"
+	"log"
 	"sort"
 	"strings"
+	"text/template"
 
 	"github.com/sqlc-dev/plugin-sdk-go/plugin"
 	"github.com/sqlc-dev/sqlc-gen-go/internal/opts"
@@ -178,3 +185,38 @@ func toServerDefinition(req *plugin.GenerateRequest, options *opts.Options, enum
 
 	return &def
 }
+
+func execServerTemplate(fs fs.FS, funcs template.FuncMap, name string, data any, goSource bool) ([]byte, error) {
+	var b bytes.Buffer
+
+	f, err := fs.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+	tmpl, err := io.ReadAll(f)
+	if err != nil {
+		return nil, err
+	}
+
+	t, err := template.New(name).Funcs(funcs).Parse(string(tmpl))
+	if err != nil {
+		return nil, err
+	}
+	err = t.Execute(&b, data)
+	if err != nil {
+		return nil, fmt.Errorf("execute template error: %w", err)
+	}
+
+	var src []byte
+	if goSource {
+		src, err = format.Source(b.Bytes())
+		if err != nil {
+			log.Println(b.String())
+			return nil, fmt.Errorf("format source error: %w", err)
+		}
+	} else {
+		src = b.Bytes()
+	}
+	return src, nil
+}

internal/server_grpc.go

@@ -1,21 +1,16 @@
 package golang
 
 import (
-	"bytes"
 	"fmt"
-	"go/format"
-	"io"
 	"io/fs"
 	"log"
 	"path/filepath"
 	"strings"
-	"text/template"
 
 	"github.com/sqlc-dev/plugin-sdk-go/plugin"
 	"github.com/sqlc-dev/sqlc-gen-go/internal/opts"
 	"github.com/walterwanderley/sqlc-grpc/converter"
 	grpctemplates "github.com/walterwanderley/sqlc-grpc/templates"
-	"golang.org/x/tools/imports"
 )
 
 func grpcFiles(req *plugin.GenerateRequest, options *opts.Options, enums []Enum, structs []Struct, queries []Query) ([]*plugin.File, error) {
@@ -110,42 +105,3 @@ func grpcFiles(req *plugin.GenerateRequest, options *opts.Options, enums []Enum,
 
 	return files, nil
 }
-
-func execServerTemplate(fs fs.FS, funcs template.FuncMap, name string, data any, goSource bool) ([]byte, error) {
-	var b bytes.Buffer
-
-	f, err := fs.Open(name)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	tmpl, err := io.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	t, err := template.New(name).Funcs(funcs).Parse(string(tmpl))
-	if err != nil {
-		return nil, err
-	}
-	err = t.Execute(&b, data)
-	if err != nil {
-		return nil, fmt.Errorf("execute template error: %w", err)
-	}
-
-	var src []byte
-	if goSource {
-		src, err = format.Source(b.Bytes())
-		if err != nil {
-			log.Println(b.String())
-			return nil, fmt.Errorf("format source error: %w", err)
-		}
-		src, err = imports.Process("", src, nil)
-		if err != nil {
-			return nil, fmt.Errorf("organize imports error: %w", err)
-		}
-	} else {
-		src = b.Bytes()
-	}
-	return src, nil
-}