move generation command from justfile to //go:generate

Author: kefniark

cmd/mangosql/mangosql.go

@@ -7,6 +7,7 @@ import (
 	"go/format"
 	"os"
 	"path"
+	"path/filepath"
 	"regexp"
 	"slices"
 	"strings"
@@ -174,7 +175,6 @@ func generate(opts GenerateOptions) error {
 	}
 
 	if opts.Inline {
-		fmt.Println(string(formatted))
 		return nil
 	}
 
@@ -186,7 +186,9 @@ func generate(opts GenerateOptions) error {
 	defer f.Close()
 
 	_, err = f.WriteString(string(formatted))
-	fmt.Printf("Generated %s\n", path.Join(folder, file))
+	if path, err := filepath.Abs(path.Join(folder, file)); err == nil {
+		fmt.Printf("Generated %s\n", path)
+	}
 
 	return err
 }

docs/getting-started/index.md

@@ -92,3 +92,12 @@ import "{your_project_url}/database"
 ```
 :::
 
+::: tip
+Mangosql can be combined with go:generate (ref: https://go.dev/blog/generate)
+
+```go
+//go:generate mangosql --output ./client.go --driver mysql ./schema.sql
+```
+
+This allow to keep code generation and usage really close to each other
+:::

internal/generator/generator.go

@@ -149,8 +149,6 @@ func Generate(schema *core.SQLSchema, contents io.Writer, pkg string, driver str
 		logConfig.Type = ``
 	}
 
-	fmt.Println(logger, logConfig)
-
 	if err = headerTmpl.Execute(contents, HeaderData{
 		Package:     pkg,
 		Url:         "https://github.com/kefniark/mangosql",

justfile

@@ -11,30 +11,7 @@ docs:
     npm run docs:dev
 
 generate:
-    # tests
-    go run ./cmd/mangosql/ --output ./tests/postgres/auto-increment/client.go --package autoincrement --logger console ./tests/postgres/auto-increment/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/postgres/composite/client.go --package composite --logger console ./tests/postgres/composite/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/postgres/types/client.go --package types --logger console ./tests/postgres/types/schema.sql
-
-    # test loggers
-    go run ./cmd/mangosql/ --output ./tests/logger/zap-logger/client.go --package zaplogger --logger zap ./tests/logger/zap-logger/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/logger/logrus-logger/client.go --package logruslogger --logger logrus ./tests/logger/logrus-logger/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/logger/zerolog-logger/client.go --package zerologlogger --logger zerolog ./tests/logger/zerolog-logger/schema.sql
-
-    # test queries
-    go run ./cmd/mangosql/ --output ./tests/queries/pq/client.go --package pq --driver pq --logger console ./tests/queries/sqlited/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/queries/pgx/client.go --package pgx --logger console ./tests/queries/sqlited/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/queries/mysql/client.go --package mysql --driver mysql --logger console ./tests/queries/mysql/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/queries/mariadb/client.go --package mariadb --driver mariadb --logger console ./tests/queries/mariadb/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/queries/sqlited/client.go --package sqlited --driver sqlite --logger console ./tests/queries/sqlited/schema.sql
-
-    # bench
-    mkdir -p ./tests/bench/pq
-    mkdir -p ./tests/bench/pgx
-    mkdir -p ./tests/bench/sqlite
-    go run ./cmd/mangosql/ --output ./tests/bench/pq/client.go --package pq --driver pq ./tests/bench/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/bench/pgx/client.go --package pgx ./tests/bench/schema.sql
-    go run ./cmd/mangosql/ --output ./tests/bench/sqlite/client.go --package pq --driver sqlite ./tests/bench/schema.sqlite.sql
+    go generate ./tests/...
 
 bench:
     CGO_ENABLED=0 go test -bench=. -benchmem ./tests/bench | tee bench.log

tests/bench/pgx/gen.go

@@ -0,0 +1,3 @@
+package pgx
+
+//go:generate go run ../../../cmd/mangosql/ --output ./client.go --package pgx ../schema.sql

tests/bench/pq/gen.go

@@ -0,0 +1,3 @@
+package pq
+
+//go:generate go run ../../../cmd/mangosql/ --output ./client.go --package pq --driver pq ../schema.sql

tests/bench/sqlite/gen.go

@@ -0,0 +1,3 @@
+package sqlited
+
+//go:generate go run ../../../cmd/mangosql/ --output ./client.go --package sqlited --driver sqlite ../schema.sqlite.sql

tests/logger/logrus-logger/client_test.go

@@ -12,6 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+//go:generate go run ../../../cmd/mangosql/ --package logruslogger --logger logrus ./schema.sql
+
 //go:embed *.sql
 var sqlFS embed.FS
 

tests/logger/zap-logger/client_test.go

@@ -12,6 +12,8 @@ import (
 	"go.uber.org/zap/zaptest/observer"
 )
 
+//go:generate go run ../../../cmd/mangosql/ --package zaplogger --logger zap ./schema.sql
+
 //go:embed *.sql
 var sqlFS embed.FS
 

tests/logger/zerolog-logger/client_test.go

@@ -12,6 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+//go:generate go run ../../../cmd/mangosql/ --package zerologlogger --logger zerolog ./schema.sql
+
 //go:embed *.sql
 var sqlFS embed.FS